From d3c678279b21959b577b3cea9801b3cf1ae664ca Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Wed, 19 Nov 2008 08:53:53 +0000
Subject: [PATCH] standardize the benchmarks so we script them easily

---
 .../Benchmarks/Prefetch/2DConv/dsm/Makefile   | 15 -----
 .../Prefetch/2DConv/javasingle/makefile       |  2 +-
 .../2DFFT/{java => javasingle}/FFT1d.java     |  0
 .../2DFFT/{java => javasingle}/FFT2d.java     |  0
 .../Prefetch/2DFFT/javasingle/makefile        |  8 +++
 .../src/Benchmarks/Prefetch/Em3d/dsm/makefile | 27 --------
 .../{ => dsm}/MatrixMultiply.java             |  0
 .../{ => dsm}/MatrixMultiplyN.java            |  0
 .../{ => dsm}/MatrixMultiplyNrun.java         |  0
 .../Prefetch/MatrixMultiply/dsm/makefile      | 15 +++++
 .../Prefetch/MatrixMultiply/java/makefile     |  9 ---
 .../{java => javasingle}/MatrixMultiply.java  |  0
 .../MatrixMultiply/javasingle/makefile        |  8 +++
 .../Prefetch/MatrixMultiply/makefile          | 65 -------------------
 .../Benchmarks/Prefetch/Moldyn/dsm/makefile   | 27 +-------
 .../Benchmarks/Prefetch/Moldyn/java/makefile  | 26 --------
 .../Moldyn/{java => javasingle}/Barrier.java  |  0
 .../{java => javasingle}/JGFInstrumentor.java |  0
 .../{java => javasingle}/JGFMolDynBench.java  |  0
 .../JGFMolDynBenchSizeA.java                  |  0
 .../Moldyn/{java => javasingle}/JGFTimer.java |  0
 .../TournamentBarrier.java                    |  0
 .../Prefetch/Moldyn/javasingle/makefile       | 15 +++++
 .../src/Benchmarks/Prefetch/SOR/dsm/makefile  | 27 +-------
 .../src/Benchmarks/Prefetch/SOR/java/makefile |  8 ---
 .../{java => javasingle}/JGFInstrumentor.java |  0
 .../SOR/{java => javasingle}/JGFSORBench.java |  0
 .../JGFSORBenchSizeA.java                     |  0
 .../JGFSORBenchSizeB.java                     |  0
 .../JGFSORBenchSizeC.java                     |  0
 .../SOR/{java => javasingle}/JGFTimer.java    |  0
 .../SOR/{java => javasingle}/SORRunner.java   |  0
 .../Prefetch/SOR/javasingle/makefile          | 15 +++++
 33 files changed, 64 insertions(+), 203 deletions(-)
 rename Robust/src/Benchmarks/Prefetch/2DFFT/{java => javasingle}/FFT1d.java (100%)
 rename Robust/src/Benchmarks/Prefetch/2DFFT/{java => javasingle}/FFT2d.java (100%)
 create mode 100644 Robust/src/Benchmarks/Prefetch/2DFFT/javasingle/makefile
 rename Robust/src/Benchmarks/Prefetch/MatrixMultiply/{ => dsm}/MatrixMultiply.java (100%)
 rename Robust/src/Benchmarks/Prefetch/MatrixMultiply/{ => dsm}/MatrixMultiplyN.java (100%)
 rename Robust/src/Benchmarks/Prefetch/MatrixMultiply/{ => dsm}/MatrixMultiplyNrun.java (100%)
 create mode 100644 Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/makefile
 delete mode 100644 Robust/src/Benchmarks/Prefetch/MatrixMultiply/java/makefile
 rename Robust/src/Benchmarks/Prefetch/MatrixMultiply/{java => javasingle}/MatrixMultiply.java (100%)
 create mode 100644 Robust/src/Benchmarks/Prefetch/MatrixMultiply/javasingle/makefile
 delete mode 100644 Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
 delete mode 100644 Robust/src/Benchmarks/Prefetch/Moldyn/java/makefile
 rename Robust/src/Benchmarks/Prefetch/Moldyn/{java => javasingle}/Barrier.java (100%)
 rename Robust/src/Benchmarks/Prefetch/Moldyn/{java => javasingle}/JGFInstrumentor.java (100%)
 rename Robust/src/Benchmarks/Prefetch/Moldyn/{java => javasingle}/JGFMolDynBench.java (100%)
 rename Robust/src/Benchmarks/Prefetch/Moldyn/{java => javasingle}/JGFMolDynBenchSizeA.java (100%)
 rename Robust/src/Benchmarks/Prefetch/Moldyn/{java => javasingle}/JGFTimer.java (100%)
 rename Robust/src/Benchmarks/Prefetch/Moldyn/{java => javasingle}/TournamentBarrier.java (100%)
 create mode 100644 Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/makefile
 delete mode 100644 Robust/src/Benchmarks/Prefetch/SOR/java/makefile
 rename Robust/src/Benchmarks/Prefetch/SOR/{java => javasingle}/JGFInstrumentor.java (100%)
 rename Robust/src/Benchmarks/Prefetch/SOR/{java => javasingle}/JGFSORBench.java (100%)
 rename Robust/src/Benchmarks/Prefetch/SOR/{java => javasingle}/JGFSORBenchSizeA.java (100%)
 rename Robust/src/Benchmarks/Prefetch/SOR/{java => javasingle}/JGFSORBenchSizeB.java (100%)
 rename Robust/src/Benchmarks/Prefetch/SOR/{java => javasingle}/JGFSORBenchSizeC.java (100%)
 rename Robust/src/Benchmarks/Prefetch/SOR/{java => javasingle}/JGFTimer.java (100%)
 rename Robust/src/Benchmarks/Prefetch/SOR/{java => javasingle}/SORRunner.java (100%)
 create mode 100644 Robust/src/Benchmarks/Prefetch/SOR/javasingle/makefile

