From 4bebc0f0c146846c02573019e3291858bef54c6c Mon Sep 17 00:00:00 2001
From: jzhou <jzhou>
Date: Sat, 17 Jul 2010 22:19:17 +0000
Subject: [PATCH] Assign each core 4 blocks of shared memory and set up the
 benchmarks' workload to make sure that each benchmark will have at least 2
 rounds of gc

---
 .../src/Benchmarks/Scheduling/GC/Fibheaps/TestRunner.java   | 2 +-
 Robust/src/Benchmarks/Scheduling/GC/GCBench/GCBench.java    | 6 +++---
 .../src/Benchmarks/Scheduling/GC/MTree/macrotest_tree.java  | 2 +-
 .../Benchmarks/Scheduling/GC/RayTracer/RayTracerBench.java  | 2 +-
 Robust/src/Runtime/multicoreruntime.h                       | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Robust/src/Benchmarks/Scheduling/GC/Fibheaps/TestRunner.java b/Robust/src/Benchmarks/Scheduling/GC/Fibheaps/TestRunner.java
index 4c8139cd..eec6f631 100644
--- a/Robust/src/Benchmarks/Scheduling/GC/Fibheaps/TestRunner.java
+++ b/Robust/src/Benchmarks/Scheduling/GC/Fibheaps/TestRunner.java
@@ -7,7 +7,7 @@ public class TestRunner {
   
   public void run() {
     // generate test data
-    int iter = 700; //200;
+    int iter = 1000; //200;
     int seed = 1967;
     //Vector testdata = new Vector(iter);
     FibHeap fh = new FibHeap();
diff --git a/Robust/src/Benchmarks/Scheduling/GC/GCBench/GCBench.java b/Robust/src/Benchmarks/Scheduling/GC/GCBench/GCBench.java
index 2db25116..2d8aa5be 100644
--- a/Robust/src/Benchmarks/Scheduling/GC/GCBench/GCBench.java
+++ b/Robust/src/Benchmarks/Scheduling/GC/GCBench/GCBench.java
@@ -83,9 +83,9 @@ public class TestRunner {
   public static final int kMaxTreeDepth;// = 16;
   
   public TestRunner() {
-    kStretchTreeDepth    = 12;// 1/2Mb 18;  // about 16Mb
-    kLongLivedTreeDepth  = 10; // 1/8Mb 16;  // about 4Mb
-    kArraySize  = 125000/16; // 1/8Mb 500000;  // about 4Mb
+    kStretchTreeDepth    = 13;// 1Mb 18;  // about 16Mb
+    kLongLivedTreeDepth  = 11; // 1/4Mb 16;  // about 4Mb
+    kArraySize  = 125000/8; // 1/4Mb 500000;  // about 4Mb
     kMinTreeDepth = 4;
     kMaxTreeDepth = 16;
   }
diff --git a/Robust/src/Benchmarks/Scheduling/GC/MTree/macrotest_tree.java b/Robust/src/Benchmarks/Scheduling/GC/MTree/macrotest_tree.java
index ea2fffcb..4a5bec80 100644
--- a/Robust/src/Benchmarks/Scheduling/GC/MTree/macrotest_tree.java
+++ b/Robust/src/Benchmarks/Scheduling/GC/MTree/macrotest_tree.java
@@ -2,7 +2,7 @@ task t1(StartupObject s{initialstate}) {
 	//System.printString("task t1\n");
 	
 	int threadnum = 62;
-    int size = 21500;
+    int size = 30000;
     int nodenum = size*10;
 	for(int i = 0; i < threadnum; ++i) {
 		TestRunner tr = new TestRunner(i, size, nodenum){run};
diff --git a/Robust/src/Benchmarks/Scheduling/GC/RayTracer/RayTracerBench.java b/Robust/src/Benchmarks/Scheduling/GC/RayTracer/RayTracerBench.java
index e8eddd67..a19f8892 100644
--- a/Robust/src/Benchmarks/Scheduling/GC/RayTracer/RayTracerBench.java
+++ b/Robust/src/Benchmarks/Scheduling/GC/RayTracer/RayTracerBench.java
@@ -2,7 +2,7 @@ task t1(StartupObject s{initialstate}) {
   //System.printString("task t1\n");
 
   int threadnum = 62;
-  int size = threadnum * 20;
+  int size = threadnum * 25;
   Composer comp = new Composer(threadnum, size){compose};
   for(int i = 0; i < threadnum; ++i) {
     TestRunner tr = new TestRunner(i, threadnum, size){run};
diff --git a/Robust/src/Runtime/multicoreruntime.h b/Robust/src/Runtime/multicoreruntime.h
index 6ab3aa9b..f78f487c 100644
--- a/Robust/src/Runtime/multicoreruntime.h
+++ b/Robust/src/Runtime/multicoreruntime.h
@@ -282,11 +282,11 @@ struct Queue * totransobjqueue; // queue to hold objs to be transferred
 #define BAMBOO_SMEM_SIZE (64 * 64) // (BAMBOO_PAGE_SIZE)
 #define BAMBOO_SHARED_MEM_SIZE ((BAMBOO_PAGE_SIZE) *(BAMBOO_NUM_PAGES))
 #else
-#define BAMBOO_NUM_PAGES (256) //(15 * 1024) //(64 * 4 * 0.75) //(1024 * 1024 * 3.5)  3G
+#define BAMBOO_NUM_PAGES (62*(2+3)) //(15 * 1024) //(64 * 4 * 0.75) //(1024 * 1024 * 3.5)  3G
 #define BAMBOO_PAGE_SIZE (4 * 1024 * 1024)  // (4096)
 #define BAMBOO_SMEM_SIZE (4 * 1024 * 1024)
-#define BAMBOO_SHARED_MEM_SIZE (1024 * 1024 * 1024) //(1024 * 1024 * 240)
-//((unsigned long long int)(3.0 * 1024 * 1024 * 1024)) // 3G// ((BAMBOO_PAGE_SIZE) * (BAMBOO_NUM_PAGES))
+#define BAMBOO_SHARED_MEM_SIZE ((BAMBOO_PAGE_SIZE) * (BAMBOO_NUM_PAGES)) //(1024 * 1024 * 240)
+//((unsigned long long int)(3.0 * 1024 * 1024 * 1024)) // 3G 
 #endif // GC_DEBUG
 
 #ifdef MULTICORE_GC
-- 
2.34.1