Skip to content

Commit c029788

Browse files
authored
Revert "[AMDGPU][SDAG] Add missing cases for SI_INDIRECT_SRC/DST (#170323) (#171787)
``` Step 7 (test-check-all) failure: Test just built components: check-all completed (failure) ******************** TEST 'LLVM :: CodeGen/AMDGPU/insert_vector_dynelt.ll' FAILED ******************** Exit Code: 1 Command Output (stdout): -- # RUN: at line 2 /home/buildbot/worker/as-builder-4/ramdisk/expensive-checks/build/bin/llc -mtriple=amdgcn -mcpu=fiji < /home/buildbot/worker/as-builder-4/ramdisk/expensive-checks/llvm-project/llvm/test/CodeGen/AMDGPU/insert_vector_dynelt.ll | /home/buildbot/worker/as-builder-4/ramdisk/expensive-checks/build/bin/FileCheck -enable-var-scope -check-prefixes=GCN /home/buildbot/worker/as-builder-4/ramdisk/expensive-checks/llvm-project/llvm/test/CodeGen/AMDGPU/insert_vector_dynelt.ll # executed command: /home/buildbot/worker/as-builder-4/ramdisk/expensive-checks/build/bin/llc -mtriple=amdgcn -mcpu=fiji # executed command: /home/buildbot/worker/as-builder-4/ramdisk/expensive-checks/build/bin/FileCheck -enable-var-scope -check-prefixes=GCN /home/buildbot/worker/as-builder-4/ramdisk/expensive-checks/llvm-project/llvm/test/CodeGen/AMDGPU/insert_vector_dynelt.ll # RUN: at line 3 /home/buildbot/worker/as-builder-4/ramdisk/expensive-checks/build/bin/llc -O0 -mtriple=amdgcn -mcpu=fiji < /home/buildbot/worker/as-builder-4/ramdisk/expensive-checks/llvm-project/llvm/test/CodeGen/AMDGPU/insert_vector_dynelt.ll | /home/buildbot/worker/as-builder-4/ramdisk/expensive-checks/build/bin/FileCheck --check-prefixes=GCN-O0 /home/buildbot/worker/as-builder-4/ramdisk/expensive-checks/llvm-project/llvm/test/CodeGen/AMDGPU/insert_vector_dynelt.ll # executed command: /home/buildbot/worker/as-builder-4/ramdisk/expensive-checks/build/bin/llc -O0 -mtriple=amdgcn -mcpu=fiji # .---command stderr------------ # | # | # After Instruction Selection # | # Machine code for function insert_dyn_i32_6: IsSSA, TracksLiveness # | Function Live Ins: $sgpr16 in %8, $sgpr17 in %9, $sgpr18 in %10, $sgpr19 in %11, $sgpr20 in %12, $sgpr21 in %13, $vgpr0 in %14, $vgpr1 in %15 # | # | bb.0 (%ir-block.0): # | successors: %bb.1(0x80000000); %bb.1(100.00%) # | liveins: $sgpr16, $sgpr17, $sgpr18, $sgpr19, $sgpr20, $sgpr21, $vgpr0, $vgpr1 # | %15:vgpr_32 = COPY $vgpr1 # | %14:vgpr_32 = COPY $vgpr0 # | %13:sgpr_32 = COPY $sgpr21 # | %12:sgpr_32 = COPY $sgpr20 # | %11:sgpr_32 = COPY $sgpr19 # | %10:sgpr_32 = COPY $sgpr18 # | %9:sgpr_32 = COPY $sgpr17 # | %8:sgpr_32 = COPY $sgpr16 # | %17:sgpr_192 = REG_SEQUENCE %8:sgpr_32, %subreg.sub0, %9:sgpr_32, %subreg.sub1, %10:sgpr_32, %subreg.sub2, %11:sgpr_32, %subreg.sub3, %12:sgpr_32, %subreg.sub4, %13:sgpr_32, %subreg.sub5 # | %16:sgpr_192 = COPY %17:sgpr_192 # | %19:vreg_192 = COPY %17:sgpr_192 # | %28:sreg_64_xexec = IMPLICIT_DEF # | %27:sreg_64_xexec = S_MOV_B64 $exec # | # | bb.1: # | ; predecessors: %bb.1, %bb.0 # | successors: %bb.1(0x40000000), %bb.3(0x40000000); %bb.1(50.00%), %bb.3(50.00%) # | # | %26:vreg_192 = PHI %19:vreg_192, %bb.0, %18:vreg_192, %bb.1 # | %29:sreg_64 = PHI %28:sreg_64_xexec, %bb.0, %30:sreg_64, %bb.1 # | %31:sreg_32_xm0 = V_READFIRSTLANE_B32 %14:vgpr_32, implicit $exec # | %32:sreg_64 = V_CMP_EQ_U32_e64 %31:sreg_32_xm0, %14:vgpr_32, implicit $exec # | %30:sreg_64 = S_AND_SAVEEXEC_B64 killed %32:sreg_64, implicit-def $exec, implicit-def $scc, implicit $exec # | $m0 = COPY killed %31:sreg_32_xm0 # | %18:vreg_192 = V_INDIRECT_REG_WRITE_MOVREL_B32_V8 %26:vreg_192(tied-def 0), %15:vgpr_32, 3, implicit $m0, implicit $exec # | $exec = S_XOR_B64_term $exec, %30:sreg_64, implicit-def $scc # | S_CBRANCH_EXECNZ %bb.1, implicit $exec # | # | bb.3: ``` This reverts commit 15df9e7.
1 parent 33fcfb3 commit c029788