diff --git a/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Makefile b/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Makefile
index 41475366..bd5234f3 100644
--- a/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Makefile
+++ b/Robust/src/Benchmarks/Prefetch/2DConv/dsm/Makefile
@@ -6,21 +6,6 @@ FLAGS1=-dsm -optimize -mainclass ${MAINCLASS}
 default:
 	../../../../buildscript ${FLAGS1} ${SRC} -o ${MAINCLASS}NPNC
 	../../../../buildscript ${FLAGS} ${SRC} -o ${MAINCLASS}N
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}1NPNC.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}2NPNC.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}2.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}3NPNC.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}3.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}4NPNC.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}4.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}5NPNC.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}5.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}6NPNC.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}6.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}7NPNC.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}7.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}8NPNC.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}8.bin
 
 clean:
 	rm -rf tmpbuilddirectory
diff --git a/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/makefile b/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/makefile
index 15c03979..ff90875c 100644
--- a/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/makefile
+++ b/Robust/src/Benchmarks/Prefetch/2DConv/javasingle/makefile
@@ -1,7 +1,7 @@
 MAINCLASS=Convolution
 SRC=${MAINCLASS}.java 
 default:
-	../../../../buildscript -nooptimize -debug -mainclass ${MAINCLASS} ${SRC} -o ${MAINCLASS}
+	../../../../buildscript -optimize -thread -debug -mainclass ${MAINCLASS} ${SRC} -o ${MAINCLASS}
 
 clean:
 	rm -rf tmpbuilddirectory
