Index: llvm/lib/CodeGen/MIRCanonicalizerPass.cpp =================================================================== --- llvm/lib/CodeGen/MIRCanonicalizerPass.cpp +++ llvm/lib/CodeGen/MIRCanonicalizerPass.cpp @@ -374,7 +374,7 @@ static bool runOnBasicBlock(MachineBasicBlock *MBB, std::vector &bbNames, - unsigned &basicBlockNum, NamedVRegCursor &NVC) { + unsigned &basicBlockNum, VRegRenamer &Renamer) { if (CanonicalizeBasicBlockNumber != ~0U) { if (CanonicalizeBasicBlockNumber != basicBlockNum++) @@ -397,8 +397,6 @@ }); bool Changed = false; - MachineFunction &MF = *MBB->getParent(); - MachineRegisterInfo &MRI = MF.getRegInfo(); bbNames.push_back(MBB->getName()); LLVM_DEBUG(dbgs() << "\n\n NEW BASIC BLOCK: " << MBB->getName() << "\n\n";); @@ -413,31 +411,7 @@ Changed |= rescheduleCanonically(IdempotentInstCount, MBB); LLVM_DEBUG(dbgs() << "MBB After Scheduling:\n"; MBB->dump();); - Changed |= NVC.renameVRegs(MBB); - - // Here we renumber the def vregs for the idempotent instructions from the top - // of the MachineBasicBlock so that they are named in the order that we sorted - // them alphabetically. Eventually we wont need SkipVRegs because we will use - // named vregs instead. - if (IdempotentInstCount) - NVC.skipVRegs(); - - auto MII = MBB->begin(); - for (unsigned i = 0; i < IdempotentInstCount && MII != MBB->end(); ++i) { - MachineInstr &MI = *MII++; - Changed = true; - Register vRegToRename = MI.getOperand(0).getReg(); - auto Rename = NVC.createVirtualRegister(vRegToRename); - - std::vector RenameMOs; - for (auto &MO : MRI.reg_operands(vRegToRename)) { - RenameMOs.push_back(&MO); - } - - for (auto *MO : RenameMOs) { - MO->setReg(Rename); - } - } + Changed |= Renamer.renameVRegs(MBB); Changed |= doDefKillClear(MBB); @@ -477,9 +451,9 @@ bool Changed = false; MachineRegisterInfo &MRI = MF.getRegInfo(); - NamedVRegCursor NVC(MRI); + VRegRenamer Renamer(MRI); for (auto MBB : RPOList) - Changed |= runOnBasicBlock(MBB, BBNames, BBNum, NVC); + Changed |= runOnBasicBlock(MBB, BBNames, BBNum, Renamer); return Changed; } Index: llvm/lib/CodeGen/MIRNamerPass.cpp =================================================================== --- llvm/lib/CodeGen/MIRNamerPass.cpp +++ llvm/lib/CodeGen/MIRNamerPass.cpp @@ -54,11 +54,11 @@ if (MF.empty()) return Changed; - NamedVRegCursor NVC(MF.getRegInfo()); + VRegRenamer Renamer(MF.getRegInfo()); ReversePostOrderTraversal RPOT(&*MF.begin()); for (auto &MBB : RPOT) - Changed |= NVC.renameVRegs(MBB); + Changed |= Renamer.renameVRegs(MBB); return Changed; } Index: llvm/lib/CodeGen/MIRVRegNamerUtils.h =================================================================== --- llvm/lib/CodeGen/MIRVRegNamerUtils.h +++ llvm/lib/CodeGen/MIRVRegNamerUtils.h @@ -25,65 +25,68 @@ #include "llvm/CodeGen/Passes.h" #include "llvm/Support/raw_ostream.h" -#include namespace llvm { +/// VRegRenamer - This class is used for renaming vregs in a machine basic +/// block according to semantics of the instruction. +class VRegRenamer { + class NamedVReg { + Register Reg; + std::string Name; -/// NamedVRegCursor - The cursor is an object that keeps track of what the next -/// vreg name should be. It does book keeping to determine when to skip the -/// index value and by how much, or if the next vreg name should be an increment -/// from the previous. -class NamedVRegCursor { - MachineRegisterInfo &MRI; + public: + NamedVReg(Register Reg, std::string Name = "") : Reg(Reg), Name(Name) {} + NamedVReg(std::string Name = "") : Reg(~0U), Name(Name) {} - /// virtualVRegNumber - Book keeping of the last vreg position. - unsigned virtualVRegNumber; + const std::string &getName() const { return Name; } - /// SkipGapSize - Used to calculate a modulo amount to skip by after every - /// sequence of instructions starting from a given side-effecting - /// MachineInstruction for a given MachineBasicBlock. The general idea is that - /// for a given program compiled with two different opt pipelines, there - /// shouldn't be greater than SkipGapSize difference in how many vregs are in - /// play between the two and for every def-use graph of vregs we rename we - /// will round up to the next SkipGapSize'th number so that we have a high - /// change of landing on the same name for two given matching side-effects - /// for the two compilation outcomes. - const unsigned SkipGapSize; + Register getReg() const { return Reg; } + }; - /// RenamedInOtherBB - VRegs that we already renamed: ie breadcrumbs. - std::vector RenamedInOtherBB; + MachineRegisterInfo &MRI; -public: - NamedVRegCursor() = delete; - /// 1000 for the SkipGapSize was a good heuristic at the time of the writing - /// of the MIRCanonicalizerPass. Adjust as needed. - NamedVRegCursor(MachineRegisterInfo &MRI, unsigned SkipGapSize = 1000) - : MRI(MRI), virtualVRegNumber(0), SkipGapSize(SkipGapSize) {} + unsigned CurrentBBNumber = 0; - /// SkipGapSize - Skips modulo a gap value of indices. Indices are used to - /// produce the next vreg name. - void skipVRegs(); + /// Given an Instruction, construct a hash of the operands + /// of the instructions along with the opcode. + /// When dealing with virtual registers, just hash the opcode of + /// the instruction defining that vreg. + /// Handle immediates, registers (physical and virtual) explicitly, + /// and return a common value for the other cases. + /// Instruction will be named in the following scheme + /// bb_hash_. + std::string getInstructionOpcodeHash(MachineInstr &MI); - unsigned getVirtualVReg() const { return virtualVRegNumber; } + /// For all the VRegs that are candidates for renaming, + /// return a mapping from old vregs to new vregs with names. + std::map + getVRegRenameMap(const std::vector &VRegs); - /// incrementVirtualVReg - This increments an index value that us used to - /// create a new vreg name. This is not a Register. - unsigned incrementVirtualVReg(unsigned incr = 1) { - virtualVRegNumber += incr; - return virtualVRegNumber; - } + /// Perform replacing of registers based on the vreg map. + bool doVRegRenaming(const std::map &VRegRenameMap); + +public: + VRegRenamer() = delete; + VRegRenamer(MachineRegisterInfo &MRI) : MRI(MRI) {} /// createVirtualRegister - Given an existing vreg, create a named vreg to - /// take its place. + /// take its place. The name is determined by calling + /// getInstructionOpcodeHash. unsigned createVirtualRegister(unsigned VReg); - /// renameVRegs - For a given MachineBasicBlock, scan for side-effecting - /// instructions, walk the def-use from each side-effecting root (in sorted - /// root order) and rename the encountered vregs in the def-use graph in a - /// canonical ordering. This method maintains book keeping for which vregs - /// were already renamed in RenamedInOtherBB. - // @return changed - bool renameVRegs(MachineBasicBlock *MBB); + /// Create a vreg with name and return it. + unsigned createVirtualRegisterWithName(unsigned VReg, + const std::string &Name); + /// Linearly traverse the MachineBasicBlock and rename each instruction's + /// vreg definition based on the semantics of the instruction. + /// Names are as follows bb_hash_[0-9]+ + bool renameInstsInMBB(MachineBasicBlock *MBB); + + /// Same as the above, but sets a BBNum depending on BB traversal that + /// will be used as prefix for the vreg names. + bool renameVRegs(MachineBasicBlock *MBB, unsigned BBNum = 0); + + unsigned getCurrentBBNumber() const { return CurrentBBNumber; } }; } // namespace llvm Index: llvm/lib/CodeGen/MIRVRegNamerUtils.cpp =================================================================== --- llvm/lib/CodeGen/MIRVRegNamerUtils.cpp +++ llvm/lib/CodeGen/MIRVRegNamerUtils.cpp @@ -13,226 +13,14 @@ #define DEBUG_TYPE "mir-vregnamer-utils" -namespace { - -// TypedVReg and VRType are used to tell the renamer what to do at points in a -// sequence of values to be renamed. A TypedVReg can either contain -// an actual VReg, a FrameIndex, or it could just be a barrier for the next -// candidate (side-effecting instruction). This tells the renamer to increment -// to the next vreg name, or to skip modulo some skip-gap value. -enum VRType { RSE_Reg = 0, RSE_FrameIndex, RSE_NewCandidate }; -class TypedVReg { - VRType Type; - Register Reg; - -public: - TypedVReg(Register Reg) : Type(RSE_Reg), Reg(Reg) {} - TypedVReg(VRType Type) : Type(Type), Reg(~0U) { - assert(Type != RSE_Reg && "Expected a non-Register Type."); - } - - bool isReg() const { return Type == RSE_Reg; } - bool isFrameIndex() const { return Type == RSE_FrameIndex; } - bool isCandidate() const { return Type == RSE_NewCandidate; } - - VRType getType() const { return Type; } - Register getReg() const { - assert(this->isReg() && "Expected a virtual or physical Register."); - return Reg; - } -}; - -/// Here we find our candidates. What makes an interesting candidate? -/// A candidate for a canonicalization tree root is normally any kind of -/// instruction that causes side effects such as a store to memory or a copy to -/// a physical register or a return instruction. We use these as an expression -/// tree root that we walk in order to build a canonical walk which should -/// result in canonical vreg renaming. -std::vector populateCandidates(MachineBasicBlock *MBB) { - std::vector Candidates; - MachineRegisterInfo &MRI = MBB->getParent()->getRegInfo(); - - for (auto II = MBB->begin(), IE = MBB->end(); II != IE; ++II) { - MachineInstr *MI = &*II; - - bool DoesMISideEffect = false; - - if (MI->getNumOperands() > 0 && MI->getOperand(0).isReg()) { - const Register Dst = MI->getOperand(0).getReg(); - DoesMISideEffect |= !Register::isVirtualRegister(Dst); - - for (auto UI = MRI.use_begin(Dst); UI != MRI.use_end(); ++UI) { - if (DoesMISideEffect) - break; - DoesMISideEffect |= (UI->getParent()->getParent() != MI->getParent()); - } - } - - if (!MI->mayStore() && !MI->isBranch() && !DoesMISideEffect) - continue; - - LLVM_DEBUG(dbgs() << "Found Candidate: "; MI->dump();); - Candidates.push_back(MI); - } - - return Candidates; -} - -void doCandidateWalk(std::vector &VRegs, - std::queue &RegQueue, - std::vector &VisitedMIs, - const MachineBasicBlock *MBB) { - - const MachineFunction &MF = *MBB->getParent(); - const MachineRegisterInfo &MRI = MF.getRegInfo(); - - while (!RegQueue.empty()) { - - auto TReg = RegQueue.front(); - RegQueue.pop(); - - if (TReg.isFrameIndex()) { - LLVM_DEBUG(dbgs() << "Popping frame index.\n";); - VRegs.push_back(TypedVReg(RSE_FrameIndex)); - continue; - } - - assert(TReg.isReg() && "Expected vreg or physreg."); - Register Reg = TReg.getReg(); - - if (Register::isVirtualRegister(Reg)) { - LLVM_DEBUG({ - dbgs() << "Popping vreg "; - MRI.def_begin(Reg)->dump(); - dbgs() << "\n"; - }); - - if (!llvm::any_of(VRegs, [&](const TypedVReg &TR) { - return TR.isReg() && TR.getReg() == Reg; - })) { - VRegs.push_back(TypedVReg(Reg)); - } - } else { - LLVM_DEBUG(dbgs() << "Popping physreg.\n";); - VRegs.push_back(TypedVReg(Reg)); - continue; - } - - for (auto RI = MRI.def_begin(Reg), RE = MRI.def_end(); RI != RE; ++RI) { - MachineInstr *Def = RI->getParent(); - - if (Def->getParent() != MBB) - continue; - - if (llvm::any_of(VisitedMIs, - [&](const MachineInstr *VMI) { return Def == VMI; })) { - break; - } - - LLVM_DEBUG({ - dbgs() << "\n========================\n"; - dbgs() << "Visited MI: "; - Def->dump(); - dbgs() << "BB Name: " << Def->getParent()->getName() << "\n"; - dbgs() << "\n========================\n"; - }); - VisitedMIs.push_back(Def); - for (unsigned I = 1, E = Def->getNumOperands(); I != E; ++I) { - - MachineOperand &MO = Def->getOperand(I); - if (MO.isFI()) { - LLVM_DEBUG(dbgs() << "Pushing frame index.\n";); - RegQueue.push(TypedVReg(RSE_FrameIndex)); - } - - if (!MO.isReg()) - continue; - RegQueue.push(TypedVReg(MO.getReg())); - } - } - } -} - -std::map -getVRegRenameMap(const std::vector &VRegs, - const std::vector &renamedInOtherBB, - MachineRegisterInfo &MRI, NamedVRegCursor &NVC) { - std::map VRegRenameMap; - bool FirstCandidate = true; - - for (auto &vreg : VRegs) { - if (vreg.isFrameIndex()) { - // We skip one vreg for any frame index because there is a good chance - // (especially when comparing SelectionDAG to GlobalISel generated MIR) - // that in the other file we are just getting an incoming vreg that comes - // from a copy from a frame index. So it's safe to skip by one. - unsigned LastRenameReg = NVC.incrementVirtualVReg(); - (void)LastRenameReg; - LLVM_DEBUG(dbgs() << "Skipping rename for FI " << LastRenameReg << "\n";); - continue; - } else if (vreg.isCandidate()) { - - // After the first candidate, for every subsequent candidate, we skip mod - // 10 registers so that the candidates are more likely to start at the - // same vreg number making it more likely that the canonical walk from the - // candidate insruction. We don't need to skip from the first candidate of - // the BasicBlock because we already skip ahead several vregs for each BB. - unsigned LastRenameReg = NVC.getVirtualVReg(); - if (FirstCandidate) - NVC.incrementVirtualVReg(LastRenameReg % 10); - FirstCandidate = false; - continue; - } else if (!Register::isVirtualRegister(vreg.getReg())) { - unsigned LastRenameReg = NVC.incrementVirtualVReg(); - (void)LastRenameReg; - LLVM_DEBUG({ - dbgs() << "Skipping rename for Phys Reg " << LastRenameReg << "\n"; - }); - continue; - } - - auto Reg = vreg.getReg(); - if (llvm::find(renamedInOtherBB, Reg) != renamedInOtherBB.end()) { - LLVM_DEBUG(dbgs() << "Vreg " << Reg - << " already renamed in other BB.\n";); - continue; - } - - auto Rename = NVC.createVirtualRegister(Reg); - - if (VRegRenameMap.find(Reg) == VRegRenameMap.end()) { - LLVM_DEBUG(dbgs() << "Mapping vreg ";); - if (MRI.reg_begin(Reg) != MRI.reg_end()) { - LLVM_DEBUG(auto foo = &*MRI.reg_begin(Reg); foo->dump();); - } else { - LLVM_DEBUG(dbgs() << Reg;); - } - LLVM_DEBUG(dbgs() << " to ";); - if (MRI.reg_begin(Rename) != MRI.reg_end()) { - LLVM_DEBUG(auto foo = &*MRI.reg_begin(Rename); foo->dump();); - } else { - LLVM_DEBUG(dbgs() << Rename;); - } - LLVM_DEBUG(dbgs() << "\n";); - - VRegRenameMap.insert(std::pair(Reg, Rename)); - } - } - - return VRegRenameMap; -} - -bool doVRegRenaming(std::vector &renamedInOtherBB, - const std::map &VRegRenameMap, - MachineRegisterInfo &MRI) { +bool VRegRenamer::doVRegRenaming( + const std::map &VRegRenameMap) { bool Changed = false; for (auto I = VRegRenameMap.begin(), E = VRegRenameMap.end(); I != E; ++I) { auto VReg = I->first; auto Rename = I->second; - renamedInOtherBB.push_back(Rename); - std::vector RenameMOs; for (auto &MO : MRI.reg_operands(VReg)) { RenameMOs.push_back(&MO); @@ -250,99 +38,108 @@ return Changed; } -bool renameVRegs(MachineBasicBlock *MBB, - std::vector &renamedInOtherBB, - NamedVRegCursor &NVC) { - bool Changed = false; - MachineFunction &MF = *MBB->getParent(); - MachineRegisterInfo &MRI = MF.getRegInfo(); - - std::vector Candidates = populateCandidates(MBB); - std::vector VisitedMIs; - llvm::copy(Candidates, std::back_inserter(VisitedMIs)); - - std::vector VRegs; - for (auto candidate : Candidates) { - VRegs.push_back(TypedVReg(RSE_NewCandidate)); - - std::queue RegQueue; - - // Here we walk the vreg operands of a non-root node along our walk. - // The root nodes are the original candidates (stores normally). - // These are normally not the root nodes (except for the case of copies to - // physical registers). - for (unsigned i = 1; i < candidate->getNumOperands(); i++) { - if (candidate->mayStore() || candidate->isBranch()) - break; +std::map +VRegRenamer::getVRegRenameMap(const std::vector &VRegs) { + std::map VRegRenameMap; - MachineOperand &MO = candidate->getOperand(i); - if (!(MO.isReg() && Register::isVirtualRegister(MO.getReg()))) - continue; + std::map VRegNameCollisionMap; - LLVM_DEBUG(dbgs() << "Enqueue register"; MO.dump(); dbgs() << "\n";); - RegQueue.push(TypedVReg(MO.getReg())); + auto GetUniqueVRegName = + [&VRegNameCollisionMap](const NamedVReg &Reg) -> std::string { + auto It = VRegNameCollisionMap.find(Reg.getName()); + unsigned Counter = 0; + if (It != VRegNameCollisionMap.end()) { + Counter = It->second; } + ++Counter; + VRegNameCollisionMap[Reg.getName()] = Counter; + return Reg.getName() + "__" + std::to_string(Counter); + }; + + for (auto &Vreg : VRegs) { + auto Reg = Vreg.getReg(); + assert(Register::isVirtualRegister(Reg) && + "Expecting Virtual Registers Only"); + auto NewNameForReg = GetUniqueVRegName(Vreg); + auto Rename = createVirtualRegisterWithName(Reg, NewNameForReg); + + VRegRenameMap.insert(std::pair(Reg, Rename)); + } + return VRegRenameMap; +} - // Here we walk the root candidates. We start from the 0th operand because - // the root is normally a store to a vreg. - for (unsigned i = 0; i < candidate->getNumOperands(); i++) { - - if (!candidate->mayStore() && !candidate->isBranch()) - break; - - MachineOperand &MO = candidate->getOperand(i); - - // TODO: Do we want to only add vregs here? - if (!MO.isReg() && !MO.isFI()) - continue; - - LLVM_DEBUG(dbgs() << "Enqueue Reg/FI"; MO.dump(); dbgs() << "\n";); - - RegQueue.push(MO.isReg() ? TypedVReg(MO.getReg()) - : TypedVReg(RSE_FrameIndex)); +std::string VRegRenamer::getInstructionOpcodeHash(MachineInstr &MI) { + std::string S; + raw_string_ostream OS(S); + auto HashOperand = [this](const MachineOperand &MO) -> unsigned { + if (MO.isImm()) + return MO.getImm(); + if (MO.isTargetIndex()) + return MO.getOffset() | (MO.getTargetFlags() << 16); + if (MO.isReg()) { + return Register::isVirtualRegister(MO.getReg()) + ? MRI.getVRegDef(MO.getReg())->getOpcode() + : (unsigned)MO.getReg(); } + // We could explicitly handle all the types of the MachineOperand, + // here but we can just return a common number until we find a + // compelling test case where this is bad. The only side effect here + // is contributing to a hash collission but there's enough information + // (Opcodes,other registers etc) that this will likely not be a problem. + return 0; + }; + SmallVector MIOperands; + MIOperands.push_back(MI.getOpcode()); + for (auto &Op : MI.uses()) { + MIOperands.push_back(HashOperand(Op)); + } + auto HashMI = hash_combine_range(MIOperands.begin(), MIOperands.end()); + return std::to_string(HashMI).substr(0, 5); +} + +unsigned VRegRenamer::createVirtualRegister(unsigned VReg) { + return createVirtualRegisterWithName( + VReg, getInstructionOpcodeHash(*MRI.getVRegDef(VReg))); +} - doCandidateWalk(VRegs, RegQueue, VisitedMIs, MBB); +bool VRegRenamer::renameInstsInMBB(MachineBasicBlock *MBB) { + std::vector VRegs; + std::string Prefix = "bb" + std::to_string(getCurrentBBNumber()) + "_"; + for (auto &MII : *MBB) { + MachineInstr &Candidate = MII; + // Don't rename stores/branches. + if (Candidate.mayStore() || Candidate.isBranch()) + continue; + if (!Candidate.getNumOperands()) + continue; + // Look for instructions that define VRegs in operand 0. + MachineOperand &MO = Candidate.getOperand(0); + // Avoid non regs, instructions defining physical regs. + if (!MO.isReg() || !Register::isVirtualRegister(MO.getReg())) + continue; + VRegs.push_back( + NamedVReg(MO.getReg(), Prefix + getInstructionOpcodeHash(Candidate))); } // If we have populated no vregs to rename then bail. // The rest of this function does the vreg remaping. if (VRegs.size() == 0) - return Changed; + return false; - auto VRegRenameMap = getVRegRenameMap(VRegs, renamedInOtherBB, MRI, NVC); - Changed |= doVRegRenaming(renamedInOtherBB, VRegRenameMap, MRI); - return Changed; + auto VRegRenameMap = getVRegRenameMap(VRegs); + return doVRegRenaming(VRegRenameMap); } -} // anonymous namespace - -void NamedVRegCursor::skipVRegs() { - unsigned VRegGapIndex = 1; - if (!virtualVRegNumber) { - VRegGapIndex = 0; - virtualVRegNumber = MRI.createIncompleteVirtualRegister(); - } - const unsigned VR_GAP = (++VRegGapIndex * SkipGapSize); - unsigned I = virtualVRegNumber; - const unsigned E = (((I + VR_GAP) / VR_GAP) + 1) * VR_GAP; - - virtualVRegNumber = E; +bool VRegRenamer::renameVRegs(MachineBasicBlock *MBB, unsigned BBNum) { + CurrentBBNumber = BBNum; + return renameInstsInMBB(MBB); } -unsigned NamedVRegCursor::createVirtualRegister(unsigned VReg) { - if (!virtualVRegNumber) - skipVRegs(); - std::string S; - raw_string_ostream OS(S); - OS << "namedVReg" << (virtualVRegNumber & ~0x80000000); - OS.flush(); - virtualVRegNumber++; +unsigned VRegRenamer::createVirtualRegisterWithName(unsigned VReg, + const std::string &Name) { + std::string Temp(Name); + std::transform(Temp.begin(), Temp.end(), Temp.begin(), ::tolower); if (auto RC = MRI.getRegClassOrNull(VReg)) - return MRI.createVirtualRegister(RC, OS.str()); - return MRI.createGenericVirtualRegister(MRI.getType(VReg), OS.str()); -} - -bool NamedVRegCursor::renameVRegs(MachineBasicBlock *MBB) { - return ::renameVRegs(MBB, RenamedInOtherBB, *this); + return MRI.createVirtualRegister(RC, Temp); + return MRI.createGenericVirtualRegister(MRI.getType(VReg), Name); } Index: llvm/test/CodeGen/MIR/AArch64/mirCanonCopyCopyProp.mir =================================================================== --- llvm/test/CodeGen/MIR/AArch64/mirCanonCopyCopyProp.mir +++ llvm/test/CodeGen/MIR/AArch64/mirCanonCopyCopyProp.mir @@ -39,8 +39,8 @@ %42:gpr32 = LDRWui %stack.0, 0 :: (dereferenceable load 8) - ;CHECK: %namedVReg1352:gpr32 = LDRWui %stack.0, 0 :: (dereferenceable load 8) - ;CHECK-NEXT: $w0 = COPY %namedVReg1352 + ;CHECK: %bb0_11909__1:gpr32 = LDRWui %stack.0, 0 :: (dereferenceable load 8) + ;CHECK-NEXT: $w0 = COPY %bb0_11909__1 ;CHECK-NEXT: RET_ReallyLR implicit $w0 %vreg1234:gpr32 = COPY %42 Index: llvm/test/CodeGen/MIR/AArch64/mirCanonIdempotent.mir =================================================================== --- llvm/test/CodeGen/MIR/AArch64/mirCanonIdempotent.mir +++ llvm/test/CodeGen/MIR/AArch64/mirCanonIdempotent.mir @@ -1,11 +1,11 @@ # RUN: llc -mtriple=arm64-apple-ios11.0.0 -o - -verify-machineinstrs -run-pass mir-canonicalizer %s | FileCheck %s # These Idempotent instructions are sorted alphabetically (based on after the '=') -# CHECK: %namedVReg4352:gpr64 = MOVi64imm 4617315517961601024 -# CHECK-NEXT: %namedVReg4353:gpr32 = MOVi32imm 408 -# CHECK-NEXT: %namedVReg4354:gpr32 = MOVi32imm 408 -# CHECK-NEXT: %namedVReg4355:gpr64all = IMPLICIT_DEF -# CHECK-NEXT: %namedVReg4356:fpr64 = FMOVDi 20 -# CHECK-NEXT: %namedVReg4357:fpr64 = FMOVDi 112 +# CHECK: %bb0_17169__1:gpr64 = MOVi64imm 4617315517961601024 +# CHECK-NEXT: %bb0_42274__1:gpr32 = MOVi32imm 408 +# CHECK-NEXT: %bb0_42274__2:gpr32 = MOVi32imm 408 +# CHECK-NEXT: %bb0_18275__1:gpr64all = IMPLICIT_DEF +# CHECK-NEXT: %bb0_13880__1:fpr64 = FMOVDi 20 +# CHECK-NEXT: %bb0_21467__1:fpr64 = FMOVDi 112 ... --- Index: llvm/test/CodeGen/MIR/AArch64/mirnamer.mir =================================================================== --- llvm/test/CodeGen/MIR/AArch64/mirnamer.mir +++ llvm/test/CodeGen/MIR/AArch64/mirnamer.mir @@ -5,10 +5,10 @@ body: | bb.0: - ;CHECK: bb - ;CHECK-NEXT: %namedVReg1353:_(p0) = COPY $d0 - ;CHECK-NEXT: %namedVReg1352:_(<4 x s32>) = COPY $q0 - ;CHECK-NEXT: G_STORE %namedVReg1352(<4 x s32>), %namedVReg1353 + ;CHECK-LABEL: bb.0 + ;CHECK-NEXT: %bb0_12265__1:_(p0) = COPY $d0 + ;CHECK-NEXT: %bb0_18308__1:_(<4 x s32>) = COPY $q0 + ;CHECK-NEXT: G_STORE %bb0_18308__1(<4 x s32>), %bb0_12265__1(p0) :: (store 16) liveins: $q0, $d0 %1:fpr(p0) = COPY $d0 @@ -25,20 +25,20 @@ body: | bb.0: - ;CHECK: bb - ;CHECK-NEXT: %namedVReg1370:gpr32 = LDRWui - ;CHECK-NEXT: %namedVReg1371:gpr32 = MOVi32imm 1 - ;CHECK-NEXT: %namedVReg1372:gpr32 = LDRWui - ;CHECK-NEXT: %namedVReg1373:gpr32 = MOVi32imm 2 - ;CHECK-NEXT: %namedVReg1359:gpr32 = LDRWui - ;CHECK-NEXT: %namedVReg1360:gpr32 = MOVi32imm 3 - ;CHECK-NEXT: %namedVReg1365:gpr32 = nsw ADDWrr - ;CHECK-NEXT: %namedVReg1361:gpr32 = LDRWui - ;CHECK-NEXT: %namedVReg1366:gpr32 = nsw ADDWrr - ;CHECK-NEXT: %namedVReg1362:gpr32 = MOVi32imm 4 - ;CHECK-NEXT: %namedVReg1355:gpr32 = nsw ADDWrr - ;CHECK-NEXT: %namedVReg1363:gpr32 = LDRWui - ;CHECK-NEXT: %namedVReg1364:gpr32 = MOVi32imm 5 + ;CHECK-LABEL: bb.0 + ;CHECK-NEXT: %bb0_11909__1:gpr32 = LDRWui + ;CHECK-NEXT: %bb0_17251__1:gpr32 = MOVi32imm 1 + ;CHECK-NEXT: %bb0_11909__2:gpr32 = LDRWui + ;CHECK-NEXT: %bb0_44296__1:gpr32 = MOVi32imm 2 + ;CHECK-NEXT: %bb0_11909__3:gpr32 = LDRWui + ;CHECK-NEXT: %bb0_10150__1:gpr32 = MOVi32imm 3 + ;CHECK-NEXT: %bb0_18184__1:gpr32 = nsw ADDWrr + ;CHECK-NEXT: %bb0_11909__4:gpr32 = LDRWui + ;CHECK-NEXT: %bb0_18184__2:gpr32 = nsw ADDWrr + ;CHECK-NEXT: %bb0_56622__1:gpr32 = MOVi32imm 4 + ;CHECK-NEXT: %bb0_18184__3:gpr32 = nsw ADDWrr + ;CHECK-NEXT: %bb0_11909__5:gpr32 = LDRWui + ;CHECK-NEXT: %bb0_74788__1:gpr32 = MOVi32imm 5 %0:gpr32 = LDRWui %stack.0, 0 :: (dereferenceable load 8) %1:gpr32 = MOVi32imm 1 @@ -73,12 +73,12 @@ bb.0: liveins: $x0, $x1, $d0, $d1 - ;CHECK: bb - ;CHECK-NEXT: %namedVReg1355:gpr32 = LDRWui - ;CHECK-NEXT: %namedVReg1354:gpr32 = COPY %namedVReg1355 - ;CHECK-NEXT: %namedVReg1353:gpr32 = COPY %namedVReg1354 - ;CHECK-NEXT: %namedVReg1352:gpr32 = COPY %namedVReg1353 - ;CHECK-NEXT: $w0 = COPY %namedVReg1352 + ;CHECK-LABEL: bb.0: + ;CHECK-NEXT: %bb0_11909__1:gpr32 = LDRWui %stack.0, 0 + ;CHECK-NEXT: %bb0_31408__1:gpr32 = COPY %bb0_11909__1 + ;CHECK-NEXT: %bb0_14282__1:gpr32 = COPY %bb0_31408__1 + ;CHECK-NEXT: %bb0_14282__2:gpr32 = COPY %bb0_14282__1 + ;CHECK-NEXT: $w0 = COPY %bb0_14282__2 %0:gpr32 = LDRWui %stack.0, 0 :: (dereferenceable load 8) %1:gpr32 = COPY %0 Index: llvm/test/CodeGen/MIR/AMDGPU/mir-canon-multi.mir =================================================================== --- llvm/test/CodeGen/MIR/AMDGPU/mir-canon-multi.mir +++ llvm/test/CodeGen/MIR/AMDGPU/mir-canon-multi.mir @@ -1,18 +1,26 @@ -# RUN: llc -o - -march=amdgcn -run-pass mir-canonicalizer -x mir %s | FileCheck %s +# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py +# RUN: llc -o - -march=amdgcn -run-pass mir-canonicalizer %s | FileCheck %s -# CHECK: %namedVReg4354:vgpr_32 = COPY $vgpr0 -# CHECK: %namedVReg1352:vgpr_32 = COPY %namedVReg4353 -# CHECK-NEXT: %namedVReg1358:vgpr_32 = COPY %namedVReg1361 -# CHECK-NEXT: %namedVReg1359:vgpr_32 = COPY %namedVReg1362 -# CHECK-NEXT: %namedVReg1353:vreg_64 = REG_SEQUENCE %namedVReg4354, %subreg.sub0, %namedVReg1352, %subreg.sub1 -# CHECK-NEXT: %namedVReg1354:sgpr_128 = REG_SEQUENCE %namedVReg4354, %subreg.sub0, %namedVReg1352, %subreg.sub1, %namedVReg1358, %subreg.sub2, %namedVReg1359, %subreg.sub3 # This tests for the itereator invalidation fix (reviews.llvm.org/D62713) -# CHECK-NEXT: BUFFER_STORE_DWORD_ADDR64 %namedVReg1352, %namedVReg1353, %namedVReg1354, 0, 0, 0, 0, 0, 0, 0, implicit $exec ... --- name: foo body: | bb.0: + ; CHECK-LABEL: name: foo + ; CHECK: %bb0_43693__1:sreg_32_xm0 = S_MOV_B32 61440 + ; CHECK: %bb0_13829__1:sreg_32_xm0 = S_MOV_B32 0 + ; CHECK: %bb0_14481__1:vgpr_32 = COPY $vgpr0 + ; CHECK: %bb0_18142__1:sgpr_64 = COPY $sgpr0_sgpr1 + ; CHECK: %bb0_16462__1:sreg_64_xexec = S_LOAD_DWORDX2_IMM %bb0_18142__1, 9, 0, 0 + ; CHECK: %bb0_89962__1:sreg_64_xexec = S_LOAD_DWORDX2_IMM %bb0_18142__1, 11, 0, 0 + ; CHECK: %bb0_10035__1:vgpr_32 = COPY %bb0_13829__1 + ; CHECK: %bb0_18361__1:vgpr_32 = COPY %bb0_16462__1 + ; CHECK: %bb0_18361__2:vgpr_32 = COPY %bb0_89962__1 + ; CHECK: %bb0_16181__1:vreg_64 = REG_SEQUENCE %bb0_14481__1, %subreg.sub0, %bb0_10035__1, %subreg.sub1 + ; CHECK: %bb0_71315__1:sgpr_128 = REG_SEQUENCE %bb0_14481__1, %subreg.sub0, %bb0_10035__1, %subreg.sub1, %bb0_18361__1, %subreg.sub2, %bb0_18361__2, %subreg.sub3 + ; CHECK: BUFFER_STORE_DWORD_ADDR64 %bb0_10035__1, %bb0_16181__1, %bb0_71315__1, 0, 0, 0, 0, 0, 0, 0, implicit $exec + ; CHECK: S_ENDPGM 0 %10:sreg_32_xm0 = S_MOV_B32 61440 %11:sreg_32_xm0 = S_MOV_B32 0 %3:vgpr_32 = COPY $vgpr0