Cleanup file structure

bench/perf_monitoring/make_plot.sh

@@ -42,7 +42,7 @@ rm $WHAT.out.header $WHAT.gnuplot
 # generate html/svg graph
 
 echo " " > $WHAT.html
-cat ../chart_header.html > $WHAT.html
+cat resources/chart_header.html > $WHAT.html
 echo 'var customSettings = {"TITLE":"","SUBTITLE":"","XLABEL":"","YLABEL":""};' >> $WHAT.html
 #  'data' is an array of datasets (i.e. curves), each of which is an object of the form
 #  {
@@ -95,4 +95,4 @@ do
 done < $WHAT.out
 echo '];'  >> $WHAT.html
 
-cat ../chart_footer.html >> $WHAT.html
+cat resources/chart_footer.html >> $WHAT.html

bench/perf_monitoring/run.sh

@@ -30,6 +30,16 @@ else
   selected=false
 fi
 
+WORKING_DIR=${PREFIX:?"default"}
+
+if [ -z "$PREFIX" ]; then
+  WORKING_DIR_PREFIX="$WORKING_DIR/"
+else
+  WORKING_DIR_PREFIX="$WORKING_DIR/$PREFIX-"
+fi
+echo "WORKING_DIR_PREFIX=$WORKING_DIR_PREFIX"
+mkdir -p $WORKING_DIR
+
 global_args="$*"
 
 if [ $selected == true ]; then
@@ -122,9 +132,9 @@ function test_current
   fi
 }
 
-make_backup $PREFIX"s"$bench
-make_backup $PREFIX"d"$bench
-make_backup $PREFIX"c"$bench
+make_backup $WORKING_DIR_PREFIX"s"$bench
+make_backup $WORKING_DIR_PREFIX"d"$bench
+make_backup $WORKING_DIR_PREFIX"c"$bench
 
 cut -f1 -d"#" < changesets.txt | grep -E '[[:alnum:]]' | while read rev
 do
@@ -135,27 +145,27 @@ do
     actual_rev=`hg identify | cut -f1 -d' '`
     cd ..
     
-    test_current $actual_rev float                  $PREFIX"s"$bench
-    test_current $actual_rev double                 $PREFIX"d"$bench
-    test_current $actual_rev "std::complex<double>" $PREFIX"c"$bench
+    test_current $actual_rev float                  $WORKING_DIR_PREFIX"s"$bench
+    test_current $actual_rev double                 $WORKING_DIR_PREFIX"d"$bench
+    test_current $actual_rev "std::complex<double>" $WORKING_DIR_PREFIX"c"$bench
   fi
   
 done
 
 echo "Float:"
-cat $PREFIX"s""$bench.out"
+cat $WORKING_DIR_PREFIX"s""$bench.out"
 echo " "
 
 echo "Double:"
-cat $PREFIX"d""$bench.out"
+cat $WORKING_DIR_PREFIX"d""$bench.out"
 echo ""
 
 echo "Complex:"
-cat $PREFIX"c""$bench.out"
+cat $WORKING_DIR_PREFIX"c""$bench.out"
 echo ""
 
-./make_plot.sh $PREFIX"s"$bench $bench $settings_file
-./make_plot.sh $PREFIX"d"$bench $bench $settings_file
-./make_plot.sh $PREFIX"c"$bench $bench $settings_file
+./make_plot.sh $WORKING_DIR_PREFIX"s"$bench $bench $settings_file
+./make_plot.sh $WORKING_DIR_PREFIX"d"$bench $bench $settings_file
+./make_plot.sh $WORKING_DIR_PREFIX"c"$bench $bench $settings_file
 
 

bench/perf_monitoring/runall.sh

@@ -11,21 +11,21 @@
 #   -up : enforce the recomputation of existing data, and keep best results as a merging strategy
 #   -s  : recompute selected changesets only and keep bests
 
