changes to Moldyn and SOR benchmarks

diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile
index b4cd4e2507b9d985329df107df78f5a88a59703b..cec5302dd14efca4ac9da93476bf32e2d0d8d436 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile
+++ b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile
@@ -7,15 +7,23 @@ SRC=${MAINCLASS}.java \
        IntWrapper.java \
        MDWrap.java \
        ../../../../ClassLibrary/JavaDSM/Barrier.java
-FLAGS=-dsm -dsmcaching -prefetch -optimize -excprefetch particle.force -excprefetch particle.domove -excprefetch particle.mkekin -excprefetch TournamentBarrier.DoBarrier -excprefetch JGFMolDynBench.JGFvalidate -excprefetch JGFMolDynBench.JGFapplication -excprefetch JGFMolDynBench.JGFinitialise -excprefetch mdRunner.init -excprefetch mdRunner.doinit -excprefetch mdRunner.doinit2 -mainclass ${MAINCLASS} -trueprob 0.75
-#FLAGS=-dsm -dsmcaching -prefetch -optimize -excprefetch particle.force -excprefetch particle.domove -excprefetch particle.mkekin -excprefetch TournamentBarrier.DoBarrier -excprefetch JGFMolDynBench.JGFvalidate -excprefetch JGFMolDynBench.JGFapplication -excprefetch JGFMolDynBench.JGFinitialise -excprefetch mdRunner.init -mainclass ${MAINCLASS} -trueprob 0.75
-FLAGS2=-dsm -optimize -mainclass ${MAINCLASS}
-FLAGS1=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} -trueprob 0.75
+FLAGS=-dsm -dsmcaching -transstats -prefetch -optimize -excprefetch particle.force -excprefetch particle.domove -excprefetch particle.mkekin -excprefetch TournamentBarrier.DoBarrier -excprefetch JGFMolDynBench.JGFvalidate -excprefetch JGFMolDynBench.JGFapplication -excprefetch JGFMolDynBench.JGFinitialise -excprefetch mdRunner.init -excprefetch mdRunner.doinit -excprefetch mdRunner.doinit2 -mainclass ${MAINCLASS} -trueprob 0.75
+FLAGS2=-dsm -transstats -optimize -mainclass ${MAINCLASS}
+FLAGS1=-dsm -dsmcaching -transstats -optimize -mainclass ${MAINCLASS} -trueprob 0.75
+
+FLAGSP=-dsm -dsmcaching -prefetch -optimize -excprefetch particle.force -excprefetch particle.domove -excprefetch particle.mkekin -excprefetch TournamentBarrier.DoBarrier -excprefetch JGFMolDynBench.JGFvalidate -excprefetch JGFMolDynBench.JGFapplication -excprefetch JGFMolDynBench.JGFinitialise -excprefetch mdRunner.init -excprefetch mdRunner.doinit -excprefetch mdRunner.doinit2 -mainclass ${MAINCLASS} -trueprob 0.75
+FLAGSNPNC=-dsm -optimize -mainclass ${MAINCLASS}
+FLAGSNPC=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} -trueprob 0.75
+
+
 
 default:
-       ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC ${SRC}
-#      ../../../../buildscript ${FLAGS1} -o ${MAINCLASS}NPC ${SRC}
-       ../../../../buildscript ${FLAGS} -o ${MAINCLASS}N  ${SRC}
+       ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}withstatNPNC ${SRC}
+       ../../../../buildscript ${FLAGS1} -o ${MAINCLASS}withstatNPC ${SRC}
+       ../../../../buildscript ${FLAGS} -o ${MAINCLASS}withstatN  ${SRC}
+       ../../../../buildscript ${FLAGSNPNC} -o ${MAINCLASS}NPNC ${SRC}
+       ../../../../buildscript ${FLAGSNPC} -o ${MAINCLASS}NPC ${SRC}
+       ../../../../buildscript ${FLAGSP} -o ${MAINCLASS}N  ${SRC}
 
 clean:
        rm -rf tmpbuilddirectory/

diff --git a/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java b/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java
index b1d563d4acc2e6448b7d46a160d06e251b198b7b..e5534d9e8cedd759c7daa7d7f5dbe8600853a7c3 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java
+++ b/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java
@@ -109,7 +109,7 @@ public class JGFSORBench {
                sor.Gtotal += G[i][j];
            }
        }               
