benchmarks as used for paper

diff --git a/Robust/src/Benchmarks/SingleTM/Labyrinth3D/Grid.java b/Robust/src/Benchmarks/SingleTM/Labyrinth3D/Grid.java
index 53fedf7122667a029b19b6d793c06dc9de1de4c7..7c2831af11b199270a9d7acd84e42bf32e6b4596 100644 (file)
--- a/Robust/src/Benchmarks/SingleTM/Labyrinth3D/Grid.java
+++ b/Robust/src/Benchmarks/SingleTM/Labyrinth3D/Grid.java
@@ -214,6 +214,7 @@ void grid_addPath (grid_t* gridPtr, vector_t* pointVectorPtr);
     int height = this.height;
     int width = this.width;
     int area = height * width;
+    boolean dowrites=true;
     for(i = 1; i < (n-1); i++) {
       int gridPointIndex = ((Integer)(pointVectorPtr.vector_at(i))).intValue();
       int z = gridPointIndex / area;
@@ -221,7 +222,7 @@ void grid_addPath (grid_t* gridPtr, vector_t* pointVectorPtr);
       int y = index2d / width;
       int x = index2d % width;        
       if (points_unaligned[x][y][z] != GRID_POINT_EMPTY) {
-       return true;
+       dowrites=false;
       }
     }
 
@@ -231,9 +232,10 @@ void grid_addPath (grid_t* gridPtr, vector_t* pointVectorPtr);
       int index2d = gridPointIndex % area;
       int y = index2d / width;
       int x = index2d % width;
-      points_unaligned[x][y][z] = GRID_POINT_FULL;
+      int[] array=points_unaligned[x][y];
+      if (dowrites) array[z] = GRID_POINT_FULL;
     }
-    return false;
+    return !dowrites;
   }
 
   public int getPointIndex(int x,int y,int z) {
@@ -250,7 +252,10 @@ void grid_addPath (grid_t* gridPtr, vector_t* pointVectorPtr);
       System.out.println("[z ="+z+"]");
       for (int x = 0; x < width; x++) {
        for (int y = 0; y < height; y++) {
-         System.out.print(points_unaligned[x][y][z]);
+         String str=String.valueOf(points_unaligned[x][y][z]);
+         for(int sp=0; sp<(4-str.length());sp++)
+           System.out.print(" ");
+         System.out.print(str);
        }
        System.out.println("");
       }

diff --git a/Robust/src/Benchmarks/SingleTM/compileall b/Robust/src/Benchmarks/SingleTM/compileall
index a293e67089fbd2d4886f7f6746fb364e5d205732..f305e5e02fd1da9a72fba9b6b21d5ab26cbea1a0 100755 (executable)
--- a/Robust/src/Benchmarks/SingleTM/compileall
+++ b/Robust/src/Benchmarks/SingleTM/compileall
@@ -7,10 +7,14 @@ cd SSCA2
 make &
 cd ..
 
-cd Labyrinth
+cd Labyrinth3D
 make &
 cd ..
 
 cd Genome
 make &
+cd ..
+
+cd Intruder
+make &
 cd ..
\ No newline at end of file

diff --git a/Robust/src/Benchmarks/SingleTM/runall b/Robust/src/Benchmarks/SingleTM/runall
index afd1de64528efc9ece84996ee09407188164649a..2809b9430482b9f13b7baf99a2bf1c5b8ca0c83b 100755 (executable)
--- a/Robust/src/Benchmarks/SingleTM/runall
+++ b/Robust/src/Benchmarks/SingleTM/runall
@@ -8,31 +8,75 @@ args="$@"
 cd $dir
 echo ============================================================
 echo Running Fission $command $@
+for i in 1 2 3 4 5
+do
+echo Trial $i
 time ./FIS$command $args
+done
 echo
 echo
 echo Running STM $command $@
-time ./STM$command $args
+for i in 1 2 3 4 5
+do
+echo Trial $i
+#time ./STM$command $args
+done
 echo
 echo
 echo Running Optimized STM $command $@
-time ./OPTSTM$command $args
+for i in 1 2 3 4 5
+do
+echo Trial $i
+#time ./OPTSTM$command $args
+done
 echo
 echo
 echo Running Lock $command $@
+for i in 1 2 3 4 5
+do
+echo Trial $i
 time ./LOCK$command $args
+done
+echo
+echo
+echo Running No JOPTIMIZE STM $command $@
+for i in 1 2 3 4 5
+do
+echo Trial $i
+#time ./STMNOJ$command $args
+done
+echo
+echo
+echo Running No JOPTIMIZE Lock $command $@
+for i in 1 2 3 4 5
+do
+echo Trial $i
+time ./LOCKNOJ$command $args
+done
 echo
 echo
 cd ..
 }
 #get plenty of stack space
