[PATCH] D62717: [MIR-Canon] Skip the first N vreg names lazily.

[Puyan Lotfi via Phabricator via llvm-commits]

plotfi created this revision.
Herald added subscribers: llvm-commits, hiraditya, javed.absar.
Herald added a project: LLVM.

This consolidates the vreg skip code into one function (SkipVRegs()). SkipVRegs() now knows if it should skip as if it is the first initialization or subsequent skips.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D62717

Files:
  llvm/lib/CodeGen/MIRCanonicalizerPass.cpp
  llvm/test/CodeGen/MIR/AArch64/multiple-lhs-operands.mir


Index: llvm/test/CodeGen/MIR/AArch64/multiple-lhs-operands.mir
===================================================================
--- llvm/test/CodeGen/MIR/AArch64/multiple-lhs-operands.mir
+++ llvm/test/CodeGen/MIR/AArch64/multiple-lhs-operands.mir
@@ -2,6 +2,9 @@
 # This test ensures that the MIR parser can parse multiple register machine
 # operands before '='.
 
+# This tests that a MIR file with no vregs does not get altered by mir-canon.
+# RUN: llc -mtriple=aarch64 -o - -run-pass mir-canonicalizer -verify-machineinstrs %s
+
 --- |
 
   declare void @foo()
Index: llvm/lib/CodeGen/MIRCanonicalizerPass.cpp
===================================================================
--- llvm/lib/CodeGen/MIRCanonicalizerPass.cpp
+++ llvm/lib/CodeGen/MIRCanonicalizerPass.cpp
@@ -480,21 +480,18 @@
 namespace {
 class NamedVRegCursor {
   MachineRegisterInfo &MRI;
-  unsigned virtualVRegNumber;
+  unsigned virtualVRegNumber = 0;
 
 public:
   NamedVRegCursor(MachineRegisterInfo &MRI) : MRI(MRI) {
-    unsigned VRegGapIndex = 0;
-    const unsigned VR_GAP = (++VRegGapIndex * 1000);
-
-    unsigned I = MRI.createIncompleteVirtualRegister();
-    const unsigned E = (((I + VR_GAP) / VR_GAP) + 1) * VR_GAP;
-
-    virtualVRegNumber = E;
   }
 
   void SkipVRegs() {
     unsigned VRegGapIndex = 1;
+    if (!virtualVRegNumber) {
+      VRegGapIndex = 0;
+      virtualVRegNumber = MRI.createIncompleteVirtualRegister();
+    }
     const unsigned VR_GAP = (++VRegGapIndex * 1000);
 
     unsigned I = virtualVRegNumber;
@@ -511,6 +508,8 @@
   }
 
   unsigned createVirtualRegister(unsigned VReg) {
+    if (!virtualVRegNumber)
+      SkipVRegs();
     std::string S;
     raw_string_ostream OS(S);
     OS << "namedVReg" << (virtualVRegNumber & ~0x80000000);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D62717.202368.patch
Type: text/x-patch
Size: 1764 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190531/07355bea/attachment.bin>