-    //System.out.println("DEBUG: G.length= " + G.length+" sor.Gtotal= " + sor.Gtotal);
+    System.out.println("DEBUG: G.length= " + G.length+" sor.Gtotal= " + sor.Gtotal);
     }
   }
 

diff --git a/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile b/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile
index 3a312d8b42a93f232adca469ae2046cf97dcccef..af00ace2c64d7a6b2c41885642dcffc277cac987 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile
+++ b/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile
@@ -1,6 +1,3 @@
-#MAINCLASS=JGFSORBenchSizeA
-#MAINCLASS=JGFSORBenchSizeC
-MAINCLASS1=JGFSORBenchSizeC
 MAINCLASS=JGFSORBenchSizeD
 SRC=${MAINCLASS}.java \
        JGFSORBench.java \
@@ -9,23 +6,21 @@ SRC=${MAINCLASS}.java \
        SORRunner.java \
        SORWrap.java \
     ../../../../ClassLibrary/JavaDSM/Barrier.java
-SRC1=${MAINCLASS1}.java \
-       JGFSORBench.java \
-       JGFInstrumentor.java \
-       JGFTimer.java \
-       SORRunner.java \
-       SORWrap.java \
-    ../../../../ClassLibrary/JavaDSM/Barrier.java
 
-FLAGS=-dsm -prefetch -dsmcaching -optimize -excprefetch JGFSORBench.JGFSORBench -excprefetch JGFSORBenchSizeA.main -excprefetch JGFSORBench.RandomMatrix -excprefetch JGFSORBench.init_sync -excprefetch JGFSORBench.JGFkernel -trueprob 0.72
-FLAGS1=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} 
-FLAGS2=-dsm -optimize
+FLAGS=-dsm -transstats -prefetch -dsmcaching -builddir tmpbuilddirectory2 -optimize -excprefetch JGFSORBench.JGFSORBench -excprefetch JGFSORBenchSizeA.main -excprefetch JGFSORBench.RandomMatrix -excprefetch JGFSORBench.init_sync -excprefetch JGFSORBench.JGFkernel -trueprob 0.72
+FLAGS1=-dsm -dsmcaching -transstats -optimize -builddir tmpbuilddirectory1 -mainclass ${MAINCLASS} 
+FLAGS2=-dsm -optimize -transstats
+
+FLAGSP=-dsm -prefetch -dsmcaching -optimize -builddir tmpbuilddirectory2 -excprefetch JGFSORBench.JGFSORBench -excprefetch JGFSORBenchSizeA.main -excprefetch JGFSORBench.RandomMatrix -excprefetch JGFSORBench.init_sync -excprefetch JGFSORBench.JGFkernel -trueprob 0.72
+FLAGSNPC=-dsm -dsmcaching -optimize -builddir tmpbuilddirectory1 -mainclass ${MAINCLASS} 
+FLAGSNPNC=-dsm -optimize 
 
 default:
-       ../../../../buildscript ${FLAGS2} -mainclass ${MAINCLASS} -o ${MAINCLASS}NPNC ${SRC}
-       ../../../../buildscript ${FLAGS} -mainclass ${MAINCLASS} -o ${MAINCLASS}N  ${SRC}
-#      ../../../../buildscript ${FLAGS2} -mainclass ${MAINCLASS1} -o ${MAINCLASS1}NPNC ${SRC1}
-#      ../../../../buildscript ${FLAGS} -mainclass ${MAINCLASS1} -o ${MAINCLASS1}N  ${SRC1}
+       ../../../../buildscript ${FLAGSNPNC} -mainclass ${MAINCLASS} -o ${MAINCLASS}NPNC ${SRC}
+       ../../../../buildscript ${FLAGSNPC} -mainclass ${MAINCLASS} -o ${MAINCLASS}NPC ${SRC}
+       ../../../../buildscript ${FLAGSP} -mainclass ${MAINCLASS} -o ${MAINCLASS}N  ${SRC}
+       ../../../../buildscript ${FLAGS2} -mainclass ${MAINCLASS} -o ${MAINCLASS}withstatNPNC ${SRC}
+       ../../../../buildscript ${FLAGS} -mainclass ${MAINCLASS} -o ${MAINCLASS}withstatN  ${SRC}
 
 clean:
        rm -rf tmpbuilddirectory