From 36a517d92719991be2ec381ac34296dcb6730276 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Thu, 30 May 2019 23:04:09 +0700 Subject: [PATCH] fix benches --- scripts/bench_map_foreach.sh | 4 ++-- scripts/bench_map_insert.sh | 4 ++-- scripts/bench_map_lookup.sh | 4 ++-- scripts/bench_set_foreach.sh | 4 ++-- scripts/bench_set_insert.sh | 4 ++-- scripts/bench_set_lookup.sh | 4 ++-- unbench/CMakeLists.txt | 2 -- unbench/map_foreach_bench.cpp | 2 +- unbench/map_insert_bench.cpp | 2 +- unbench/map_lookup_bench.cpp | 2 +- unbench/set_foreach_bench.cpp | 2 +- unbench/set_insert_bench.cpp | 2 +- unbench/set_lookup_bench.cpp | 2 +- 13 files changed, 18 insertions(+), 20 deletions(-) diff --git a/scripts/bench_map_foreach.sh b/scripts/bench_map_foreach.sh index 6b2860b..054d30f 100755 --- a/scripts/bench_map_foreach.sh +++ b/scripts/bench_map_foreach.sh @@ -1,8 +1,8 @@ #!/bin/bash set -e -BUILD_DIR=`dirname "$BASH_SOURCE"`/../build +BUILD_DIR=`dirname "$BASH_SOURCE"`/../build/release cd $BUILD_DIR ./unbench/flat.hpp.unbench --benchmark_filter=_map_foreach --benchmark_format=csv > benchmark_map_foreach.csv -../scripts/bench_drawer.py -f benchmark_map_foreach.csv +../../scripts/bench_drawer.py -f benchmark_map_foreach.csv diff --git a/scripts/bench_map_insert.sh b/scripts/bench_map_insert.sh index 5333e9f..ba8bb11 100755 --- a/scripts/bench_map_insert.sh +++ b/scripts/bench_map_insert.sh @@ -1,8 +1,8 @@ #!/bin/bash set -e -BUILD_DIR=`dirname "$BASH_SOURCE"`/../build +BUILD_DIR=`dirname "$BASH_SOURCE"`/../build/release cd $BUILD_DIR ./unbench/flat.hpp.unbench --benchmark_filter=_map_insert --benchmark_format=csv > benchmark_map_insert.csv -../scripts/bench_drawer.py -f benchmark_map_insert.csv +../../scripts/bench_drawer.py -f benchmark_map_insert.csv diff --git a/scripts/bench_map_lookup.sh b/scripts/bench_map_lookup.sh index 30d5120..0c4a544 100755 --- a/scripts/bench_map_lookup.sh +++ b/scripts/bench_map_lookup.sh @@ -1,8 +1,8 @@ #!/bin/bash set -e -BUILD_DIR=`dirname "$BASH_SOURCE"`/../build +BUILD_DIR=`dirname "$BASH_SOURCE"`/../build/release cd $BUILD_DIR ./unbench/flat.hpp.unbench --benchmark_filter=_map_lookup --benchmark_format=csv > benchmark_map_lookup.csv -../scripts/bench_drawer.py -f benchmark_map_lookup.csv +../../scripts/bench_drawer.py -f benchmark_map_lookup.csv diff --git a/scripts/bench_set_foreach.sh b/scripts/bench_set_foreach.sh index dc6e906..be7dec0 100755 --- a/scripts/bench_set_foreach.sh +++ b/scripts/bench_set_foreach.sh @@ -1,8 +1,8 @@ #!/bin/bash set -e -BUILD_DIR=`dirname "$BASH_SOURCE"`/../build +BUILD_DIR=`dirname "$BASH_SOURCE"`/../build/release cd $BUILD_DIR ./unbench/flat.hpp.unbench --benchmark_filter=_set_foreach --benchmark_format=csv > benchmark_set_foreach.csv -../scripts/bench_drawer.py -f benchmark_set_foreach.csv +../../scripts/bench_drawer.py -f benchmark_set_foreach.csv diff --git a/scripts/bench_set_insert.sh b/scripts/bench_set_insert.sh index 1e8d850..7a29ca9 100755 --- a/scripts/bench_set_insert.sh +++ b/scripts/bench_set_insert.sh @@ -1,8 +1,8 @@ #!/bin/bash set -e -BUILD_DIR=`dirname "$BASH_SOURCE"`/../build +BUILD_DIR=`dirname "$BASH_SOURCE"`/../build/release cd $BUILD_DIR ./unbench/flat.hpp.unbench --benchmark_filter=_set_insert --benchmark_format=csv > benchmark_set_insert.csv -../scripts/bench_drawer.py -f benchmark_set_insert.csv +../../scripts/bench_drawer.py -f benchmark_set_insert.csv diff --git a/scripts/bench_set_lookup.sh b/scripts/bench_set_lookup.sh index f96e5cd..8914163 100755 --- a/scripts/bench_set_lookup.sh +++ b/scripts/bench_set_lookup.sh @@ -1,8 +1,8 @@ #!/bin/bash set -e -BUILD_DIR=`dirname "$BASH_SOURCE"`/../build +BUILD_DIR=`dirname "$BASH_SOURCE"`/../build/release cd $BUILD_DIR ./unbench/flat.hpp.unbench --benchmark_filter=_set_lookup --benchmark_format=csv > benchmark_set_lookup.csv -../scripts/bench_drawer.py -f benchmark_set_lookup.csv +../../scripts/bench_drawer.py -f benchmark_set_lookup.csv diff --git a/unbench/CMakeLists.txt b/unbench/CMakeLists.txt index f257e35..5feabf4 100644 --- a/unbench/CMakeLists.txt +++ b/unbench/CMakeLists.txt @@ -44,5 +44,3 @@ if(Boost_CONTAINER_FOUND) target_compile_definitions(${PROJECT_NAME} PRIVATE BOOST_CONTAINER_FOUND) endif() - -add_test(${PROJECT_NAME} ${PROJECT_NAME}) diff --git a/unbench/map_foreach_bench.cpp b/unbench/map_foreach_bench.cpp index db680b1..925169f 100644 --- a/unbench/map_foreach_bench.cpp +++ b/unbench/map_foreach_bench.cpp @@ -7,7 +7,7 @@ #include "bench_base.hpp" using namespace flat_hpp_unbench; -#include +#include using namespace flat_hpp; #ifdef BOOST_CONTAINER_FOUND diff --git a/unbench/map_insert_bench.cpp b/unbench/map_insert_bench.cpp index 3343f41..bbcf10c 100644 --- a/unbench/map_insert_bench.cpp +++ b/unbench/map_insert_bench.cpp @@ -7,7 +7,7 @@ #include "bench_base.hpp" using namespace flat_hpp_unbench; -#include +#include using namespace flat_hpp; #ifdef BOOST_CONTAINER_FOUND diff --git a/unbench/map_lookup_bench.cpp b/unbench/map_lookup_bench.cpp index 04d43d8..6b69e3e 100644 --- a/unbench/map_lookup_bench.cpp +++ b/unbench/map_lookup_bench.cpp @@ -7,7 +7,7 @@ #include "bench_base.hpp" using namespace flat_hpp_unbench; -#include +#include using namespace flat_hpp; #ifdef BOOST_CONTAINER_FOUND diff --git a/unbench/set_foreach_bench.cpp b/unbench/set_foreach_bench.cpp index 18ccbdf..73e803b 100644 --- a/unbench/set_foreach_bench.cpp +++ b/unbench/set_foreach_bench.cpp @@ -7,7 +7,7 @@ #include "bench_base.hpp" using namespace flat_hpp_unbench; -#include +#include using namespace flat_hpp; #ifdef BOOST_CONTAINER_FOUND diff --git a/unbench/set_insert_bench.cpp b/unbench/set_insert_bench.cpp index 7d888e4..324645a 100644 --- a/unbench/set_insert_bench.cpp +++ b/unbench/set_insert_bench.cpp @@ -7,7 +7,7 @@ #include "bench_base.hpp" using namespace flat_hpp_unbench; -#include +#include using namespace flat_hpp; #ifdef BOOST_CONTAINER_FOUND diff --git a/unbench/set_lookup_bench.cpp b/unbench/set_lookup_bench.cpp index 11810a7..324966a 100644 --- a/unbench/set_lookup_bench.cpp +++ b/unbench/set_lookup_bench.cpp @@ -7,7 +7,7 @@ #include "bench_base.hpp" using namespace flat_hpp_unbench; -#include +#include using namespace flat_hpp; #ifdef BOOST_CONTAINER_FOUND