Change tabbing for everything....

[IRC.git] / Robust / src / Benchmarks / Prefetch / Em3d / dsm / makefile

diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile
index 83a99ce0e1314319a472582be51ff96c004bfc78..a16163979d1ef13e8299d6e7d3db5adc940c393a 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile
+++ b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile
@@ -7,22 +7,34 @@ SRC1=${MAINCLASS}Nold.java \
        BiGraphNold.java \
        Node.java \
        Barrier.java
+SRC3=${MAINCLASS}2.java \
+       ${MAINCLASS}Wrap.java \
+       BiGraph2.java \
+       Node2.java \
+       EVector.java 
 
-FLAGS=-dsm -prefetch -optimize -transstats -excprefetch Em3d.main -excprefetch BiGraph.create -excprefetch Node.Node -excprefetch Node.fillTable -excprefetch Node.makeUniqueNeighbors -excprefetch Node.makeFromNodes -excprefetch Node.updateFromNodes -nooptimize -debug -mainclass ${MAINCLASS} -trueprob 0.91
-FLAGS2=-dsm -optimize -transstats -mainclass ${MAINCLASS}
+FLAGS=-dsm -prefetch -optimize -excprefetch Em3d.main -excprefetch BiGraph.create -excprefetch Node.Node -excprefetch Node.fillTable -excprefetch Node.makeUniqueNeighbors -excprefetch Node.makeFromNodes -excprefetch Node.updateFromNodes -debug -mainclass ${MAINCLASS} -trueprob 0.85
+FLAGS1=-dsm -prefetch -dsmcaching -optimize -excprefetch Node.makeUniqueNeighbors -excprefetch EVector.ensureCapacity -excprefetch EVector.addElement -excprefetch BiGraph.makeFromNodes -excprefetch EVector.elementAt -excprefetch BiGraph.initializeNodes -excprefetch BiGraph.allocateNodes -mainclass ${MAINCLASS} -trueprob 0.85
+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 ${FLAGS2} -o ${MAINCLASS}NNP ${SRC1}
-       ../../../../buildscript ${FLAGS} -o ${MAINCLASS}N ${SRC1}
-       cp ${MAINCLASS}NNP.bin ${MAINCLASS}1NP.bin
+       ../../../../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}NNP.bin ${MAINCLASS}2NP.bin
+       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}2NPNC.bin
+       cp ${MAINCLASS}NP.bin ${MAINCLASS}2NP.bin
        cp ${MAINCLASS}N.bin ${MAINCLASS}2.bin
-       cp ${MAINCLASS}NNP.bin ${MAINCLASS}3NP.bin
+       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}3NPNC.bin
+       cp ${MAINCLASS}NP.bin ${MAINCLASS}3NP.bin
        cp ${MAINCLASS}N.bin ${MAINCLASS}3.bin
-       cp ${MAINCLASS}NNP.bin ${MAINCLASS}4NP.bin
+       cp ${MAINCLASS}NPNC.bin ${MAINCLASS}4NPNC.bin
+       cp ${MAINCLASS}NP.bin ${MAINCLASS}4NP.bin
        cp ${MAINCLASS}N.bin ${MAINCLASS}4.bin
 
 clean: