dolysis
/
rocksdb
mirror of https://github.com/facebook/rocksdb.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade gbenchmark to 1.6.1 (#9775) 

Summary:
Upgrade google benchmark to the latest 1.6.1.

Pull Request resolved: https://github.com/facebook/rocksdb/pull/9775

Test Plan: CI

Reviewed By: riversand963

Differential Revision: D35252889

Pulled By: jay-zhuang

fbshipit-source-id: 4d60dd1c6f522d0af0b3942ae8fa88e5ae17f34a
This commit is contained in:
Jay Zhuang 2022-03-30 10:09:49 -07:00 committed by Facebook GitHub Bot
parent 5a085d789d
commit d5c34fa8f4
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.circleci/config.yml
View File

@ -102,10 +102,16 @@ commands:
install-benchmark: install-benchmark:
steps: steps:
- run:
name: Install ninja build
command: sudo apt-get update -y && sudo apt-get install -y ninja-build
- run: - run:
name: Install benchmark name: Install benchmark
command: | command: |
sudo apt-get update -y && sudo apt-get install -y libbenchmark-dev git clone --depth 1 --branch v1.6.1 https://github.com/google/benchmark.git ~/benchmark
cd ~/benchmark && mkdir build && cd build
cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_ENABLE_GTEST_TESTS=0
ninja && sudo ninja install
upgrade-cmake: upgrade-cmake:
steps: steps:
@ -431,8 +437,8 @@ jobs:
resource_class: xlarge resource_class: xlarge
steps: steps:
- pre-steps - pre-steps
- install-benchmark
- run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get update -y && sudo apt-get install gcc-11 g++-11 libgflags-dev - run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get update -y && sudo apt-get install gcc-11 g++-11 libgflags-dev
- install-benchmark
- run: CC=gcc-11 CXX=g++-11 V=1 make -j16 all microbench - run: CC=gcc-11 CXX=g++-11 V=1 make -j16 all microbench
- post-steps - post-steps

2
build_tools/build_detect_platform
View File

@ -598,7 +598,7 @@ EOF
fi fi
if ! test $ROCKSDB_DISABLE_BENCHMARK; then if ! test $ROCKSDB_DISABLE_BENCHMARK; then
# Test whether google benchmark is available # Test whether google benchmark is available
$CXX $PLATFORM_CXXFLAGS -x c++ - -o /dev/null -lbenchmark 2>/dev/null <<EOF $CXX $PLATFORM_CXXFLAGS -x c++ - -o /dev/null -lbenchmark -lpthread 2>/dev/null <<EOF
#include <benchmark/benchmark.h> #include <benchmark/benchmark.h>
int main() {} int main() {}
EOF EOF