[PATCH] D57008: [AMDGPU] With XNACK, cannot clause a load with result coalesced with operand

[Tim Renouf via Phabricator via llvm-commits]

tpr created this revision.
Herald added subscribers: llvm-commits, t-tye, dstuttard, yaxunl, nhaehnle, wdng, jvesely, kzhuravl, arsenm.

With XNACK, an smem load whose result is coalesced with an operand (thus
it overwrites its own operand) cannot appear in a clause, because some
other instruction might XNACK and restart the whole clause.

The clause breaker already realized that an smem that overwrites an
operand cannot appear in a clause, and broke the clause. The problem
that this commit fixes is that the SIFormMemoryClauses optimization
formed a bundle with early clobber, which caused the earlier code that
set up the coalesced operand to be removed as dead.

Change-Id: I703c4d5b0bf7d6060222bec491f45c18bb3c0016


Repository:
  rL LLVM

https://reviews.llvm.org/D57008

Files:
  lib/Target/AMDGPU/SIFormMemoryClauses.cpp
  test/CodeGen/AMDGPU/smem-no-clause-coalesced.mir


Index: test/CodeGen/AMDGPU/smem-no-clause-coalesced.mir
===================================================================
--- /dev/null
+++ test/CodeGen/AMDGPU/smem-no-clause-coalesced.mir
@@ -0,0 +1,44 @@
+# RUN: llc -march=amdgcn -mcpu=gfx902 -o - %s -run-pass si-form-memory-clauses -verify-machineinstrs | FileCheck -check-prefix=XNACK %s
+
+# The SIFormMemoryClauses pass must not form a clause (indicated by BUNDLE)
+# from the two adjacent smem instructions, because the first one has its
+# result coalesced with an operand.
+
+# XNACK-NOT: BUNDLE
+
+---
+name:            _amdgpu_cs_main
+alignment:       0
+exposesReturnsTwice: false
+legalized:       false
+regBankSelected: false
+selected:        false
+failedISel:      false
+tracksRegLiveness: true
+hasWinCFI:       false
+fixedStack:      []
+stack:           []
+constants:       []
+body:             |
+  bb.0:
+    liveins: $sgpr2, $sgpr3, $sgpr12, $sgpr13, $sgpr14, $vgpr0, $vgpr1
+  
+    %18:vgpr_32 = COPY $vgpr1
+    %12:sgpr_32 = COPY $sgpr12
+    %3:sgpr_32 = COPY $sgpr3
+    undef %36.sub0:sgpr_128 = COPY $sgpr2
+    %17:vgpr_32 = COPY $vgpr0
+    %14:sgpr_32 = COPY $sgpr14
+    %13:sgpr_32 = COPY $sgpr13
+    %22:sreg_64_xexec = S_GETPC_B64
+    %22.sub0:sreg_64_xexec = COPY %12
+    %36.sub1:sgpr_128 = S_AND_B32 %3, 65535, implicit-def dead $scc
+    %36.sub3:sgpr_128 = S_MOV_B32 151468
+    %36.sub2:sgpr_128 = S_MOV_B32 -1
+    %22.sub0:sreg_64_xexec = S_LOAD_DWORD_IMM %22, 48, 0 :: (load 4 from `i8 addrspace(4)* undef`, addrspace 4)
+    %37:sreg_64_xexec = S_BUFFER_LOAD_DWORDX2_IMM %36, 640, 0 :: (dereferenceable invariant load 8)
+    undef %169.sub0:vreg_128 = V_LSHL_ADD_U32 %13, 4, %17, implicit $exec
+    %169.sub1:vreg_128 = V_LSHL_ADD_U32 %14, 4, %18, implicit $exec
+    S_ENDPGM
+
+...
Index: lib/Target/AMDGPU/SIFormMemoryClauses.cpp
===================================================================
--- lib/Target/AMDGPU/SIFormMemoryClauses.cpp
+++ lib/Target/AMDGPU/SIFormMemoryClauses.cpp
@@ -119,6 +119,17 @@
     return false;
   if (!IsVMEMClause && !isSMEMClauseInst(MI))
     return false;
+  // If this is a load instruction where the result has been coalesced with an operand, then we cannot clause it.
+  const MachineOperand &ResMO = MI.getOperand(0);
+  if (ResMO.isReg() && ResMO.isDef()) {
+    unsigned ResReg = ResMO.getReg();
+    for (const MachineOperand &MO : MI.operands()) {
+      if (!MO.isReg() || MO.isDef())
+        continue;
+      if (MO.getReg() == ResReg)
+        return false;
+    }
+  }
   return true;
 }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D57008.182762.patch
Type: text/x-patch
Size: 2558 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190121/6151d074/attachment.bin>