some tweaks to number of workers and workloads

[IRC.git] / Robust / src / Benchmarks / oooJava / sor / makefile

diff --git a/Robust/src/Benchmarks/oooJava/sor/makefile b/Robust/src/Benchmarks/oooJava/sor/makefile
index d1de74d317a290bbcd2f49b81a209f4b193238ba..81f32ad64c05ca67d9836025d5a9a4d389ab83a5 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/sor/makefile
+++ b/Robust/src/Benchmarks/oooJava/sor/makefile
@@ -2,28 +2,8 @@ PROGRAM=JGFSORBenchSizeD
 
 SOURCE_FILES=JGFSORBenchSizeD.java
 
-BUILDSCRIPT=../../../buildscript
+NUM_OOO_WORKERS=24
+NUM_RCR_WORKERS=23
+COREPINFLAG=-corepin
 
-USEOOO= -ooojava 24 2  -ooodebug  
-BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 1024 -garbagestats -debug -joptimize -noloop -optimize -coreprof -coreprof-eventwords 1024*1024*128 -coreprof-checkoverflow 
-DISJOINT= -disjoint -disjoint-k 1 -enable-assertions #-disjoint-desire-determinism
-
-default:
-       $(BUILDSCRIPT) -nojava $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p $(SOURCE_FILES) -builddir par
-
-single:
-       $(BUILDSCRIPT) $(BSFLAGS) -thread -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
-
-ooo:
-       $(BUILDSCRIPT) $(USEOOO) $(BSFLAGS) $(DISJOINT) -o $(PROGRAM)p -builddir par $(SOURCE_FILES) 
-
-clean:
-       rm -f  $(PROGRAM)p.bin $(PROGRAM)s.bin
-       rm -fr par sing
-       rm -f  *~
-       rm -f  *.dot
-       rm -f  *.png
-       rm -f  *.txt
-       rm -f  aliases.txt
-       rm -f  mlpReport*txt
-       rm -f  results*txt
+include ../master-makefile