AMDGPU/GlobalISel: Implement select for 32-bit G_ADD

[arsenm]

test/CodeGen/AMDGPU/GlobalISel/inst-select-add.mir

1 ↗

(On Diff #188821)

I’ve just been generating all of the global isel test checks

4 ↗

(On Diff #188821)

Can you include the type in the name

40 ↗

(On Diff #188821)

64-bit scalar at least looks like is already handled that should have a test here

[tstellar]

Clean up test

[tstellar]

test/CodeGen/AMDGPU/GlobalISel/inst-select-add.mir

40 ↗

(On Diff #188821)

Where did you see this? I tried to add the test, but it complained that 64-bit G_ADD was not legal.

[arsenm]

test/CodeGen/AMDGPU/GlobalISel/inst-select-add.mir

40 ↗

(On Diff #188821)

bool AMDGPUInstructionSelector::selectG_ADD(MachineInstr &I) const {
Creates an S_ADD_U32 + S_ADDC_U32 pair

[tstellar]

test/CodeGen/AMDGPU/GlobalISel/inst-select-add.mir

40 ↗

(On Diff #188821)

Because 64-bit G_ADD is not legal yet, this code is only ever called when selecting G_GEP.

[arsenm]

llvm/lib/Target/AMDGPU/AMDGPUGISel.td

132 ↗

(On Diff #193643)

Should use the _e64 version

[arsenm]

LGTM

llvm/lib/Target/AMDGPU/AMDGPUGISel.td

132 ↗

(On Diff #193643)

I tried to do this, but there are a few problems. I have a supplemental patch which uses the right version for gfx9.

llvm/trunk/lib/Target/AMDGPU/AMDGPUGISel.td

multiclass GISelVop2IntrPat <
   // generic machine instruction may be better that matching the intrinsic
   // directly.
   def : GISelVop2CommutePat <node, inst, dst_vt, src_vt>;
 }
 
 def : GISelSop2Pat <or, S_OR_B32, i32>;
 def : GISelVop2Pat <or, V_OR_B32_e32, i32>;
 
+def : GISelSop2Pat <add, S_ADD_I32, i32>;
+def : GISelVop2Pat <add, V_ADD_I32_e32, i32>;
+
 def : GISelSop2Pat <sra, S_ASHR_I32, i32>;
 let AddedComplexity = 100 in {
 let SubtargetPredicate = isGFX6GFX7 in {
 def : GISelVop2Pat <sra, V_ASHR_I32_e32, i32>;
 }
 def : GISelVop2CommutePat <sra, V_ASHRREV_I32_e32, i32>;
 }
 def : GISelVop3Pat2CommutePat <sra, V_ASHRREV_I32_e64, i32>;

llvm/trunk/lib/Target/AMDGPU/AMDGPUInstructionSelector.cpp

bool AMDGPUInstructionSelector::select(MachineInstr &I,
 
   if (!isPreISelGenericOpcode(I.getOpcode())) {
     if (I.isCopy())
       return selectCOPY(I);
     return true;
   }
 
   switch (I.getOpcode()) {
+  case TargetOpcode::G_ADD:
+    if (selectG_ADD(I))
+      return true;
+    LLVM_FALLTHROUGH;
   default:
     return selectImpl(I, CoverageInfo);
-  case TargetOpcode::G_ADD:
-    return selectG_ADD(I);
   case TargetOpcode::G_INTTOPTR:
   case TargetOpcode::G_BITCAST:
     return selectCOPY(I);
   case TargetOpcode::G_CONSTANT:
   case TargetOpcode::G_FCONSTANT:
     return selectG_CONSTANT(I);
   case TargetOpcode::G_EXTRACT:
     return selectG_EXTRACT(I);

llvm/trunk/test/CodeGen/AMDGPU/GlobalISel/inst-select-add.mir

+# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
+# RUN: llc -march=amdgcn -run-pass=instruction-select -verify-machineinstrs -global-isel %s -o - | FileCheck %s -check-prefixes=GCN
+
+---
+name:            add_i32
+legalized:       true
+regBankSelected: true
+
+body: |
+  bb.0:
+    liveins: $sgpr0, $sgpr1, $vgpr0, $vgpr3_vgpr4
+    ; GCN-LABEL: name: add_i32
+    ; GCN: [[COPY:%[0-9]+]]:sreg_32 = COPY $sgpr0
+    ; GCN: [[COPY1:%[0-9]+]]:sreg_32 = COPY $sgpr1
+    ; GCN: [[COPY2:%[0-9]+]]:vgpr_32 = COPY $vgpr0
+    ; GCN: [[COPY3:%[0-9]+]]:vreg_64 = COPY $vgpr3_vgpr4
+    ; GCN: [[S_ADD_I32_:%[0-9]+]]:sreg_32_xm0 = S_ADD_I32 [[COPY]], [[COPY1]], implicit-def $scc
+    ; GCN: [[V_ADD_I32_e32_:%[0-9]+]]:vgpr_32 = V_ADD_I32_e32 [[S_ADD_I32_]], [[COPY2]], implicit-def $vcc, implicit $exec
+    ; GCN: [[V_ADD_I32_e32_1:%[0-9]+]]:vgpr_32 = V_ADD_I32_e32 [[S_ADD_I32_]], [[V_ADD_I32_e32_]], implicit-def $vcc, implicit $exec
+    ; GCN: [[V_ADD_I32_e32_2:%[0-9]+]]:vgpr_32 = V_ADD_I32_e32 [[V_ADD_I32_e32_1]], [[COPY2]], implicit-def $vcc, implicit $exec
+    ; GCN: FLAT_STORE_DWORD [[COPY3]], [[V_ADD_I32_e32_2]], 0, 0, 0, 0, implicit $exec, implicit $flat_scr
+    %0:sgpr(s32) = COPY $sgpr0
+    %1:sgpr(s32) = COPY $sgpr1
+    %2:vgpr(s32) = COPY $vgpr0
+    %3:vgpr(p1) = COPY $vgpr3_vgpr4
+    %4:sgpr(s32) = G_CONSTANT i32 1
+    %5:sgpr(s32) = G_CONSTANT i32 4096
+
+    ; add ss
+    %6:sgpr(s32) = G_ADD %0, %1
+
+    ; add vs
+    %7:vgpr(s32) = G_ADD %2, %6
+
+    ; add sv
+    %8:vgpr(s32) = G_ADD %6, %7
+
+    ; add vv
+    %9:vgpr(s32) = G_ADD %8, %2
+
+    G_STORE %9, %3 :: (store 4, addrspace 1)
+
+...