From e4d9a8e03f7573d865292151e976ec0c304bfa93 Mon Sep 17 00:00:00 2001 From: adash Date: Tue, 21 Oct 2008 00:31:41 +0000 Subject: [PATCH] Scripts and Benchmarks changed to function with 8 machines --- .../Benchmarks/Prefetch/Em3d/dsm/Em3d2.java | 14 ++- .../src/Benchmarks/Prefetch/Em3d/dsm/makefile | 22 ++++- .../MatrixMultiply/MatrixMultiplyN.java | 6 +- .../MatrixMultiply/MatrixMultiplyNrun.java | 15 ++- .../Prefetch/MatrixMultiply/makefile | 44 +++++++-- .../MicroBenchmarks/MultiMCReadcommit.java | 5 +- .../MicroBenchmarks/MultiMCWritecommit.java | 12 ++- .../MicroBenchmarks/OneMCReadcommit.java | 7 +- .../MicroBenchmarks/OneMCWritecommit.java | 9 +- .../Prefetch/MicroBenchmarks/bm.txt | 8 +- .../Prefetch/Moldyn/dsm/JGFMolDynBench.java | 16 +-- .../Moldyn/dsm/JGFMolDynBenchSizeA.java | 1 + .../Benchmarks/Prefetch/Moldyn/dsm/makefile | 18 ++++ .../Prefetch/SOR/dsm/JGFSORBench.java | 6 +- .../Prefetch/SOR/dsm/JGFSORBenchSizeD.java | 3 + .../src/Benchmarks/Prefetch/SOR/dsm/makefile | 26 +++-- Robust/src/Benchmarks/Prefetch/bm.txt | 28 ++---- Robust/src/Benchmarks/Prefetch/run.sh | 98 +++++++++++++++---- 18 files changed, 247 insertions(+), 91 deletions(-) diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java index e35e4731..0f1fbbc2 100644 --- a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java +++ b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java @@ -138,11 +138,15 @@ public class Em3d extends Thread { System.printString("Initializing em3d random graph...\n"); long start0 = System.currentTimeMillis(); int numThreads = em.numThreads; - int[] mid = new int[4]; - mid[0] = (128<<24)|(195<<16)|(175<<8)|84;//dw-8 - mid[1] = (128<<24)|(195<<16)|(175<<8)|85;//dw-9 - mid[2] = (128<<24)|(195<<16)|(175<<8)|86;//dw-7 - mid[3] = (128<<24)|(195<<16)|(175<<8)|87;//dw-5 + int[] mid = new int[8]; + mid[0] = (128<<24)|(195<<16)|(175<<8)|84;//dw-10 + mid[1] = (128<<24)|(195<<16)|(175<<8)|85;//dw-11 + mid[2] = (128<<24)|(195<<16)|(175<<8)|86;//dw-12 + mid[3] = (128<<24)|(195<<16)|(175<<8)|87;//dw-13 + mid[4] = (128<<24)|(195<<16)|(175<<8)|88;//dw-14 + mid[5] = (128<<24)|(195<<16)|(175<<8)|89;//dw-15 + mid[6] = (128<<24)|(195<<16)|(175<<8)|90;//dw-16 + mid[7] = (128<<24)|(195<<16)|(175<<8)|91;//dw-17 System.printString("DEBUG -> numThreads = " + numThreads+"\n"); BarrierServer mybarr; diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile index a1616397..931210fa 100644 --- a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile +++ b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/makefile @@ -22,20 +22,32 @@ 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 ${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}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}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}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}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/MatrixMultiplyN.java b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyN.java index 59c837a4..9a5eb0b9 100644 --- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyN.java +++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyN.java @@ -41,11 +41,15 @@ public class MatrixMultiply extends Thread{ SIZE=Integer.parseInt(args[1]); } - int[] mid = new int[4]; + int[] mid = new int[8]; mid[0] = (128<<24)|(195<<16)|(175<<8)|84; //dw-10 mid[1] = (128<<24)|(195<<16)|(175<<8)|85; //dw-11 mid[2] = (128<<24)|(195<<16)|(175<<8)|86; //dw-12 mid[3] = (128<<24)|(195<<16)|(175<<8)|87; //dw-13 + mid[4] = (128<<24)|(195<<16)|(175<<8)|88; //dw-14 + mid[5] = (128<<24)|(195<<16)|(175<<8)|89; //dw-15 + mid[6] = (128<<24)|(195<<16)|(175<<8)|90; //dw-16 + mid[7] = (128<<24)|(195<<16)|(175<<8)|91; //dw-17 int p, q, r; MatrixMultiply[] mm; MatrixMultiply tmp; diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyNrun.java b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyNrun.java index 21400e49..2e1118f5 100644 --- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyNrun.java +++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/MatrixMultiplyNrun.java @@ -51,11 +51,16 @@ public class MatrixMultiply extends Thread{ } } - int[] mid = new int[4]; - mid[0] = (128<<24)|(195<<16)|(175<<8)|79; - mid[1] = (128<<24)|(195<<16)|(175<<8)|80; - mid[2] = (128<<24)|(195<<16)|(175<<8)|78; - mid[3] = (128<<24)|(195<<16)|(175<<8)|73; + int[] mid = new int[8]; + mid[0] = (128<<24)|(195<<16)|(175<<8)|84;//dw-10 + mid[1] = (128<<24)|(195<<16)|(175<<8)|85;//dw-11 + mid[2] = (128<<24)|(195<<16)|(175<<8)|86;//dw-12 + mid[3] = (128<<24)|(195<<16)|(175<<8)|87;//dw-13 + mid[4] = (128<<24)|(195<<16)|(175<<8)|88;//dw-14 + mid[5] = (128<<24)|(195<<16)|(175<<8)|89;//dw-15 + mid[6] = (128<<24)|(195<<16)|(175<<8)|90;//dw-16 + mid[7] = (128<<24)|(195<<16)|(175<<8)|91;//dw-17 + int p, q, r; MatrixMultiply[] mm; MatrixMultiply tmp; diff --git a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile index d6d8bbcb..1361f509 100644 --- a/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile +++ b/Robust/src/Benchmarks/Prefetch/MatrixMultiply/makefile @@ -6,35 +6,59 @@ 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 ${FLAGS1} -o ${MAINCLASS}NNP ${SRC1} ../../../buildscript ${FLAGS} -o ${MAINCLASS}N ${SRC1} ../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC200 ${SRC2} - ../../../buildscript ${FLAGS1} -o ${MAINCLASS}NNP200 ${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}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}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}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}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}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}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}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}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 diff --git a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/MultiMCReadcommit.java b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/MultiMCReadcommit.java index ded2de86..cd9f9177 100644 --- a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/MultiMCReadcommit.java +++ b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/MultiMCReadcommit.java @@ -43,12 +43,15 @@ public class ReadArrayObj extends Thread { nthreads = Integer.parseInt(args[0]); } - int[] mid = new int[5]; + int[] mid = new int[8]; mid[0] = (128<<24)|(195<<16)|(175<<8)|84;//dw-10 mid[1] = (128<<24)|(195<<16)|(175<<8)|85;//dw-11 mid[2] = (128<<24)|(195<<16)|(175<<8)|86;//dw-12 mid[3] = (128<<24)|(195<<16)|(175<<8)|87;//dw-13 mid[4] = (128<<24)|(195<<16)|(175<<8)|88;//dw-14 + mid[5] = (128<<24)|(195<<16)|(175<<8)|89;//dw-15 + mid[6] = (128<<24)|(195<<16)|(175<<8)|90;//dw-16 + mid[7] = (128<<24)|(195<<16)|(175<<8)|91;//dw-17 ReadArrayObj[] a; atomic { diff --git a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/MultiMCWritecommit.java b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/MultiMCWritecommit.java index f2fd6003..6f6774d9 100644 --- a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/MultiMCWritecommit.java +++ b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/MultiMCWritecommit.java @@ -20,16 +20,19 @@ public class WriteArrayObj extends Thread { atomic { //Remote machine aborts come from here for(int i=lower; i0) { nthreads = Integer.parseInt(args[0]); } - int[] mid = new int[5]; + int[] mid = new int[8]; mid[0] = (128<<24)|(195<<16)|(175<<8)|84;//dw-10 mid[1] = (128<<24)|(195<<16)|(175<<8)|85;//dw-11 mid[2] = (128<<24)|(195<<16)|(175<<8)|86;//dw-12 mid[3] = (128<<24)|(195<<16)|(175<<8)|87;//dw-13 mid[4] = (128<<24)|(195<<16)|(175<<8)|88;//dw-14 + mid[5] = (128<<24)|(195<<16)|(175<<8)|89;//dw-15 + mid[6] = (128<<24)|(195<<16)|(175<<8)|90;//dw-16 + mid[7] = (128<<24)|(195<<16)|(175<<8)|91;//dw-17 ReadArray[] a; atomic { @@ -53,7 +56,6 @@ public class ReadArray extends Thread { ra[i].ra.join(); //Read Array elements - /* for(int j=0; j<10000; j++) { atomic { int val; @@ -62,7 +64,6 @@ public class ReadArray extends Thread { } } } - */ System.printString("Finished\n"); } diff --git a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/OneMCWritecommit.java b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/OneMCWritecommit.java index c5c87c85..d1220c5c 100644 --- a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/OneMCWritecommit.java +++ b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/OneMCWritecommit.java @@ -23,12 +23,15 @@ public class WriteArray extends Thread { nthreads = Integer.parseInt(args[0]); } - int[] mid = new int[5]; + int[] mid = new int[8]; mid[0] = (128<<24)|(195<<16)|(175<<8)|84;//dw-10 mid[1] = (128<<24)|(195<<16)|(175<<8)|85;//dw-11 mid[2] = (128<<24)|(195<<16)|(175<<8)|86;//dw-12 mid[3] = (128<<24)|(195<<16)|(175<<8)|87;//dw-13 mid[4] = (128<<24)|(195<<16)|(175<<8)|88;//dw-14 + mid[5] = (128<<24)|(195<<16)|(175<<8)|89;//dw-15 + mid[6] = (128<<24)|(195<<16)|(175<<8)|90;//dw-16 + mid[7] = (128<<24)|(195<<16)|(175<<8)|91;//dw-17 WriteArray[] wa; atomic { @@ -49,7 +52,7 @@ public class WriteArray extends Thread { wawrap[i].wa.join(); //Write into Array - /* + Integer val; for(int j=0; j<10000; j++) { atomic { @@ -59,7 +62,7 @@ public class WriteArray extends Thread { } } } - */ + System.printString("Finished\n"); } } diff --git a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/bm.txt b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/bm.txt index 8fea22b7..cb7c4af4 100644 --- a/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/bm.txt +++ b/Robust/src/Benchmarks/Prefetch/MicroBenchmarks/bm.txt @@ -1,4 +1,4 @@ -OneMCReadcommit:1:2:3:4:5:rarray -MultiMCReadcommit:1:2:3:4:5:rao -OneMCWritecommit:1:2:3:4:5:warray -MultiMCWritecommit:1:2:3:4:5:wao +OneMCReadcommit:1:2:3:4:5:6:7:8:rarray +MultiMCReadcommit:1:2:3:4:5:6:7:8:rao +OneMCWritecommit:1:2:3:4:5:6:7:8:warray +MultiMCWritecommit:1:2:3:4:5:6:7:8:wao diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBench.java b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBench.java index 24fcb3ed..e654ee60 100644 --- a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBench.java +++ b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBench.java @@ -69,11 +69,15 @@ public class JGFMolDynBench { public static void JGFapplication(JGFMolDynBench mold) { // Create new arrays BarrierServer mybarr; - int[] mid = new int[4]; - mid[0] = (128<<24)|(195<<16)|(175<<8)|79; - mid[1] = (128<<24)|(195<<16)|(175<<8)|80; - mid[2] = (128<<24)|(195<<16)|(175<<8)|78; - mid[3] = (128<<24)|(195<<16)|(175<<8)|73; + int[] mid = new int[8]; + mid[0] = (128<<24)|(195<<16)|(175<<8)|84;//dw-10 + mid[1] = (128<<24)|(195<<16)|(175<<8)|85;//dw-11 + mid[2] = (128<<24)|(195<<16)|(175<<8)|86;//dw-12 + mid[3] = (128<<24)|(195<<16)|(175<<8)|87;//dw-13 + mid[4] = (128<<24)|(195<<16)|(175<<8)|88;//dw-14 + mid[5] = (128<<24)|(195<<16)|(175<<8)|89;//dw-15 + mid[6] = (128<<24)|(195<<16)|(175<<8)|90;//dw-16 + mid[7] = (128<<24)|(195<<16)|(175<<8)|91;//dw-17 double sh_force [][]; double sh_force2 [][][]; @@ -345,7 +349,7 @@ class mdRunner extends Thread { int mdsize; double tmpden; int movemx=50; - Barrier barr=new Barrier("128.195.175.79"); + Barrier barr=new Barrier("128.195.175.84"); particle[] one; int id; atomic { diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBenchSizeA.java b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBenchSizeA.java index e3b71076..bfc5d4f8 100644 --- a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBenchSizeA.java +++ b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/JGFMolDynBenchSizeA.java @@ -79,6 +79,7 @@ public class JGFMolDynBenchSizeA { JGFInstrumentor.printTimer("Section3:MolDyn:Run", instr.timers); JGFInstrumentor.printTimer("Section3:MolDyn:Total", instr.timers); + System.printString("Finished\n"); } } diff --git a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile index 709f729b..5103e261 100644 --- a/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile +++ b/Robust/src/Benchmarks/Prefetch/Moldyn/dsm/makefile @@ -8,18 +8,36 @@ IntWrapper.java \ MDWrap.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 -mainclass ${MAINCLASS} -o ${MAINCLASS} -trueprob 0.75 FLAGS2=-dsm -optimize -mainclass ${MAINCLASS} -o ${MAINCLASS}NP +FLAGS1=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} -o ${MAINCLASS}NP -trueprob 0.75 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 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 c629c046..b54530bb 100644 --- a/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java +++ b/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBench.java @@ -46,11 +46,15 @@ public class JGFSORBench { int numthreads, datasize; BarrierServer mybarr; - int[] mid = new int[4]; + int[] mid = new int[8]; mid[0] = (128<<24)|(195<<16)|(175<<8)|84;//dw-10 mid[1] = (128<<24)|(195<<16)|(175<<8)|85;//dw-11 mid[2] = (128<<24)|(195<<16)|(175<<8)|86;//dw-12 mid[3] = (128<<24)|(195<<16)|(175<<8)|87;//dw-13 + mid[4] = (128<<24)|(195<<16)|(175<<8)|88;//dw-14 + mid[5] = (128<<24)|(195<<16)|(175<<8)|89;//dw-15 + mid[6] = (128<<24)|(195<<16)|(175<<8)|90;//dw-16 + mid[7] = (128<<24)|(195<<16)|(175<<8)|91;//dw-17 double[][] G; int num_iterations; diff --git a/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBenchSizeD.java b/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBenchSizeD.java index 4c3d4ae8..09616fc6 100644 --- a/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBenchSizeD.java +++ b/Robust/src/Benchmarks/Prefetch/SOR/dsm/JGFSORBenchSizeD.java @@ -31,6 +31,9 @@ public class JGFSORBenchSizeD{ nthreads = 1; } + JGFInstrumentor instr = new JGFInstrumentor(); + JGFInstrumentor.printHeader(2,0,nthreads); + JGFSORBench sor; atomic { sor = global new JGFSORBench(nthreads); diff --git a/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile b/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile index d879e943..811d4589 100644 --- a/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile +++ b/Robust/src/Benchmarks/Prefetch/SOR/dsm/makefile @@ -7,26 +7,38 @@ SRC=${MAINCLASS}.java \ JGFTimer.java \ SORRunner.java \ SORWrap.java -FLAGS=-dsm -prefetch -dsmcaching -optimize -excprefetch JGFSORBench.JGFSORBench -excprefetch JGFSORBenchSizeA.main -excprefetch JGFSORBench.RandomMatrix -excprefetch JGFSORBench.init_sync -excprefetch JGFSORBench.JGFkernel -mainclass ${MAINCLASS} -trueprob 0.72 -FLAGS1=-dsm -dsmcaching -optimize -mainclass ${MAINCLASS} +FLAGS=-dsm -prefetch -dsmcaching -nooptimize -debug -excprefetch JGFSORBench.JGFSORBench -excprefetch JGFSORBenchSizeA.main -excprefetch JGFSORBench.RandomMatrix -excprefetch JGFSORBench.init_sync -excprefetch JGFSORBench.JGFkernel -mainclass ${MAINCLASS} -trueprob 0.72 +FLAGS1=-dsm -dsmcaching -nooptimize -debug -mainclass ${MAINCLASS} FLAGS2=-dsm -optimize -mainclass ${MAINCLASS} default: ../../../../buildscript ${FLAGS2} -o ${MAINCLASS}NPNC ${SRC} - ../../../../buildscript ${FLAGS1} -o ${MAINCLASS}NP ${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}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}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}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}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 clean: rm -rf tmpbuilddirectory diff --git a/Robust/src/Benchmarks/Prefetch/bm.txt b/Robust/src/Benchmarks/Prefetch/bm.txt index 97b4bae6..b1442179 100644 --- a/Robust/src/Benchmarks/Prefetch/bm.txt +++ b/Robust/src/Benchmarks/Prefetch/bm.txt @@ -1,22 +1,12 @@ -JGFSORBenchSizeA:SOR/dsm:1:2:3:4:sorverA -JGFSORBenchSizeC:SOR/dsm:1:2:3:4:sorverC -JGFSORBenchSizeD:SOR/dsm:1:2:3:4:sorverD -JGFMolDynBenchSizeA:Moldyn/dsm:1:2:3:4:moldynverA +JGFSORBenchSizeA:SOR/dsm:1:2:3:4:5:6:7:8:sorverA +JGFSORBenchSizeD:SOR/dsm:1:2:3:4:5:6:7:8:sorverD +JGFMolDynBenchSizeA:Moldyn/dsm:1:2:3:4:5:6:7:8:moldynverA +JGFMolDynBenchSizeD:Moldyn/dsm:1:2:3:4:5:6:7:8:moldynverD JGFLUFactBenchSizeA:LUFact/dsm:1:2:3:4:lufactverA -MatrixMultiply:MM200:1 200 30:2 200 30:3 200 30:4 200 30:mmver200 -MatrixMultiply:MatrixMultiply:1 600:2 600:3 600:4 600:mmver600 -Em3d:Em3d/dsm:-T 1 -N 4000 -d 130 -p -i 3:-T 2 -N 4000 -d 130 -p -i 3:-T 3 -N 4000 -d 130 -p -i 3:-T 4 -N 4000 -d 130 -p -i 3:em3dver40001303 -Em3d:Em3d/dsm:-T 1 -N 4000 -d 130 -p -i 6:-T 2 -N 4000 -d 130 -p -i 6:-T 3 -N 4000 -d 130 -p -i 6:-T 4 -N 4000 -d 130 -p -i 6:em3dver40001306 -Em3d:Em3d/dsm:-T 1 -N 6000 -d 250 -p -i 6:-T 2 -N 6000 -d 250 -p -i 6:-T 3 -N 6000 -d 250 -p -i 6:-T 4 -N 6000 -d 250 -p -i 6:em3dver60002506 -Em3d:Em3d/dsm:-T 1 -N 6000 -d 200 -p -i 6:-T 2 -N 6000 -d 200 -p -i 6:-T 3 -N 6000 -d 200 -p -i 6:-T 4 -N 6000 -d 200 -p -i 6:em3dver60002006 -Em3d:Em3d/dsm:-T 1 -N 6000 -d 200 -p -i 10:-T 2 -N 6000 -d 200 -p -i 10:-T 3 -N 6000 -d 200 -p -i 10:-T 4 -N 6000 -d 200 -p -i 10:em3dver600020010 -Em3d:Em3d/dsm:-T 1 -N 8000 -d 270 -p -i 6:-T 2 -N 8000 -d 270 -p -i 6:-T 3 -N 8000 -d 270 -p -i 6:-T 4 -N 8000 -d 270 -p -i 6:em3dver80002706 -Em3d:Em3d/dsm:-T 1 -N 8000 -d 270 -p -i 10:-T 2 -N 8000 -d 270 -p -i 10:-T 3 -N 8000 -d 270 -p -i 10:-T 4 -N 8000 -d 270 -p -i 10:em3dver800027010 -Em3d:Em3d/dsm:-T 1 -N 10000 -d 400 -p -i 150:-T 2 -N 10000 -d 400 -p -i 150:-T 3 -N 10000 -d 400 -p -i 150:-T 4 -N 10000 -d 400 -p -i 150:em3dver10000400150 -Em3d:Em3d/dsm:-T 1 -N 10000 -d 800 -p -i 15:-T 2 -N 10000 -d 800 -p -i 15:-T 3 -N 10000 -d 800 -p -i 15:-T 4 -N 10000 -d 800 -p -i 15:em3dver1000080015 -Em3d:Em3d/dsm:-T 1 -N 10000 -d 1000 -p -i 15:-T 2 -N 10000 -d 1000 -p -i 15:-T 3 -N 10000 -d 1000 -p -i 15:-T 4 -N 10000 -d 1000 -p -i 15:em3dver10000100015 -Em3d:Em3d/dsm:-T 1 -N 20000 -d 800 -p -i 15:-T 2 -N 20000 -d 800 -p -i 15:-T 3 -N 20000 -d 800 -p -i 15:-T 4 -N 20000 -d 800 -p -i 15:em3dver2000080015 -Em3d:Em3d/dsm:-T 1 -N 20000 -d 600 -p -i 15:-T 2 -N 20000 -d 600 -p -i 15:-T 3 -N 20000 -d 600 -p -i 15:-T 4 -N 20000 -d 600 -p -i 15:em3dver2000060015 -Em3d:Em3d/dsm:-T 1 -N 20000 -d 1000 -p -i 15:-T 2 -N 20000 -d 1000 -p -i 15:-T 3 -N 20000 -d 1000 -p -i 15:-T 4 -N 20000 -d 1000 -p -i 15:em3dver20000100015 +MatrixMultiply:MM200:1 200 30:2 200 30:3 200 30:4 200 30:5 200 30:6 200 30:7 200 30:8 200 30:mmver200 +MatrixMultiply:MatrixMultiply:1 600:2 600:3 600:4 600:5 600:6 600:7 600:8 600:mmver600 +Em3d:Em3d/dsm:-T 1 -N 4000 -d 130 -p -i 6:-T 2 -N 4000 -d 130 -p -i 6:-T 3 -N 4000 -d 130 -p -i 6:-T 4 -N 4000 -d 130 -p -i 6:-T 5 -N 4000 -d 130 -p -i 6:-T 6 -N 4000 -d 130 -p -i 6:-T 7 -N 4000 -d 130 -p -i 6:-T 8 -N 4000 -d 130 -p -i 6:em3dver40001306 +Em3d:Em3d/dsm:-T 1 -N 6000 -d 200 -p -i 10:-T 2 -N 6000 -d 200 -p -i 10:-T 3 -N 6000 -d 200 -p -i 10:-T 4 -N 6000 -d 200 -p -i 10:-T 5 -N 6000 -d 200 -p -i 10:-T 6 -N 6000 -d 200 -p -i 10:-T 7 -N 6000 -d 200 -p -i 10:-T 8 -N 6000 -d 200 -p -i 10:em3dver600020010 +Em3d:Em3d/dsm:-T 1 -N 10000 -d 1000 -i 15:-T 2 -N 10000 -d 1000 -i 15:-T 3 -N 10000 -d 1000 -i 15:-T 4 -N 10000 -d 1000 -i 15:-T 5 -N 10000 -d 1000 -i 15:-T 6 -N 10000 -d 1000 -i 15:-T 7 -N 10000 -d 1000 -i 15:-T 8 -N 10000 -d 1000 -i 15:em3dver10000100015 Chase:Chase:::::chase Array:Array:::::array diff --git a/Robust/src/Benchmarks/Prefetch/run.sh b/Robust/src/Benchmarks/Prefetch/run.sh index 3ae77bdd..b4ebdbcc 100755 --- a/Robust/src/Benchmarks/Prefetch/run.sh +++ b/Robust/src/Benchmarks/Prefetch/run.sh @@ -1,9 +1,13 @@ #!/bin/sh #set -x -MACHINES2='dw-9.eecs.uci.edu' -MACHINES3='dw-9.eecs.uci.edu dw-7.eecs.uci.edu' -MACHINES4='dw-9.eecs.uci.edu dw-7.eecs.uci.edu dw-5.eecs.uci.edu' +MACHINES2='dw-11.eecs.uci.edu' +MACHINES3='dw-11.eecs.uci.edu dw-12.eecs.uci.edu' +MACHINES4='dw-11.eecs.uci.edu dw-12.eecs.uci.edu dw-13.eecs.uci.edu' +MACHINES5='dw-11.eecs.uci.edu dw-12.eecs.uci.edu dw-13.eecs.uci.edu dw-14.eecs.uci.edu' +MACHINES6='dw-11.eecs.uci.edu dw-12.eecs.uci.edu dw-13.eecs.uci.edu dw-14.eecs.uci.edu dw-15.eecs.uci.edu' +MACHINES7='dw-11.eecs.uci.edu dw-12.eecs.uci.edu dw-13.eecs.uci.edu dw-14.eecs.uci.edu dw-15.eecs.uci.edu dw-16.eecs.uci.edu' +MACHINES8='dw-11.eecs.uci.edu dw-12.eecs.uci.edu dw-13.eecs.uci.edu dw-14.eecs.uci.edu dw-15.eecs.uci.edu dw-16.eecs.uci.edu dw-17.eecs.uci.edu' LOGDIR=/home/adash/research/Robust/src/Benchmarks/Prefetch/runlog TOPDIR=`pwd` @@ -25,6 +29,22 @@ function run { arg=$ARGS4 MACHINES=$MACHINES4 fi + if [ $2 -eq 5 ]; then + arg=$ARGS5 + MACHINES=$MACHINES5 + fi + if [ $2 -eq 6 ]; then + arg=$ARGS6 + MACHINES=$MACHINES6 + fi + if [ $2 -eq 7 ]; then + arg=$ARGS7 + MACHINES=$MACHINES7 + fi + if [ $2 -eq 8 ]; then + arg=$ARGS8 + MACHINES=$MACHINES8 + fi chmod +x ~/.tmpvars for machine in `echo $MACHINES` do @@ -89,10 +109,22 @@ function callrun { PREFETCH4=${BENCHMARK}4.bin NONPREFETCH4=${BENCHMARK}4NP.bin NONPREFETCH_NONCACHE4=${BENCHMARK}4NPNC.bin + PREFETCH5=${BENCHMARK}5.bin + NONPREFETCH5=${BENCHMARK}5NP.bin + NONPREFETCH_NONCACHE5=${BENCHMARK}5NPNC.bin + PREFETCH6=${BENCHMARK}6.bin + NONPREFETCH6=${BENCHMARK}6NP.bin + NONPREFETCH_NONCACHE6=${BENCHMARK}6NPNC.bin + PREFETCH7=${BENCHMARK}7.bin + NONPREFETCH7=${BENCHMARK}7NP.bin + NONPREFETCH_NONCACHE7=${BENCHMARK}7NPNC.bin + PREFETCH8=${BENCHMARK}8.bin + NONPREFETCH8=${BENCHMARK}8NP.bin + NONPREFETCH_NONCACHE8=${BENCHMARK}8NPNC.bin cd $BMDIR echo "---------- Running local $BMDIR non-prefetch on 1 machine ---------- " - localrun 3 + # localrun 1 echo "---------- Running single thread remote $BMDIR non-prefetch + non-cache on 2 machines ---------- " # oneremote 1 1 $NONPREFETCH_NONCACHE @@ -102,25 +134,54 @@ function callrun { # oneremote 1 1 $PREFETCH echo "---------- Running two threads $BMDIR non-prefetch + non-cache on 2 machines ---------- " - run 3 2 $NONPREFETCH_NONCACHE2 + run 1 2 $NONPREFETCH_NONCACHE2 echo "---------- Running two threads $BMDIR non-prefetch on 2 machines ---------- " -# run 3 2 $NONPREFETCH2 + run 1 2 $NONPREFETCH2 echo "---------- Running two threads $BMDIR prefetch on 2 machines ---------- " - run 3 2 $PREFETCH2 + run 1 2 $PREFETCH2 echo "---------- Running three threads $BMDIR non-prefetch + non-cache on 3 machines ---------- " - run 3 3 $NONPREFETCH_NONCACHE3 + run 1 3 $NONPREFETCH_NONCACHE3 echo "---------- Running three threads $BMDIR non-prefetch on 3 machines ---------- " -# run 3 3 $NONPREFETCH3 + run 1 3 $NONPREFETCH3 echo "---------- Running three threads $BMDIR prefetch on 3 machines ---------- " - run 3 3 $PREFETCH3 + run 1 3 $PREFETCH3 echo "---------- Running four threads $BMDIR non-prefetch + non-cache on 4 machines ---------- " - run 3 4 $NONPREFETCH_NONCACHE4 + run 1 4 $NONPREFETCH_NONCACHE4 echo "---------- Running four threads $BMDIR non-prefetch on 4 machines ---------- " -# run 3 4 $NONPREFETCH4 + run 1 4 $NONPREFETCH4 echo "---------- Running four threads $BMDIR prefetch on 4 machines ---------- " - run 3 4 $PREFETCH4 + run 1 4 $PREFETCH4 + + echo "---------- Running five threads $BMDIR non-prefetch + non-cache on 5 machines ---------- " + run 1 5 $NONPREFETCH_NONCACHE5 + echo "---------- Running five threads $BMDIR non-prefetch on 5 machines ---------- " + run 1 5 $NONPREFETCH5 + echo "---------- Running five threads $BMDIR prefetch on 5 machines ---------- " + run 1 5 $PREFETCH5 + + echo "---------- Running six threads $BMDIR non-prefetch + non-cache on 6 machines ---------- " + run 1 6 $NONPREFETCH_NONCACHE6 + echo "---------- Running six threads $BMDIR non-prefetch on 6 machines ---------- " + run 1 6 $NONPREFETCH6 + echo "---------- Running six threads $BMDIR prefetch on 6 machines ---------- " + run 1 6 $PREFETCH6 + + + echo "---------- Running seven threads $BMDIR non-prefetch + non-cache on 7 machines ---------- " + run 1 7 $NONPREFETCH_NONCACHE7 + echo "---------- Running seven threads $BMDIR non-prefetch on 7 machines ---------- " + run 1 7 $NONPREFETCH7 + echo "---------- Running seven threads $BMDIR prefetch on 7 machines ---------- " + run 1 7 $PREFETCH7 + + echo "---------- Running eight threads $BMDIR non-prefetch + non-cache on 8 machines ---------- " + run 1 8 $NONPREFETCH_NONCACHE8 + echo "---------- Running eight threads $BMDIR non-prefetch on 8 machines ---------- " + run 1 8 $NONPREFETCH8 + echo "---------- Running eight threads $BMDIR prefetch on 8 machines ---------- " + run 1 8 $PREFETCH8 cd $TOPDIR } @@ -141,10 +202,7 @@ function callmicrorun { cd $TOPDIR } -benchmarks='array chase mmver200 mmver600' -#benchmarks='em3dver10000100015' -#benchmarks='moldynverA' -#benchmarks='sorverD' //8000 X 8000 matrix +benchmarks='mmver600 mmver200 moldynverA sorverD em3dver10000100015' echo "---------- Clean old files ---------- " rm runlog/* @@ -157,7 +215,11 @@ do ARGS2=`echo $bm | cut -f4 -d":"` ARGS3=`echo $bm | cut -f5 -d":"` ARGS4=`echo $bm | cut -f6 -d":"` - EXTENSION=`echo $bm | cut -f7 -d":"` + ARGS5=`echo $bm | cut -f7 -d":"` + ARGS6=`echo $bm | cut -f8 -d":"` + ARGS7=`echo $bm | cut -f9 -d":"` + ARGS8=`echo $bm | cut -f10 -d":"` + EXTENSION=`echo $bm | cut -f11 -d":"` name1='array' name2='chase' if [ $b == $name1 ] || [ $b == $name2 ]; then -- 2.34.1