diff --git a/Robust/src/Benchmarks/Prefetch/2DFFT/java/FFT1d.java b/Robust/src/Benchmarks/Prefetch/2DFFT/javasingle/FFT1d.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/2DFFT/java/FFT1d.java
rename to Robust/src/Benchmarks/Prefetch/2DFFT/javasingle/FFT1d.java
diff --git a/Robust/src/Benchmarks/Prefetch/2DFFT/java/FFT2d.java b/Robust/src/Benchmarks/Prefetch/2DFFT/javasingle/FFT2d.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/2DFFT/java/FFT2d.java
rename to Robust/src/Benchmarks/Prefetch/2DFFT/javasingle/FFT2d.java
diff --git a/Robust/src/Benchmarks/Prefetch/2DFFT/javasingle/makefile b/Robust/src/Benchmarks/Prefetch/2DFFT/javasingle/makefile
new file mode 100644
index 00000000..248cdd02
--- /dev/null
+++ b/Robust/src/Benchmarks/Prefetch/2DFFT/javasingle/makefile
@@ -0,0 +1,8 @@
+MAINCLASS=FFT2d
+SRC=${MAINCLASS}.java FFT1d.java
+default:
+	../../../../buildscript -optimize -thread -debug -mainclass ${MAINCLASS} ${SRC} -o ${MAINCLASS}
+
+clean:
+	rm -rf tmpbuilddirectory
+	rm *.bin
diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile
index 931210fa..f7c448f5 100644
--- a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile
+++ b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile
@@ -19,35 +19,8 @@ FLAGS2=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} -trueprob 0.85
 FLAGS3=-dsm -optimize -mainclass ${MAINCLASS} -trueprob 0.85
 
 default:
-#	../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NP ${SRC}
-#	../../../../buildscript ${FLAGS} -o ${MAINCLASS} ${SRC}
 	../../../../buildscript ${FLAGS3} -o ${MAINCLASS}NPNC ${SRC3}
-#	../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NP ${SRC3}
 	../../../../buildscript ${FLAGS1} -o ${MAINCLASS}N ${SRC3}
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}1NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}1NP.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}1.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}2NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}2NP.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}2.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}3NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}3NP.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}3.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}4NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}4NP.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}4.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}5NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}5NP.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}5.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}6NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}6NP.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}6.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}7NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}7NP.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}7.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}8NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}8NP.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}8.bin
 
 clean:
 	rm -rf tmpbuilddirectory
diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply.java b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/MatrixMultiply.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiply.java
rename to Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/MatrixMultiply.java
diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyN.java b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/MatrixMultiplyN.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyN.java
rename to Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/MatrixMultiplyN.java
diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyNrun.java b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/MatrixMultiplyNrun.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyNrun.java
rename to Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/MatrixMultiplyNrun.java
diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/makefile b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/makefile
new file mode 100644
index 00000000..9a3a0a21
--- /dev/null
+++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/dsm/makefile
@@ -0,0 +1,15 @@
+MAINCLASS=MatrixMultiply
+SRC1=${MAINCLASS}N.java
+SRC2=${MAINCLASS}Nrun.java
+FLAGS=-dsm -dsmcaching -prefetch -optimize -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS} -trueprob 0.98
+FLAGS1=-dsm -optimize -dsmcaching -mainclass ${MAINCLASS}
+FLAGS2=-dsm -optimize -mainclass ${MAINCLASS}
+default:
+	../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC ${SRC1}
+	../../../buildscript ${FLAGS} -o ${MAINCLASS}N ${SRC1}
+	../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC200 ${SRC2}
+	../../../buildscript ${FLAGS} -o ${MAINCLASS}N200 ${SRC2}
+
+clean:
+	rm -rf tmpbuilddirectory
+	rm *.bin
diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/java/makefile b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/java/makefile
deleted file mode 100644
index e9ceb5e2..00000000
--- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/java/makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-MAINCLASS=MatrixMultiply
-SRC=${MAINCLASS}N.java
-default:
-	javac ${SRC}
-run:
-	java ${MAINCLASS}
-
-clean:
-	rm *.class
diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/java/MatrixMultiply.java b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/javasingle/MatrixMultiply.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/MatrixMultiply/java/MatrixMultiply.java
rename to Robust/src/Benchmarks/Prefetch/MatrixMultiply/javasingle/MatrixMultiply.java
diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/javasingle/makefile b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/javasingle/makefile
new file mode 100644
index 00000000..31a36711
--- /dev/null
+++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/javasingle/makefile
@@ -0,0 +1,8 @@
+MAINCLASS=MatrixMultiply
+SRC=${MAINCLASS}.java
+default:
+	../../../../buildscript -optimize -thread -debug -mainclass ${MAINCLASS} ${SRC} -o ${MAINCLASS}
+
+clean:
+	rm -rf tmpbuilddirectory
+	rm *.bin
diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
deleted file mode 100644
index f2a7c19d..00000000
--- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-MAINCLASS=MatrixMultiply
-SRC1=${MAINCLASS}N.java
-SRC2=${MAINCLASS}Nrun.java
-FLAGS=-dsm -dsmcaching -prefetch -optimize -excprefetch MatrixMultiply.main -excprefetch MMul.setValues -excprefetch MMul.transpose -mainclass ${MAINCLASS} -trueprob 0.98
-FLAGS1=-dsm -optimize -dsmcaching -mainclass ${MAINCLASS}
-FLAGS2=-dsm -optimize -mainclass ${MAINCLASS}
-default:
-	../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC ${SRC1}
-#	../../../buildscript ${FLAGS1} -o ${MAINCLASS}NNP ${SRC1}
-	../../../buildscript ${FLAGS} -o ${MAINCLASS}N ${SRC1}
-	../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC200 ${SRC2}
-#	../../../buildscript ${FLAGS1} -o ${MAINCLASS}NNP200 ${SRC2}
-	../../../buildscript ${FLAGS} -o ${MAINCLASS}N200 ${SRC2}
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}1NPNC.bin
-#	cp ${MAINCLASS}NNP.bin ${MAINCLASS}1NP.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}1.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}2NPNC.bin
-#	cp ${MAINCLASS}NNP.bin ${MAINCLASS}2NP.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}2.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}3NPNC.bin
-#	cp ${MAINCLASS}NNP.bin ${MAINCLASS}3NP.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}3.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}4NPNC.bin
-#	cp ${MAINCLASS}NNP.bin ${MAINCLASS}4NP.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}4.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}5NPNC.bin
-#	cp ${MAINCLASS}NNP.bin ${MAINCLASS}5NP.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}5.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}6NPNC.bin
-#	cp ${MAINCLASS}NNP.bin ${MAINCLASS}6NP.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}6.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}7NPNC.bin
-#	cp ${MAINCLASS}NNP.bin ${MAINCLASS}7NP.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}7.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}8NPNC.bin
-#	cp ${MAINCLASS}NNP.bin ${MAINCLASS}8NP.bin
-	cp ${MAINCLASS}N.bin ${MAINCLASS}8.bin
-	cp ${MAINCLASS}NPNC200.bin ../MM200/${MAINCLASS}1NPNC.bin
-#	cp ${MAINCLASS}NNP200.bin ../MM200/${MAINCLASS}1NP.bin
-	cp ${MAINCLASS}N200.bin ../MM200/${MAINCLASS}1.bin
-	cp ${MAINCLASS}NPNC200.bin ../MM200/${MAINCLASS}2NPNC.bin
-#	cp ${MAINCLASS}NNP200.bin ../MM200/${MAINCLASS}2NP.bin
-	cp ${MAINCLASS}N200.bin ../MM200/${MAINCLASS}2.bin
-	cp ${MAINCLASS}NPNC200.bin ../MM200/${MAINCLASS}3NPNC.bin
-#	cp ${MAINCLASS}NNP200.bin ../MM200/${MAINCLASS}3NP.bin
-	cp ${MAINCLASS}N200.bin ../MM200/${MAINCLASS}3.bin
-	cp ${MAINCLASS}NPNC200.bin ../MM200/${MAINCLASS}4NPNC.bin
-#	cp ${MAINCLASS}NNP200.bin ../MM200/${MAINCLASS}4NP.bin
-	cp ${MAINCLASS}N200.bin ../MM200/${MAINCLASS}4.bin
-	cp ${MAINCLASS}NPNC200.bin ../MM200/${MAINCLASS}5NPNC.bin
-#	cp ${MAINCLASS}NNP200.bin ../MM200/${MAINCLASS}5NP.bin
-	cp ${MAINCLASS}N200.bin ../MM200/${MAINCLASS}5.bin
-	cp ${MAINCLASS}NPNC200.bin ../MM200/${MAINCLASS}6NPNC.bin
-#	cp ${MAINCLASS}NNP200.bin ../MM200/${MAINCLASS}6NP.bin
-	cp ${MAINCLASS}N200.bin ../MM200/${MAINCLASS}6.bin
-	cp ${MAINCLASS}NPNC200.bin ../MM200/${MAINCLASS}7NPNC.bin
-#	cp ${MAINCLASS}NNP200.bin ../MM200/${MAINCLASS}7NP.bin
-	cp ${MAINCLASS}N200.bin ../MM200/${MAINCLASS}7.bin
-	cp ${MAINCLASS}NPNC200.bin ../MM200/${MAINCLASS}8NPNC.bin
-#	cp ${MAINCLASS}NNP200.bin ../MM200/${MAINCLASS}8NP.bin
-	cp ${MAINCLASS}N200.bin ../MM200/${MAINCLASS}8.bin
-
-clean:
-	rm -rf tmpbuilddirectory
-	rm *.bin
diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile
index 5103e261..070f116b 100644
--- a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile
+++ b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile
@@ -12,32 +12,7 @@ FLAGS1=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} -o ${MAINCLASS}NP -tru
 
 default:
 	../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC ${SRC}
