[HLO Componentization] Populate hlo/testlib sub-component (Phase II).

This CL takes care of 1. Migrating external projects dependencies from ``` tensorflow/compiler/xla:test tensorflow/compiler/xla:test_helpers tensorflow/compiler/xla/service:pattern_matcher_gmock ``` to `tensorflow/compiler/xla/hlo/testlib:*` PiperOrigin-RevId: 714103813
openxla · Jan 11, 2025 · 91bf62c · 91bf62c
1 parent 53af204
commit 91bf62c
Show file tree

Hide file tree

Showing 62 changed files with 145 additions and 144 deletions.
diff --git a/xla/tests/BUILD b/xla/tests/BUILD
diff --git a/xla/tests/all_reduce_test.cc b/xla/tests/all_reduce_test.cc
@@ -16,8 +16,8 @@ limitations under the License.
 #include <cstdint>
 #include <utility>
 
+#include "xla/hlo/testlib/test.h"
 #include "xla/literal_util.h"
-#include "xla/test.h"
 #include "xla/tests/hlo_pjrt_test_base.h"
 #include "xla/tests/test_macros.h"
 

diff --git a/xla/tests/array_elementwise_ops_test.cc b/xla/tests/array_elementwise_ops_test.cc
@@ -38,11 +38,11 @@ limitations under the License.
 #include "xla/comparison_util.h"
 #include "xla/fp_util.h"
 #include "xla/hlo/builder/xla_builder.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/layout_util.h"
 #include "xla/literal.h"
 #include "xla/primitive_util.h"
 #include "xla/stream_executor/device_description.h"
-#include "xla/test.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/test_macros.h"
 #include "xla/types.h"

diff --git a/xla/tests/bad_rng_shape_validation_test.cc b/xla/tests/bad_rng_shape_validation_test.cc
@@ -19,8 +19,8 @@ limitations under the License.
 #include "absl/status/statusor.h"
 #include "xla/hlo/builder/xla_builder.h"
 #include "xla/hlo/builder/xla_computation.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/shape.h"
-#include "xla/test.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/xla_data.pb.h"
 #include "tsl/platform/logging.h"

diff --git a/xla/tests/batch_norm_grad_test.cc b/xla/tests/batch_norm_grad_test.cc
@@ -16,8 +16,8 @@ limitations under the License.
 #include <utility>
 
 #include "absl/status/status.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/literal_util.h"
-#include "xla/test.h"
 #include "xla/tests/hlo_test_base.h"
 #include "xla/tests/test_macros.h"
 #include "tsl/platform/statusor.h"

diff --git a/xla/tests/batch_norm_training_test.cc b/xla/tests/batch_norm_training_test.cc
@@ -16,8 +16,8 @@ limitations under the License.
 #include <utility>
 
 #include "absl/status/status.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/literal_util.h"
-#include "xla/test.h"
 #include "xla/tests/hlo_test_base.h"
 #include "xla/tests/test_macros.h"
 #include "tsl/platform/statusor.h"

diff --git a/xla/tests/batch_normalization_test.cc b/xla/tests/batch_normalization_test.cc
@@ -29,11 +29,11 @@ limitations under the License.
 #include "xla/hlo/ir/hlo_computation.h"
 #include "xla/hlo/ir/hlo_instruction.h"
 #include "xla/hlo/ir/hlo_module.h"
+#include "xla/hlo/testlib/test.h"
+#include "xla/hlo/testlib/test_helpers.h"
 #include "xla/literal.h"
 #include "xla/reference_util.h"
 #include "xla/shape_util.h"
-#include "xla/test.h"
-#include "xla/test_helpers.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/hlo_test_base.h"
 #include "xla/tests/literal_test_util.h"

diff --git a/xla/tests/bfloat16_test.cc b/xla/tests/bfloat16_test.cc
@@ -26,11 +26,11 @@ limitations under the License.
 #include "xla/hlo/ir/hlo_computation.h"
 #include "xla/hlo/ir/hlo_instruction.h"
 #include "xla/hlo/ir/hlo_module.h"
