From ada2a9d418ce49e28d27139f911e8b8c456e1e6f Mon Sep 17 00:00:00 2001 From: jjenista Date: Tue, 6 Apr 2010 20:50:03 +0000 Subject: [PATCH] changes to automate old and new analysis benchmark suites, want tabular output to match for easily comparisons --- ...akeTable.sh => genTable-all-benchmarks.sh} | 23 ++- .../Ownership/genTable-paper-benchmarks.sh | 129 ++++++++++++ .../Benchmarks/disjoint/expectedSharing.tex | 190 +++++++++++------- Robust/src/Benchmarks/disjoint/makefile | 5 +- 4 files changed, 260 insertions(+), 87 deletions(-) rename Robust/src/Benchmarks/Ownership/{makeTable.sh => genTable-all-benchmarks.sh} (88%) create mode 100755 Robust/src/Benchmarks/Ownership/genTable-paper-benchmarks.sh diff --git a/Robust/src/Benchmarks/Ownership/makeTable.sh b/Robust/src/Benchmarks/Ownership/genTable-all-benchmarks.sh similarity index 88% rename from Robust/src/Benchmarks/Ownership/makeTable.sh rename to Robust/src/Benchmarks/Ownership/genTable-all-benchmarks.sh index afb3b768..9eb5428c 100755 --- a/Robust/src/Benchmarks/Ownership/makeTable.sh +++ b/Robust/src/Benchmarks/Ownership/genTable-all-benchmarks.sh @@ -18,7 +18,7 @@ NAME[$num]=jHTTPp2 BDIR[$num]=Jhttpp2/BR num=$[$num+1] -NAME[$num]=MapReduce +NAME[$num]=MapReduce1 BDIR[$num]=MapReduce/Tag num=$[$num+1] @@ -54,14 +54,22 @@ NAME[$num]=KMeans-Bamboo BDIR[$num]=Scheduling/KMeans num=$[$num+1] +NAME[$num]=MapReduce2 +BDIR[$num]=Scheduling/MapReduce +num=$[$num+1] + NAME[$num]=FluidAnimate BDIR[$num]=Scheduling/PSFluidAnimate num=$[$num+1] -NAME[$num]=Spider +NAME[$num]=Spider1 BDIR[$num]=Spider/BR num=$[$num+1] +NAME[$num]=Spider2 +BDIR[$num]=Spider/BRTag +num=$[$num+1] + NAME[$num]=TileSearch BDIR[$num]=TileSearch/Tag num=$[$num+1] @@ -70,17 +78,20 @@ NAME[$num]=TicTacToe BDIR[$num]=TTTTag num=$[$num+1] -NAME[$num]=WebServer +NAME[$num]=WebServer1 BDIR[$num]=WebServer num=$[$num+1] +NAME[$num]=WebServer2 +BDIR[$num]=WebServerTag +num=$[$num+1] + NAME[$num]=Tracking BDIR[$num]=Scheduling/Tracking num=$[$num+1] - ########################### # No need to modify below! ########################### @@ -98,12 +109,10 @@ echo '\hline' >> $TABFILE i="0" while [ $i -lt $num ]; do - echo ${NAME[$i]} - cd $BENCHTOP/${BDIR[$i]} # unfortunately this echo adds an unwanted newline echo ${NAME[$i]} >> $BENCHSUM/$TABFILE - make -f $BENCHSUM/makefile + make -f $BENCHSUM/makefile tabbed cat aliases.txt >> $BENCHSUM/$TABFILE make -f $BENCHSUM/makefile clean i=$[$i+1] diff --git a/Robust/src/Benchmarks/Ownership/genTable-paper-benchmarks.sh b/Robust/src/Benchmarks/Ownership/genTable-paper-benchmarks.sh new file mode 100755 index 00000000..57060085 --- /dev/null +++ b/Robust/src/Benchmarks/Ownership/genTable-paper-benchmarks.sh @@ -0,0 +1,129 @@ +#!/bin/bash + +num="0" + +NAME[$num]=Bank +BDIR[$num]=BankApp +num=$[$num+1] + +NAME[$num]=Chat +BDIR[$num]=ChatTag +num=$[$num+1] + +NAME[$num]=WebPortal +BDIR[$num]=Conglomerator/Tag +num=$[$num+1] + +NAME[$num]=jHTTPp2 +BDIR[$num]=Jhttpp2/BR +num=$[$num+1] + +#NAME[$num]=MapReduce +#BDIR[$num]=MapReduce/Tag +#num=$[$num+1] + +NAME[$num]=MultiGame +BDIR[$num]=MMG/Tag +num=$[$num+1] + +#NAME[$num]=PERT +#BDIR[$num]=PERT/Tag +#num=$[$num+1] + +NAME[$num]=FilterBank +BDIR[$num]=Scheduling/FilterBank +num=$[$num+1] + +NAME[$num]=Fractal +BDIR[$num]=Scheduling/Fractal +num=$[$num+1] + +NAME[$num]=MolDyn +BDIR[$num]=Scheduling/JGFMolDyn +num=$[$num+1] + +NAME[$num]=MonteCarlo +BDIR[$num]=Scheduling/JGFMonteCarlo +num=$[$num+1] + +NAME[$num]=Series +BDIR[$num]=Scheduling/JGFSeries +num=$[$num+1] + +NAME[$num]=KMeans-Bamboo +BDIR[$num]=Scheduling/KMeans +num=$[$num+1] + +NAME[$num]=FluidAnimate +BDIR[$num]=Scheduling/PSFluidAnimate +num=$[$num+1] + +NAME[$num]=Spider +BDIR[$num]=Spider/BR +num=$[$num+1] + +#NAME[$num]=TileSearch +#BDIR[$num]=TileSearch/Tag +#num=$[$num+1] + +#NAME[$num]=TicTacToe +#BDIR[$num]=TTTTag +#num=$[$num+1] + +NAME[$num]=WebServer +BDIR[$num]=WebServer +num=$[$num+1] + +NAME[$num]=Tracking +BDIR[$num]=Scheduling/Tracking +num=$[$num+1] + + + +########################### +# No need to modify below! +########################### + +BENCHTOP=~/research/Robust/src/Benchmarks +BENCHSUM=$BENCHTOP/Ownership + +TABFILE=tabResults.tex +rm -f $TABFILE +touch $TABFILE +echo '\begin{tabular}{|l|l|r|r|r|}' >> $TABFILE +echo '\hline' >> $TABFILE +echo 'Benchmark & Sharing & Time (s) & Lines & Methods \\' >> $TABFILE +echo '\hline' >> $TABFILE + +i="0" +while [ $i -lt $num ]; do + cd $BENCHTOP/${BDIR[$i]} + # unfortunately this echo adds an unwanted newline + echo ${NAME[$i]} >> $BENCHSUM/$TABFILE + make -f $BENCHSUM/makefile tabbed + cat aliases.txt >> $BENCHSUM/$TABFILE + make -f $BENCHSUM/makefile clean + i=$[$i+1] +done + +cd $BENCHSUM + +echo '\hline' >> $TABFILE +echo '\end{tabular}' >> $TABFILE + +# remove unwanted newlines from file so latex doesn't barf +sed ' +/$/ { +# append the next line + N +# look for multi-line pattern + /\n \&/ { +# delete everything between + s/\n \&/ \&/ +# print + P +# then delete the first line + D + } +}' <$TABFILE >$TABFILE.temp +mv $TABFILE.temp $TABFILE diff --git a/Robust/src/Benchmarks/disjoint/expectedSharing.tex b/Robust/src/Benchmarks/disjoint/expectedSharing.tex index 9fb940a1..8a20ac74 100644 --- a/Robust/src/Benchmarks/disjoint/expectedSharing.tex +++ b/Robust/src/Benchmarks/disjoint/expectedSharing.tex @@ -3,8 +3,120 @@ \begin{document} + + +\section{Current Sharing} + + +% \color{red}{} + + +\begin{tabular}{|l|c|c|c|c|} +\hline +Benchmark & Ownership & Disjoint & Disjoint & Disjoint Stack \\ + & Sharing & Stack & Queue & Callees on top \\ +\hline +Bank & 0 & 0 & 0 & 0 \\ +Chat & 3 & 3 & 3 & 3 \\ +WebPortal & 0 & 0 & 0 & 0 \\ +jHTTPp2 & 0 & 0 & 0 & 0 \\ +MapReduce1 & 2 & \color{red}{1} & \color{red}{1} & \color{red}{1} \\ +MultiGame & 10 & 10 & 10 & 10 \\ +PERT & 0 & 0 & 0 & 0 \\ +FilterBank & 0 & 0 & 0 & 0 \\ +Fractal & 1 & 1 & 1 & 1 \\ +MolDyn & 2 & 2 & 2 & 2 \\ +MonteCarlo & 0 & 0 & 0 & 0 \\ +Series & 0 & 0 & 0 & 0 \\ +KMeans-Bamboo & 2 & 2 & 2 & 2 \\ +MapReduce2 & 3 & \color{red}{0} & \color{red}{0} & \color{red}{0} \\ +FluidAnimate & 2 & 2 & 2 & 2 \\ +Spider1 & 0 & 0 & 0 & 0 \\ +Spider2 & 0 & 0 & 0 & 0 \\ +TileSearch & 0 & 0 & 0 & 0 \\ +TicTacToe & 0 & 0 & 0 & 0 \\ +WebServer1 & 0 & 0 & 0 & 0 \\ +WebServer2 & 0 & 0 & 0 & 0 \\ +Tracking & 0 & 0 & 0 & 0 \\ +\hline +\end{tabular} + + +\newpage + +\section{Current Analysis Runtimes} +These times were measured on DC-11. + +\begin{tabular}{|l|c|c|c|c|} +\hline +Benchmark & Ownership & Disjoint & Disjoint & Disjoint Stack \\ + & Sharing & Stack & Queue & Callees on top \\ +\hline +Bank & 1.71 & 4.66 & 4.70 & 5.02 \\ +Chat & 1.66 & 3.71 & 3.66 & 3.68 \\ +WebPortal & 1.17 & 2.95 & 3.15 & 3.17 \\ +jHTTPp2 & 1.99 & 3.95 & 4.44 & 3.96 \\ +MapReduce1 & 4.19 & 38.28 & 37.95 & 40.36 \\ +MultiGame & 23.15 & 225.76 & 227.62 & 226.91 \\ +PERT & 0.76 & 0.95 & 0.88 & 0.87 \\ +FilterBank & 0.42 & 0.15 & 0.18 & 0.15 \\ +Fractal & 0.42 & 0.11 & 0.11 & 0.11 \\ +MolDyn & 2.97 & 2.04 & 2.19 & 2.87 \\ +MonteCarlo & 0.82 & 1.73 & 1.72 & 1.72 \\ +Series & 0.62 & 0.35 & 0.35 & 0.33 \\ +KMeans-Bamboo & 1.12 & 5.92 & 6.02 & 6.05 \\ +MapReduce2 & 10.43 & 54.28 & 52.59 & 52.83 \\ +FluidAnimate & 122.39 & 12479.20 & 11416.19 & 12298.70 \\ +Spider1 & 1.63 & 8.28 & 8.30 & 6.70 \\ +Spider2 & 2.18 & 9.24 & 9.15 & 12.10 \\ +TileSearch & 2.66 & 5.76 & 5.26 & 7.13 \\ +TicTacToe & 1.05 & 1.76 & 1.84 & 2.08 \\ +WebServer1 & 2.04 & 14.69 & 14.62 & 13.91 \\ +WebServer2 & 2.48 & 14.15 & 14.02 & 14.46 \\ +Tracking & 32.86 & 16.29 & 15.79 & 17.78 \\ +\hline +\end{tabular} + + +\newpage + \section{Raw Results} + +\subsection{Ownership} + +\begin{tabular}{|l|l|r|r|r|} +\hline +Benchmark & Sharing & Time (s) & Lines & Methods \\ +\hline +Bank & 0 & 1.71 & 2059 & 67 \\ +Chat & 3 & 1.66 & 1744 & 71 \\ +WebPortal & 0 & 1.17 & 2213 & 93 \\ +jHTTPp2 & 0 & 1.99 & 2679 & 122 \\ +MapReduce1 & 2 & 4.19 & 2370 & 114 \\ +MultiGame & 10 & 23.15 & 3099 & 46 \\ +PERT & 0 & 0.76 & 2184 & 61 \\ +FilterBank & 0 & 0.42 & 1555 & 9 \\ +Fractal & 1 & 0.42 & 1568 & 8 \\ +MolDyn & 2 & 2.97 & 2136 & 31 \\ +MonteCarlo & 0 & 0.82 & 3638 & 49 \\ +Series & 0 & 0.62 & 1639 & 10 \\ +KMeans-Bamboo & 2 & 1.12 & 2893 & 45 \\ +MapReduce2 & 3 & 10.43 & 2314 & 95 \\ +FluidAnimate & 2 & 122.39 & 3821 & 82 \\ +Spider1 & 0 & 1.63 & 1827 & 80 \\ +Spider2 & 0 & 2.18 & 1831 & 83 \\ +TileSearch & 0 & 2.66 & 2284 & 34 \\ +TicTacToe & 0 & 1.05 & 1766 & 68 \\ +WebServer1 & 0 & 2.04 & 2090 & 97 \\ +WebServer2 & 0 & 2.48 & 2089 & 100 \\ +Tracking & 0 & 32.86 & 5218 & 158 \\ +\hline +\end{tabular} + + + + \subsection{Stack} \begin{tabular}{|l|l|r|r|r|} @@ -105,82 +217,4 @@ Tracking & 0 & 17.78 & 5218 & 158 \\ - - - - -\section{Current Sharing} - - -% \color{red}{} - - -\begin{tabular}{|l|c|c|c|c|} -\hline -Benchmark & Ownership & Disjoint & Disjoint & Disjoint Stack \\ - & Sharing & Stack & Queue & Callees on top \\ -\hline -Bank & 0 & 0 & 0 & 0 \\ -Chat & 3 & 3 & 3 & 3 \\ -WebPortal & 0 & 0 & 0 & 0 \\ -jHTTPp2 & 0 & 0 & 0 & 0 \\ -MapReduce1 & 2 & \color{red}{1} & \color{red}{1} & \color{red}{1} \\ -MultiGame & 10 & 10 & 10 & 10 \\ -PERT & 0 & 0 & 0 & 0 \\ -FilterBank & 0 & 0 & 0 & 0 \\ -Fractal & 1 & 1 & 1 & 1 \\ -MolDyn & 2 & 2 & 2 & 2 \\ -MonteCarlo & 0 & 0 & 0 & 0 \\ -Series & 0 & 0 & 0 & 0 \\ -KMeans-Bamboo & 2 & 2 & 2 & 2 \\ -MapReduce2 & 3 & \color{red}{0} & \color{red}{0} & \color{red}{0} \\ -FluidAnimate & 2 & 2 & 2 & 2 \\ -Spider1 & 0 & 0 & 0 & 0 \\ -Spider2 & 0 & 0 & 0 & 0 \\ -TileSearch & 0 & 0 & 0 & 0 \\ -TicTacToe & 0 & 0 & 0 & 0 \\ -WebServer1 & 0 & 0 & 0 & 0 \\ -WebServer2 & 0 & 0 & 0 & 0 \\ -Tracking & 0 & 0 & 0 & 0 \\ -\hline -\end{tabular} - - - -\section{Current Analysis Runtimes} -These times were measured on DC-11. - -\begin{tabular}{|l|c|c|c|c|} -\hline -Benchmark & Ownership & Disjoint & Disjoint & Disjoint Stack \\ - & Sharing & Stack & Queue & Callees on top \\ -\hline -Bank & & 4.66 & 4.70 & 5.02 \\ -Chat & & 3.71 & 3.66 & 3.68 \\ -WebPortal & & 2.95 & 3.15 & 3.17 \\ -jHTTPp2 & & 3.95 & 4.44 & 3.96 \\ -MapReduce1 & & 38.28 & 37.95 & 40.36 \\ -MultiGame & & 225.76 & 227.62 & 226.91 \\ -PERT & & 0.95 & 0.88 & 0.87 \\ -FilterBank & & 0.15 & 0.18 & 0.15 \\ -Fractal & & 0.11 & 0.11 & 0.11 \\ -MolDyn & & 2.04 & 2.19 & 2.87 \\ -MonteCarlo & & 1.73 & 1.72 & 1.72 \\ -Series & & 0.35 & 0.35 & 0.33 \\ -KMeans-Bamboo & & 5.92 & 6.02 & 6.05 \\ -MapReduce2 & & 54.28 & 52.59 & 52.83 \\ -FluidAnimate & & 12479.20 & 11416.19 & 12298.70 \\ -Spider1 & & 8.28 & 8.30 & 6.70 \\ -Spider2 & & 9.24 & 9.15 & 12.10 \\ -TileSearch & & 5.76 & 5.26 & 7.13 \\ -TicTacToe & & 1.76 & 1.84 & 2.08 \\ -WebServer1 & & 14.69 & 14.62 & 13.91 \\ -WebServer2 & & 14.15 & 14.02 & 14.46 \\ -Tracking & & 16.29 & 15.79 & 17.78 \\ -\hline -\end{tabular} - - - - \end{document} diff --git a/Robust/src/Benchmarks/disjoint/makefile b/Robust/src/Benchmarks/disjoint/makefile index 4c3e3061..4c71c08e 100644 --- a/Robust/src/Benchmarks/disjoint/makefile +++ b/Robust/src/Benchmarks/disjoint/makefile @@ -9,7 +9,7 @@ BUILDSCRIPT=~/research/Robust/src/buildscript ################################################# #DEBUGFLAGS= -disjoint-debug-callsite setClusters innerKMeansSetting 20 #DEBUGFLAGS= -disjoint-debug-callsite ensureCapacity addElement 100 - +#DEBUGFLAGS= -disjoint-debug-callsite setReduceFinish reduceOutput 100 ################################################# ## @@ -25,7 +25,8 @@ BUILDSCRIPT=~/research/Robust/src/buildscript #SNAPFLAGS= -disjoint-debug-snap-method calcGoodFeatureTask 5 10 true #SNAPFLAGS= -disjoint-debug-snap-method calcGoodFeature 5 1 true #SNAPFLAGS= -disjoint-debug-snap-method t3 1 1 true - +#SNAPFLAGS= -disjoint-debug-snap-method reduceOutput 5 50 true +#SNAPFLAGS= -disjoint-debug-snap-method setReduceFinish 5 50 true -- 2.34.1