From 1aef7fcf02784cf73392e7c1ae66a9945c487934 Mon Sep 17 00:00:00 2001 From: jzhou Date: Fri, 15 Jul 2011 01:42:54 +0000 Subject: [PATCH] my changes --- .../{TestRunner.java => TestRunner.p} | 3 +- .../GCBench/{TestRunner.java => TestRunner.p} | 3 +- .../{AppDemoRunner.java => AppDemoRunner.p} | 8 +- .../MTree/{TestRunner.java => TestRunner.p} | 3 +- .../{TestRunner.java => TestRunner.p} | 3 +- .../bh/{TestRunner.java => TestRunner.p} | 3 +- .../lcss/{TestRunner.java => TestRunner.p} | 5 +- .../tsp/{TestRunner.java => TestRunner.p} | 3 +- .../voronoi/{TestRunner.java => TestRunner.p} | 3 +- Robust/src/Runtime/bamboo/multicorehelper.c | 43 ++++++++++- Robust/src/Runtime/bamboo/multicoremem.h | 75 +------------------ 11 files changed, 66 insertions(+), 86 deletions(-) rename Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/Fibheaps/{TestRunner.java => TestRunner.p} (96%) rename Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/GCBench/{TestRunner.java => TestRunner.p} (98%) rename Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/JGFMonteCarlo/{AppDemoRunner.java => AppDemoRunner.p} (93%) rename Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/MTree/{TestRunner.java => TestRunner.p} (94%) rename Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/RayTracer/{TestRunner.java => TestRunner.p} (97%) rename Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/bh/{TestRunner.java => TestRunner.p} (98%) rename Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/lcss/{TestRunner.java => TestRunner.p} (99%) rename Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/tsp/{TestRunner.java => TestRunner.p} (97%) rename Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/voronoi/{TestRunner.java => TestRunner.p} (95%) diff --git a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/Fibheaps/TestRunner.java b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/Fibheaps/TestRunner.p similarity index 96% rename from Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/Fibheaps/TestRunner.java rename to Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/Fibheaps/TestRunner.p index c61f7b72..d5edbeea 100644 --- a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/Fibheaps/TestRunner.java +++ b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/Fibheaps/TestRunner.p @@ -59,7 +59,8 @@ public class TestRunner extends Thread { } public static void main(String[] args) { - int threadnum = 62; + int threadnum = THREADNUM; + System.setgcprofileflag(); for(int i = 0; i < threadnum; ++i) { TestRunner tr = new TestRunner(); tr.start(); diff --git a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/GCBench/TestRunner.java b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/GCBench/TestRunner.p similarity index 98% rename from Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/GCBench/TestRunner.java rename to Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/GCBench/TestRunner.p index 0507ff1f..d9028ea9 100644 --- a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/GCBench/TestRunner.java +++ b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/GCBench/TestRunner.p @@ -148,7 +148,8 @@ public class TestRunner extends Thread { } public static void main(String[] args) { - int threadnum = 62; + int threadnum = THREADNUM; + System.setgcprofileflag(); for(int i = 0; i < threadnum; ++i) { TestRunner tr = new TestRunner(); tr.start(); diff --git a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/JGFMonteCarlo/AppDemoRunner.java b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/JGFMonteCarlo/AppDemoRunner.p similarity index 93% rename from Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/JGFMonteCarlo/AppDemoRunner.java rename to Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/JGFMonteCarlo/AppDemoRunner.p index 96a13210..e62c6543 100644 --- a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/JGFMonteCarlo/AppDemoRunner.java +++ b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/JGFMonteCarlo/AppDemoRunner.p @@ -66,9 +66,11 @@ public class AppDemoRunner extends Thread { public static void main(String[] args) { int datasize = 10000; //should be times of 2 - int nruns = 62 * 62; //16 * 16; - int group = 62; // 16; + //int nruns = 62 * 62; //16 * 16; + int group = THREADNUM; // 16; + int nruns = group * group; + System.setgcprofileflag(); AppDemo ad = new AppDemo(datasize, nruns, group); ad.initSerial(); @@ -77,4 +79,4 @@ public class AppDemoRunner extends Thread { adr.start(); } } -} \ No newline at end of file +} diff --git a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/MTree/TestRunner.java b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/MTree/TestRunner.p similarity index 94% rename from Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/MTree/TestRunner.java rename to Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/MTree/TestRunner.p index 9189df39..be5f2d4b 100644 --- a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/MTree/TestRunner.java +++ b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/MTree/TestRunner.p @@ -35,9 +35,10 @@ public class TestRunner extends Thread { } public static void main(String[] args) { - int threadnum = 62; // 56; + int threadnum = THREADNUM; // 56; int size = 40000; int nodenum = size*10; + System.setgcprofileflag(); for(int i = 0; i < threadnum; ++i) { TestRunner tr = new TestRunner(i, size, nodenum); tr.start(); diff --git a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/RayTracer/TestRunner.java b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/RayTracer/TestRunner.p similarity index 97% rename from Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/RayTracer/TestRunner.java rename to Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/RayTracer/TestRunner.p index 2c39a7c4..e9b726ce 100644 --- a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/RayTracer/TestRunner.java +++ b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/RayTracer/TestRunner.p @@ -78,8 +78,9 @@ public class TestRunner extends RayTracer { } public static void main(String[] args) { - int threadnum = 62; // 56; + int threadnum = THREADNUM; // 56; int size = threadnum * 25; + System.setgcprofileflag(); Composer comp = new Composer(threadnum, size); RayTracer rt = new RayTracer(); Scene scene = rt.createScene(); diff --git a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/bh/TestRunner.java b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/bh/TestRunner.p similarity index 98% rename from Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/bh/TestRunner.java rename to Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/bh/TestRunner.p index de3ffcbd..9db00d0e 100644 --- a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/bh/TestRunner.java +++ b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/bh/TestRunner.p @@ -115,8 +115,9 @@ public class TestRunner extends Thread } public static void main(String[] args) { - int threadnum = 62; + int threadnum = THREADNUM; int nbody = 700; + System.setgcprofileflag(); for(int i = 0; i < threadnum; ++i) { TestRunner tr = new TestRunner(nbody); tr.start(); diff --git a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/lcss/TestRunner.java b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/lcss/TestRunner.p similarity index 99% rename from Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/lcss/TestRunner.java rename to Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/lcss/TestRunner.p index 9a91b4cc..894b9117 100644 --- a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/lcss/TestRunner.java +++ b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/lcss/TestRunner.p @@ -232,7 +232,7 @@ public class TestRunner extends Thread { } } public static void main(String argv[]){ - int threadnum = 62; + int threadnum = THREADNUM; int[] args = new int[6]; args[0] = 1; args[1] = 2; @@ -240,9 +240,10 @@ public class TestRunner extends Thread { args[3] = 80; args[4] = 81; args[5] = 240; + System.setgcprofileflag(); for(int i = 0; i < threadnum; ++i) { TestRunner tr = new TestRunner(args); tr.start(); } } -} \ No newline at end of file +} diff --git a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/tsp/TestRunner.java b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/tsp/TestRunner.p similarity index 97% rename from Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/tsp/TestRunner.java rename to Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/tsp/TestRunner.p index ce70adc4..f6701483 100644 --- a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/tsp/TestRunner.java +++ b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/tsp/TestRunner.p @@ -104,8 +104,9 @@ public class TestRunner extends Thread System.exit(0); }*/ public static void main(String[] args) { - int threadnum = 62; + int threadnum = THREADNUM; int ncities = 4080*2; + System.setgcprofileflag(); for(int i = 0; i < threadnum; ++i) { TestRunner tr = new TestRunner(ncities); tr.start(); diff --git a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/voronoi/TestRunner.java b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/voronoi/TestRunner.p similarity index 95% rename from Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/voronoi/TestRunner.java rename to Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/voronoi/TestRunner.p index 52de99ca..8d2f3871 100644 --- a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/voronoi/TestRunner.java +++ b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/voronoi/TestRunner.p @@ -44,8 +44,9 @@ public class TestRunner extends Thread } public static void main(String[] args) { - int threadnum = 62; + int threadnum = THREADNUM; int npoints = 32000; + System.setgcprofileflag(); for(int i = 0; i < threadnum; ++i) { TestRunner tr = new TestRunner(npoints); tr.start(); diff --git a/Robust/src/Runtime/bamboo/multicorehelper.c b/Robust/src/Runtime/bamboo/multicorehelper.c index 43f619f1..abf28159 100644 --- a/Robust/src/Runtime/bamboo/multicorehelper.c +++ b/Robust/src/Runtime/bamboo/multicorehelper.c @@ -74,8 +74,49 @@ unsigned int gc_block2core[64] = { 3, 7, 11, 15, 19, 23, 27, 31, 30, 26, 22, 18, 14, 10, 6, 2, 1, 5, 9, 13, 17, 21, 25, 29, 28, 24, 20, 16, 12, 8, 4, 0 }; +#elif defined GC_40 +// NUMCORES4GC = 40 +unsigned int gc_core2block[80] = { + 0,79, 15,64, 16,63, 31,48, 32,47, + 1,78, 14,65, 17,62, 30,49, 33,46, + 2,77, 13,66, 18,61, 29,50, 34,45, + 3,76, 12,67, 19,60, 28,51, 35,44, + 4,75, 11,68, 20,59, 27,52, 36,43, + 5,74, 10,69, 21,58, 26,53, 37,42, + 6,73, 9,70, 22,57, 25,54, 38,41, + 7,72, 8,71, 23,56, 24,55, 39,40 +}; + +unsigned int gc_block2core[80] = { + 0, 5, 10, 15, 20, 25, 30, 35, 36, 31, 26, 21, 16, 11, 6, 1, + 2, 7, 12, 17, 22, 27, 32, 37, 38, 33, 28, 23, 18, 13, 8, 3, + 4, 9, 14, 19, 24, 29, 34, 39, 39, 34, 29, 24, 19, 14, 9, 4, + 3, 8, 13, 18, 23, 28, 33, 38, 37, 32, 27, 22, 17, 12, 7, 2, + 1, 6, 11, 16, 21, 26, 31, 36, 35, 30, 25, 20, 15, 10, 5, 0 +}; +#elif defined GC_44 +// NUMCORES4GC = 44 +unsigned int gc_core2block[88] = { + 0,87, 15,72, 16,71, 31,56, 32,55, 43,44, + 1,86, 14,73, 17,70, 30,57, 33,54, 42,45, + 2,85, 13,74, 18,69, 29,58, 34,53, 41,46, + 3,84, 12,75, 19,68, 28,59, 35,52, 40,47 + 4,83, 11,76, 20,67, 27,60, 36,51, + 5,82, 10,77, 21,66, 26,61, 37,50, + 6,81, 9,78, 22,65, 25,62, 38,49, + 7,80, 8,79, 23,64, 24,63, 39,48 +}; + +unsigned int gc_block2core[96] = { + 0, 6, 12, 18, 24, 29, 34, 39, 40, 35, 30, 25, 19, 13, 7, 1, + 2, 8, 14, 20, 26, 31, 38, 44, 45, 39, 33, 27, 21, 15, 9, 3, + 4, 10, 16, 22, 28, 34, 40, 46, 47, 41, 35, 29, 23, 17, 11, 5, + 5, 11, 17, 23, 29, 35, 41, 47, 46, 40, 34, 28, 22, 16, 10, 4, + 3, 9, 15, 21, 27, 33, 39, 45, 44, 38, 32, 26, 20, 14, 8, 2, + 1, 7, 13, 19, 25, 31, 37, 43, 42, 36, 30, 24, 18, 12, 6, 0 +}; #elif defined GC_48 -// NUMCORES4GC = 50 +// NUMCORES4GC = 48 unsigned int gc_core2block[96] = { 0,95, 15,80, 16,79, 31,64, 32,63, 47,48, 1,94, 14,81, 17,78, 30,65, 33,62, 46,49, diff --git a/Robust/src/Runtime/bamboo/multicoremem.h b/Robust/src/Runtime/bamboo/multicoremem.h index 21fb53df..585a2d93 100644 --- a/Robust/src/Runtime/bamboo/multicoremem.h +++ b/Robust/src/Runtime/bamboo/multicoremem.h @@ -21,83 +21,12 @@ #endif // MULTICORE_GC #endif // TILERA_BME -#ifdef BAMBOO_MEMPROF -#define GC_BAMBOO_NUMCORES 56 -#else -#ifdef MGC -#define GC_BAMBOO_NUMCORES (NUMCORES) -#else -#define GC_BAMBOO_NUMCORES 62 -#endif -#endif - #define BAMBOO_SHARED_RUNTIME_PAGE_SIZE ((unsigned int)(1<<24)) //16M -#define BAMBOO_PAGE_SIZE ((unsigned int)(64 * 1024)) // 64K -#define BAMBOO_PAGE_SIZE_BITS (16) -#ifdef GC_LARGEPAGESIZE -#define BAMBOO_PAGE_SIZE ((unsigned int)(4 * 64 * 1024)) -#define BAMBOO_PAGE_SIZE_BITS (18) -#elif defined GC_LARGEPAGESIZE2 -#define BAMBOO_PAGE_SIZE ((unsigned int)(4 * 64 * 1024)) // 64K -#define BAMBOO_PAGE_SIZE_BITS (18) -#endif - -#ifdef GC_DEBUG -#include "structdefs.h" -#define BAMBOO_NUM_BLOCKS (NUMCORES4GC*(2+3)) -#define BAMBOO_PAGE_SIZE (64 * 64) -#define BAMBOO_PAGE_SIZE_BITS (12) -#define BAMBOO_SMEM_SIZE ((unsigned int)(BAMBOO_PAGE_SIZE)) -#define BAMBOO_SHARED_MEM_SIZE ((unsigned int)((BAMBOO_SMEM_SIZE) *(BAMBOO_NUM_BLOCKS))) - -#elif defined GC_CACHE_ADAPT -#ifdef GC_LARGESHAREDHEAP -#define BAMBOO_NUM_BLOCKS ((unsigned int)((GC_BAMBOO_NUMCORES)*(2+24))) -#elif defined MGC -#define BAMBOO_NUM_BLOCKS ((unsigned int)((GC_BAMBOO_NUMCORES)*72)) // 72M per core -#else -#define BAMBOO_NUM_BLOCKS ((unsigned int)((GC_BAMBOO_NUMCORES)*(2+14))) -#endif -#ifdef GC_LARGEPAGESIZE -#define BAMBOO_SMEM_SIZE ((unsigned int)(4 * (BAMBOO_PAGE_SIZE))) -#elif defined GC_SMALLPAGESIZE -#define BAMBOO_SMEM_SIZE ((unsigned int)(BAMBOO_PAGE_SIZE)) -#elif defined GC_SMALLPAGESIZE2 -#define BAMBOO_SMEM_SIZE ((unsigned int)(BAMBOO_PAGE_SIZE)) -#elif defined GC_LARGEPAGESIZE2 -#define BAMBOO_SMEM_SIZE ((unsigned int)(BAMBOO_PAGE_SIZE)) -#elif defined MGC -#define BAMBOO_SMEM_SIZE ((unsigned int)(16*(BAMBOO_PAGE_SIZE))) // 1M -#else -#define BAMBOO_SMEM_SIZE ((unsigned int)(4 * (BAMBOO_PAGE_SIZE))) -#endif // GC_LARGEPAGESIZE +// include the header file that defines the BAMBOO_NUM_BLOCKS, BAMBOO_PAGE_SIZE, BAMBOO_PAGE_SIZE_BITS and BAMBOO_SMEM_SIZE +#include "multicorememsize.h" #define BAMBOO_SHARED_MEM_SIZE ((unsigned int)((BAMBOO_SMEM_SIZE) * (BAMBOO_NUM_BLOCKS))) -#else // GC_DEBUG -#ifdef GC_LARGESHAREDHEAP -#define BAMBOO_NUM_BLOCKS ((unsigned int)((GC_BAMBOO_NUMCORES)*(2+5))) -#elif defined MGC -#define BAMBOO_NUM_BLOCKS ((unsigned int)((GC_BAMBOO_NUMCORES)*72)) // 72M per core -#else -#define BAMBOO_NUM_BLOCKS ((unsigned int)((GC_BAMBOO_NUMCORES)*(2+2))) //(15 * 1024) //(64 * 4 * 0.75) //(1024 * 1024 * 3.5) 3G -#endif -#ifdef GC_LARGEPAGESIZE -#define BAMBOO_SMEM_SIZE ((unsigned int)(BAMBOO_PAGE_SIZE*16)) -#elif defined GC_SMALLPAGESIZE -#define BAMBOO_PAGE_SIZE ((unsigned int)(256 * 1024)) // (4096) -#define BAMBOO_PAGE_SIZE_BITS (18) -#define BAMBOO_SMEM_SIZE ((unsigned int)(BAMBOO_PAGE_SIZE)) -#elif defined GC_SMALLPAGESIZE2 -#define BAMBOO_PAGE_SIZE ((unsigned int)(256 * 1024)) // (4096) 64 -#define BAMBOO_PAGE_SIZE_BITS (18) -#define BAMBOO_SMEM_SIZE ((unsigned int)(BAMBOO_PAGE_SIZE)) -#else -#define BAMBOO_SMEM_SIZE ((unsigned int)(BAMBOO_PAGE_SIZE*16)) -#endif // GC_LARGEPAGESIZE -#define BAMBOO_SHARED_MEM_SIZE ((unsigned int)((BAMBOO_SMEM_SIZE) * (BAMBOO_NUM_BLOCKS))) //(1024 * 1024 * 240) //((unsigned long long int)(3.0 * 1024 * 1024 * 1024)) // 3G -#endif // GC_DEBUG - #if defined(MULTICORE_GC)||defined(PMC_GC) #if defined(GC_SMALLPAGESIZE)||defined(PMC_GC) // memory for globals -- 2.34.1