Resolve merge conflicts

ROCm · Jul 10, 2024 · 01f6bda · 01f6bda
1 parent ce55709
commit 01f6bda
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 37 deletions.
diff --git a/third_party/xla/xla/service/gpu/fusions/BUILD b/third_party/xla/xla/service/gpu/fusions/BUILD
@@ -79,12 +79,7 @@ cc_library(
 xla_test(
     name = "in_place_dynamic_update_slice_mlir_test",
     srcs = ["in_place_dynamic_update_slice_mlir_test.cc"],
-<<<<<<< HEAD
-    tags = ["no_rocm"], #TODO(rocm) TEMP
-    use_gpu = True,
-=======
     backends = ["gpu"],
->>>>>>> 73722cf2cca19d86967eb49e512918cd566548b3
     deps = [
         ":in_place_dynamic_update_slice_mlir",
         ":mlir_emitter_test_base",
@@ -382,12 +377,8 @@ cc_library(
 xla_test(
     name = "loop_mlir_test",
     srcs = ["loop_mlir_test.cc"],
-<<<<<<< HEAD
     tags = ["no_rocm"],
-    use_gpu = True,
-=======
     backends = ["gpu"],
->>>>>>> 73722cf2cca19d86967eb49e512918cd566548b3
     deps = [
         ":loop_mlir",
         ":mlir_emitter_test_base",
@@ -436,12 +427,7 @@ cc_library(
 xla_test(
     name = "scatter_mlir_test",
     srcs = ["scatter_mlir_test.cc"],
-<<<<<<< HEAD
-    tags = ["no_rocm"],
-    use_gpu = True,
-=======
     backends = ["gpu"],
->>>>>>> 73722cf2cca19d86967eb49e512918cd566548b3
     deps = [
         ":mlir_emitter_test_base",
         ":scatter_mlir",
@@ -492,12 +478,7 @@ cc_library(
 xla_test(
     name = "transpose_mlir_test",
     srcs = ["transpose_mlir_test.cc"],
-<<<<<<< HEAD
-    tags = ["no_rocm"], #TODO(rocm) TEMP
-    use_gpu = True,
-=======
     backends = ["gpu"],
->>>>>>> 73722cf2cca19d86967eb49e512918cd566548b3
     deps = [
         ":mlir_emitter_test_base",
         ":transpose_mlir",
@@ -887,12 +868,7 @@ cc_library(
 xla_test(
     name = "reduction_mlir_test",
     srcs = ["reduction_mlir_test.cc"],
-<<<<<<< HEAD
-    tags = ["no_rocm"], #TODO(rocm) TEMP
-    use_gpu = True,
-=======
     backends = ["gpu"],
->>>>>>> 73722cf2cca19d86967eb49e512918cd566548b3
     deps = [
         ":mlir_emitter_test_base",
         ":reduction_mlir",
@@ -977,12 +953,7 @@ cc_library(
 xla_test(
     name = "concatenate_mlir_test",
     srcs = ["concatenate_mlir_test.cc"],
-<<<<<<< HEAD
-    tags = ["no_rocm"], #TODO(rocm) TEMP
-    use_gpu = True,
-=======
     backends = ["gpu"],
->>>>>>> 73722cf2cca19d86967eb49e512918cd566548b3
     deps = [
         ":concatenate_mlir",
         ":mlir_emitter_test_base",
@@ -1114,12 +1085,7 @@ cc_library(
 xla_test(
     name = "input_slices_mlir_test",
     srcs = ["input_slices_mlir_test.cc"],
-<<<<<<< HEAD
-    tags = ["no_rocm"], #TODO(rocm) TEMP
-    use_gpu = True,
-=======
     backends = ["gpu"],
->>>>>>> 73722cf2cca19d86967eb49e512918cd566548b3
     deps = [
         ":input_slices_mlir",
         ":mlir_emitter_test_base",

diff --git a/third_party/xla/xla/service/gpu/gpu_compiler_test.cc b/third_party/xla/xla/service/gpu/gpu_compiler_test.cc
@@ -343,18 +343,16 @@ ENTRY main {
 
 TEST_F(GpuCompilerTest,
        GemmFusionIsNoOpWhenGemmFusionAutotunerFallsBackToCublas) {
-<<<<<<< HEAD
   if (std::holds_alternative<se::RocmComputeCapability>(GpuComputeComp())) {
     GTEST_SKIP() << "Folder structure differences prevents finding of gpu_compiler_test_autotune_db.textproto.";
-=======
+  }
   auto cc = backend()
                 .default_stream_executor()
                 ->GetDeviceDescription()
                 .cuda_compute_capability();
   if (!cc.IsAtLeastAmpere()) {
     GTEST_SKIP() << "Autotuning results have only been generated for Ampere "
                  << "and Hopper GPUs";
->>>>>>> 73722cf2cca19d86967eb49e512918cd566548b3
   }
   const absl::string_view hlo_string = R"(
 HloModule test