From dd91ed2ec3902df8d016e7a18754c238fdc221f8 Mon Sep 17 00:00:00 2001 From: jjenista Date: Fri, 26 Mar 2010 01:08:14 +0000 Subject: [PATCH] current version of benchmark lists and run modes --- Robust/src/Benchmarks/Ownership/makeTable.sh | 112 ++++++++-------- Robust/src/Benchmarks/Ownership/makefile | 4 +- Robust/src/Benchmarks/disjoint/makeTable.sh | 129 +++++++++++++++++++ Robust/src/Benchmarks/disjoint/makefile | 9 +- 4 files changed, 197 insertions(+), 57 deletions(-) create mode 100755 Robust/src/Benchmarks/disjoint/makeTable.sh diff --git a/Robust/src/Benchmarks/Ownership/makeTable.sh b/Robust/src/Benchmarks/Ownership/makeTable.sh index aa50466a..afb3b768 100755 --- a/Robust/src/Benchmarks/Ownership/makeTable.sh +++ b/Robust/src/Benchmarks/Ownership/makeTable.sh @@ -1,75 +1,83 @@ #!/bin/bash -NAME[0]=Bank -BDIR[0]=BankApp +num="0" -NAME[1]=Chat -BDIR[1]=ChatTag +NAME[$num]=Bank +BDIR[$num]=BankApp +num=$[$num+1] -NAME[2]=Conglomerator -BDIR[2]=Conglomerator/Tag +NAME[$num]=Chat +BDIR[$num]=ChatTag +num=$[$num+1] -NAME[3]=jHTTPp2 -BDIR[3]=Jhttpp2/BR +NAME[$num]=WebPortal +BDIR[$num]=Conglomerator/Tag +num=$[$num+1] -NAME[4]=MapReduce1 -BDIR[4]=MapReduce/Tag +NAME[$num]=jHTTPp2 +BDIR[$num]=Jhttpp2/BR +num=$[$num+1] -NAME[5]=MultiGame -BDIR[5]=MMG/Tag +NAME[$num]=MapReduce +BDIR[$num]=MapReduce/Tag +num=$[$num+1] -NAME[6]=Performance -BDIR[6]=Performance +NAME[$num]=MultiGame +BDIR[$num]=MMG/Tag +num=$[$num+1] -NAME[7]=PERT -BDIR[7]=PERT/Tag +NAME[$num]=PERT +BDIR[$num]=PERT/Tag +num=$[$num+1] -NAME[8]=FilterBank -BDIR[8]=Scheduling/FilterBank +NAME[$num]=FilterBank +BDIR[$num]=Scheduling/FilterBank +num=$[$num+1] -NAME[9]=Fractal -BDIR[9]=Scheduling/Fractal +NAME[$num]=Fractal +BDIR[$num]=Scheduling/Fractal +num=$[$num+1] -NAME[10]=MolDynamics -BDIR[10]=Scheduling/JGFMolDyn +NAME[$num]=MolDyn +BDIR[$num]=Scheduling/JGFMolDyn +num=$[$num+1] -NAME[11]=MonteCarlo -BDIR[11]=Scheduling/JGFMonteCarlo +NAME[$num]=MonteCarlo +BDIR[$num]=Scheduling/JGFMonteCarlo +num=$[$num+1] -NAME[12]=Series -BDIR[12]=Scheduling/JGFSeries +NAME[$num]=Series +BDIR[$num]=Scheduling/JGFSeries +num=$[$num+1] -NAME[13]=KMeans -BDIR[13]=Scheduling/KMeans +NAME[$num]=KMeans-Bamboo +BDIR[$num]=Scheduling/KMeans +num=$[$num+1] -NAME[14]=MapReduce2 -BDIR[14]=Scheduling/MapReduce +NAME[$num]=FluidAnimate +BDIR[$num]=Scheduling/PSFluidAnimate +num=$[$num+1] -NAME[15]=FluidAnimate -BDIR[15]=Scheduling/PSFluidAnimate +NAME[$num]=Spider +BDIR[$num]=Spider/BR +num=$[$num+1] -NAME[16]=Spider1 -BDIR[16]=Spider/BR +NAME[$num]=TileSearch +BDIR[$num]=TileSearch/Tag +num=$[$num+1] -NAME[17]=Spider2 -BDIR[17]=Spider/BRTag +NAME[$num]=TicTacToe +BDIR[$num]=TTTTag +num=$[$num+1] -NAME[18]=TileSearch -BDIR[18]=TileSearch/Tag +NAME[$num]=WebServer +BDIR[$num]=WebServer +num=$[$num+1] -NAME[19]=TicTacToe -BDIR[19]=TTTTag +NAME[$num]=Tracking +BDIR[$num]=Scheduling/Tracking +num=$[$num+1] -NAME[20]=WebServer1 -BDIR[20]=WebServer - -NAME[21]=WebServer2 -BDIR[21]=WebServerTag - -NAME[22]=Tracking -BDIR[22]=Scheduling/Tracking - -NUMBENCHMARKS=23 @@ -89,7 +97,9 @@ echo 'Benchmark & Sharing & Time (s) & Lines & Methods \\' >> $TABFILE echo '\hline' >> $TABFILE i="0" -while [ $i -lt $NUMBENCHMARKS ]; do +while [ $i -lt $num ]; do + echo ${NAME[$i]} + cd $BENCHTOP/${BDIR[$i]} # unfortunately this echo adds an unwanted newline echo ${NAME[$i]} >> $BENCHSUM/$TABFILE diff --git a/Robust/src/Benchmarks/Ownership/makefile b/Robust/src/Benchmarks/Ownership/makefile index 0a4bf1e7..36258971 100644 --- a/Robust/src/Benchmarks/Ownership/makefile +++ b/Robust/src/Benchmarks/Ownership/makefile @@ -1,6 +1,6 @@ BUILDSCRIPT=~/research/Robust/src/buildscript -#BSFLAGS= -recover -justanalyze -ownership -ownaliasfiletab aliases.txt -enable-assertions #-ownwritedots final #-flatirtasks -BSFLAGS= -recover -justanalyze -ownership -ownaliasfile aliases.txt -enable-assertions #-ownwritedots final #-flatirtasks +BSFLAGS= -recover -justanalyze -ownership -ownaliasfiletab aliases.txt -enable-assertions #-ownwritedots final #-flatirtasks +#BSFLAGS= -recover -justanalyze -ownership -ownaliasfile aliases.txt -enable-assertions #-ownwritedots final #-flatirtasks AD1= -ownallocdepth 1 AD3= -ownallocdepth 3 AD5= -ownallocdepth 5 diff --git a/Robust/src/Benchmarks/disjoint/makeTable.sh b/Robust/src/Benchmarks/disjoint/makeTable.sh new file mode 100755 index 00000000..d03455ca --- /dev/null +++ b/Robust/src/Benchmarks/disjoint/makeTable.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/disjoint + +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 bamboo-release + 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/makefile b/Robust/src/Benchmarks/disjoint/makefile index 5cc58813..fcf911f0 100644 --- a/Robust/src/Benchmarks/disjoint/makefile +++ b/Robust/src/Benchmarks/disjoint/makefile @@ -24,22 +24,23 @@ JAVAFLAGS= -mainclass test DEBUGMODE= -enable-assertions RELEASEMODE= -disjoint-release-mode -BSFLAGS= -justanalyze -disjoint -disjoint-k 1 -disjoint-write-dots final -disjoint-alias-file aliases.txt normal +#BSFLAGS= -justanalyze -disjoint -disjoint-k 1 -disjoint-write-dots final -disjoint-alias-file aliases.txt normal +BSFLAGS= -justanalyze -disjoint -disjoint-k 1 -disjoint-write-dots final -disjoint-alias-file aliases.txt tabbed all: echo 'pass another arg: ' bamboo: - $(BUILDSCRIPT) $(BAMBOOFLAGS) $(DEBUGMODE) $(BSFLAGS) $(DEBUGFLAGS) $(SNAPFLAGS) *.java + $(BUILDSCRIPT) $(BAMBOOFLAGS) $(DEBUGMODE) $(BSFLAGS) $(DEBUGFLAGS) $(SNAPFLAGS) *.java bamboo-release: $(BUILDSCRIPT) $(BAMBOOFLAGS) $(RELEASEMODE) $(BSFLAGS) $(DEBUGFLAGS) $(SNAPFLAGS) *.java java: - $(BUILDSCRIPT) $(JAVAFLAGS) $(DEBUGMODE) $(BSFLAGS) $(DEBUGFLAGS) $(SNAPFLAGS) *.java + $(BUILDSCRIPT) $(JAVAFLAGS) $(DEBUGMODE) $(BSFLAGS) $(DEBUGFLAGS) $(SNAPFLAGS) *.java java-release: - $(BUILDSCRIPT) $(JAVAFLAGS) $(RELEASEMODE) $(BSFLAGS) $(DEBUGFLAGS) $(SNAPFLAGS) *.java + $(BUILDSCRIPT) $(JAVAFLAGS) $(RELEASEMODE) $(BSFLAGS) $(DEBUGFLAGS) $(SNAPFLAGS) *.java clean: rm -f *.bin -- 2.34.1