https://github.com/optimisan updated https://github.com/llvm/llvm-project/pull/114010
>From 9792d73efca78fc55a9d25afb17448c7aeb490c6 Mon Sep 17 00:00:00 2001 From: Akshat Oke <akshat....@amd.com> Date: Tue, 29 Oct 2024 07:14:30 +0000 Subject: [PATCH 1/3] [CodeGen][NewPM] Port RegUsageInfoPropagation pass to NPM --- .../llvm/CodeGen/RegUsageInfoPropagate.h | 25 +++++++ llvm/include/llvm/InitializePasses.h | 2 +- llvm/include/llvm/Passes/CodeGenPassBuilder.h | 1 + .../llvm/Passes/MachinePassRegistry.def | 2 +- llvm/lib/CodeGen/CodeGen.cpp | 2 +- llvm/lib/CodeGen/RegUsageInfoPropagate.cpp | 75 +++++++++++++------ llvm/lib/Passes/PassBuilder.cpp | 1 + llvm/test/CodeGen/AArch64/preserve.ll | 4 + 8 files changed, 86 insertions(+), 26 deletions(-) create mode 100644 llvm/include/llvm/CodeGen/RegUsageInfoPropagate.h diff --git a/llvm/include/llvm/CodeGen/RegUsageInfoPropagate.h b/llvm/include/llvm/CodeGen/RegUsageInfoPropagate.h new file mode 100644 index 00000000000000..73624015e37d9d --- /dev/null +++ b/llvm/include/llvm/CodeGen/RegUsageInfoPropagate.h @@ -0,0 +1,25 @@ +//===- llvm/CodeGen/RegUsageInfoPropagate.h ---------------------*- C++ -*-===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_CODEGEN_REGUSAGEINFOPROPAGATE_H +#define LLVM_CODEGEN_REGUSAGEINFOPROPAGATE_H + +#include "llvm/CodeGen/MachinePassManager.h" + +namespace llvm { + +class RegUsageInfoPropagationPass + : public PassInfoMixin<RegUsageInfoPropagationPass> { +public: + PreservedAnalyses run(MachineFunction &MF, + MachineFunctionAnalysisManager &MFAM); +}; + +} // namespace llvm + +#endif // LLVM_CODEGEN_REGUSAGEINFOPROPAGATE_H diff --git a/llvm/include/llvm/InitializePasses.h b/llvm/include/llvm/InitializePasses.h index 44b7ba830bb329..bc209a4e939415 100644 --- a/llvm/include/llvm/InitializePasses.h +++ b/llvm/include/llvm/InitializePasses.h @@ -258,7 +258,7 @@ void initializeRegAllocScoringPass(PassRegistry &); void initializeRegBankSelectPass(PassRegistry &); void initializeRegToMemWrapperPassPass(PassRegistry &); void initializeRegUsageInfoCollectorLegacyPass(PassRegistry &); -void initializeRegUsageInfoPropagationPass(PassRegistry &); +void initializeRegUsageInfoPropagationLegacyPass(PassRegistry &); void initializeRegionInfoPassPass(PassRegistry &); void initializeRegionOnlyPrinterPass(PassRegistry &); void initializeRegionOnlyViewerPass(PassRegistry &); diff --git a/llvm/include/llvm/Passes/CodeGenPassBuilder.h b/llvm/include/llvm/Passes/CodeGenPassBuilder.h index 066cd70ec8b996..9f41cc41a7c926 100644 --- a/llvm/include/llvm/Passes/CodeGenPassBuilder.h +++ b/llvm/include/llvm/Passes/CodeGenPassBuilder.h @@ -54,6 +54,7 @@ #include "llvm/CodeGen/PreISelIntrinsicLowering.h" #include "llvm/CodeGen/RegAllocFast.h" #include "llvm/CodeGen/RegUsageInfoCollector.h" +#include "llvm/CodeGen/RegUsageInfoPropagate.h" #include "llvm/CodeGen/RegisterUsageInfo.h" #include "llvm/CodeGen/ReplaceWithVeclib.h" #include "llvm/CodeGen/SafeStack.h" diff --git a/llvm/include/llvm/Passes/MachinePassRegistry.def b/llvm/include/llvm/Passes/MachinePassRegistry.def index 0ee4794034e98b..6327ab1abd48e9 100644 --- a/llvm/include/llvm/Passes/MachinePassRegistry.def +++ b/llvm/include/llvm/Passes/MachinePassRegistry.def @@ -157,6 +157,7 @@ MACHINE_FUNCTION_PASS("print<machine-post-dom-tree>", MACHINE_FUNCTION_PASS("print<slot-indexes>", SlotIndexesPrinterPass(dbgs())) MACHINE_FUNCTION_PASS("print<virtregmap>", VirtRegMapPrinterPass(dbgs())) MACHINE_FUNCTION_PASS("reg-usage-collector", RegUsageInfoCollectorPass()) +MACHINE_FUNCTION_PASS("reg-usage-propagation", RegUsageInfoPropagationPass()) MACHINE_FUNCTION_PASS("require-all-machine-function-properties", RequireAllMachineFunctionPropertiesPass()) MACHINE_FUNCTION_PASS("stack-coloring", StackColoringPass()) @@ -251,7 +252,6 @@ DUMMY_MACHINE_FUNCTION_PASS("prologepilog-code", PrologEpilogCodeInserterPass) DUMMY_MACHINE_FUNCTION_PASS("ra-basic", RABasicPass) DUMMY_MACHINE_FUNCTION_PASS("ra-greedy", RAGreedyPass) DUMMY_MACHINE_FUNCTION_PASS("ra-pbqp", RAPBQPPass) -DUMMY_MACHINE_FUNCTION_PASS("reg-usage-propagation", RegUsageInfoPropagationPass) DUMMY_MACHINE_FUNCTION_PASS("regalloc", RegAllocPass) DUMMY_MACHINE_FUNCTION_PASS("regallocscoringpass", RegAllocScoringPass) DUMMY_MACHINE_FUNCTION_PASS("regbankselect", RegBankSelectPass) diff --git a/llvm/lib/CodeGen/CodeGen.cpp b/llvm/lib/CodeGen/CodeGen.cpp index e7e8a121369b75..013a9b3c9c4ffa 100644 --- a/llvm/lib/CodeGen/CodeGen.cpp +++ b/llvm/lib/CodeGen/CodeGen.cpp @@ -114,7 +114,7 @@ void llvm::initializeCodeGen(PassRegistry &Registry) { initializeRAGreedyPass(Registry); initializeRegAllocFastPass(Registry); initializeRegUsageInfoCollectorLegacyPass(Registry); - initializeRegUsageInfoPropagationPass(Registry); + initializeRegUsageInfoPropagationLegacyPass(Registry); initializeRegisterCoalescerPass(Registry); initializeRemoveLoadsIntoFakeUsesPass(Registry); initializeRemoveRedundantDebugValuesPass(Registry); diff --git a/llvm/lib/CodeGen/RegUsageInfoPropagate.cpp b/llvm/lib/CodeGen/RegUsageInfoPropagate.cpp index 5ffe6acc83d601..3877d1c0d62488 100644 --- a/llvm/lib/CodeGen/RegUsageInfoPropagate.cpp +++ b/llvm/lib/CodeGen/RegUsageInfoPropagate.cpp @@ -18,6 +18,7 @@ /// //===----------------------------------------------------------------------===// +#include "llvm/CodeGen/RegUsageInfoPropagate.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/CodeGen/MachineFrameInfo.h" #include "llvm/CodeGen/MachineFunctionPass.h" @@ -25,8 +26,10 @@ #include "llvm/CodeGen/MachineRegisterInfo.h" #include "llvm/CodeGen/Passes.h" #include "llvm/CodeGen/RegisterUsageInfo.h" +#include "llvm/IR/Analysis.h" #include "llvm/IR/Module.h" #include "llvm/Pass.h" +#include "llvm/Passes/CodeGenPassBuilder.h" #include "llvm/Support/Debug.h" #include "llvm/Support/raw_ostream.h" @@ -38,26 +41,16 @@ using namespace llvm; namespace { -class RegUsageInfoPropagation : public MachineFunctionPass { +class RegUsageInfoPropagation { public: - RegUsageInfoPropagation() : MachineFunctionPass(ID) { - PassRegistry &Registry = *PassRegistry::getPassRegistry(); - initializeRegUsageInfoPropagationPass(Registry); - } + explicit RegUsageInfoPropagation(PhysicalRegisterUsageInfo *PRUI) + : PRUI(PRUI) {} - StringRef getPassName() const override { return RUIP_NAME; } - - bool runOnMachineFunction(MachineFunction &MF) override; - - void getAnalysisUsage(AnalysisUsage &AU) const override { - AU.addRequired<PhysicalRegisterUsageInfoWrapperLegacy>(); - AU.setPreservesAll(); - MachineFunctionPass::getAnalysisUsage(AU); - } - - static char ID; + bool run(MachineFunction &MF); private: + PhysicalRegisterUsageInfo *PRUI; + static void setRegMask(MachineInstr &MI, ArrayRef<uint32_t> RegMask) { assert(RegMask.size() == MachineOperand::getRegMaskSize(MI.getParent()->getParent() @@ -71,15 +64,34 @@ class RegUsageInfoPropagation : public MachineFunctionPass { } }; +class RegUsageInfoPropagationLegacy : public MachineFunctionPass { +public: + static char ID; + RegUsageInfoPropagationLegacy() : MachineFunctionPass(ID) { + PassRegistry &Registry = *PassRegistry::getPassRegistry(); + initializeRegUsageInfoPropagationLegacyPass(Registry); + } + + StringRef getPassName() const override { return RUIP_NAME; } + + bool runOnMachineFunction(MachineFunction &MF) override; + + void getAnalysisUsage(AnalysisUsage &AU) const override { + AU.addRequired<PhysicalRegisterUsageInfoWrapperLegacy>(); + AU.setPreservesAll(); + MachineFunctionPass::getAnalysisUsage(AU); + } +}; + } // end of anonymous namespace -INITIALIZE_PASS_BEGIN(RegUsageInfoPropagation, "reg-usage-propagation", +INITIALIZE_PASS_BEGIN(RegUsageInfoPropagationLegacy, "reg-usage-propagation", RUIP_NAME, false, false) INITIALIZE_PASS_DEPENDENCY(PhysicalRegisterUsageInfoWrapperLegacy) -INITIALIZE_PASS_END(RegUsageInfoPropagation, "reg-usage-propagation", +INITIALIZE_PASS_END(RegUsageInfoPropagationLegacy, "reg-usage-propagation", RUIP_NAME, false, false) -char RegUsageInfoPropagation::ID = 0; +char RegUsageInfoPropagationLegacy::ID = 0; // Assumes call instructions have a single reference to a function. static const Function *findCalledFunction(const Module &M, @@ -95,12 +107,29 @@ static const Function *findCalledFunction(const Module &M, return nullptr; } -bool RegUsageInfoPropagation::runOnMachineFunction(MachineFunction &MF) { - const Module &M = *MF.getFunction().getParent(); +bool RegUsageInfoPropagationLegacy::runOnMachineFunction(MachineFunction &MF) { PhysicalRegisterUsageInfo *PRUI = &getAnalysis<PhysicalRegisterUsageInfoWrapperLegacy>().getPRUI(); - LLVM_DEBUG(dbgs() << " ++++++++++++++++++++ " << getPassName() + RegUsageInfoPropagation RUIP(PRUI); + return RUIP.run(MF); +} + +PreservedAnalyses +RegUsageInfoPropagationPass::run(MachineFunction &MF, + MachineFunctionAnalysisManager &MFAM) { + Module &MFA = *MF.getFunction().getParent(); + auto *PRUI = MFAM.getResult<ModuleAnalysisManagerMachineFunctionProxy>(MF) + .getCachedResult<PhysicalRegisterUsageInfoAnalysis>(MFA); + assert(PRUI && "PhysicalRegisterUsageInfoAnalysis not available"); + RegUsageInfoPropagation(PRUI).run(MF); + return PreservedAnalyses::all(); +} + +bool RegUsageInfoPropagation::run(MachineFunction &MF) { + const Module &M = *MF.getFunction().getParent(); + + LLVM_DEBUG(dbgs() << " ++++++++++++++++++++ " << RUIP_NAME << " ++++++++++++++++++++ \n"); LLVM_DEBUG(dbgs() << "MachineFunction : " << MF.getName() << "\n"); @@ -151,5 +180,5 @@ bool RegUsageInfoPropagation::runOnMachineFunction(MachineFunction &MF) { } FunctionPass *llvm::createRegUsageInfoPropPass() { - return new RegUsageInfoPropagation(); + return new RegUsageInfoPropagationLegacy(); } diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp index 902eff2a0611f8..4ee2204069fb76 100644 --- a/llvm/lib/Passes/PassBuilder.cpp +++ b/llvm/lib/Passes/PassBuilder.cpp @@ -119,6 +119,7 @@ #include "llvm/CodeGen/PreISelIntrinsicLowering.h" #include "llvm/CodeGen/RegAllocFast.h" #include "llvm/CodeGen/RegUsageInfoCollector.h" +#include "llvm/CodeGen/RegUsageInfoPropagate.h" #include "llvm/CodeGen/RegisterUsageInfo.h" #include "llvm/CodeGen/SafeStack.h" #include "llvm/CodeGen/SelectOptimize.h" diff --git a/llvm/test/CodeGen/AArch64/preserve.ll b/llvm/test/CodeGen/AArch64/preserve.ll index 5839bb5440a9b0..0e342b97a39dee 100644 --- a/llvm/test/CodeGen/AArch64/preserve.ll +++ b/llvm/test/CodeGen/AArch64/preserve.ll @@ -1,6 +1,10 @@ ; RUN: llc -enable-ipra -print-regusage -o /dev/null 2>&1 < %s | FileCheck %s +; RUN: llc -stop-after=irtranslator -o - %s \ +; RUN: | llc -x=mir -enable-ipra -passes="require<reg-usage-info>,function(machine-function(reg-usage-propagation,reg-usage-collector)),print<regusage>" -o /dev/null 2>&1 \ +; RUN: | FileCheck %s + target triple = "aarch64-unknown-unknown" declare void @bar1() define preserve_mostcc void @baz() #0 { >From 76167a8a25411fea03c77e7a812ebc3970a765cd Mon Sep 17 00:00:00 2001 From: Akshat Oke <akshat....@amd.com> Date: Wed, 30 Oct 2024 06:57:58 +0000 Subject: [PATCH 2/3] Propagate renaming from down the stack --- llvm/lib/CodeGen/RegUsageInfoPropagate.cpp | 4 ++-- llvm/test/CodeGen/AArch64/preserve.ll | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm/lib/CodeGen/RegUsageInfoPropagate.cpp b/llvm/lib/CodeGen/RegUsageInfoPropagate.cpp index 3877d1c0d62488..3ca2e3052501c5 100644 --- a/llvm/lib/CodeGen/RegUsageInfoPropagate.cpp +++ b/llvm/lib/CodeGen/RegUsageInfoPropagate.cpp @@ -120,8 +120,8 @@ RegUsageInfoPropagationPass::run(MachineFunction &MF, MachineFunctionAnalysisManager &MFAM) { Module &MFA = *MF.getFunction().getParent(); auto *PRUI = MFAM.getResult<ModuleAnalysisManagerMachineFunctionProxy>(MF) - .getCachedResult<PhysicalRegisterUsageInfoAnalysis>(MFA); - assert(PRUI && "PhysicalRegisterUsageInfoAnalysis not available"); + .getCachedResult<PhysicalRegisterUsageAnalysis>(MFA); + assert(PRUI && "PhysicalRegisterUsageAnalysis not available"); RegUsageInfoPropagation(PRUI).run(MF); return PreservedAnalyses::all(); } diff --git a/llvm/test/CodeGen/AArch64/preserve.ll b/llvm/test/CodeGen/AArch64/preserve.ll index 0e342b97a39dee..2cd2a4c21c775c 100644 --- a/llvm/test/CodeGen/AArch64/preserve.ll +++ b/llvm/test/CodeGen/AArch64/preserve.ll @@ -2,7 +2,7 @@ ; RUN: llc -enable-ipra -print-regusage -o /dev/null 2>&1 < %s | FileCheck %s ; RUN: llc -stop-after=irtranslator -o - %s \ -; RUN: | llc -x=mir -enable-ipra -passes="require<reg-usage-info>,function(machine-function(reg-usage-propagation,reg-usage-collector)),print<regusage>" -o /dev/null 2>&1 \ +; RUN: | llc -x=mir -enable-ipra -passes="require<reg-usage>,function(machine-function(reg-usage-propagation,reg-usage-collector)),print<reg-usage>" -o /dev/null 2>&1 \ ; RUN: | FileCheck %s target triple = "aarch64-unknown-unknown" >From 670c20cef71ef8aa530be7cb6f544cd432b67ace Mon Sep 17 00:00:00 2001 From: Akshat Oke <akshat....@amd.com> Date: Mon, 4 Nov 2024 11:09:27 +0000 Subject: [PATCH 3/3] stop after prologepilog, not irtranslator --- llvm/test/CodeGen/AArch64/preserve.ll | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm/test/CodeGen/AArch64/preserve.ll b/llvm/test/CodeGen/AArch64/preserve.ll index 2cd2a4c21c775c..ffd479e1bd739e 100644 --- a/llvm/test/CodeGen/AArch64/preserve.ll +++ b/llvm/test/CodeGen/AArch64/preserve.ll @@ -1,7 +1,7 @@ ; RUN: llc -enable-ipra -print-regusage -o /dev/null 2>&1 < %s | FileCheck %s -; RUN: llc -stop-after=irtranslator -o - %s \ +; RUN: llc -stop-after=prologepilog -o - %s \ ; RUN: | llc -x=mir -enable-ipra -passes="require<reg-usage>,function(machine-function(reg-usage-propagation,reg-usage-collector)),print<reg-usage>" -o /dev/null 2>&1 \ ; RUN: | FileCheck %s _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