File tree

4 files changed

+0
-9297
lines changed

4 files changed

+0
-9297
lines changed

llvm/lib/Target/AMDGPU/SIISelLowering.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6304,11 +6304,7 @@ SITargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
63046304
}
63056305
case AMDGPU::SI_INDIRECT_SRC_V1:
63066306
case AMDGPU::SI_INDIRECT_SRC_V2:
6307-
case AMDGPU::SI_INDIRECT_SRC_V3:
63086307
case AMDGPU::SI_INDIRECT_SRC_V4:
6309-
case AMDGPU::SI_INDIRECT_SRC_V5:
6310-
case AMDGPU::SI_INDIRECT_SRC_V6:
6311-
case AMDGPU::SI_INDIRECT_SRC_V7:
63126308
case AMDGPU::SI_INDIRECT_SRC_V8:
63136309
case AMDGPU::SI_INDIRECT_SRC_V9:
63146310
case AMDGPU::SI_INDIRECT_SRC_V10:
@@ -6319,11 +6315,7 @@ SITargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
63196315
return emitIndirectSrc(MI, *BB, *getSubtarget());
63206316
case AMDGPU::SI_INDIRECT_DST_V1:
63216317
case AMDGPU::SI_INDIRECT_DST_V2:
6322-
case AMDGPU::SI_INDIRECT_DST_V3:
63236318
case AMDGPU::SI_INDIRECT_DST_V4:
6324-
case AMDGPU::SI_INDIRECT_DST_V5:
6325-
case AMDGPU::SI_INDIRECT_DST_V6:
6326-
case AMDGPU::SI_INDIRECT_DST_V7:
63276319
case AMDGPU::SI_INDIRECT_DST_V8:
63286320
case AMDGPU::SI_INDIRECT_DST_V9:
63296321
case AMDGPU::SI_INDIRECT_DST_V10:

llvm/lib/Target/AMDGPU/SIInstructions.td

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -969,11 +969,7 @@ class SI_INDIRECT_DST<RegisterClass rc> : VPseudoInstSI <
969969

