move heap size of output program into the benchmark-specific makefile

diff --git a/Robust/src/Benchmarks/oooJava/D2/makefile b/Robust/src/Benchmarks/oooJava/D2/makefile
index 7c9f2e3a8f0e3a08b7edf32054b68d27f68e1aad..9235c797a8d04d76fa361a4a0c40eb742810a75e 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/D2/makefile
+++ b/Robust/src/Benchmarks/oooJava/D2/makefile
@@ -5,4 +5,6 @@ SOURCE_FILES=SerialDelaunayRefinement.java
 NUM_OOO_WORKERS=24
 NUM_RCR_WORKERS=7
 
+BMFLAGS= -heapsize-mb 5000
+
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/DelaunayRefinement-orig-algo/makefile b/Robust/src/Benchmarks/oooJava/DelaunayRefinement-orig-algo/makefile
index bfc6b8b2d1bd64caba5697ca460dd8881a4ca4ad..733f03798c3f974bcabe150bd6dcba0ab752a431 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/DelaunayRefinement-orig-algo/makefile
+++ b/Robust/src/Benchmarks/oooJava/DelaunayRefinement-orig-algo/makefile
@@ -5,4 +5,6 @@ SOURCE_FILES=SerialDelaunayRefinement.java
 NUM_OOO_WORKERS=24
 NUM_RCR_WORKERS=23
 
+BMFLAGS= -heapsize-mb 5000
+
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/DelaunayRefinement/makefile b/Robust/src/Benchmarks/oooJava/DelaunayRefinement/makefile
index 7c9f2e3a8f0e3a08b7edf32054b68d27f68e1aad..9235c797a8d04d76fa361a4a0c40eb742810a75e 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/DelaunayRefinement/makefile
+++ b/Robust/src/Benchmarks/oooJava/DelaunayRefinement/makefile
@@ -5,4 +5,6 @@ SOURCE_FILES=SerialDelaunayRefinement.java
 NUM_OOO_WORKERS=24
 NUM_RCR_WORKERS=7
 
+BMFLAGS= -heapsize-mb 5000
+
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/barneshut/makefile b/Robust/src/Benchmarks/oooJava/barneshut/makefile
index 7757d8b7073038bdb9f47a1b59dee0f66fb92d80..794e39a6a9cd743099da08424fd1606ef07a51a0 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/barneshut/makefile
+++ b/Robust/src/Benchmarks/oooJava/barneshut/makefile
@@ -5,4 +5,6 @@ SOURCE_FILES=Barneshut.java
 NUM_OOO_WORKERS=24
 NUM_RCR_WORKERS=24
 
+BMFLAGS= -heapsize-mb 5000
+
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/crypt/makefile b/Robust/src/Benchmarks/oooJava/crypt/makefile
index da05e66521901c02bb7b1767873a10e17deb5bcd..10959151a5cb18487ca0dd1054f5380d7af268b3 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/crypt/makefile
+++ b/Robust/src/Benchmarks/oooJava/crypt/makefile
@@ -5,4 +5,6 @@ SOURCE_FILES=JGFCryptBench.java
 NUM_OOO_WORKERS=24
 NUM_RCR_WORKERS=23
 
+BMFLAGS= -heapsize-mb 5000
+
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/kmeans/makefile b/Robust/src/Benchmarks/oooJava/kmeans/makefile
index 1c93d937982e44e2d22f1c00a6336d39a1a1b2eb..3f2167840fba29f54bda05911cc3915e6da32cd7 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/kmeans/makefile
+++ b/Robust/src/Benchmarks/oooJava/kmeans/makefile
@@ -10,4 +10,6 @@ SOURCE_FILES=${PROGRAM}.java \
 NUM_OOO_WORKERS=24
 NUM_RCR_WORKERS=23
 
+BMFLAGS= -heapsize-mb 5000
+
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/labyrinth/makefile b/Robust/src/Benchmarks/oooJava/labyrinth/makefile
index 31c272a21aede21515784ec429bb9f49efd3f6bb..11204ed82aee8af56ad94a702f8e5838cede4d5b 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/labyrinth/makefile
+++ b/Robust/src/Benchmarks/oooJava/labyrinth/makefile
@@ -5,4 +5,6 @@ SOURCE_FILES=Coordinate.java CoordPathWrapper.java Grid.java Labyrinth.java List
 NUM_OOO_WORKERS=24
 NUM_RCR_WORKERS=23
 
+BMFLAGS= -heapsize-mb 5000
+
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/labyrinthalloc/makefile b/Robust/src/Benchmarks/oooJava/labyrinthalloc/makefile
index 31c272a21aede21515784ec429bb9f49efd3f6bb..11204ed82aee8af56ad94a702f8e5838cede4d5b 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/labyrinthalloc/makefile
+++ b/Robust/src/Benchmarks/oooJava/labyrinthalloc/makefile
@@ -5,4 +5,6 @@ SOURCE_FILES=Coordinate.java CoordPathWrapper.java Grid.java Labyrinth.java List
 NUM_OOO_WORKERS=24
 NUM_RCR_WORKERS=23
 
