[PATCH] D94914: RegAlloc: Fix assert if all registers in class reserved

[Matt Arsenault via Phabricator via llvm-commits]

arsenm created this revision.
arsenm added reviewers: qcolombet, MatzeB.
Herald added subscribers: kerbowa, hiraditya, nhaehnle, jvesely.
arsenm requested review of this revision.
Herald added a subscriber: wdng.
Herald added a project: LLVM.

With a context instruction, this would produce a context
error. However, it would continue on and do an out of bounds access of
the empty allocation order array.


https://reviews.llvm.org/D94914

Files:
  llvm/lib/CodeGen/RegAllocBase.cpp
  llvm/test/CodeGen/AMDGPU/alloc-all-regs-reserved-in-class.mir


Index: llvm/test/CodeGen/AMDGPU/alloc-all-regs-reserved-in-class.mir
===================================================================
--- /dev/null
+++ llvm/test/CodeGen/AMDGPU/alloc-all-regs-reserved-in-class.mir
@@ -0,0 +1,18 @@
+# RUN: not --crash llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -run-pass=greedy -verify-machineinstrs -o /dev/null %s 2>&1 | FileCheck %s
+
+# Check that there isn't an assert if we try to allocate a virtual register from
+# a class where all registers are reserved. All AGPRs are reserved on subtargets
+# that do not have them.
+
+# CHECK-NOT: ran out of registers during register allocation
+# CHECK: LLVM ERROR: no registers from class available to allocate
+# CHECK-NOT: ran out of registers during register allocation
+
+---
+name: use_agpr
+tracksRegLiveness: true
+body:             |
+  bb.0:
+    %0:agpr_32 = IMPLICIT_DEF
+    S_ENDPGM 0, implicit %0
+...
Index: llvm/lib/CodeGen/RegAllocBase.cpp
===================================================================
--- llvm/lib/CodeGen/RegAllocBase.cpp
+++ llvm/lib/CodeGen/RegAllocBase.cpp
@@ -124,7 +124,12 @@
         if (MI->isInlineAsm())
           break;
       }
-      if (MI && MI->isInlineAsm()) {
+
+      const TargetRegisterClass *RC = MRI->getRegClass(VirtReg->reg());
+      ArrayRef<MCPhysReg> AllocOrder = RegClassInfo.getOrder(RC);
+      if (AllocOrder.empty())
+        report_fatal_error("no registers from class available to allocate");
+      else if (MI && MI->isInlineAsm()) {
         MI->emitError("inline assembly requires more registers than available");
       } else if (MI) {
         LLVMContext &Context =
@@ -133,10 +138,9 @@
       } else {
         report_fatal_error("ran out of registers during register allocation");
       }
+
       // Keep going after reporting the error.
-      VRM->assignVirt2Phys(
-          VirtReg->reg(),
-          RegClassInfo.getOrder(MRI->getRegClass(VirtReg->reg())).front());
+      VRM->assignVirt2Phys(VirtReg->reg(), AllocOrder.front());
       continue;
     }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D94914.317347.patch
Type: text/x-patch
Size: 2037 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210118/ad68743e/attachment.bin>