Greedy: Merge VirtRegMap queries into one use (NFC)

[arsenm]

No description provided.

[arsenm]

• Greedy: Use initializer list for recoloring candidates (NFC) #160486
• Greedy: Merge VirtRegMap queries into one use (NFC) #160485 👈 (View in Graphite)
• Greedy: Move physreg check when trying to recolor vregs (NFC) #160484
• RegAllocGreedy: Check if copied lanes are live in trySplitAroundHintReg #160424 : 1 other dependent PR (#160467 )
• Greedy: Make trySplitAroundHintReg try to match hints with subreg copies #160294
• main

This stack of pull requests is managed by Graphite. Learn more about stacking.

[llvmbot]

@llvm/pr-subscribers-llvm-regalloc
@llvm/pr-subscribers-backend-systemz

@llvm/pr-subscribers-backend-x86

Author: Matt Arsenault (arsenm)

Changes

---

Full diff: https://github.com/llvm/llvm-project/pull/160485.diff

1 Files Affected:

• (modified) llvm/lib/CodeGen/RegAllocGreedy.cpp (+3-2)

diff --git a/llvm/lib/CodeGen/RegAllocGreedy.cpp b/llvm/lib/CodeGen/RegAllocGreedy.cpp
index dc23ab3ce9d2b..6957548ac6c7a 100644
--- a/llvm/lib/CodeGen/RegAllocGreedy.cpp
+++ b/llvm/lib/CodeGen/RegAllocGreedy.cpp
@@ -2502,8 +2502,10 @@ void RAGreedy::tryHintRecoloring(const LiveInterval &VirtReg) {
   do {
     Reg = RecoloringCandidates.pop_back_val();
 
+    MCRegister CurrPhys = VRM->getPhys(Reg);
+
     // This may be a skipped register.
-    if (!VRM->hasPhys(Reg)) {
+    if (!CurrPhys) {
       assert(!shouldAllocateRegister(Reg) &&
              "We have an unallocated variable which should have been handled");
       continue;
@@ -2512,7 +2514,6 @@ void RAGreedy::tryHintRecoloring(const LiveInterval &VirtReg) {
     // Get the live interval mapped with this virtual register to be able
     // to check for the interference with the new color.
     LiveInterval &LI = LIS->getInterval(Reg);
-    MCRegister CurrPhys = VRM->getPhys(Reg);
     // Check that the new color matches the register class constraints and
     // that it is free for this live range.
     if (CurrPhys != PhysReg && (!MRI->getRegClass(Reg)->contains(PhysReg) ||

[preames]

LGTM