+BMFLAGS= -heapsize-mb 5000
+
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/mergesort/makefile b/Robust/src/Benchmarks/oooJava/mergesort/makefile
index eaeafcf80ab1fb3d314ed7aac68f3680963223b8..0aac737fcfeabae5103daa267e38b9edefe711cd 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/mergesort/makefile
+++ b/Robust/src/Benchmarks/oooJava/mergesort/makefile
@@ -4,6 +4,6 @@ SOURCE_FILES=BMergeSort4.java
 
 NUM_OOO_WORKERS=65
 NUM_RCR_WORKERS=64
-#BMFLAGS=-corepin
+BMFLAGS=-heapsize-mb 8000 #-corepin
 
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/moldyn/makefile b/Robust/src/Benchmarks/oooJava/moldyn/makefile
index 69837e1dd22ae45ac7c60aad683ce38228ad70bc..4f994516df7c1fdd3af569bfde705bff87a81e75 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/moldyn/makefile
+++ b/Robust/src/Benchmarks/oooJava/moldyn/makefile
@@ -5,6 +5,6 @@ SOURCE_FILES=JGFMolDynBenchSizeB.java
 NUM_OOO_WORKERS=24
 NUM_RCR_WORKERS=23
 
-BMFLAGS=-nostalltr
+BMFLAGS= -heapsize-mb 5000 -nostalltr
 
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/monte/makefile b/Robust/src/Benchmarks/oooJava/monte/makefile
index 7f152430865506457d0704cd56525d42f3f4774f..fc5941af75b2b34a9ccd1b0bf1bd9efdf4c07476 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/monte/makefile
+++ b/Robust/src/Benchmarks/oooJava/monte/makefile
@@ -5,4 +5,6 @@ SOURCE_FILES=JGFMonteCarloBench.java
 NUM_OOO_WORKERS=24
 NUM_RCR_WORKERS=23
 
+BMFLAGS= -heapsize-mb 5000
+
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/power/makefile b/Robust/src/Benchmarks/oooJava/power/makefile
index 36ae01ed08d7dbbed47b3e7d351e9a269956665a..7057db69d15974b206c17378d7672383d9042cb4 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/power/makefile
+++ b/Robust/src/Benchmarks/oooJava/power/makefile
@@ -5,4 +5,6 @@ SOURCE_FILES=$(PROGRAM).java
 NUM_OOO_WORKERS=24
 NUM_RCR_WORKERS=23
 
+BMFLAGS= -heapsize-mb 5000
+
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/raytracer/makefile b/Robust/src/Benchmarks/oooJava/raytracer/makefile
index b6ebcc5e67c1539048d4464034a5019842c34d74..cff270266b71e4879bbe229b795b876e12afadb3 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/raytracer/makefile
+++ b/Robust/src/Benchmarks/oooJava/raytracer/makefile
@@ -5,4 +5,6 @@ SOURCE_FILES=test.java
 NUM_OOO_WORKERS=24
 NUM_RCR_WORKERS=23
 
+BMFLAGS= -heapsize-mb 5000
+
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/sor/makefile b/Robust/src/Benchmarks/oooJava/sor/makefile
index 980264557f2c91107f1169cb228afea4ff295b6e..75f83275e888a91d047d26a1788bd2630ce0aa35 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/sor/makefile
+++ b/Robust/src/Benchmarks/oooJava/sor/makefile
@@ -4,6 +4,7 @@ SOURCE_FILES=JGFSORBenchSizeD.java
 
 NUM_OOO_WORKERS=24
 NUM_RCR_WORKERS=23
-#BMFLAGS=-corepin
+
+BMFLAGS= -heapsize-mb 5000 #-corepin
 
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/tracking/makefile b/Robust/src/Benchmarks/oooJava/tracking/makefile
index 6d4c8c633542bfc31f0210b50ae600a1acf1ad12..4149170e6cd67a74baadfd3a7bef628ae74cdd19 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/tracking/makefile
+++ b/Robust/src/Benchmarks/oooJava/tracking/makefile
@@ -5,4 +5,6 @@ SOURCE_FILES=TrackingBench.java
 NUM_OOO_WORKERS=24
 NUM_RCR_WORKERS=23
 
+BMFLAGS= -heapsize-mb 5000
+
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/voronoi/makefile b/Robust/src/Benchmarks/oooJava/voronoi/makefile
index a7699df177ac0fc784b21585711e746db3b9cef9..15b89d57ee0eab9be215a60ae5d6984cb0de4cb7 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/voronoi/makefile
+++ b/Robust/src/Benchmarks/oooJava/voronoi/makefile
@@ -5,4 +5,6 @@ SOURCE_FILES=TestRunner.java
 NUM_OOO_WORKERS=24
 NUM_RCR_WORKERS=31
 
+BMFLAGS= -heapsize-mb 5000
+
 include ../master-makefile