aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2017-01-30 15:25:57 -0800
committerGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2017-01-30 15:25:57 -0800
commitfbc39fd02c642119a2c49e517e1cd6e8fa1a008f (patch)
tree6cf2142e4b740eb440c577ca08114e4e24912f91 /bench
parent82ce92419e25d8b9902c0f39e2e3b01787bf8687 (diff)
parent63de19c0004933c7b2b1e418292b9f2ae6c138f4 (diff)
Merge latest changes from upstream
Diffstat (limited to 'bench')
-rw-r--r--bench/perf_monitoring/gemm_common.h2
-rw-r--r--bench/perf_monitoring/gemv_common.h2
-rwxr-xr-xbench/perf_monitoring/run.sh1
3 files changed, 3 insertions, 2 deletions
diff --git a/bench/perf_monitoring/gemm_common.h b/bench/perf_monitoring/gemm_common.h
index 4d4a5c0f9..30dbc0df6 100644
--- a/bench/perf_monitoring/gemm_common.h
+++ b/bench/perf_monitoring/gemm_common.h
@@ -3,7 +3,7 @@
#include <vector>
#include <string>
#include "eigen_src/Eigen/Core"
-#include "../../BenchTimer.h"
+#include "../BenchTimer.h"
using namespace Eigen;
#ifndef SCALAR
diff --git a/bench/perf_monitoring/gemv_common.h b/bench/perf_monitoring/gemv_common.h
index 25a5280a0..cc3257729 100644
--- a/bench/perf_monitoring/gemv_common.h
+++ b/bench/perf_monitoring/gemv_common.h
@@ -4,7 +4,7 @@
#include <string>
#include <functional>
#include "eigen_src/Eigen/Core"
-#include "../../BenchTimer.h"
+#include "../BenchTimer.h"
using namespace Eigen;
#ifndef SCALAR
diff --git a/bench/perf_monitoring/run.sh b/bench/perf_monitoring/run.sh
index 14a26907f..20871668e 100755
--- a/bench/perf_monitoring/run.sh
+++ b/bench/perf_monitoring/run.sh
@@ -112,6 +112,7 @@ function test_current
# echo $update et $selected et $rev_found because $rev et "$global_args"
# echo $count_rev et $count_ref
if [ $update == true ] || [ $count_rev != $count_ref ] || ([ $selected == true ] && [ $rev_found == true ]); then
+ echo "RUN: $CXX -O3 -DNDEBUG -march=native $CXX_FLAGS -I eigen_src $bench.cpp -DSCALAR=$scalar -o $name"
if $CXX -O3 -DNDEBUG -march=native $CXX_FLAGS -I eigen_src $bench.cpp -DSCALAR=$scalar -o $name; then
curr=`./$name $settings_file`
if [ $count_rev == $count_ref ]; then