970970
def SI_INDIRECT_SRC_V1 : SI_INDIRECT_SRC<VGPR_32>;
971971
def SI_INDIRECT_SRC_V2 : SI_INDIRECT_SRC<VReg_64>;
972-
def SI_INDIRECT_SRC_V3 : SI_INDIRECT_SRC<VReg_96>;
973972
def SI_INDIRECT_SRC_V4 : SI_INDIRECT_SRC<VReg_128>;
974-
def SI_INDIRECT_SRC_V5 : SI_INDIRECT_SRC<VReg_160>;
975-
def SI_INDIRECT_SRC_V6 : SI_INDIRECT_SRC<VReg_192>;
976-
def SI_INDIRECT_SRC_V7 : SI_INDIRECT_SRC<VReg_224>;
977973
def SI_INDIRECT_SRC_V8 : SI_INDIRECT_SRC<VReg_256>;
978974
def SI_INDIRECT_SRC_V9 : SI_INDIRECT_SRC<VReg_288>;
979975
def SI_INDIRECT_SRC_V10 : SI_INDIRECT_SRC<VReg_320>;
@@ -984,11 +980,7 @@ def SI_INDIRECT_SRC_V32 : SI_INDIRECT_SRC<VReg_1024>;
984980

985981
def SI_INDIRECT_DST_V1 : SI_INDIRECT_DST<VGPR_32>;
986982
def SI_INDIRECT_DST_V2 : SI_INDIRECT_DST<VReg_64>;
987-
def SI_INDIRECT_DST_V3 : SI_INDIRECT_DST<VReg_96>;
988983
def SI_INDIRECT_DST_V4 : SI_INDIRECT_DST<VReg_128>;
989-
def SI_INDIRECT_DST_V5 : SI_INDIRECT_DST<VReg_160>;
990-
def SI_INDIRECT_DST_V6 : SI_INDIRECT_DST<VReg_192>;
991-
def SI_INDIRECT_DST_V7 : SI_INDIRECT_DST<VReg_224>;
992984
def SI_INDIRECT_DST_V8 : SI_INDIRECT_DST<VReg_256>;
993985
def SI_INDIRECT_DST_V9 : SI_INDIRECT_DST<VReg_288>;
994986
def SI_INDIRECT_DST_V10 : SI_INDIRECT_DST<VReg_320>;
@@ -2787,11 +2779,7 @@ multiclass SI_INDIRECT_Pattern <ValueType vt, ValueType eltvt, string VecSize> {
27872779
}
27882780

27892781
defm : SI_INDIRECT_Pattern <v2f32, f32, "V2">;
2790-
defm : SI_INDIRECT_Pattern<v3f32, f32, "V3">;
27912782
defm : SI_INDIRECT_Pattern <v4f32, f32, "V4">;
2792-
defm : SI_INDIRECT_Pattern<v5f32, f32, "V5">;
2793-
defm : SI_INDIRECT_Pattern<v6f32, f32, "V6">;
2794-
defm : SI_INDIRECT_Pattern<v7f32, f32, "V7">;
27952783
defm : SI_INDIRECT_Pattern <v8f32, f32, "V8">;
27962784
defm : SI_INDIRECT_Pattern <v9f32, f32, "V9">;
27972785
defm : SI_INDIRECT_Pattern <v10f32, f32, "V10">;
@@ -2801,11 +2789,7 @@ defm : SI_INDIRECT_Pattern <v16f32, f32, "V16">;
28012789
defm : SI_INDIRECT_Pattern <v32f32, f32, "V32">;
28022790

28032791
defm : SI_INDIRECT_Pattern <v2i32, i32, "V2">;
2804-
defm : SI_INDIRECT_Pattern<v3i32, i32, "V3">;
28052792
defm : SI_INDIRECT_Pattern <v4i32, i32, "V4">;
2806-
defm : SI_INDIRECT_Pattern<v5i32, i32, "V5">;
2807-
defm : SI_INDIRECT_Pattern<v6i32, i32, "V6">;
2808-
defm : SI_INDIRECT_Pattern<v7i32, i32, "V7">;
28092793
defm : SI_INDIRECT_Pattern <v8i32, i32, "V8">;
28102794
defm : SI_INDIRECT_Pattern <v9i32, i32, "V9">;
28112795
defm : SI_INDIRECT_Pattern <v10i32, i32, "V10">;

0 commit comments

Comments
 (0)