+#include "xla/hlo/testlib/test.h"
+#include "xla/hlo/testlib/test_helpers.h"
 #include "xla/literal.h"
 #include "xla/reference_util.h"
 #include "xla/shape_util.h"
-#include "xla/test.h"
-#include "xla/test_helpers.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/hlo_test_base.h"
 #include "xla/tests/literal_test_util.h"

diff --git a/xla/tests/broadcast_simple_test.cc b/xla/tests/broadcast_simple_test.cc
@@ -23,9 +23,9 @@ limitations under the License.
 #include "xla/array4d.h"
 #include "xla/client/local_client.h"
 #include "xla/hlo/builder/xla_builder.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/literal.h"
 #include "xla/literal_util.h"
-#include "xla/test.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/literal_test_util.h"
 #include "xla/tests/test_macros.h"

diff --git a/xla/tests/call_test.cc b/xla/tests/call_test.cc
@@ -18,10 +18,10 @@ limitations under the License.
 
 #include "xla/hlo/builder/xla_builder.h"
 #include "xla/hlo/builder/xla_computation.h"
+#include "xla/hlo/testlib/test_helpers.h"
 #include "xla/literal.h"
 #include "xla/literal_util.h"
 #include "xla/shape_util.h"
-#include "xla/test_helpers.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/literal_test_util.h"
 #include "xla/tests/test_macros.h"

diff --git a/xla/tests/check_execution_arity_test.cc b/xla/tests/check_execution_arity_test.cc
@@ -20,10 +20,10 @@ limitations under the License.
 #include "xla/client/global_data.h"
 #include "xla/client/local_client.h"
 #include "xla/hlo/builder/xla_builder.h"
+#include "xla/hlo/testlib/test.h"
+#include "xla/hlo/testlib/test_helpers.h"
 #include "xla/literal.h"
 #include "xla/shape_util.h"
-#include "xla/test.h"
-#include "xla/test_helpers.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/test_macros.h"
 #include "xla/xla_data.pb.h"

diff --git a/xla/tests/cholesky_test.cc b/xla/tests/cholesky_test.cc
@@ -23,8 +23,8 @@ limitations under the License.
 #include "xla/hlo/builder/lib/arithmetic.h"
 #include "xla/hlo/builder/lib/matrix.h"
 #include "xla/hlo/builder/xla_builder.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/literal.h"
-#include "xla/test.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/literal_test_util.h"
 #include "xla/tests/test_macros.h"

diff --git a/xla/tests/client_library_test_base.cc b/xla/tests/client_library_test_base.cc
@@ -26,11 +26,11 @@ limitations under the License.
 #include "xla/client/local_client.h"
 #include "xla/execution_options_util.h"
 #include "xla/hlo/builder/xla_builder.h"
+#include "xla/hlo/testlib/test_helpers.h"
 #include "xla/literal_util.h"
 #include "xla/service/platform_util.h"
 #include "xla/shape_util.h"
 #include "xla/status_macros.h"
-#include "xla/test_helpers.h"
 #include "xla/xla_data.pb.h"
 #include "tsl/platform/logging.h"
 

diff --git a/xla/tests/client_test.cc b/xla/tests/client_test.cc
@@ -21,9 +21,9 @@ limitations under the License.
 #include "xla/client/local_client.h"
 #include "xla/hlo/builder/xla_builder.h"
 #include "xla/hlo/builder/xla_computation.h"
+#include "xla/hlo/testlib/test_helpers.h"
 #include "xla/shape_util.h"
 #include "xla/status_macros.h"
-#include "xla/test_helpers.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/literal_test_util.h"
 #include "xla/tests/test_macros.h"

