Merge pull request #18397 from billfeng327/feature/reinstate-rbe-windows

Reinstated version bump of google benchmark

CMakeLists.txt

@@ -3238,6 +3238,7 @@ target_link_libraries(grpc++_core_stats
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   grpc++
+  ${_gRPC_GFLAGS_LIBRARIES}
 )
 
 endif (gRPC_BUILD_CODEGEN)
@@ -3892,6 +3893,7 @@ target_link_libraries(grpc++_proto_reflection_desc_db
   ${_gRPC_ALLTARGETS_LIBRARIES}
   grpc++
   grpc
+  ${_gRPC_GFLAGS_LIBRARIES}
 )
 
 foreach(_hdr
@@ -4014,6 +4016,7 @@ target_include_directories(grpc++_test_config
 target_link_libraries(grpc++_test_config
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
+  ${_gRPC_GFLAGS_LIBRARIES}
 )
 
 
@@ -4111,6 +4114,7 @@ target_link_libraries(grpc++_test_util
   grpc++
   grpc_test_util
   grpc
+  ${_gRPC_GFLAGS_LIBRARIES}
 )
 
 foreach(_hdr
@@ -4306,6 +4310,7 @@ target_link_libraries(grpc++_test_util_unsecure
   grpc++_unsecure
   grpc_test_util_unsecure
   grpc_unsecure
+  ${_gRPC_GFLAGS_LIBRARIES}
 )
 
 foreach(_hdr
@@ -4834,6 +4839,7 @@ target_link_libraries(grpc_cli_libs
   grpc++_proto_reflection_desc_db
   grpc++
   grpc
+  ${_gRPC_GFLAGS_LIBRARIES}
 )
 
 foreach(_hdr
@@ -5044,6 +5050,7 @@ target_link_libraries(http2_client_main
   grpc++
   grpc
   grpc++_test_config
+  ${_gRPC_GFLAGS_LIBRARIES}
 )
 
 endif (gRPC_BUILD_CODEGEN)
@@ -5100,6 +5107,7 @@ target_link_libraries(interop_client_helper
   grpc++
   grpc
   gpr
+  ${_gRPC_GFLAGS_LIBRARIES}
 )
 
 endif (gRPC_BUILD_CODEGEN)
@@ -5173,6 +5181,7 @@ target_link_libraries(interop_client_main
   grpc
   gpr
   grpc++_test_config
+  ${_gRPC_GFLAGS_LIBRARIES}
 )
 
 endif (gRPC_BUILD_CODEGEN)
@@ -5221,6 +5230,7 @@ target_link_libraries(interop_server_helper
   grpc++
   grpc
   gpr
+  ${_gRPC_GFLAGS_LIBRARIES}
 )
 
 
@@ -5292,6 +5302,7 @@ target_link_libraries(interop_server_lib
   grpc
   gpr
   grpc++_test_config
+  ${_gRPC_GFLAGS_LIBRARIES}
 )
 
 endif (gRPC_BUILD_CODEGEN)
@@ -5336,6 +5347,7 @@ target_link_libraries(interop_server_main
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   interop_server_lib
+  ${_gRPC_GFLAGS_LIBRARIES}
 )
 
 
@@ -5445,6 +5457,7 @@ target_link_libraries(qps
   grpc++_core_stats
   grpc++
   grpc
+  ${_gRPC_GFLAGS_LIBRARIES}
 )
 
 endif (gRPC_BUILD_CODEGEN)

Makefile

@@ -8059,6 +8059,7 @@ endif
 
 LIBBENCHMARK_SRC = \
     third_party/benchmark/src/benchmark.cc \
+    third_party/benchmark/src/benchmark_main.cc \
     third_party/benchmark/src/benchmark_register.cc \
     third_party/benchmark/src/colorprint.cc \
     third_party/benchmark/src/commandlineflags.cc \
@@ -8069,6 +8070,7 @@ LIBBENCHMARK_SRC = \
     third_party/benchmark/src/json_reporter.cc \
     third_party/benchmark/src/reporter.cc \
     third_party/benchmark/src/sleep.cc \
+    third_party/benchmark/src/statistics.cc \
     third_party/benchmark/src/string_util.cc \
     third_party/benchmark/src/sysinfo.cc \
     third_party/benchmark/src/timers.cc \

bazel/grpc_deps.bzl

@@ -147,16 +147,15 @@ def grpc_deps():
     if "com_github_gflags_gflags" not in native.existing_rules():
         http_archive(
             name = "com_github_gflags_gflags",
-            strip_prefix = "gflags-30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e",
-            url = "https://github.com/gflags/gflags/archive/30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e.tar.gz",
+            strip_prefix = "gflags-28f50e0fed19872e0fd50dd23ce2ee8cd759338e",
+            url = "https://github.com/gflags/gflags/archive/28f50e0fed19872e0fd50dd23ce2ee8cd759338e.tar.gz",
         )
 
     if "com_github_google_benchmark" not in native.existing_rules():
         http_archive(
             name = "com_github_google_benchmark",
-            build_file = "@com_github_grpc_grpc//third_party:benchmark.BUILD",
-            strip_prefix = "benchmark-9913418d323e64a0111ca0da81388260c2bbe1e9",
-            url = "https://github.com/google/benchmark/archive/9913418d323e64a0111ca0da81388260c2bbe1e9.tar.gz",
+            strip_prefix = "benchmark-e776aa0275e293707b6a0901e0e8d8a8a3679508",
+            url = "https://github.com/google/benchmark/archive/e776aa0275e293707b6a0901e0e8d8a8a3679508.tar.gz",
         )
 
     if "com_github_cares_cares" not in native.existing_rules():

cmake/benchmark.cmake

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 if("${gRPC_BENCHMARK_PROVIDER}" STREQUAL "module")
+  set(BENCHMARK_ENABLE_GTEST_TESTS OFF CACHE BOOL "Turn off gTest in gBenchmark")
   if(NOT BENCHMARK_ROOT_DIR)
     set(BENCHMARK_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/benchmark)
   endif()
@@ -35,3 +36,4 @@ elseif("${gRPC_BENCHMARK_PROVIDER}" STREQUAL "package")
   endif()
   set(_gRPC_FIND_BENCHMARK "if(NOT benchmark_FOUND)\n  find_package(benchmark CONFIG)\nendif()")
 endif()
+

cmake/gflags.cmake

@@ -18,19 +18,18 @@ if("${gRPC_GFLAGS_PROVIDER}" STREQUAL "module")
   endif()
   if(EXISTS "${GFLAGS_ROOT_DIR}/CMakeLists.txt")
     add_subdirectory(${GFLAGS_ROOT_DIR} third_party/gflags)
-    if(TARGET gflags_static)
-      set(_gRPC_GFLAGS_LIBRARIES gflags_static)
-      set(_gRPC_GFLAGS_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include")
-    endif()
+    set(_gRPC_GFLAGS_LIBRARIES gflags::gflags)
+    set(_gRPC_GFLAGS_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include")
   else()
     message(WARNING "gRPC_GFLAGS_PROVIDER is \"module\" but GFLAGS_ROOT_DIR is wrong")
   endif()
 elseif("${gRPC_GFLAGS_PROVIDER}" STREQUAL "package")
   # Use "CONFIG" as there is no built-in cmake module for gflags.
   find_package(gflags REQUIRED CONFIG)
-  if(TARGET gflags)
-    set(_gRPC_GFLAGS_LIBRARIES gflags)
+  if(TARGET gflags::gflags)
+    set(_gRPC_GFLAGS_LIBRARIES gflags::gflags)
     set(_gRPC_GFLAGS_INCLUDE_DIR ${GFLAGS_INCLUDE_DIR})
   endif()
   set(_gRPC_FIND_GFLAGS "if(NOT gflags_FOUND)\n  find_package(gflags CONFIG)\nendif()")
 endif()
+

grpc.gyp

@@ -2065,6 +2065,7 @@
       ],
       'sources': [
         'third_party/benchmark/src/benchmark.cc',
+        'third_party/benchmark/src/benchmark_main.cc',
         'third_party/benchmark/src/benchmark_register.cc',
         'third_party/benchmark/src/colorprint.cc',
         'third_party/benchmark/src/commandlineflags.cc',
@@ -2075,6 +2076,7 @@
         'third_party/benchmark/src/json_reporter.cc',
         'third_party/benchmark/src/reporter.cc',
         'third_party/benchmark/src/sleep.cc',
+        'third_party/benchmark/src/statistics.cc',
         'third_party/benchmark/src/string_util.cc',
         'third_party/benchmark/src/sysinfo.cc',
         'third_party/benchmark/src/timers.cc',

templates/CMakeLists.txt.template

@@ -53,7 +53,7 @@
         deps.append("${_gRPC_BENCHMARK_LIBRARIES}")
       else:
         deps.append(d)
-    if target_dict.build == 'test' and target_dict.language == 'c++':
+    if (target_dict.build == 'test' or target_dict.build == 'private') and target_dict.language == 'c++':
       deps.append("${_gRPC_GFLAGS_LIBRARIES}")
     return deps
 

third_party/BUILD

@@ -1,5 +1,4 @@
 exports_files([
-    "benchmark.BUILD",
     "gtest.BUILD",
     "objective_c/Cronet/bidirectional_stream_c.h",
     "zlib.BUILD",

third_party/benchmark

@@ -1 +1 @@
-Subproject commit 5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8
+Subproject commit e776aa0275e293707b6a0901e0e8d8a8a3679508

third_party/benchmark.BUILD

@@ -1,15 +0,0 @@
-cc_library(
-    name = "benchmark",
-    srcs = glob(["src/*.cc"]),
-    hdrs = glob(["include/**/*.h", "src/*.h"]),
-    includes = [
-        "include", "."
-    ],
-    copts = [
-        "-DHAVE_POSIX_REGEX"
-    ],
-    linkstatic = 1,
-    visibility = [
-        "//visibility:public",
-    ],
-)

third_party/gflags

@@ -1 +1 @@
-Subproject commit 30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e
+Subproject commit 28f50e0fed19872e0fd50dd23ce2ee8cd759338e

tools/run_tests/generated/sources_and_headers.json

@@ -7378,10 +7378,9 @@
     "deps": [], 
     "headers": [
       "third_party/benchmark/include/benchmark/benchmark.h", 
-      "third_party/benchmark/include/benchmark/benchmark_api.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/benchmark_register.h", 
       "third_party/benchmark/src/check.h", 
       "third_party/benchmark/src/colorprint.h", 
       "third_party/benchmark/src/commandlineflags.h", 
@@ -7393,9 +7392,10 @@
       "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/statistics.h", 
       "third_party/benchmark/src/string_util.h", 
-      "third_party/benchmark/src/sysinfo.h", 
+      "third_party/benchmark/src/thread_manager.h", 
+      "third_party/benchmark/src/thread_timer.h", 
       "third_party/benchmark/src/timers.h"
     ], 
     "is_filegroup": false, 

tools/run_tests/sanity/check_submodules.sh

@@ -27,13 +27,13 @@ want_submodules=$(mktemp /tmp/submXXXXXX)
 git submodule | awk '{ print $1 }' | sort > "$submodules"
 cat << EOF | awk '{ print $1 }' | sort > "$want_submodules"
  cc4bed2d74f7c8717e31f9579214ab52a9c9c610 third_party/abseil-cpp (cc4bed2)
- 5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8 third_party/benchmark (v1.2.0)
+ e776aa0275e293707b6a0901e0e8d8a8a3679508 third_party/benchmark (v1.2.0)
  73594cde8c9a52a102c4341c244c833aa61b9c06 third_party/bloaty (remotes/origin/wide-14-g73594cd)
  b29b21a81b32ec273f118f589f46d56ad3332420 third_party/boringssl (remotes/origin/chromium-stable)
  afc30d43eef92979b05776ec0963c9cede5fb80f third_party/boringssl-with-bazel (fips-20180716-116-gafc30d43e)
  3be1924221e1326df520f8498d704a5c4c8d0cce third_party/cares/cares (cares-1_13_0)
  911001cdca003337bdb93fab32740cde61bafee3 third_party/data-plane-api (heads/master)
- 30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e third_party/gflags (v2.2.0-5-g30dbc81)
+ 28f50e0fed19872e0fd50dd23ce2ee8cd759338e third_party/gflags (v2.2.0-5-g30dbc81)
  80ed4d0bbf65d57cc267dfc63bd2584557f11f9b third_party/googleapis (common-protos-1_3_1-915-g80ed4d0bb)
  ec44c6c1675c25b9827aacd08c02433cccde7780 third_party/googletest (release-1.8.0)
  6599cac0965be8e5a835ab7a5684bbef033d5ad0 third_party/libcxx (heads/release_60)