From 0d63cef180ccc6f5afab824cc784949acb137713 Mon Sep 17 00:00:00 2001 From: Puyan Lotfi Date: Fri, 31 May 2019 06:02:38 +0000 Subject: [PATCH] [MIR-Canon] Skip the first N vreg names lazily. 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. The first skip is also done the first time createVirtualRegister is called by the cursor instead of by the cursor's constructor. This prevents verifier errors on machine functions that have no vregs (where the verifier will complain that there are vregs when the function uses none). Differential Revision: https://reviews.llvm.org/D62717 llvm-svn: 362195 --- llvm/lib/CodeGen/MIRCanonicalizerPass.cpp | 16 +++++++--------- llvm/test/CodeGen/MIR/AArch64/multiple-lhs-operands.mir | 3 +++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/llvm/lib/CodeGen/MIRCanonicalizerPass.cpp b/llvm/lib/CodeGen/MIRCanonicalizerPass.cpp index d36c0c8..a409723 100644 --- a/llvm/lib/CodeGen/MIRCanonicalizerPass.cpp +++ b/llvm/lib/CodeGen/MIRCanonicalizerPass.cpp @@ -483,18 +483,14 @@ class NamedVRegCursor { unsigned virtualVRegNumber; 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; - } + NamedVRegCursor(MachineRegisterInfo &MRI) : MRI(MRI), virtualVRegNumber(0) {} void SkipVRegs() { unsigned VRegGapIndex = 1; + if (!virtualVRegNumber) { + VRegGapIndex = 0; + virtualVRegNumber = MRI.createIncompleteVirtualRegister(); + } const unsigned VR_GAP = (++VRegGapIndex * 1000); unsigned I = virtualVRegNumber; @@ -511,6 +507,8 @@ public: } unsigned createVirtualRegister(unsigned VReg) { + if (!virtualVRegNumber) + SkipVRegs(); std::string S; raw_string_ostream OS(S); OS << "namedVReg" << (virtualVRegNumber & ~0x80000000); diff --git a/llvm/test/CodeGen/MIR/AArch64/multiple-lhs-operands.mir b/llvm/test/CodeGen/MIR/AArch64/multiple-lhs-operands.mir index 5f4bd98..1437e97 100644 --- a/llvm/test/CodeGen/MIR/AArch64/multiple-lhs-operands.mir +++ b/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() -- 2.7.4