diff options
| author | Mircea Trofin <mtrofin@google.com> | 2021-12-07 16:46:55 -0800 |
|---|---|---|
| committer | Mircea Trofin <mtrofin@google.com> | 2021-12-07 17:10:41 -0800 |
| commit | 5dda2efde574d3a200d04c371f561a77ee9f4aff (patch) | |
| tree | 1a32f91fd0db5308de8f5fbc32613c18275588fe /libc/benchmarks | |
| parent | 572d1ecccc473ba4ddb46dd04759dc2e336f0e1c (diff) | |
| download | llvm-5dda2efde574d3a200d04c371f561a77ee9f4aff.tar.gz | |
Re-Reland "[benchmarks] Move libcxx's fork of google/benchmark and llvm/utils'"
This reverts commit b2fbd45d2395f1f6ef39db72b7156724fc101e40. D114922
fixed the reason of the 2nd revert.
This patch also re-applies 39e9f5d3685f3cfca0df072928ad96d973704dff.
Differential Revision: https://reviews.llvm.org/D112012
Diffstat (limited to 'libc/benchmarks')
| -rw-r--r-- | libc/benchmarks/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libc/benchmarks/LibcBenchmark.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libc/benchmarks/CMakeLists.txt b/libc/benchmarks/CMakeLists.txt index 9f01afecef12..7a0170a9c056 100644 --- a/libc/benchmarks/CMakeLists.txt +++ b/libc/benchmarks/CMakeLists.txt @@ -17,7 +17,7 @@ string(REPLACE ";" " " GOOGLE_BENCHMARK_TARGET_FLAGS "${GOOGLE_BENCHMARK_TARGET_ ExternalProject_Add(google-benchmark EXCLUDE_FROM_ALL ON PREFIX google-benchmark - SOURCE_DIR ${LIBC_SOURCE_DIR}/../llvm/utils/benchmark + SOURCE_DIR ${LLVM_THIRD_PARTY_DIR}/benchmark INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/google-benchmark CMAKE_CACHE_ARGS -DBUILD_SHARED_LIBS:BOOL=OFF diff --git a/libc/benchmarks/LibcBenchmark.cpp b/libc/benchmarks/LibcBenchmark.cpp index cef595d75e0d..621e0468db68 100644 --- a/libc/benchmarks/LibcBenchmark.cpp +++ b/libc/benchmarks/LibcBenchmark.cpp @@ -15,7 +15,7 @@ namespace libc_benchmarks { void checkRequirements() { const auto &CpuInfo = benchmark::CPUInfo::Get(); - if (CpuInfo.scaling_enabled) + if (CpuInfo.scaling == benchmark::CPUInfo::ENABLED) report_fatal_error( "CPU scaling is enabled, the benchmark real time measurements may be " "noisy and will incur extra overhead."); |