-#	../../../../buildscript ${FLAGS1} -o ${MAINCLASS}NP ${SRC}
-	../../../../buildscript ${FLAGS} -o ${MAINCLASS}P  ${SRC}
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}1NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}1NP.bin
-	cp ${MAINCLASS}P.bin ${MAINCLASS}1.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}2NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}2NP.bin
-	cp ${MAINCLASS}P.bin ${MAINCLASS}2.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}3NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}3NP.bin
-	cp ${MAINCLASS}P.bin ${MAINCLASS}3.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}4NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}4NP.bin
-	cp ${MAINCLASS}P.bin ${MAINCLASS}4.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}5NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}5NP.bin
-	cp ${MAINCLASS}P.bin ${MAINCLASS}5.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}6NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}6NP.bin
-	cp ${MAINCLASS}P.bin ${MAINCLASS}6.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}7NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}7NP.bin
-	cp ${MAINCLASS}P.bin ${MAINCLASS}7.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}8NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}8NP.bin
-	cp ${MAINCLASS}P.bin ${MAINCLASS}8.bin
+	../../../../buildscript ${FLAGS} -o ${MAINCLASS}N  ${SRC}
 
 clean:
 	rm -rf tmpbuilddirectory/
diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/java/makefile b/Robust/src/Benchmarks/Prefetch/Moldyn/java/makefile
deleted file mode 100644
index 7589d000..00000000
--- a/Robust/src/Benchmarks/Prefetch/Moldyn/java/makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-
-#SRC = JGFMolDynBenchSizeA
-#default:
-#	javac ${SRC}.java
-#run:
-#	java ${SRC} 2
-#
-#clean:
-#	rm *.class
-
-MAINCLASS=JGFMolDynBenchSizeA
-SRC=${MAINCLASS}.java \
-JGFInstrumentor.java \
-JGFTimer.java \
-JGFMolDynBench.java \
-Barrier.java
-#FLAGS=-dsm -prefetch -excprefetch particle.force -excprefetch particle.domove -excprefetch particle.mkekin -excprefetch TournamentBarrier.DoBarrier -excprefetch JGFMolDynBench.JGFvalidate -excprefetch JGFMolDynBench.JGFapplication -optimize -debug -profile -mainclass ${MAINCLASS} -o ${MAINCLASS} -trueprob 0.8
-FLAGS2= -thread -mainclass ${MAINCLASS} -o ${MAINCLASS}NP
-
-default:
-	../../../../buildscript ${FLAGS2} ${SRC}
-#	../../../../buildscript ${FLAGS} ${SRC}
-
-clean:
-	rm -rf tmpbuilddirectory/
-	rm *.bin
diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/java/Barrier.java b/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/Barrier.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/Moldyn/java/Barrier.java
rename to Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/Barrier.java
diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/java/JGFInstrumentor.java b/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFInstrumentor.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/Moldyn/java/JGFInstrumentor.java
rename to Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFInstrumentor.java
diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/java/JGFMolDynBench.java b/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFMolDynBench.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/Moldyn/java/JGFMolDynBench.java
rename to Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFMolDynBench.java
diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/java/JGFMolDynBenchSizeA.java b/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFMolDynBenchSizeA.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/Moldyn/java/JGFMolDynBenchSizeA.java
rename to Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFMolDynBenchSizeA.java
diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/java/JGFTimer.java b/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFTimer.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/Moldyn/java/JGFTimer.java
rename to Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/JGFTimer.java
diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/java/TournamentBarrier.java b/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/TournamentBarrier.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/Moldyn/java/TournamentBarrier.java
rename to Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/TournamentBarrier.java
diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/makefile b/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/makefile
new file mode 100644
index 00000000..ba8f95cf
--- /dev/null
+++ b/Robust/src/Benchmarks/Prefetch/Moldyn/javasingle/makefile
@@ -0,0 +1,15 @@
+MAINCLASS=JGFMolDynBenchSizeA
+SRC=${MAINCLASS}.java \
+JGFInstrumentor.java \
+JGFTimer.java \
+JGFMolDynBench.java \
+Barrier.java
+
+FLAGS2= -thread -optimize -mainclass ${MAINCLASS} -o ${MAINCLASS}NP
+
+default:
+	../../../../buildscript ${FLAGS2} ${SRC}
+
+clean:
+	rm -rf tmpbuilddirectory/
+	rm *.bin
diff --git a/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile b/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile
index 811d4589..3ac0be0d 100644
--- a/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile
+++ b/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile
@@ -13,32 +13,7 @@ FLAGS2=-dsm -optimize -mainclass ${MAINCLASS}
 
 default:
 	../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC ${SRC}
