Skip to content

Commit 9ee392f

Browse files
committed
[ROCM] Clean up XLA unit tests for warp size 64
1 parent 56f0a13 commit 9ee392f

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

third_party/xla/xla/service/gpu/tests/gpu_codegen_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ std::string GpuCodegenTest::MakePlatformSpecificLlvm(absl::string_view input) {
7171
is_built_with_rocm_ ? "amdgpu_kernel void" : "void"},
7272
{"BARRIER",
7373
is_built_with_rocm_ ? "@llvm.amdgcn.s.barrier" : "@llvm.nvvm.barrier0"},
74-
{"SHUFFLE", is_built_with_rocm_ ? "i32 @llvm.amdgcn.ds.swizzle"
74+
{"SHUFFLE", is_built_with_rocm_ ? "i32 @llvm.amdgcn.ds.bpermute"
7575
: "float @llvm.nvvm.shfl.sync.down.f32"},
7676
{"TIDX", is_built_with_rocm_ ? "@llvm.amdgcn.workitem.id.x"
7777
: "@llvm.nvvm.read.ptx.sreg.tid.x"},

third_party/xla/xla/service/gpu/tests/gpu_kernel_tiling_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ TEST_F(GpuKernelTilingTest, RowReductionCorrectShmemUsage) {
649649
auto &debug_options = hlo_module->mutable_config().mutable_debug_options();
650650
debug_options.set_xla_gpu_mlir_emitter_level(3);
651651
auto expected_ir = is_built_with_rocm_ ? R"(
652-
; CHECK: %llvm.amdgcn.kernel.input_reduce_fusion.lds.t = type { [4 x [2 x float]] }
652+
; CHECK: %llvm.amdgcn.kernel.input_reduce_fusion.lds.t = type { [4 x [1 x float]] }
653653
; CHECK: @llvm.amdgcn.kernel.input_reduce_fusion.lds = internal addrspace(3) global %llvm.amdgcn.kernel.input_reduce_fusion.lds.t poison
654654
)"
655655
: R"(

third_party/xla/xla/service/gpu/tests/reduction_vectorization_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ CHECK-NOT: SHUFFLE
143143
expected_optimized_llvm_ir,
144144
{{"X_THREAD", is_built_with_rocm_ ? "@llvm.amdgcn.workitem.id.x"
145145
: "@llvm.nvvm.read.ptx.sreg.tid.x"},
146-
{"SHUFFLE", is_built_with_rocm_ ? "@llvm.amdgcn.ds.swizzle"
146+
{"SHUFFLE", is_built_with_rocm_ ? "@llvm.amdgcn.ds.bpermute"
147147
: "llvm.nvvm.shfl.sync.down.f32"}});
148148

149149
CompileAndVerifyIr(hlo_text, expected_optimized_llvm_ir, true);

third_party/xla/xla/tests/multioutput_fusion_test.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -383,19 +383,19 @@ XLA_TEST_F(MultiOutputFusionTest, MultiOutputReduceFusionMinorWithExtraOutput) {
383383
XLA_TEST_F(MultiOutputFusionTest, MultiOutputReduceFusionMajorWithExtraOutput) {
384384
const std::string testcase = absl::StrCat(kScalarOps, R"(
385385
fused_reduce {
386-
p0 = f32[32,32,2]{2,1,0} parameter(0)
386+
p0 = f32[64,64,2]{2,1,0} parameter(0)
387387
c0 = f32[] constant(0)
388-
r1 = f32[32,2]{1,0} reduce(p0, c0), dimensions={0}, to_apply=Add
389-
mul = f32[32,32,2]{2,1,0} multiply(p0, p0)
388+
r1 = f32[64,2]{1,0} reduce(p0, c0), dimensions={0}, to_apply=Add
389+
mul = f32[64,64,2]{2,1,0} multiply(p0, p0)
390390
c1 = f32[] constant(5)
391-
r2 = f32[32,2]{1,0} reduce(mul, c1), dimensions={0}, to_apply=Max
392-
ROOT tuple = (f32[32,2]{1,0}, f32[32,32,2]{2,1,0}, f32[32,2]{1,0})
391+
r2 = f32[64,2]{1,0} reduce(mul, c1), dimensions={0}, to_apply=Max
392+
ROOT tuple = (f32[64,2]{1,0}, f32[64,64,2]{2,1,0}, f32[64,2]{1,0})
393393
tuple(r1, mul, r2)
394394
}
395395
396396
ENTRY reduce {
397-
p = f32[32,32,2]{2,1,0} parameter(0)
398-
ROOT fusion = (f32[32,2]{1,0}, f32[32,32,2]{2,1,0}, f32[32,2]{1,0})
397+
p = f32[64,64,2]{2,1,0} parameter(0)
398+
ROOT fusion = (f32[64,2]{1,0}, f32[64,64,2]{2,1,0}, f32[64,2]{1,0})
399399
fusion(p), kind=kInput, calls=fused_reduce
400400
})");
401401
auto module = ParseAndReturnVerifiedModule(testcase).value();

0 commit comments

Comments
 (0)