diff options
author | Gael Guennebaud <g.gael@free.fr> | 2016-12-07 14:23:49 +0100 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2016-12-07 14:23:49 +0100 |
commit | 3855ab472f1bd523ba51122b731c4336182a3268 (patch) | |
tree | f2bcdd3797e0ce8c28b591aee836c4ef81ee9a78 /bench/perf_monitoring | |
parent | 59a59fa8e725298613c55f01ef0c95c5e2e33707 (diff) |
Cleanup file structure
Diffstat (limited to 'bench/perf_monitoring')
-rw-r--r-- | bench/perf_monitoring/changesets.txt (renamed from bench/perf_monitoring/gemm/changesets.txt) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/gemm.cpp (renamed from bench/perf_monitoring/gemm/gemm.cpp) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/gemm_common.h (renamed from bench/perf_monitoring/gemm/gemm_common.h) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/gemm_settings.txt (renamed from bench/perf_monitoring/gemm/gemm_settings.txt) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/gemm_square_settings.txt (renamed from bench/perf_monitoring/gemm/gemm_square_settings.txt) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/gemv.cpp (renamed from bench/perf_monitoring/gemm/gemv.cpp) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/gemv_common.h (renamed from bench/perf_monitoring/gemm/gemv_common.h) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/gemv_settings.txt (renamed from bench/perf_monitoring/gemm/gemv_settings.txt) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/gemv_square_settings.txt (renamed from bench/perf_monitoring/gemm/gemv_square_settings.txt) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/gemvt.cpp (renamed from bench/perf_monitoring/gemm/gemvt.cpp) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/lazy_gemm.cpp (renamed from bench/perf_monitoring/gemm/lazy_gemm.cpp) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/lazy_gemm_settings.txt (renamed from bench/perf_monitoring/gemm/lazy_gemm_settings.txt) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/llt.cpp (renamed from bench/perf_monitoring/gemm/llt.cpp) | 0 | ||||
-rwxr-xr-x | bench/perf_monitoring/make_plot.sh (renamed from bench/perf_monitoring/gemm/make_plot.sh) | 4 | ||||
-rw-r--r-- | bench/perf_monitoring/resources/chart_footer.html (renamed from bench/perf_monitoring/chart_footer.html) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/resources/chart_header.html (renamed from bench/perf_monitoring/chart_header.html) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/resources/footer.html (renamed from bench/perf_monitoring/footer.html) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/resources/header.html (renamed from bench/perf_monitoring/header.html) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/resources/s1.js (renamed from bench/perf_monitoring/gemm/s1.js) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/resources/s2.js (renamed from bench/perf_monitoring/gemm/s2.js) | 0 | ||||
-rwxr-xr-x | bench/perf_monitoring/run.sh (renamed from bench/perf_monitoring/gemm/run.sh) | 34 | ||||
-rwxr-xr-x | bench/perf_monitoring/runall.sh (renamed from bench/perf_monitoring/gemm/runall.sh) | 35 | ||||
-rw-r--r-- | bench/perf_monitoring/trmv_lo.cpp (renamed from bench/perf_monitoring/gemm/trmv_lo.cpp) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/trmv_lot.cpp (renamed from bench/perf_monitoring/gemm/trmv_lot.cpp) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/trmv_up.cpp (renamed from bench/perf_monitoring/gemm/trmv_up.cpp) | 0 | ||||
-rw-r--r-- | bench/perf_monitoring/trmv_upt.cpp (renamed from bench/perf_monitoring/gemm/trmv_upt.cpp) | 0 |
26 files changed, 46 insertions, 27 deletions
diff --git a/bench/perf_monitoring/gemm/changesets.txt b/bench/perf_monitoring/changesets.txt index 960699c04..960699c04 100644 --- a/bench/perf_monitoring/gemm/changesets.txt +++ b/bench/perf_monitoring/changesets.txt diff --git a/bench/perf_monitoring/gemm/gemm.cpp b/bench/perf_monitoring/gemm.cpp index 804139db7..804139db7 100644 --- a/bench/perf_monitoring/gemm/gemm.cpp +++ b/bench/perf_monitoring/gemm.cpp diff --git a/bench/perf_monitoring/gemm/gemm_common.h b/bench/perf_monitoring/gemm_common.h index 34ff5edb8..34ff5edb8 100644 --- a/bench/perf_monitoring/gemm/gemm_common.h +++ b/bench/perf_monitoring/gemm_common.h diff --git a/bench/perf_monitoring/gemm/gemm_settings.txt b/bench/perf_monitoring/gemm_settings.txt index 5c43e1c7d..5c43e1c7d 100644 --- a/bench/perf_monitoring/gemm/gemm_settings.txt +++ b/bench/perf_monitoring/gemm_settings.txt diff --git a/bench/perf_monitoring/gemm/gemm_square_settings.txt b/bench/perf_monitoring/gemm_square_settings.txt index 98474d173..98474d173 100644 --- a/bench/perf_monitoring/gemm/gemm_square_settings.txt +++ b/bench/perf_monitoring/gemm_square_settings.txt diff --git a/bench/perf_monitoring/gemm/gemv.cpp b/bench/perf_monitoring/gemv.cpp index 82e5ab960..82e5ab960 100644 --- a/bench/perf_monitoring/gemm/gemv.cpp +++ b/bench/perf_monitoring/gemv.cpp diff --git a/bench/perf_monitoring/gemm/gemv_common.h b/bench/perf_monitoring/gemv_common.h index 55ee0ff8b..55ee0ff8b 100644 --- a/bench/perf_monitoring/gemm/gemv_common.h +++ b/bench/perf_monitoring/gemv_common.h diff --git a/bench/perf_monitoring/gemm/gemv_settings.txt b/bench/perf_monitoring/gemv_settings.txt index 21a5ee051..21a5ee051 100644 --- a/bench/perf_monitoring/gemm/gemv_settings.txt +++ b/bench/perf_monitoring/gemv_settings.txt diff --git a/bench/perf_monitoring/gemm/gemv_square_settings.txt b/bench/perf_monitoring/gemv_square_settings.txt index 5165759f4..5165759f4 100644 --- a/bench/perf_monitoring/gemm/gemv_square_settings.txt +++ b/bench/perf_monitoring/gemv_square_settings.txt diff --git a/bench/perf_monitoring/gemm/gemvt.cpp b/bench/perf_monitoring/gemvt.cpp index fe945767e..fe945767e 100644 --- a/bench/perf_monitoring/gemm/gemvt.cpp +++ b/bench/perf_monitoring/gemvt.cpp diff --git a/bench/perf_monitoring/gemm/lazy_gemm.cpp b/bench/perf_monitoring/lazy_gemm.cpp index 773306048..773306048 100644 --- a/bench/perf_monitoring/gemm/lazy_gemm.cpp +++ b/bench/perf_monitoring/lazy_gemm.cpp diff --git a/bench/perf_monitoring/gemm/lazy_gemm_settings.txt b/bench/perf_monitoring/lazy_gemm_settings.txt index 407d5d4fa..407d5d4fa 100644 --- a/bench/perf_monitoring/gemm/lazy_gemm_settings.txt +++ b/bench/perf_monitoring/lazy_gemm_settings.txt diff --git a/bench/perf_monitoring/gemm/llt.cpp b/bench/perf_monitoring/llt.cpp index d55b7d803..d55b7d803 100644 --- a/bench/perf_monitoring/gemm/llt.cpp +++ b/bench/perf_monitoring/llt.cpp diff --git a/bench/perf_monitoring/gemm/make_plot.sh b/bench/perf_monitoring/make_plot.sh index 5027a3aa7..fa44b0f28 100755 --- a/bench/perf_monitoring/gemm/make_plot.sh +++ b/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 diff --git a/bench/perf_monitoring/chart_footer.html b/bench/perf_monitoring/resources/chart_footer.html index 8acc69f14..8acc69f14 100644 --- a/bench/perf_monitoring/chart_footer.html +++ b/bench/perf_monitoring/resources/chart_footer.html diff --git a/bench/perf_monitoring/chart_header.html b/bench/perf_monitoring/resources/chart_header.html index bb9ddffdd..bb9ddffdd 100644 --- a/bench/perf_monitoring/chart_header.html +++ b/bench/perf_monitoring/resources/chart_header.html diff --git a/bench/perf_monitoring/footer.html b/bench/perf_monitoring/resources/footer.html index 81d8c883c..81d8c883c 100644 --- a/bench/perf_monitoring/footer.html +++ b/bench/perf_monitoring/resources/footer.html diff --git a/bench/perf_monitoring/header.html b/bench/perf_monitoring/resources/header.html index 1f2230909..1f2230909 100644 --- a/bench/perf_monitoring/header.html +++ b/bench/perf_monitoring/resources/header.html diff --git a/bench/perf_monitoring/gemm/s1.js b/bench/perf_monitoring/resources/s1.js index cfff2d3f5..cfff2d3f5 100644 --- a/bench/perf_monitoring/gemm/s1.js +++ b/bench/perf_monitoring/resources/s1.js diff --git a/bench/perf_monitoring/gemm/s2.js b/bench/perf_monitoring/resources/s2.js index 54eda2cd5..54eda2cd5 100644 --- a/bench/perf_monitoring/gemm/s2.js +++ b/bench/perf_monitoring/resources/s2.js diff --git a/bench/perf_monitoring/gemm/run.sh b/bench/perf_monitoring/run.sh index 44a3457e0..b5f72ca52 100755 --- a/bench/perf_monitoring/gemm/run.sh +++ b/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 diff --git a/bench/perf_monitoring/gemm/runall.sh b/bench/perf_monitoring/runall.sh index 4f1d46c4e..21fa5115d 100755 --- a/bench/perf_monitoring/gemm/runall.sh +++ b/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 · x (trmv)' print_tr trmv_lot 'y += L<sup>T</sup> · x (trmv)' print_tr trmv_lot 'L · L<sup>T<sup> = A (Cholesky,potrf)' -cat ../footer.html >> $htmlfile +cat resources/footer.html >> $htmlfile + +fi diff --git a/bench/perf_monitoring/gemm/trmv_lo.cpp b/bench/perf_monitoring/trmv_lo.cpp index 3fabb6e54..3fabb6e54 100644 --- a/bench/perf_monitoring/gemm/trmv_lo.cpp +++ b/bench/perf_monitoring/trmv_lo.cpp diff --git a/bench/perf_monitoring/gemm/trmv_lot.cpp b/bench/perf_monitoring/trmv_lot.cpp index 32e085aaf..32e085aaf 100644 --- a/bench/perf_monitoring/gemm/trmv_lot.cpp +++ b/bench/perf_monitoring/trmv_lot.cpp diff --git a/bench/perf_monitoring/gemm/trmv_up.cpp b/bench/perf_monitoring/trmv_up.cpp index c58e471ec..c58e471ec 100644 --- a/bench/perf_monitoring/gemm/trmv_up.cpp +++ b/bench/perf_monitoring/trmv_up.cpp diff --git a/bench/perf_monitoring/gemm/trmv_upt.cpp b/bench/perf_monitoring/trmv_upt.cpp index 511e00885..511e00885 100644 --- a/bench/perf_monitoring/gemm/trmv_upt.cpp +++ b/bench/perf_monitoring/trmv_upt.cpp |