diff --git a/xla/tests/compute_constant_test.cc b/xla/tests/compute_constant_test.cc
@@ -23,11 +23,11 @@ limitations under the License.
 #include "xla/client/global_data.h"
 #include "xla/hlo/builder/xla_builder.h"
 #include "xla/hlo/builder/xla_computation.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/layout_util.h"
 #include "xla/literal.h"
 #include "xla/shape_util.h"
 #include "xla/status_macros.h"
-#include "xla/test.h"
 #include "xla/tests/literal_test_util.h"
 #include "xla/tests/test_macros.h"
 #include "xla/tests/test_utils.h"

diff --git a/xla/tests/concat_test.cc b/xla/tests/concat_test.cc
@@ -22,10 +22,10 @@ limitations under the License.
 #include "xla/client/local_client.h"
 #include "xla/hlo/builder/xla_builder.h"
 #include "xla/hlo/builder/xla_computation.h"
+#include "xla/hlo/testlib/test.h"
+#include "xla/hlo/testlib/test_helpers.h"
 #include "xla/literal_util.h"
 #include "xla/reference_util.h"
-#include "xla/test.h"
-#include "xla/test_helpers.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/hlo_test_base.h"
 #include "xla/tests/literal_test_util.h"

diff --git a/xla/tests/concatenate_test.cc b/xla/tests/concatenate_test.cc
@@ -23,10 +23,10 @@ limitations under the License.
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 #include "absl/types/span.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/literal.h"
 #include "xla/literal_util.h"
 #include "xla/shape.h"
-#include "xla/test.h"
 #include "xla/tests/hlo_test_base.h"
 #include "xla/tests/literal_test_util.h"
 #include "tsl/platform/status.h"

diff --git a/xla/tests/constant_reduction_function_test.cc b/xla/tests/constant_reduction_function_test.cc
@@ -20,7 +20,7 @@ limitations under the License.
 #include <string>
 #include <vector>
 
-#include "xla/test.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/tests/hlo_test_base.h"
 #include "xla/tests/literal_test_util.h"
 #include "xla/tests/test_macros.h"

diff --git a/xla/tests/conv_depthwise_backprop_filter_test.cc b/xla/tests/conv_depthwise_backprop_filter_test.cc
@@ -17,10 +17,10 @@ limitations under the License.
 
 #include "xla/execution_options_util.h"
 #include "xla/hlo/builder/xla_computation.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/hlo/transforms/despecializer.h"
 #include "xla/hlo/transforms/simplifiers/float_normalization.h"
 #include "xla/status_macros.h"
-#include "xla/test.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/hlo_test_base.h"
 #include "xla/tests/test_macros.h"

diff --git a/xla/tests/conv_depthwise_common.cc b/xla/tests/conv_depthwise_common.cc
@@ -19,10 +19,10 @@ limitations under the License.
 
 #include "xla/execution_options_util.h"
 #include "xla/hlo/builder/xla_computation.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/hlo/transforms/despecializer.h"
 #include "xla/hlo/transforms/simplifiers/float_normalization.h"
 #include "xla/status_macros.h"
-#include "xla/test.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/hlo_test_base.h"
 #include "xla/tests/test_macros.h"

diff --git a/xla/tests/conv_depthwise_common.h b/xla/tests/conv_depthwise_common.h
@@ -20,10 +20,10 @@ limitations under the License.
 
 #include "xla/execution_options_util.h"
 #include "xla/hlo/builder/xla_computation.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/hlo/transforms/despecializer.h"
 #include "xla/hlo/transforms/simplifiers/float_normalization.h"
 #include "xla/status_macros.h"
-#include "xla/test.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/hlo_test_base.h"
 #include "xla/tests/test_macros.h"

diff --git a/xla/tests/conv_depthwise_test.cc b/xla/tests/conv_depthwise_test.cc
@@ -17,10 +17,10 @@ limitations under the License.
 
 #include "xla/execution_options_util.h"
 #include "xla/hlo/builder/xla_computation.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/hlo/transforms/despecializer.h"
 #include "xla/hlo/transforms/simplifiers/float_normalization.h"
 #include "xla/status_macros.h"
