[flang-commits] [flang] [AMDGPU] Port AMDGPURewriteUndefForPHI to new pass manager (PR #66008)
via flang-commits
flang-commits at lists.llvm.org
Tue Sep 12 11:15:14 PDT 2023
https://github.com/jwanggit86 updated https://github.com/llvm/llvm-project/pull/66008:
>From c68ad692f9d4c657f5dfaeb5d8c52c5331ebbb64 Mon Sep 17 00:00:00 2001
From: Jun Wang <jun.wang7 at amd.com>
Date: Mon, 11 Sep 2023 15:25:42 -0500
Subject: [PATCH 1/2] [AMDGPU] Port AMDGPURewriteUndefForPHI to new pass
manager
This patch ports the AMDGPURewriteUndefForPHI pass to the new pass
manager. With this, the pass is supported under both the legacy and
the new pass managers.
---
llvm/lib/Target/AMDGPU/AMDGPU.h | 10 ++++++++++
.../lib/Target/AMDGPU/AMDGPURewriteUndefForPHI.cpp | 14 ++++++++++++++
llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp | 4 ++++
llvm/test/CodeGen/AMDGPU/rewrite-undef-for-phi.ll | 1 +
4 files changed, 29 insertions(+)
diff --git a/llvm/lib/Target/AMDGPU/AMDGPU.h b/llvm/lib/Target/AMDGPU/AMDGPU.h
index 157a02ec31b2ec6..434943490caeab3 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPU.h
+++ b/llvm/lib/Target/AMDGPU/AMDGPU.h
@@ -291,6 +291,16 @@ FunctionPass *createAMDGPURewriteUndefForPHIPass();
void initializeAMDGPURewriteUndefForPHIPass(PassRegistry &);
extern char &AMDGPURewriteUndefForPHIPassID;
+class AMDGPURewriteUndefForPHIPass
+ : public PassInfoMixin<AMDGPURewriteUndefForPHIPass> {
+private:
+ TargetMachine &TM;
+
+public:
+ AMDGPURewriteUndefForPHIPass(TargetMachine &TM) : TM(TM){};
+ PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
+};
+
void initializeSIAnnotateControlFlowPass(PassRegistry&);
extern char &SIAnnotateControlFlowPassID;
diff --git a/llvm/lib/Target/AMDGPU/AMDGPURewriteUndefForPHI.cpp b/llvm/lib/Target/AMDGPU/AMDGPURewriteUndefForPHI.cpp
index 9c07851243c9173..3e9625e954ea653 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPURewriteUndefForPHI.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPURewriteUndefForPHI.cpp
@@ -177,6 +177,20 @@ bool AMDGPURewriteUndefForPHI::runOnFunction(Function &F) {
return rewritePHIs(F, UA, DT);
}
+PreservedAnalyses
+AMDGPURewriteUndefForPHIPass::run(Function &F, FunctionAnalysisManager &AM) {
+ UniformityInfo &UA = AM.getResult<UniformityInfoAnalysis>(F);
+ DominatorTree *DT = &AM.getResult<DominatorTreeAnalysis>(F);
+ bool Changed = rewritePHIs(F, UA, DT);
+ if (Changed) {
+ PreservedAnalyses PA;
+ PA.preserveSet<CFGAnalyses>();
+ return PA;
+ }
+
+ return PreservedAnalyses::all();
+}
+
FunctionPass *llvm::createAMDGPURewriteUndefForPHIPass() {
return new AMDGPURewriteUndefForPHI();
}
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
index 991681dafedaad1..befa036ee32df14 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
@@ -663,6 +663,10 @@ void AMDGPUTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
PM.addPass(AMDGPULowerKernelArgumentsPass(*this));
return true;
}
+ if (PassName == "amdgpu-rewrite-undef-for-phi") {
+ PM.addPass(AMDGPURewriteUndefForPHIPass(*this));
+ return true;
+ }
return false;
});
diff --git a/llvm/test/CodeGen/AMDGPU/rewrite-undef-for-phi.ll b/llvm/test/CodeGen/AMDGPU/rewrite-undef-for-phi.ll
index c0f6c5ae0240a69..4f6b9f474c13171 100644
--- a/llvm/test/CodeGen/AMDGPU/rewrite-undef-for-phi.ll
+++ b/llvm/test/CodeGen/AMDGPU/rewrite-undef-for-phi.ll
@@ -1,5 +1,6 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt -mtriple=amdgcn-- -S -amdgpu-rewrite-undef-for-phi %s | FileCheck -check-prefix=OPT %s
+; RUN: opt -mtriple=amdgcn-- -S -passes=amdgpu-rewrite-undef-for-phi %s | FileCheck -check-prefix=OPT %s
define amdgpu_ps float @basic(float inreg %c, i32 %x) #0 {
; OPT-LABEL: @basic(
>From 15343db5c33e403c189b0f693a9332bcea60cf7b Mon Sep 17 00:00:00 2001
From: Jun Wang <jun.wang7 at amd.com>
Date: Tue, 12 Sep 2023 13:13:43 -0500
Subject: [PATCH 2/2] [AMDGPU] Port AMDGPURewriteUndefForPHI to new pass
manager
This patch ports the AMDGPURewriteUndefForPHI pass to the new pass
manager. With this, the pass is supported under both the legacy and
the new pass managers.
---
llvm/lib/Target/AMDGPU/AMDGPU.h | 6 +++---
.../Target/AMDGPU/AMDGPURewriteUndefForPHI.cpp | 18 +++++++++---------
llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/llvm/lib/Target/AMDGPU/AMDGPU.h b/llvm/lib/Target/AMDGPU/AMDGPU.h
index 434943490caeab3..6234c10996bbbb9 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPU.h
+++ b/llvm/lib/Target/AMDGPU/AMDGPU.h
@@ -287,9 +287,9 @@ extern char &AMDGPURemoveIncompatibleFunctionsID;
void initializeAMDGPULateCodeGenPreparePass(PassRegistry &);
extern char &AMDGPULateCodeGenPrepareID;
-FunctionPass *createAMDGPURewriteUndefForPHIPass();
-void initializeAMDGPURewriteUndefForPHIPass(PassRegistry &);
-extern char &AMDGPURewriteUndefForPHIPassID;
+FunctionPass *createAMDGPURewriteUndefForPHILegacyPass();
+void initializeAMDGPURewriteUndefForPHILegacyPass(PassRegistry &);
+extern char &AMDGPURewriteUndefForPHILegacyPassID;
class AMDGPURewriteUndefForPHIPass
: public PassInfoMixin<AMDGPURewriteUndefForPHIPass> {
diff --git a/llvm/lib/Target/AMDGPU/AMDGPURewriteUndefForPHI.cpp b/llvm/lib/Target/AMDGPU/AMDGPURewriteUndefForPHI.cpp
index 3e9625e954ea653..459400e3359ca1b 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPURewriteUndefForPHI.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPURewriteUndefForPHI.cpp
@@ -69,11 +69,11 @@ using namespace llvm;
namespace {
-class AMDGPURewriteUndefForPHI : public FunctionPass {
+class AMDGPURewriteUndefForPHILegacy : public FunctionPass {
public:
static char ID;
- AMDGPURewriteUndefForPHI() : FunctionPass(ID) {
- initializeAMDGPURewriteUndefForPHIPass(*PassRegistry::getPassRegistry());
+ AMDGPURewriteUndefForPHILegacy() : FunctionPass(ID) {
+ initializeAMDGPURewriteUndefForPHILegacyPass(*PassRegistry::getPassRegistry());
}
bool runOnFunction(Function &F) override;
StringRef getPassName() const override {
@@ -91,13 +91,13 @@ class AMDGPURewriteUndefForPHI : public FunctionPass {
};
} // end anonymous namespace
-char AMDGPURewriteUndefForPHI::ID = 0;
+char AMDGPURewriteUndefForPHILegacy::ID = 0;
-INITIALIZE_PASS_BEGIN(AMDGPURewriteUndefForPHI, DEBUG_TYPE,
+INITIALIZE_PASS_BEGIN(AMDGPURewriteUndefForPHILegacy, DEBUG_TYPE,
"Rewrite undef for PHI", false, false)
INITIALIZE_PASS_DEPENDENCY(UniformityInfoWrapperPass)
INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass)
-INITIALIZE_PASS_END(AMDGPURewriteUndefForPHI, DEBUG_TYPE,
+INITIALIZE_PASS_END(AMDGPURewriteUndefForPHILegacy, DEBUG_TYPE,
"Rewrite undef for PHI", false, false)
bool rewritePHIs(Function &F, UniformityInfo &UA, DominatorTree *DT) {
@@ -170,7 +170,7 @@ bool rewritePHIs(Function &F, UniformityInfo &UA, DominatorTree *DT) {
return Changed;
}
-bool AMDGPURewriteUndefForPHI::runOnFunction(Function &F) {
+bool AMDGPURewriteUndefForPHILegacy::runOnFunction(Function &F) {
UniformityInfo &UA =
getAnalysis<UniformityInfoWrapperPass>().getUniformityInfo();
DominatorTree *DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree();
@@ -191,6 +191,6 @@ AMDGPURewriteUndefForPHIPass::run(Function &F, FunctionAnalysisManager &AM) {
return PreservedAnalyses::all();
}
-FunctionPass *llvm::createAMDGPURewriteUndefForPHIPass() {
- return new AMDGPURewriteUndefForPHI();
+FunctionPass *llvm::createAMDGPURewriteUndefForPHILegacyPass() {
+ return new AMDGPURewriteUndefForPHILegacy();
}
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
index befa036ee32df14..fc703cfd0972840 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
@@ -390,7 +390,7 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeAMDGPUTarget() {
initializeAMDGPURemoveIncompatibleFunctionsPass(*PR);
initializeAMDGPULowerModuleLDSLegacyPass(*PR);
initializeAMDGPURewriteOutArgumentsPass(*PR);
- initializeAMDGPURewriteUndefForPHIPass(*PR);
+ initializeAMDGPURewriteUndefForPHILegacyPass(*PR);
initializeAMDGPUUnifyMetadataPass(*PR);
initializeSIAnnotateControlFlowPass(*PR);
initializeAMDGPUInsertDelayAluPass(*PR);
@@ -1154,7 +1154,7 @@ bool GCNPassConfig::addPreISel() {
// TODO: Move this right after structurizeCFG to avoid extra divergence
// analysis. This depends on stopping SIAnnotateControlFlow from making
// control flow modifications.
- addPass(createAMDGPURewriteUndefForPHIPass());
+ addPass(createAMDGPURewriteUndefForPHILegacyPass());
}
addPass(createLCSSAPass());
More information about the flang-commits
mailing list