-ulimit -s 40000
+ulimit -s 45000
 
 #Kmeans
-run KMeans KMeans.bin -m 15 -n 15 -t 0.00001 -i inputs/random-n65536-d32-c16.txt -nthreads 1
-run KMeans KMeans.bin -m 15 -n 15 -t 0.00001 -i inputs/random-n65536-d32-c16.txt -nthreads 2
-run KMeans KMeans.bin -m 15 -n 15 -t 0.00001 -i inputs/random-n65536-d32-c16.txt -nthreads 4
-run KMeans KMeans.bin -m 15 -n 15 -t 0.00001 -i inputs/random-n65536-d32-c16.txt -nthreads 8
+#run KMeans KMeans.bin -m 15 -n 15 -t 0.00001 -i inputs/random-n65536-d32-c16.txt -nthreads 1
+#run KMeans KMeans.bin -m 15 -n 15 -t 0.00001 -i inputs/random-n65536-d32-c16.txt -nthreads 2
+#run KMeans KMeans.bin -m 15 -n 15 -t 0.00001 -i inputs/random-n65536-d32-c16.txt -nthreads 4
+#run KMeans KMeans.bin -m 15 -n 15 -t 0.00001 -i inputs/random-n65536-d32-c16.txt -nthreads 8
+
+#Kmeans low
+#run KMeans KMeans.bin -m 40 -n 40 -t 0.00001 -i inputs/random-n65536-d32-c16.txt -nthreads 1
+#run KMeans KMeans.bin -m 40 -n 40 -t 0.00001 -i inputs/random-n65536-d32-c16.txt -nthreads 2
+#run KMeans KMeans.bin -m 40 -n 40 -t 0.00001 -i inputs/random-n65536-d32-c16.txt -nthreads 4
+#run KMeans KMeans.bin -m 40 -n 40 -t 0.00001 -i inputs/random-n65536-d32-c16.txt -nthreads 8
+
+#Labrynth
+#run Labyrinth3D Labyrinth.bin -i inputs/random-x512-y512-z7-n512.txt -t 1
+#run Labyrinth3D Labyrinth.bin -i inputs/random-x512-y512-z7-n512.txt -t 2
+#run Labyrinth3D Labyrinth.bin -i inputs/random-x512-y512-z7-n512.txt -t 4
+#run Labyrinth3D Labyrinth.bin -i inputs/random-x512-y512-z7-n512.txt -t 8
 
 #SSCA2
 run SSCA2 SSCA2.bin -s 20 -i 1.0 -u 1.0 -l 3 -p 3 -t 1
@@ -40,14 +84,14 @@ run SSCA2 SSCA2.bin -s 20 -i 1.0 -u 1.0 -l 3 -p 3 -t 2
 run SSCA2 SSCA2.bin -s 20 -i 1.0 -u 1.0 -l 3 -p 3 -t 4
 run SSCA2 SSCA2.bin -s 20 -i 1.0 -u 1.0 -l 3 -p 3 -t 8
 
-#Labrynth
-run Labyrinth Labyrinth.bin -i inputs/random-x512-y512-z7-n512.txt -t 1
-run Labyrinth Labyrinth.bin -i inputs/random-x512-y512-z7-n512.txt -t 2
-run Labyrinth Labyrinth.bin -i inputs/random-x512-y512-z7-n512.txt -t 4
-run Labyrinth Labyrinth.bin -i inputs/random-x512-y512-z7-n512.txt -t 8
-
 #Genome
-run Genome Genome.bin -g 8192 -s 32 -n 167721 -t 1
-run Genome Genome.bin -g 8192 -s 32 -n 167721 -t 2
-run Genome Genome.bin -g 8192 -s 32 -n 167721 -t 4
-run Genome Genome.bin -g 8192 -s 32 -n 167721 -t 8
\ No newline at end of file
+#run Genome Genome.bin -g 8192 -s 32 -n 167721 -t 1
+#run Genome Genome.bin -g 8192 -s 32 -n 167721 -t 2
+#run Genome Genome.bin -g 8192 -s 32 -n 167721 -t 4
+#run Genome Genome.bin -g 8192 -s 32 -n 167721 -t 8
+
+#run Intruder Intruder.bin -a 10 -l 128 -n 262144 -s 1 -t 1
+#run Intruder Intruder.bin -a 10 -l 128 -n 262144 -s 1 -t 2
+#run Intruder Intruder.bin -a 10 -l 128 -n 262144 -s 1 -t 4
+#run Intruder Intruder.bin -a 10 -l 128 -n 262144 -s 1 -t 8
+