-#	../../../../buildscript ${FLAGS1} -o ${MAINCLASS}NP  ${SRC}
-	../../../../buildscript ${FLAGS} -o ${MAINCLASS}P  ${SRC}
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}1NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}1NP.bin
-	cp ${MAINCLASS}P.bin ${MAINCLASS}1.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}2NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}2NP.bin
-	cp ${MAINCLASS}P.bin ${MAINCLASS}2.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}3NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}3NP.bin
-	cp ${MAINCLASS}P.bin ${MAINCLASS}3.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}4NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}4NP.bin
-	cp ${MAINCLASS}P.bin ${MAINCLASS}4.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}5NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}5NP.bin
-	cp ${MAINCLASS}P.bin ${MAINCLASS}5.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}6NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}6NP.bin
-	cp ${MAINCLASS}P.bin ${MAINCLASS}6.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}7NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}7NP.bin
-	cp ${MAINCLASS}P.bin ${MAINCLASS}7.bin
-	cp ${MAINCLASS}NPNC.bin ${MAINCLASS}8NPNC.bin
-#	cp ${MAINCLASS}NP.bin ${MAINCLASS}8NP.bin
-	cp ${MAINCLASS}P.bin ${MAINCLASS}8.bin
+	../../../../buildscript ${FLAGS} -o ${MAINCLASS}N  ${SRC}
 
 clean:
 	rm -rf tmpbuilddirectory