-./run.sh gemm gemm_settings.txt $*
-./run.sh lazy_gemm lazy_gemm_settings.txt $*
-./run.sh gemv gemv_settings.txt $*
-./run.sh gemvt gemv_settings.txt $*
-./run.sh trmv_up gemv_square_settings.txt $*
-./run.sh trmv_lo gemv_square_settings.txt $*
-./run.sh trmv_upt gemv_square_settings.txt $*
-./run.sh trmv_lot gemv_square_settings.txt $*
-./run.sh llt gemm_square_settings.txt $*
+# ./run.sh gemm gemm_settings.txt $*
+# ./run.sh lazy_gemm lazy_gemm_settings.txt $*
+# ./run.sh gemv gemv_settings.txt $*
+# ./run.sh gemvt gemv_settings.txt $*
+# ./run.sh trmv_up gemv_square_settings.txt $*
+# ./run.sh trmv_lo gemv_square_settings.txt $*
+# ./run.sh trmv_upt gemv_square_settings.txt $*
+# ./run.sh trmv_lot gemv_square_settings.txt $*
+# ./run.sh llt gemm_square_settings.txt $*
 
 
 # generate html file
 
 function print_td {
-  echo '<td><a href="'$PREFIX$1"$2"'.html"><img src="'$PREFIX$1"$2"'.png" title="'$3'"></a></td>' >> $htmlfile
+  echo '<td><a href="'$PREFIX'-'$1"$2"'.html"><img src="'$PREFIX'-'$1"$2"'.png" title="'$3'"></a></td>' >> $htmlfile
 }
 
 function print_tr {
@@ -36,8 +36,15 @@ function print_tr {
   print_td c $1 complex
   echo '</tr>' >> $htmlfile
 }
-htmlfile="index.html"
-cat ../header.html > $htmlfile
+
+if [ -n "$PREFIX" ]; then
+
+
+cp resources/s1.js $PREFIX/
+cp resources/s2.js $PREFIX/
+
+htmlfile="$PREFIX/index.html"
+cat resources/header.html > $htmlfile
 
 echo '<h1>'$1'</h1>' >> $htmlfile
 echo '<table>' >> $htmlfile
@@ -51,4 +58,6 @@ print_tr trmv_lo    'y += L &middot; x   &nbsp; (trmv)'
 print_tr trmv_lot   'y += L<sup>T</sup> &middot; x  &nbsp; (trmv)'
 print_tr trmv_lot   'L &middot; L<sup>T<sup> = A &nbsp;  (Cholesky,potrf)'
 
-cat ../footer.html >> $htmlfile
+cat resources/footer.html >> $htmlfile
+
+fi

scripts/eigen_monitor_perf.sh

@@ -6,17 +6,17 @@
 USER='ggael'
 UPLOAD_DIR=perf_monitoring/ggaelmacbook26
 EIGEN_SOURCE_PATH=$HOME/Eigen/eigen
-export PREFIX="haswell-fma-"
+export PREFIX="haswell-fma"
 export CXX_FLAGS="-mfma -w"
 
 ####
 
-BENCH_PATH=$EIGEN_SOURCE_PATH/bench/perf_monitoring/gemm/
+BENCH_PATH=$EIGEN_SOURCE_PATH/bench/perf_monitoring/$PREFIX
 PREVPATH=`pwd`
-cd $BENCH_PATH && ./runall.sh "Haswell 2.6GHz, FMA, Apple's clang" $*
+cd $EIGEN_SOURCE_PATH/bench/perf_monitoring && ./runall.sh "Haswell 2.6GHz, FMA, Apple's clang" $*
 cd $PREVPATH
 
-ALLFILES="$BENCH_PATH/$PREFIX*.png $BENCH_PATH/$PREFIX*.html $BENCH_PATH/index.html $BENCH_PATH/s1.js $BENCH_PATH/s2.js"
+ALLFILES="$BENCH_PATH/*.png $BENCH_PATH/*.html $BENCH_PATH/index.html $BENCH_PATH/s1.js $BENCH_PATH/s2.js"
 
 # (the '/' at the end of path is very important, see rsync documentation)
 rsync -az --no-p --delete $ALLFILES $USER@ssh.tuxfamily.org:eigen/eigen.tuxfamily.org-web/htdocs/$UPLOAD_DIR/ || { echo "upload failed"; exit 1; }