From 1a948807eda807efddf936bab21b4bb0631b57a1 Mon Sep 17 00:00:00 2001 From: David Dunleavy Date: Mon, 27 Jan 2025 14:50:19 -0800 Subject: [PATCH] Use `tsl/platform:test_main` for all test targets with benchmarks PiperOrigin-RevId: 720316297 --- xla/BUILD | 9 +++++---- xla/backends/cpu/nanort/BUILD | 2 +- xla/backends/cpu/runtime/BUILD | 4 ++-- xla/backends/cpu/runtime/xnnpack/BUILD | 2 +- xla/backends/gpu/runtime/BUILD | 2 +- xla/ffi/BUILD | 4 ++-- xla/ffi/api/BUILD | 3 ++- xla/hlo/analysis/BUILD | 4 ++-- xla/hlo/evaluator/BUILD | 2 +- xla/hlo/ir/BUILD | 1 - xla/pjrt/cpu/BUILD | 3 ++- xla/service/BUILD | 2 +- xla/service/gpu/kernels/BUILD | 5 +++-- xla/service/graphcycles/BUILD | 2 +- xla/stream_executor/BUILD | 2 +- xla/stream_executor/gpu/BUILD | 2 +- xla/tsl/concurrency/BUILD | 4 ++-- xla/tsl/distributed_runtime/rpc/BUILD | 2 +- xla/tsl/lib/hash/BUILD | 2 +- xla/tsl/lib/io/BUILD | 2 +- xla/tsl/lib/random/BUILD | 4 ++-- xla/tsl/platform/BUILD | 2 +- xla/tsl/util/BUILD | 2 +- 23 files changed, 35 insertions(+), 32 deletions(-) diff --git a/xla/BUILD b/xla/BUILD index 80e3d11670b1d..dacd3da87c6ae 100644 --- a/xla/BUILD +++ b/xla/BUILD @@ -483,9 +483,9 @@ xla_cc_test( ":shape_util", ":xla_data_proto_cc", "//xla/hlo/testlib:test", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/hash:hash_testing", "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", "@tsl//tsl/platform:test_benchmark", ], ) @@ -498,12 +498,12 @@ xla_cc_test( ":util", ":xla_data_proto_cc", "//xla/hlo/testlib:test", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", "@tsl//tsl/platform:env", "@tsl//tsl/platform:protobuf", "@tsl//tsl/platform:test_benchmark", @@ -619,13 +619,14 @@ xla_cc_test( ":xla_data_proto_cc", "//xla/hlo/testlib:test", "//xla/tsl/lib/core:status_test_util", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/base", "@com_google_absl//absl/hash", "@com_google_absl//absl/random", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", - "@com_google_googletest//:gtest_main", + "@com_google_googletest//:gtest", "@tsl//tsl/platform:errors", "@tsl//tsl/platform:logging", "@tsl//tsl/platform:macros", @@ -1015,8 +1016,8 @@ xla_cc_test( ":shape_util", ":xla_data_proto_cc", "//xla/hlo/testlib:test", + "//xla/tsl/platform:test_main", "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", "@tsl//tsl/platform:test_benchmark", ], ) diff --git a/xla/backends/cpu/nanort/BUILD b/xla/backends/cpu/nanort/BUILD index 21dfce6073e9d..884b1d772a6f9 100644 --- a/xla/backends/cpu/nanort/BUILD +++ b/xla/backends/cpu/nanort/BUILD @@ -61,10 +61,10 @@ xla_cc_test( "//xla/tsl/platform:statusor", "//xla/tsl/platform:test", "//xla/tsl/platform:test_benchmark", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/container:inlined_vector", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", - "@com_google_googletest//:gtest_main", ], ) diff --git a/xla/backends/cpu/runtime/BUILD b/xla/backends/cpu/runtime/BUILD index 32af0efd19aad..9880ce6ef188a 100644 --- a/xla/backends/cpu/runtime/BUILD +++ b/xla/backends/cpu/runtime/BUILD @@ -262,11 +262,11 @@ xla_cc_test( "//xla/tsl/platform:statusor", "//xla/tsl/platform:test", "//xla/tsl/platform:test_benchmark", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", - "@com_google_googletest//:gtest_main", "@eigen_archive//:eigen3", ], ) @@ -1033,10 +1033,10 @@ xla_cc_test( "//xla/tsl/platform:statusor", "//xla/tsl/platform:test", "//xla/tsl/platform:test_benchmark", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", "@com_google_absl//absl/types:span", - "@com_google_googletest//:gtest_main", ], ) diff --git a/xla/backends/cpu/runtime/xnnpack/BUILD b/xla/backends/cpu/runtime/xnnpack/BUILD index d86ff9ee73c50..9a0c0282f38c4 100644 --- a/xla/backends/cpu/runtime/xnnpack/BUILD +++ b/xla/backends/cpu/runtime/xnnpack/BUILD @@ -33,9 +33,9 @@ xla_cc_test( "//xla/tsl/platform:statusor", "//xla/tsl/platform:test", "//xla/tsl/platform:test_benchmark", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/synchronization", - "@com_google_googletest//:gtest_main", ], ) diff --git a/xla/backends/gpu/runtime/BUILD b/xla/backends/gpu/runtime/BUILD index fb4c4e33912d7..489267efba0ad 100644 --- a/xla/backends/gpu/runtime/BUILD +++ b/xla/backends/gpu/runtime/BUILD @@ -171,11 +171,11 @@ xla_test( "//xla/stream_executor:stream_executor_memory_allocator", "//xla/stream_executor/gpu:gpu_test_kernels_fatbin", "//xla/tsl/lib/core:status_test_util", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/functional:function_ref", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", - "@com_google_googletest//:gtest_main", "@tsl//tsl/platform:status", "@tsl//tsl/platform:statusor", "@tsl//tsl/platform:test", diff --git a/xla/ffi/BUILD b/xla/ffi/BUILD index b9b0c652663d2..41ee88abbacb5 100644 --- a/xla/ffi/BUILD +++ b/xla/ffi/BUILD @@ -46,10 +46,10 @@ xla_cc_test( "//xla/ffi/api:c_api", "//xla/stream_executor:device_memory", "//xla/tsl/lib/core:status_test_util", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", "@tsl//tsl/platform:statusor", "@tsl//tsl/platform:test", "@tsl//tsl/platform:test_benchmark", @@ -222,13 +222,13 @@ xla_cc_test( "//xla/stream_executor:stream", "//xla/tsl/concurrency:async_value", "//xla/tsl/lib/core:status_test_util", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/log:check", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:string_view", "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", "@eigen_archive//:eigen3", "@tsl//tsl/platform:env", "@tsl//tsl/platform:status_matchers", diff --git a/xla/ffi/api/BUILD b/xla/ffi/api/BUILD index a3207605591f1..daae18cef9e18 100644 --- a/xla/ffi/api/BUILD +++ b/xla/ffi/api/BUILD @@ -88,11 +88,12 @@ xla_cc_test( "//xla/stream_executor:device_memory_allocator", "//xla/tsl/concurrency:async_value", "//xla/tsl/lib/core:status_test_util", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/log:check", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", "@com_google_absl//absl/synchronization", - "@com_google_googletest//:gtest_main", + "@com_google_googletest//:gtest", "@eigen_archive//:eigen3", "@tsl//tsl/platform:env", "@tsl//tsl/platform:errors", diff --git a/xla/hlo/analysis/BUILD b/xla/hlo/analysis/BUILD index d06b6823bbf58..9ff5089d4172d 100644 --- a/xla/hlo/analysis/BUILD +++ b/xla/hlo/analysis/BUILD @@ -44,7 +44,7 @@ xla_cc_test( "//xla/hlo/testlib:test", "//xla/service:computation_placer_hdr", "//xla/service:hlo_module_config", - "@com_google_googletest//:gtest_main", + "//xla/tsl/platform:test_main", "@tsl//tsl/platform:status", "@tsl//tsl/platform:test_benchmark", ], @@ -76,8 +76,8 @@ xla_cc_test( "//xla/hlo/testlib:test_helpers", "//xla/service:computation_placer", "//xla/service:hlo_module_config", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/random", - "@com_google_googletest//:gtest_main", "@tsl//tsl/platform:status", "@tsl//tsl/platform:test_benchmark", ], diff --git a/xla/hlo/evaluator/BUILD b/xla/hlo/evaluator/BUILD index 6766f1073b3af..8907c252f53f0 100644 --- a/xla/hlo/evaluator/BUILD +++ b/xla/hlo/evaluator/BUILD @@ -148,6 +148,7 @@ xla_cc_test( "//xla/service:shape_inference", "//xla/tests:literal_test_util", "//xla/tests:test_utils", + "//xla/tsl/platform:test_main", # fixdeps: keep "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/base:endian", "@com_google_absl//absl/container:flat_hash_set", @@ -157,7 +158,6 @@ xla_cc_test( "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", "@com_google_absl//absl/types:span", - "@com_google_googletest//:gtest_main", # fixdeps: keep "@tsl//tsl/platform:errors", "@tsl//tsl/platform:statusor", "@tsl//tsl/platform:test", diff --git a/xla/hlo/ir/BUILD b/xla/hlo/ir/BUILD index 5caced5dfd817..2924f6ea10ad6 100644 --- a/xla/hlo/ir/BUILD +++ b/xla/hlo/ir/BUILD @@ -281,7 +281,6 @@ cc_test( "//xla/tsl/platform:test_main", "@com_google_absl//absl/strings:str_format", "@com_google_absl//absl/types:span", - "@com_google_googletest//:gtest_main", ], ) diff --git a/xla/pjrt/cpu/BUILD b/xla/pjrt/cpu/BUILD index a146f139e4f6c..d396fb0e78ceb 100644 --- a/xla/pjrt/cpu/BUILD +++ b/xla/pjrt/cpu/BUILD @@ -256,10 +256,11 @@ xla_cc_test( "//xla/tsl/platform:statusor", "//xla/tsl/platform:test", "//xla/tsl/platform:test_benchmark", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/log:check", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", "@com_google_absl//absl/synchronization", - "@com_google_googletest//:gtest_main", + "@com_google_googletest//:gtest", ], ) diff --git a/xla/service/BUILD b/xla/service/BUILD index 7d3dac18ea63b..0e8f3af9dec27 100644 --- a/xla/service/BUILD +++ b/xla/service/BUILD @@ -5775,12 +5775,12 @@ xla_cc_test( srcs = ["rendezvous_test.cc"], deps = [ ":rendezvous", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/synchronization", "@com_google_absl//absl/time", "@com_google_absl//absl/types:span", - "@com_google_googletest//:gtest_main", "@tsl//tsl/platform:env", "@tsl//tsl/platform:test", "@tsl//tsl/platform:test_benchmark", diff --git a/xla/service/gpu/kernels/BUILD b/xla/service/gpu/kernels/BUILD index 3a11d8bae997c..0d8b2604acf67 100644 --- a/xla/service/gpu/kernels/BUILD +++ b/xla/service/gpu/kernels/BUILD @@ -202,11 +202,12 @@ xla_test( "//xla/stream_executor:stream", "//xla/stream_executor/gpu:gpu_init", "//xla/stream_executor/host:host_platform", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/log:check", "@com_google_absl//absl/random", "@com_google_absl//absl/strings", "@com_google_absl//absl/time", - "@com_google_googletest//:gtest_main", + "@com_google_googletest//:gtest", "@tsl//tsl/platform:statusor", "@tsl//tsl/platform:test", "@tsl//tsl/platform:test_benchmark", @@ -335,7 +336,7 @@ xla_cc_binary( "//xla/stream_executor:stream", "//xla/stream_executor:stream_executor_h", "//xla/stream_executor/cuda:cuda_platform", - "@com_google_googletest//:gtest_main", + "//xla/tsl/platform:test_main", "@tsl//tsl/platform:status", "@tsl//tsl/platform:statusor", "@tsl//tsl/platform:test", diff --git a/xla/service/graphcycles/BUILD b/xla/service/graphcycles/BUILD index 94d1ec6ff6396..afa93d7cc4d75 100644 --- a/xla/service/graphcycles/BUILD +++ b/xla/service/graphcycles/BUILD @@ -40,9 +40,9 @@ xla_cc_test( srcs = ["graphcycles_test.cc"], deps = [ ":graphcycles", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/random", - "@com_google_googletest//:gtest_main", "@tsl//tsl/platform:logging", "@tsl//tsl/platform:test", "@tsl//tsl/platform:test_benchmark", diff --git a/xla/stream_executor/BUILD b/xla/stream_executor/BUILD index e51deefedb66a..5d1cdc7159ffa 100644 --- a/xla/stream_executor/BUILD +++ b/xla/stream_executor/BUILD @@ -785,7 +785,7 @@ xla_cc_test( ":stream_executor_h", ":typed_kernel_factory", "//xla/stream_executor/host:host_platform", - "@com_google_googletest//:gtest_main", + "//xla/tsl/platform:test_main", "@tsl//tsl/platform:test", "@tsl//tsl/platform:test_benchmark", ], diff --git a/xla/stream_executor/gpu/BUILD b/xla/stream_executor/gpu/BUILD index 00c3809ebe360..dc3565f4fe7c5 100644 --- a/xla/stream_executor/gpu/BUILD +++ b/xla/stream_executor/gpu/BUILD @@ -652,13 +652,13 @@ xla_test( "//xla/stream_executor/cuda:cuda_platform_id", "//xla/stream_executor/rocm:rocm_platform_id", "//xla/tsl/lib/core:status_test_util", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/base", "@com_google_absl//absl/log:check", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest", - "@com_google_googletest//:gtest_main", "@tsl//tsl/platform:errors", "@tsl//tsl/platform:status", "@tsl//tsl/platform:status_matchers", diff --git a/xla/tsl/concurrency/BUILD b/xla/tsl/concurrency/BUILD index c3b0a2a6341ea..b4700eb36fa30 100644 --- a/xla/tsl/concurrency/BUILD +++ b/xla/tsl/concurrency/BUILD @@ -52,11 +52,11 @@ tsl_cc_test( ":async_value", "//xla/tsl/platform:test", "//xla/tsl/platform:test_benchmark", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/functional:any_invocable", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/types:span", - "@com_google_googletest//:gtest_main", ], ) @@ -68,11 +68,11 @@ tsl_cc_test( ":ref_count", "//xla/tsl/platform:test", "//xla/tsl/platform:test_benchmark", + "//xla/tsl/platform:test_main", "@com_google_absl//absl/functional:any_invocable", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/types:span", - "@com_google_googletest//:gtest_main", ], ) diff --git a/xla/tsl/distributed_runtime/rpc/BUILD b/xla/tsl/distributed_runtime/rpc/BUILD index 383846735f4bb..83aaccd1d9f37 100644 --- a/xla/tsl/distributed_runtime/rpc/BUILD +++ b/xla/tsl/distributed_runtime/rpc/BUILD @@ -60,8 +60,8 @@ tsl_cc_test( "//xla/tsl/platform:errors", "//xla/tsl/platform:test", "//xla/tsl/platform:test_benchmark", + "//xla/tsl/platform:test_main", "//xla/tsl/protobuf:distributed_runtime_payloads_proto_cc_impl", - "@com_google_googletest//:gtest_main", ] + tsl_grpc_cc_dependencies(), ) diff --git a/xla/tsl/lib/hash/BUILD b/xla/tsl/lib/hash/BUILD index d32c1c2e261b6..cd560c4ac0813 100644 --- a/xla/tsl/lib/hash/BUILD +++ b/xla/tsl/lib/hash/BUILD @@ -70,8 +70,8 @@ tsl_cc_test( "//xla/tsl/platform:logging", "//xla/tsl/platform:test", "//xla/tsl/platform:test_benchmark", + "//xla/tsl/platform:test_main", "//xla/tsl/platform:types", "@com_google_absl//absl/strings:cord", - "@com_google_googletest//:gtest_main", ], ) diff --git a/xla/tsl/lib/io/BUILD b/xla/tsl/lib/io/BUILD index 7bb021e49cc20..bafa45466109a 100644 --- a/xla/tsl/lib/io/BUILD +++ b/xla/tsl/lib/io/BUILD @@ -450,7 +450,7 @@ tsl_cc_test( "//xla/tsl/platform:env_impl", "//xla/tsl/platform:test", "//xla/tsl/platform:test_benchmark", - "@com_google_googletest//:gtest_main", + "//xla/tsl/platform:test_main", ], ) diff --git a/xla/tsl/lib/random/BUILD b/xla/tsl/lib/random/BUILD index d8b3e0063757b..3b4b420f15ddb 100644 --- a/xla/tsl/lib/random/BUILD +++ b/xla/tsl/lib/random/BUILD @@ -162,8 +162,8 @@ tsl_cc_test( "//xla/tsl/platform:macros", "//xla/tsl/platform:test", "//xla/tsl/platform:test_benchmark", + "//xla/tsl/platform:test_main", "//xla/tsl/platform:types", - "@com_google_googletest//:gtest_main", ], ) @@ -222,7 +222,7 @@ tsl_cc_test( "//xla/tsl/platform:macros", "//xla/tsl/platform:test", "//xla/tsl/platform:test_benchmark", + "//xla/tsl/platform:test_main", "//xla/tsl/platform:types", - "@com_google_googletest//:gtest_main", ], ) diff --git a/xla/tsl/platform/BUILD b/xla/tsl/platform/BUILD index 671818b6026cf..7510e8abfb107 100644 --- a/xla/tsl/platform/BUILD +++ b/xla/tsl/platform/BUILD @@ -562,12 +562,12 @@ tsl_cc_test( srcs = ["statusor_test.cc"], deps = [ ":statusor", + ":test_main", "//xla/tsl/platform:errors", "//xla/tsl/platform:macros", "//xla/tsl/platform:test", "//xla/tsl/platform:test_benchmark", "@com_google_absl//absl/base:config", - "@com_google_googletest//:gtest_main", ], ) diff --git a/xla/tsl/util/BUILD b/xla/tsl/util/BUILD index 14ca017e9127b..0d8ddd0c66683 100644 --- a/xla/tsl/util/BUILD +++ b/xla/tsl/util/BUILD @@ -278,7 +278,7 @@ tsl_cc_test( "//xla/tsl/platform:errors", "//xla/tsl/platform:test", "//xla/tsl/platform:test_benchmark", - "@com_google_googletest//:gtest_main", + "//xla/tsl/platform:test_main", "@tsl//tsl/platform:strcat", ], )