-#include "xla/test.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/conv_depthwise_common.h"
 #include "xla/tests/hlo_test_base.h"

diff --git a/xla/tests/convolution_dimension_numbers_test.cc b/xla/tests/convolution_dimension_numbers_test.cc
@@ -22,8 +22,8 @@ limitations under the License.
 #include "xla/client/local_client.h"
 #include "xla/hlo/builder/padding.h"
 #include "xla/hlo/builder/xla_builder.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/reference_util.h"
-#include "xla/test.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/literal_test_util.h"
 #include "xla/tests/test_macros.h"

diff --git a/xla/tests/deallocation_test.cc b/xla/tests/deallocation_test.cc
@@ -21,8 +21,8 @@ limitations under the License.
 #include "xla/client/local_client.h"
 #include "xla/hlo/builder/xla_builder.h"
 #include "xla/hlo/builder/xla_computation.h"
-#include "xla/test.h"
-#include "xla/test_helpers.h"
+#include "xla/hlo/testlib/test.h"
+#include "xla/hlo/testlib/test_helpers.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/test_macros.h"
 

diff --git a/xla/tests/deconstruct_tuple_test.cc b/xla/tests/deconstruct_tuple_test.cc
@@ -23,10 +23,10 @@ limitations under the License.
 #include "xla/client/local_client.h"
 #include "xla/hlo/builder/xla_builder.h"
 #include "xla/hlo/builder/xla_computation.h"
+#include "xla/hlo/testlib/test.h"
+#include "xla/hlo/testlib/test_helpers.h"
 #include "xla/literal.h"
 #include "xla/shape_util.h"
-#include "xla/test.h"
-#include "xla/test_helpers.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/test_macros.h"
 #include "xla/xla_data.pb.h"

diff --git a/xla/tests/dynamic_ops_test.cc b/xla/tests/dynamic_ops_test.cc
@@ -20,6 +20,7 @@ limitations under the License.
 #include "xla/client/client_library.h"
 #include "xla/client/local_client.h"
 #include "xla/hlo/builder/xla_builder.h"
+#include "xla/hlo/testlib/test_helpers.h"
 #include "xla/reference_util.h"
 #include "xla/service/local_service.h"
 #include "xla/service/platform_util.h"
@@ -28,7 +29,6 @@ limitations under the License.
 #include "xla/stream_executor/device_memory_allocator.h"
 #include "xla/stream_executor/stream_executor.h"
 #include "xla/stream_executor/stream_executor_memory_allocator.h"
-#include "xla/test_helpers.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/hlo_test_base.h"
 #include "xla/tests/literal_test_util.h"

diff --git a/xla/tests/dynamic_reshape_test.cc b/xla/tests/dynamic_reshape_test.cc
@@ -16,9 +16,9 @@ limitations under the License.
 #include <cstdint>
 #include <utility>
 
+#include "xla/hlo/testlib/test.h"
 #include "xla/literal.h"
 #include "xla/literal_util.h"
-#include "xla/test.h"
 #include "xla/tests/hlo_test_base.h"
 #include "xla/tests/test_macros.h"
 #include "tsl/platform/statusor.h"

diff --git a/xla/tests/float8_test.cc b/xla/tests/float8_test.cc
@@ -19,7 +19,7 @@ limitations under the License.
 
 #include <gtest/gtest.h>
 #include "xla/hlo/builder/xla_builder.h"
-#include "xla/test.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/test_macros.h"
 #include "tsl/platform/ml_dtypes.h"

diff --git a/xla/tests/gather_operation_test.cc b/xla/tests/gather_operation_test.cc
@@ -23,11 +23,11 @@ limitations under the License.
 #include "xla/execution_options_util.h"
 #include "xla/hlo/builder/xla_builder.h"
 #include "xla/hlo/ir/hlo_module.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/literal.h"
 #include "xla/literal_util.h"
 #include "xla/service/hlo_module_config.h"
 #include "xla/service/service.h"
