From 7d03df3f4406a7f6c732d9694ec5914d706c1683 Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Wed, 23 Nov 2016 19:34:17 -0800 Subject: Renamed google_benchmark submodule to benchmark --- .gitmodules | 2 +- Makefile | 28 ++-- build.yaml | 2 +- src/google_benchmark/gen_build_yaml.py | 6 +- test/cpp/microbenchmarks/bm_fullstack.cc | 2 +- test/cpp/microbenchmarks/noop-benchmark.cc | 2 +- third_party/benchmark | 1 + third_party/google_benchmark | 1 - tools/run_tests/sanity/check_submodules.sh | 2 +- tools/run_tests/sources_and_headers.json | 40 +++--- .../google_benchmark/google_benchmark.vcxproj | 66 ++++----- .../google_benchmark.vcxproj.filters | 148 ++++++++++----------- 12 files changed, 150 insertions(+), 150 deletions(-) create mode 160000 third_party/benchmark delete mode 160000 third_party/google_benchmark diff --git a/.gitmodules b/.gitmodules index c32881cb95..6424a10b09 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,5 +18,5 @@ path = third_party/thrift url = https://github.com/apache/thrift.git [submodule "third_party/google_benchmark"] - path = third_party/google_benchmark + path = third_party/benchmark url = https://github.com/google/benchmark diff --git a/Makefile b/Makefile index 1609d6951b..b38c3881e1 100644 --- a/Makefile +++ b/Makefile @@ -6809,25 +6809,25 @@ endif LIBGOOGLE_BENCHMARK_SRC = \ - third_party/google_benchmark/src/benchmark.cc \ - third_party/google_benchmark/src/benchmark_register.cc \ - third_party/google_benchmark/src/colorprint.cc \ - third_party/google_benchmark/src/commandlineflags.cc \ - third_party/google_benchmark/src/complexity.cc \ - third_party/google_benchmark/src/console_reporter.cc \ - third_party/google_benchmark/src/csv_reporter.cc \ - third_party/google_benchmark/src/json_reporter.cc \ - third_party/google_benchmark/src/reporter.cc \ - third_party/google_benchmark/src/sleep.cc \ - third_party/google_benchmark/src/string_util.cc \ - third_party/google_benchmark/src/sysinfo.cc \ - third_party/google_benchmark/src/timers.cc \ + third_party/benchmark/src/benchmark.cc \ + third_party/benchmark/src/benchmark_register.cc \ + third_party/benchmark/src/colorprint.cc \ + third_party/benchmark/src/commandlineflags.cc \ + third_party/benchmark/src/complexity.cc \ + third_party/benchmark/src/console_reporter.cc \ + third_party/benchmark/src/csv_reporter.cc \ + third_party/benchmark/src/json_reporter.cc \ + third_party/benchmark/src/reporter.cc \ + third_party/benchmark/src/sleep.cc \ + third_party/benchmark/src/string_util.cc \ + third_party/benchmark/src/sysinfo.cc \ + third_party/benchmark/src/timers.cc \ PUBLIC_HEADERS_CXX += \ LIBGOOGLE_BENCHMARK_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGOOGLE_BENCHMARK_SRC)))) -$(LIBGOOGLE_BENCHMARK_OBJS): CPPFLAGS += -Ithird_party/google_benchmark/include -DHAVE_POSIX_REGEX +$(LIBGOOGLE_BENCHMARK_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX ifeq ($(NO_PROTOBUF),true) diff --git a/build.yaml b/build.yaml index 407b50ca7b..1404c89dc2 100644 --- a/build.yaml +++ b/build.yaml @@ -3772,7 +3772,7 @@ defaults: CPPFLAGS: -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter LDFLAGS: -g google_benchmark: - CPPFLAGS: -Ithird_party/google_benchmark/include -DHAVE_POSIX_REGEX + CPPFLAGS: -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX zlib: CFLAGS: -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-implicit-function-declaration $(W_NO_SHIFT_NEGATIVE_VALUE) -fvisibility=hidden diff --git a/src/google_benchmark/gen_build_yaml.py b/src/google_benchmark/gen_build_yaml.py index 302e08737a..b39e6f33ef 100755 --- a/src/google_benchmark/gen_build_yaml.py +++ b/src/google_benchmark/gen_build_yaml.py @@ -44,10 +44,10 @@ out['libs'] = [{ 'language': 'c++', 'secure': 'no', 'defaults': 'google_benchmark', - 'src': sorted(glob.glob('third_party/google_benchmark/src/*.cc')), + 'src': sorted(glob.glob('third_party/benchmark/src/*.cc')), 'headers': sorted( - glob.glob('third_party/google_benchmark/src/*.h') + - glob.glob('third_party/google_benchmark/include/benchmark/*.h')), + glob.glob('third_party/benchmark/src/*.h') + + glob.glob('third_party/benchmark/include/benchmark/*.h')), }] print yaml.dump(out) diff --git a/test/cpp/microbenchmarks/bm_fullstack.cc b/test/cpp/microbenchmarks/bm_fullstack.cc index 2b6dd3219c..10984b7e91 100644 --- a/test/cpp/microbenchmarks/bm_fullstack.cc +++ b/test/cpp/microbenchmarks/bm_fullstack.cc @@ -59,7 +59,7 @@ extern "C" { } #include "src/cpp/client/create_channel_internal.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" -#include "third_party/google_benchmark/include/benchmark/benchmark.h" +#include "third_party/benchmark/include/benchmark/benchmark.h" namespace grpc { namespace testing { diff --git a/test/cpp/microbenchmarks/noop-benchmark.cc b/test/cpp/microbenchmarks/noop-benchmark.cc index 6b06c69c6e..8ede1376db 100644 --- a/test/cpp/microbenchmarks/noop-benchmark.cc +++ b/test/cpp/microbenchmarks/noop-benchmark.cc @@ -34,7 +34,7 @@ /* This benchmark exists to ensure that the google_benchmark integration is * working */ -#include "third_party/google_benchmark/include/benchmark/benchmark.h" +#include "third_party/benchmark/include/benchmark/benchmark.h" static void BM_NoOp(benchmark::State& state) { while (state.KeepRunning()) { diff --git a/third_party/benchmark b/third_party/benchmark new file mode 160000 index 0000000000..44c25c892a --- /dev/null +++ b/third_party/benchmark @@ -0,0 +1 @@ +Subproject commit 44c25c892a6229b20db7cd9dc05584ea865896de diff --git a/third_party/google_benchmark b/third_party/google_benchmark deleted file mode 160000 index 44c25c892a..0000000000 --- a/third_party/google_benchmark +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 44c25c892a6229b20db7cd9dc05584ea865896de diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index 6ec0786c96..be12f968d2 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -43,7 +43,7 @@ git submodule | awk '{ print $1 }' | sort > $submodules cat << EOF | awk '{ print $1 }' | sort > $want_submodules c880e42ba1c8032d4cdde2aba0541d8a9d9fa2e9 third_party/boringssl (version_for_cocoapods_2.0-100-gc880e42) 05b155ff59114735ec8cd089f669c4c3d8f59029 third_party/gflags (v2.1.0-45-g05b155f) - 44c25c892a6229b20db7cd9dc05584ea865896de third_party/google_benchmark (v0.1.0-343-g44c25c8) + 44c25c892a6229b20db7cd9dc05584ea865896de third_party/benchmark (v0.1.0-343-g44c25c8) c99458533a9b4c743ed51537e25989ea55944908 third_party/googletest (release-1.7.0) a428e42072765993ff674fda72863c9f1aa2d268 third_party/protobuf (v3.1.0) 50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8) diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 9be07941d7..d176765b33 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -6204,26 +6204,26 @@ { "deps": [], "headers": [ - "third_party/google_benchmark/include/benchmark/benchmark.h", - "third_party/google_benchmark/include/benchmark/benchmark_api.h", - "third_party/google_benchmark/include/benchmark/macros.h", - "third_party/google_benchmark/include/benchmark/reporter.h", - "third_party/google_benchmark/src/arraysize.h", - "third_party/google_benchmark/src/benchmark_api_internal.h", - "third_party/google_benchmark/src/check.h", - "third_party/google_benchmark/src/colorprint.h", - "third_party/google_benchmark/src/commandlineflags.h", - "third_party/google_benchmark/src/complexity.h", - "third_party/google_benchmark/src/cycleclock.h", - "third_party/google_benchmark/src/internal_macros.h", - "third_party/google_benchmark/src/log.h", - "third_party/google_benchmark/src/mutex.h", - "third_party/google_benchmark/src/re.h", - "third_party/google_benchmark/src/sleep.h", - "third_party/google_benchmark/src/stat.h", - "third_party/google_benchmark/src/string_util.h", - "third_party/google_benchmark/src/sysinfo.h", - "third_party/google_benchmark/src/timers.h" + "third_party/benchmark/include/benchmark/benchmark.h", + "third_party/benchmark/include/benchmark/benchmark_api.h", + "third_party/benchmark/include/benchmark/macros.h", + "third_party/benchmark/include/benchmark/reporter.h", + "third_party/benchmark/src/arraysize.h", + "third_party/benchmark/src/benchmark_api_internal.h", + "third_party/benchmark/src/check.h", + "third_party/benchmark/src/colorprint.h", + "third_party/benchmark/src/commandlineflags.h", + "third_party/benchmark/src/complexity.h", + "third_party/benchmark/src/cycleclock.h", + "third_party/benchmark/src/internal_macros.h", + "third_party/benchmark/src/log.h", + "third_party/benchmark/src/mutex.h", + "third_party/benchmark/src/re.h", + "third_party/benchmark/src/sleep.h", + "third_party/benchmark/src/stat.h", + "third_party/benchmark/src/string_util.h", + "third_party/benchmark/src/sysinfo.h", + "third_party/benchmark/src/timers.h" ], "is_filegroup": false, "language": "c++", diff --git a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj index 52774e0802..1f59806cd4 100644 --- a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj +++ b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj @@ -147,53 +147,53 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters index 9db6ed4657..6f8fb9d6e2 100644 --- a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters +++ b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters @@ -1,106 +1,106 @@ - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\include\benchmark + + third_party\benchmark\include\benchmark - - third_party\google_benchmark\include\benchmark + + third_party\benchmark\include\benchmark - - third_party\google_benchmark\include\benchmark + + third_party\benchmark\include\benchmark - - third_party\google_benchmark\include\benchmark + + third_party\benchmark\include\benchmark - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src - - third_party\google_benchmark\src + + third_party\benchmark\src @@ -108,17 +108,17 @@ {7458b63d-7ba4-103d-2bed-3e3ad30d8237} - - {54a154e8-669b-a7c1-9b6e-bd1aab2f86e3} + + {3111b1b0-21cd-89e5-1dde-68eee22f75d8} - - {f54c3cb1-ec20-a651-6956-78379b51e1a5} + + {045f2c9f-39a8-d548-4596-2b82a180314a} - - {0483a457-8050-4565-bc15-09695bf7b822} + + {dcedff65-88c1-3daa-2a2e-25911e9c9752} - - {c39ff2d1-691e-4614-4d75-4bc20db05e09} + + {d3343091-ae27-29e9-3c59-09b21561282c} -- cgit v1.2.3