Modify par

Author: podondra

Makefile

@@ -22,7 +22,6 @@ opt.o: src/opt.cc src/random.h
 par.o: src/par.cc src/random.h
 	$(CXX) $(CXXFLAGS) -c $< \
 	    -fopt-info-vec-optimized -mavx -ffast-math \
-	    -DPAPI -I/usr/include \
 	    -fopenmp
 
 cache-info: tool/cache-info.cc

src/par.cc

@@ -10,11 +10,6 @@
 #include <random>
 #include "random.h"
 
-#ifdef PAPI
-#include <papi.h>
-#define NUM_EVENTS 5
-#endif
-
 #define BF 16
 
 using namespace std;
@@ -33,6 +28,7 @@ void par_computation(
         uint32_t *__restrict__ max,
         uint32_t *__restrict__ count
         ) {
+#pragma omp parallel for default(shared) num_threads(24)
     for (size_t j = 0; j < num; ++j)
         n[j] = (1 << n[j]) - 1;
 
@@ -46,7 +42,7 @@ void par_computation(
 
     uint32_t dist;
     /* loop tiling - main */
-#pragma omp parallel for default(shared) num_threads(12) \
+#pragma omp parallel for default(shared) num_threads(24) \
     private(dist, p_a, p_b, p_x, p_n, p_min, p_max, p_count)
     for (size_t j1 = 0; j1 < num - BF; j1 += BF) {
         p_a     = a + j1;
@@ -160,29 +156,8 @@ double par(default_random_engine *engine, uint32_t num, uint32_t k) {
     /* start time measurement */
     start = chrono::high_resolution_clock::now();
 
-#ifdef PAPI
-    int Events[NUM_EVENTS] = { PAPI_L1_DCM, PAPI_L2_DCM, PAPI_L2_DCA, PAPI_L3_TCM, PAPI_L3_TCA };
-    long_long values[NUM_EVENTS];
-
-    /* start counting events */
-    if (PAPI_start_counters(Events, NUM_EVENTS) != PAPI_OK)
-        return 0;
-#endif
-
     par_computation(num, k, c, d, e, a, b, n, x, min, max, count);
 
-#ifdef PAPI
-    /* Stop counting events */
-    if (PAPI_stop_counters(values, NUM_EVENTS) != PAPI_OK)
-        return 0;
-
-    fprintf(stderr, "%lld\t", values[0]);
-    fprintf(stderr, "%lld\t", values[1]);
-    fprintf(stderr, "%lld\t", values[2]);
-    fprintf(stderr, "%lld\t", values[3]);
-    fprintf(stderr, "%lld\t", values[4]);
-#endif
-
     /* end time measurement */
     end = chrono::high_resolution_clock::now();
 

tool/gpu_long_job.sh

@@ -31,5 +31,5 @@
 #$ -q gpu_long.q
 
 for N in `seq 10000000 10000000 270000000`; do
-    ../lg --opt -k 100 -n "$N" > /dev/null
+    ../lg --par -k 100 -n "$N" > /dev/null
 done

tool/par/12-threads.sh.e88962

@@ -0,0 +1,27 @@
+10000000	0.227343
+20000000	0.430050
+30000000	0.703288
+40000000	0.844168
+50000000	0.796373
+60000000	0.956685
+70000000	1.115319
+80000000	1.274490
+90000000	1.471160
+100000000	1.592788
+110000000	1.754049
+120000000	1.910793
+130000000	2.070521
+140000000	2.231861
+150000000	2.390624
+160000000	2.618280
+170000000	3.886467
+180000000	2.867159
+190000000	3.029167
+200000000	3.187242
+210000000	3.434579
+220000000	3.508491
+230000000	3.668244
+240000000	3.828935
+250000000	3.985086
+260000000	8.358737
+270000000	4.315396

tool/par/basic.sh.e88956

@@ -0,0 +1,27 @@
+10000000	1326141	75957	1326141	29804	76575	0.284719
+20000000	2275128	143764	2275128	57002	144539	0.479404
+30000000	3121309	220643	3121309	83587	221487	0.510368
+40000000	4194898	280825	4194898	109727	281795	0.695323
+50000000	5244613	346526	5244613	136024	347585	0.848015
+60000000	6288881	426312	6288881	164774	427501	1.016199
+70000000	7415152	501807	7415152	189065	503035	1.185935
+80000000	8400435	565968	8400435	217643	567296	1.353558
+90000000	9438294	630883	9438294	244027	632317	1.559557
+100000000	10478056	710916	10478056	269789	712368	1.732192
+110000000	11531129	770821	11531129	299421	772416	1.904582
+120000000	12586319	849874	12586319	322809	851529	2.028358
+130000000	13588817	906278	13588817	354866	908100	2.196629
+140000000	14683189	970617	14683189	378019	972515	2.422972
+150000000	15722720	1054905	15722720	408405	1056889	2.533676
+160000000	16793577	1114780	16793577	431090	1116902	2.702400
+170000000	17689644	1246286	17689644	494856	1248588	4.039454
+180000000	18876440	1248697	18876440	487871	1250989	3.039344
+190000000	19904424	1386015	19904424	512916	1388313	3.208552
+200000000	20951578	1415939	20951578	544121	1418243	3.458644
+210000000	21835117	1498999	21835117	567054	1501431	3.545276
+220000000	23051197	1622398	23051197	637542	1624981	3.713092
+230000000	24082943	1615628	24082943	624551	1618243	3.976767
+240000000	25444818	1739103	25444818	647494	1741962	4.150567
+250000000	26215426	1742959	26215426	675063	1745704	4.219374
+260000000	27270095	2034602	27270095	838967	2037735	8.673493
+270000000	28613478	1902139	28613478	712986	1905195	4.558483