Update Google Benchmark library
llvm-svn: 322812
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 1903976d37868f8e13e60e44b77a71b5ede04bed
diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
index 8211ebd..8a154d8 100644
--- a/benchmarks/CMakeLists.txt
+++ b/benchmarks/CMakeLists.txt
@@ -59,6 +59,7 @@
-DBENCHMARK_ENABLE_TESTING:BOOL=OFF)
endif()
+
#==============================================================================
# Benchmark tests configuration
#==============================================================================
diff --git a/benchmarks/ContainerBenchmarks.hpp b/benchmarks/ContainerBenchmarks.hpp
index dc268e7..509e3d2 100644
--- a/benchmarks/ContainerBenchmarks.hpp
+++ b/benchmarks/ContainerBenchmarks.hpp
@@ -3,7 +3,7 @@
#include <cassert>
-#include "benchmark/benchmark_api.h"
+#include "benchmark/benchmark.h"
namespace ContainerBenchmarks {
diff --git a/benchmarks/algorithms.bench.cpp b/benchmarks/algorithms.bench.cpp
index 745cc17..8631539 100644
--- a/benchmarks/algorithms.bench.cpp
+++ b/benchmarks/algorithms.bench.cpp
@@ -2,7 +2,7 @@
#include <vector>
#include <cstdint>
-#include "benchmark/benchmark_api.h"
+#include "benchmark/benchmark.h"
#include "GenerateInput.hpp"
constexpr std::size_t TestNumInputs = 1024;
@@ -59,4 +59,4 @@
getDuplicateStringInputs)->Arg(TestNumInputs);
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();
diff --git a/benchmarks/filesystem.bench.cpp b/benchmarks/filesystem.bench.cpp
index f7949a1..6771980 100644
--- a/benchmarks/filesystem.bench.cpp
+++ b/benchmarks/filesystem.bench.cpp
@@ -1,6 +1,6 @@
#include <experimental/filesystem>
-#include "benchmark/benchmark_api.h"
+#include "benchmark/benchmark.h"
#include "GenerateInput.hpp"
#include "test_iterators.h"
@@ -135,4 +135,4 @@
BENCHMARK_CAPTURE(BM_PathIterateOnceBackwards, iterate_elements,
getRandomStringInputs)->Arg(TestNumInputs);
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();
diff --git a/benchmarks/string.bench.cpp b/benchmarks/string.bench.cpp
index ef89239..8324f3e 100644
--- a/benchmarks/string.bench.cpp
+++ b/benchmarks/string.bench.cpp
@@ -2,7 +2,7 @@
#include <vector>
#include <cstdint>
-#include "benchmark/benchmark_api.h"
+#include "benchmark/benchmark.h"
#include "GenerateInput.hpp"
constexpr std::size_t MAX_STRING_LEN = 8 << 14;
@@ -46,4 +46,4 @@
}
BENCHMARK(BM_StringFindMatch2)->Range(1, MAX_STRING_LEN / 4);
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();
diff --git a/benchmarks/stringstream.bench.cpp b/benchmarks/stringstream.bench.cpp
index 6023cf7..75a7a28 100644
--- a/benchmarks/stringstream.bench.cpp
+++ b/benchmarks/stringstream.bench.cpp
@@ -1,4 +1,4 @@
-#include "benchmark/benchmark_api.h"
+#include "benchmark/benchmark.h"
#include <sstream>
double __attribute__((noinline)) istream_numbers();
@@ -35,4 +35,4 @@
}
BENCHMARK(BM_Istream_numbers)->RangeMultiplier(2)->Range(1024, 4096);
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();
diff --git a/benchmarks/unordered_set_operations.bench.cpp b/benchmarks/unordered_set_operations.bench.cpp
index e2afdde..ee0ea29 100644
--- a/benchmarks/unordered_set_operations.bench.cpp
+++ b/benchmarks/unordered_set_operations.bench.cpp
@@ -5,7 +5,7 @@
#include <cstdlib>
#include <cstring>
-#include "benchmark/benchmark_api.h"
+#include "benchmark/benchmark.h"
#include "ContainerBenchmarks.hpp"
#include "GenerateInput.hpp"
@@ -303,4 +303,4 @@
std::unordered_set<std::string>{},
getRandomCStringInputs)->Arg(TestNumInputs);
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();
diff --git a/benchmarks/util_smartptr.bench.cpp b/benchmarks/util_smartptr.bench.cpp
index ad3f03a..c984b2c 100644
--- a/benchmarks/util_smartptr.bench.cpp
+++ b/benchmarks/util_smartptr.bench.cpp
@@ -9,7 +9,7 @@
#include <memory>
-#include "benchmark/benchmark_api.h"
+#include "benchmark/benchmark.h"
static void BM_SharedPtrCreateDestroy(benchmark::State& st) {
while (st.KeepRunning()) {
@@ -39,4 +39,4 @@
}
BENCHMARK(BM_WeakPtrIncDecRef);
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();
diff --git a/benchmarks/vector_operations.bench.cpp b/benchmarks/vector_operations.bench.cpp
index 004e801..a2c4e5d 100644
--- a/benchmarks/vector_operations.bench.cpp
+++ b/benchmarks/vector_operations.bench.cpp
@@ -4,7 +4,7 @@
#include <cstdlib>
#include <cstring>
-#include "benchmark/benchmark_api.h"
+#include "benchmark/benchmark.h"
#include "ContainerBenchmarks.hpp"
#include "GenerateInput.hpp"
@@ -29,4 +29,4 @@
getRandomStringInputs)->Arg(TestNumInputs);
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();