-#include "xla/test.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/hlo_pjrt_test_base.h"
 #include "xla/tests/test_macros.h"

diff --git a/xla/tests/get_dimension_size_test.cc b/xla/tests/get_dimension_size_test.cc
@@ -17,9 +17,9 @@ limitations under the License.
 
 #include "absl/status/status.h"
 #include "xla/hlo/ir/hlo_module.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/literal.h"
 #include "xla/literal_util.h"
-#include "xla/test.h"
 #include "xla/tests/hlo_test_base.h"
 #include "xla/tests/test_macros.h"
 #include "tsl/platform/statusor.h"

diff --git a/xla/tests/grouped_convolution_test.cc b/xla/tests/grouped_convolution_test.cc
@@ -20,10 +20,10 @@ limitations under the License.
 #include "absl/algorithm/container.h"
 #include "xla/execution_options_util.h"
 #include "xla/hlo/builder/xla_computation.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/hlo/transforms/despecializer.h"
 #include "xla/hlo/transforms/simplifiers/float_normalization.h"
 #include "xla/status_macros.h"
-#include "xla/test.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/hlo_test_base.h"
 #include "xla/tests/test_macros.h"

diff --git a/xla/tests/half_test.cc b/xla/tests/half_test.cc
@@ -18,9 +18,9 @@ limitations under the License.
 
 #include "absl/status/statusor.h"
 #include "xla/hlo/builder/xla_builder.h"
+#include "xla/hlo/testlib/test.h"
+#include "xla/hlo/testlib/test_helpers.h"
 #include "xla/literal.h"
-#include "xla/test.h"
-#include "xla/test_helpers.h"
 #include "xla/tests/client_library_test_base.h"
 #include "xla/tests/test_macros.h"
 #include "xla/tests/test_utils.h"

diff --git a/xla/tests/hlo_metadata_test.cc b/xla/tests/hlo_metadata_test.cc
@@ -15,8 +15,8 @@ limitations under the License.
 
 #include "xla/client/local_client.h"
 #include "xla/hlo/builder/xla_builder.h"
+#include "xla/hlo/testlib/test_helpers.h"
 #include "xla/service/local_service.h"
-#include "xla/test_helpers.h"
 #include "xla/tests/local_client_test_base.h"
 
 namespace xla {

diff --git a/xla/tests/hlo_runner_agnostic_test_base.h b/xla/tests/hlo_runner_agnostic_test_base.h
@@ -35,13 +35,13 @@ limitations under the License.
 #include "xla/hlo/ir/hlo_instruction.h"
 #include "xla/hlo/ir/hlo_module.h"
 #include "xla/hlo/testlib/hlo_hardware_independent_test_base.h"
+#include "xla/hlo/testlib/test_helpers.h"
 #include "xla/hlo/testlib/verified_hlo_module.h"
 #include "xla/literal.h"
 #include "xla/service/computation_placer.h"
 #include "xla/service/executable.h"
 #include "xla/service/hlo_module_config.h"
 #include "xla/service/hlo_runner_interface.h"
-#include "xla/test_helpers.h"
 #include "xla/tsl/platform/test.h"
 #include "xla/util.h"
 #include "xla/xla_data.pb.h"

diff --git a/xla/tests/int4_test.cc b/xla/tests/int4_test.cc
@@ -20,7 +20,7 @@ limitations under the License.
 #include "absl/strings/substitute.h"
 #include "xla/hlo/ir/hlo_instruction.h"
 #include "xla/hlo/ir/hlo_opcode.h"
-#include "xla/test.h"
+#include "xla/hlo/testlib/test.h"
 #include "xla/tests/hlo_test_base.h"
 #include "xla/tests/test_macros.h"