Fiddled with bench scripts.

axel22 · Jul 22, 2011 · b3566bd · b3566bd
1 parent e7b5b9d
commit b3566bd
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 8 deletions.
diff --git a/bench-all-gee b/bench-all-gee
@@ -1 +1 @@
-tools/bench-all gee 1,2,4,6,8,10,12,14,16,18,20,24,28,32,36,40,44,48,52,56,60,64 1000000 5 3 2 1000000
+tools/bench-all gee 1,2,4,6,8,10,12,14,16,18,20,24,28,32,36,40,44,48,52,56,60,64 1000000 5 3 2 1000000 non-uniform 12 0.6 32000
diff --git a/bench-all-gee~ b/bench-all-gee~
@@ -0,0 +1 @@
+tools/bench-all gee 1,2,4,6,8,10,12,14,16,18,20,24,28,32,36,40,44,48,52,56,60,64 1000000 5 3 2 1000000
diff --git a/bench-all-lambda b/bench-all-lambda
@@ -1 +1 @@
-tools/bench-all lambda 1,2,4,6,8,10,12,14,16 500000,1000000 5 3 2 15000000
+tools/bench-all lambda 1,2,4,6,8,10,12,14,16 500000,1000000 5 3 2 15000000 non-uniform 12 0.6 32000
diff --git a/bench-all-lambda~ b/bench-all-lambda~
@@ -0,0 +1 @@
+tools/bench-all lambda 1,2,4,6,8,10,12,14,16 500000,1000000 5 3 2 15000000
diff --git a/bench-all-maglite b/bench-all-maglite
@@ -1 +1 @@
-tools/bench-all gee 1,2,4,6,8,10,12,14,16,18,20,24,28,32,36,40,44,48,52,56,60,64 1000000 5 3 2 1000000
+tools/bench-all maglite 1,2,4,6,8,10,12,14,16,18,20,24,28,32,36,40,44,48,52,56,60,64 1000000 5 4 1 1000000 non-uniform 12 0.6 32000
diff --git a/bench-all-maglite~ b/bench-all-maglite~
@@ -0,0 +1 @@
+tools/bench-all maglite 1,2,4,6,8,10,12,14,16,18,20,24,28,32,36,40,44,48,52,56,60,64 1000000 5 4 1 1000000 
diff --git a/bench-all-moxie b/bench-all-moxie
@@ -1 +1 @@
-tools/bench-all moxie 1,2,4,6,8,10,12,14,16,18,20,24,28,32,36,40,44,48,52,56,60,64,68,72,76,80,84,88,92,96,100,104,108,112,116,120,124,128 1000000 5 3 2 1000000
+tools/bench-all moxie 1,2,4,6,8,10,12,14,16,18,20,24,28,32,36,40,44,48,52,56,60,64,68,72,76,80,84,88,92,96,100,104,108,112,116,120,124,128 1000000 5 3 2 1000000 non-uniform 12 0.6 32000
diff --git a/bench-all-moxie~ b/bench-all-moxie~
@@ -0,0 +1 @@
+tools/bench-all moxie 1,2,4,6,8,10,12,14,16,18,20,24,28,32,36,40,44,48,52,56,60,64,68,72,76,80,84,88,92,96,100,104,108,112,116,120,124,128 1000000 5 3 2 1000000
diff --git a/bench-all-wolf b/bench-all-wolf
@@ -1 +1 @@
-tools/bench-all wolf 1,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32 500000,1000000 5 3 2 25000000
+tools/bench-all wolf 1,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32 500000,1000000 5 3 2 25000000 non-uniform 12 0.6 32000
diff --git a/bench-all-wolf~ b/bench-all-wolf~
@@ -0,0 +1 @@
+tools/bench-all wolf 1,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32 500000,1000000 5 3 2 25000000
diff --git a/tools/bench-all b/tools/bench-all
@@ -1,12 +1,13 @@
 #!/bin/bash
 
 if [ "$1" == "-h" ]; then
-  echo "Runs all benchmarks. Synthax: bench-all <workstation> <numproc-range> <size-range> <lookups> <inserts> <removes> <totalops-for-bench-update>"
+  echo "Runs all benchmarks. Synthax: bench-all <workstation> <numproc-range> <size-range> <lookups> <inserts> <removes> <totalops-for-bench-update> <pagerank-pagegenerator> <pagerank-maxlinks> <pagerank-damping> <pagerank-size>"
 else
   tools/bench-insert $@
   tools/bench-lookup $@
   tools/bench-remove $@
   tools/bench-update $@
   tools/bench-snapshot $@
   tools/bench-iter $@
+  tools/bench-pagerank $@
 fi
diff --git a/tools/bench-pagerank b/tools/bench-pagerank
@@ -1,3 +1,3 @@
 #!/bin/bash
-TASK="bench-batch --gnuplot=$1-pagerank -Dsz=$3 -Dpar=$2 -Dpagegenerator=non-uniform -Dmaxlinks=32 -Ddamping=0.45 ctries.ParPageRank ctries.FilterPageRank"
-sbt "$TASK"
+TASK="bench-batch --gnuplot=$1-pagerank -Dsz=$11 -Dpar=$2 -Dpagegenerator=$8 -Dmaxlinks=$9 -Ddamping=$10 -Ddebug=false ctries.ParPageRank ctries.FilterPageRank"
+sbt "$TASK"