Declare microbenchmarks as tests rather than binaries, fix issues

test/cpp/microbenchmarks/BUILD

@@ -14,7 +14,7 @@
 
 licenses(["notice"])  # Apache v2
 
-load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package")
+load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package")
 
 grpc_package(name = "test/cpp/microbenchmarks")
 
@@ -48,75 +48,98 @@ grpc_cc_library(
     ],
 )
 
-grpc_cc_binary(
-    name = "bm_closure",
+# Need a secure version of helpers to benchmark opencensus
+grpc_cc_library(
+    name = "helpers_secure",
     testonly = 1,
+    srcs = ["helpers.cc"],
+    hdrs = [
+        "fullstack_context_mutators.h",
+        "fullstack_fixtures.h",
+        "helpers.h",
+    ],
+    external_deps = [
+        "benchmark",
+    ],
+    tags = ["no_windows"],
+    deps = [
+        "//:grpc++",
+        "//src/proto/grpc/testing:echo_proto",
+        "//test/core/util:grpc_test_util",
+        "//test/cpp/util:test_config",
+    ],
+)
+
+grpc_cc_test(
+    name = "bm_closure",
     srcs = ["bm_closure.cc"],
     tags = ["no_windows"],
     deps = [":helpers"],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_alarm",
-    testonly = 1,
     srcs = ["bm_alarm.cc"],
     tags = ["no_windows"],
     deps = [":helpers"],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_arena",
-    testonly = 1,
+    size = "enormous",
     srcs = ["bm_arena.cc"],
-    tags = ["no_windows"],
+    tags = [
+        "no_windows",
+        "notsan",
+    ],
+    uses_polling = False,
     deps = [":helpers"],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_byte_buffer",
-    testonly = 1,
     srcs = ["bm_byte_buffer.cc"],
     tags = ["no_windows"],
+    uses_polling = False,
     deps = [":helpers"],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_channel",
-    testonly = 1,
     srcs = ["bm_channel.cc"],
     tags = ["no_windows"],
+    uses_polling = False,
     deps = [":helpers"],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_call_create",
-    testonly = 1,
     srcs = ["bm_call_create.cc"],
     tags = ["no_windows"],
+    uses_polling = False,
     deps = [":helpers"],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_cq",
-    testonly = 1,
     srcs = ["bm_cq.cc"],
     tags = ["no_windows"],
     deps = [":helpers"],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_cq_multiple_threads",
-    testonly = 1,
     srcs = ["bm_cq_multiple_threads.cc"],
     tags = ["no_windows"],
+    uses_polling = False,
     deps = [":helpers"],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_error",
-    testonly = 1,
     srcs = ["bm_error.cc"],
     tags = ["no_windows"],
+    uses_polling = False,
     deps = [":helpers"],
 )
 
@@ -130,9 +153,9 @@ grpc_cc_library(
     deps = [":helpers"],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_fullstack_streaming_ping_pong",
-    testonly = 1,
+    size = "large",
     srcs = [
         "bm_fullstack_streaming_ping_pong.cc",
     ],
@@ -152,9 +175,8 @@ grpc_cc_library(
     deps = [":helpers"],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_fullstack_streaming_pump",
-    testonly = 1,
     srcs = [
         "bm_fullstack_streaming_pump.cc",
     ],
@@ -165,13 +187,16 @@ grpc_cc_binary(
     deps = [":fullstack_streaming_pump_h"],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_fullstack_trickle",
-    testonly = 1,
+    size = "enormous",
     srcs = ["bm_fullstack_trickle.cc"],
     tags = [
         "no_mac",  # to emulate "excluded_poll_engines: poll"
         "no_windows",
+        "noasan",
+        "nomsan",
+        "notsan",
     ],
     deps = [":helpers"],
 )
@@ -185,9 +210,8 @@ grpc_cc_library(
     deps = [":helpers"],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_fullstack_unary_ping_pong",
-    testonly = 1,
     srcs = [
         "bm_fullstack_unary_ping_pong.cc",
     ],
@@ -198,47 +222,50 @@ grpc_cc_binary(
     deps = [":fullstack_unary_ping_pong_h"],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_metadata",
-    testonly = 1,
     srcs = ["bm_metadata.cc"],
     tags = ["no_windows"],
+    uses_polling = False,
     deps = [":helpers"],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_chttp2_hpack",
-    testonly = 1,
     srcs = ["bm_chttp2_hpack.cc"],
     tags = ["no_windows"],
+    uses_polling = False,
     deps = [":helpers"],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_opencensus_plugin",
-    testonly = 1,
     srcs = ["bm_opencensus_plugin.cc"],
     language = "C++",
     deps = [
-        ":helpers",
+        ":helpers_secure",
         "//:grpc_opencensus_plugin",
         "//src/proto/grpc/testing:echo_proto",
     ],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_timer",
-    testonly = 1,
     srcs = ["bm_timer.cc"],
     tags = ["no_windows"],
+    uses_polling = False,
     deps = [":helpers"],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_threadpool",
-    testonly = 1,
+    size = "enormous",
     srcs = ["bm_threadpool.cc"],
-    tags = ["no_windows"],
+    tags = [
+        "no_windows",
+        "notsan",
+    ],
+    uses_polling = False,
     deps = [":helpers"],
 )
 
@@ -253,7 +280,7 @@ grpc_cc_library(
     deps = [
         ":helpers",
         "//src/proto/grpc/testing:echo_proto",
-        "//test/cpp/util:test_util",
+        "//test/cpp/util:test_util_unsecure",
     ],
 )
 
@@ -269,9 +296,8 @@ grpc_cc_library(
     ],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_callback_unary_ping_pong",
-    testonly = 1,
     srcs = [
         "bm_callback_unary_ping_pong.cc",
     ],
@@ -291,12 +317,15 @@ grpc_cc_library(
     ],
 )
 
-grpc_cc_binary(
+grpc_cc_test(
     name = "bm_callback_streaming_ping_pong",
-    testonly = 1,
+    size = "large",
     srcs = [
         "bm_callback_streaming_ping_pong.cc",
     ],
-    tags = ["no_windows"],
+    tags = [
+        "no_mac",  # to emulate "excluded_poll_engines: poll"
+        "no_windows",
+    ],
     deps = [":callback_streaming_ping_pong_h"],
 )

test/cpp/microbenchmarks/bm_call_create.cc

@@ -513,7 +513,8 @@ static void BM_IsolatedFilter(benchmark::State& state) {
       static_cast<grpc_channel_stack*>(gpr_zalloc(channel_size));
   GPR_ASSERT(GRPC_LOG_IF_ERROR(
       "channel_stack_init",
-      grpc_channel_stack_init(1, FilterDestroy, channel_stack, &filters[0],
+      grpc_channel_stack_init(1, FilterDestroy, channel_stack,
+                              filters.size() == 0 ? nullptr : &filters[0],
                               filters.size(), &channel_args,
                               fixture.flags & REQUIRES_TRANSPORT
                                   ? &dummy_transport::dummy_transport

test/cpp/microbenchmarks/bm_opencensus_plugin.cc

@@ -22,7 +22,8 @@
 
 #include "absl/base/call_once.h"
 #include "absl/strings/str_cat.h"
-#include "include/grpc++/grpc++.h"
+#include "include/grpc/grpc.h"
+#include "include/grpcpp/grpcpp.h"
 #include "include/grpcpp/opencensus.h"
 #include "opencensus/stats/stats.h"
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
@@ -100,6 +101,13 @@ static void BM_E2eLatencyCensusDisabled(benchmark::State& state) {
 BENCHMARK(BM_E2eLatencyCensusDisabled);
 
 static void BM_E2eLatencyCensusEnabled(benchmark::State& state) {
+  // Avoid a data race between registering plugin and shutdown of previous
+  // test (order-dependent) by doing an init/shutdown so that any previous
+  // shutdowns are fully complete first.
+  grpc_init();
+  grpc_shutdown_blocking();
+
+  // Now start the test by registering the plugin (once in the execution)
   RegisterOnce();
   // This we can safely repeat, and doing so clears accumulated data to avoid
   // initialization costs varying between runs.

test/cpp/microbenchmarks/bm_timer.cc

@@ -81,7 +81,7 @@ static void BM_TimerBatch(benchmark::State& state) {
       grpc_timer_init(&timer_closure->timer, deadline, &timer_closure->closure);
     }
     if (check) {
-      grpc_millis next;
+      grpc_millis next = GRPC_MILLIS_INF_FUTURE;
       grpc_timer_check(&next);
     }
     for (grpc_millis deadline = start; deadline != end; deadline += increment) {

tools/remote_build/rbe_common.bazelrc

@@ -55,7 +55,7 @@ build:asan --copt=-gmlt
 # use double the default value for "moderate" and "long" timeout as sanitizer
 # tests tend to be slower
 build:asan --test_timeout=60,600,1800,3600
-build:asan --test_tag_filters=-no_linux,-qps_json_driver
+build:asan --test_tag_filters=-no_linux,-noasan,-qps_json_driver
 
 # memory sanitizer: most settings are already in %workspace%/.bazelrc
 # we only need a few additional ones that are Foundry specific
@@ -78,7 +78,7 @@ build:tsan --copt=-gmlt
 # use double the default value for "moderate" and "long" timeout as sanitizer
 # tests tend to be slower
 build:tsan --test_timeout=60,600,1800,3600
-build:tsan --test_tag_filters=-no_linux,-qps_json_driver
+build:tsan --test_tag_filters=-no_linux,-notsan,-qps_json_driver
 build:tsan --extra_execution_platforms=@rbe_default//config:platform
 
 # undefined behavior sanitizer: most settings are already in %workspace%/.bazelrc