diff --git a/Robust/src/Benchmarks/Prefetch/SOR/java/makefile b/Robust/src/Benchmarks/Prefetch/SOR/java/makefile
deleted file mode 100644
index ce11392a..00000000
--- a/Robust/src/Benchmarks/Prefetch/SOR/java/makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-SRC = JGFSORBenchSizeA
-default:
-	javac ${SRC}.java
-run:
-	java ${SRC} 2
-
-clean:
-	rm *.class
diff --git a/Robust/src/Benchmarks/Prefetch/SOR/java/JGFInstrumentor.java b/Robust/src/Benchmarks/Prefetch/SOR/javasingle/JGFInstrumentor.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/SOR/java/JGFInstrumentor.java
rename to Robust/src/Benchmarks/Prefetch/SOR/javasingle/JGFInstrumentor.java
diff --git a/Robust/src/Benchmarks/Prefetch/SOR/java/JGFSORBench.java b/Robust/src/Benchmarks/Prefetch/SOR/javasingle/JGFSORBench.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/SOR/java/JGFSORBench.java
rename to Robust/src/Benchmarks/Prefetch/SOR/javasingle/JGFSORBench.java
diff --git a/Robust/src/Benchmarks/Prefetch/SOR/java/JGFSORBenchSizeA.java b/Robust/src/Benchmarks/Prefetch/SOR/javasingle/JGFSORBenchSizeA.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/SOR/java/JGFSORBenchSizeA.java
rename to Robust/src/Benchmarks/Prefetch/SOR/javasingle/JGFSORBenchSizeA.java
diff --git a/Robust/src/Benchmarks/Prefetch/SOR/java/JGFSORBenchSizeB.java b/Robust/src/Benchmarks/Prefetch/SOR/javasingle/JGFSORBenchSizeB.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/SOR/java/JGFSORBenchSizeB.java
rename to Robust/src/Benchmarks/Prefetch/SOR/javasingle/JGFSORBenchSizeB.java
diff --git a/Robust/src/Benchmarks/Prefetch/SOR/java/JGFSORBenchSizeC.java b/Robust/src/Benchmarks/Prefetch/SOR/javasingle/JGFSORBenchSizeC.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/SOR/java/JGFSORBenchSizeC.java
rename to Robust/src/Benchmarks/Prefetch/SOR/javasingle/JGFSORBenchSizeC.java
diff --git a/Robust/src/Benchmarks/Prefetch/SOR/java/JGFTimer.java b/Robust/src/Benchmarks/Prefetch/SOR/javasingle/JGFTimer.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/SOR/java/JGFTimer.java
rename to Robust/src/Benchmarks/Prefetch/SOR/javasingle/JGFTimer.java
diff --git a/Robust/src/Benchmarks/Prefetch/SOR/java/SORRunner.java b/Robust/src/Benchmarks/Prefetch/SOR/javasingle/SORRunner.java
similarity index 100%
rename from Robust/src/Benchmarks/Prefetch/SOR/java/SORRunner.java
rename to Robust/src/Benchmarks/Prefetch/SOR/javasingle/SORRunner.java
diff --git a/Robust/src/Benchmarks/Prefetch/SOR/javasingle/makefile b/Robust/src/Benchmarks/Prefetch/SOR/javasingle/makefile
new file mode 100644
index 00000000..c59ceff5
--- /dev/null
+++ b/Robust/src/Benchmarks/Prefetch/SOR/javasingle/makefile
@@ -0,0 +1,15 @@
+MAINCLASS=JGFMolDynBenchSizeD
+SRC=${MAINCLASS}.java \
+JGFInstrumentor.java \
+JGFTimer.java \
+JGFMolDynBench.java \
+SORRunner.java
+
+FLAGS2= -thread -optimize -mainclass ${MAINCLASS} -o ${MAINCLASS}NP
+
+default:
+	../../../../buildscript ${FLAGS2} ${SRC}
+
+clean:
+	rm -rf tmpbuilddirectory/
+	rm *.bin
-- 
2.34.1