Author: Matt Arsenault
Date: 2025-06-20T16:44:06+09:00
New Revision: c361bffa50f1ed790c393ffbab39c2e07dfcb242
URL: https://github.com/llvm/llvm-project/commit/c361bffa50f1ed790c393ffbab39c2e07dfcb242
DIFF: https://github.com/llvm/llvm-project/commit/c361bffa50f1ed790c393ffbab39c2e07dfcb242.diff
LOG: AMDGPU: Remove legacy pass manager version of AMDGPUUnifyMetadata (#144985)
This is only run in the new pass manager now.
Added:
Modified:
llvm/lib/Target/AMDGPU/AMDGPU.h
llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
llvm/lib/Target/AMDGPU/AMDGPUUnifyMetadata.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Target/AMDGPU/AMDGPU.h b/llvm/lib/Target/AMDGPU/AMDGPU.h
index 0ad18c38213ff..68a3caf595449 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPU.h
+++ b/llvm/lib/Target/AMDGPU/AMDGPU.h
@@ -439,10 +439,6 @@ struct AMDGPUPrintfRuntimeBindingPass
PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
};
-ModulePass* createAMDGPUUnifyMetadataPass();
-void initializeAMDGPUUnifyMetadataPass(PassRegistry&);
-extern char &AMDGPUUnifyMetadataID;
-
struct AMDGPUUnifyMetadataPass : PassInfoMixin<AMDGPUUnifyMetadataPass> {
PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
};
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
index 074beccef33c1..1ea7dd01d15c0 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
@@ -537,7 +537,6 @@ extern "C" LLVM_ABI LLVM_EXTERNAL_VISIBILITY void LLVMInitializeAMDGPUTarget() {
initializeAMDGPUReserveWWMRegsLegacyPass(*PR);
initializeAMDGPURewriteOutArgumentsPass(*PR);
initializeAMDGPURewriteUndefForPHILegacyPass(*PR);
- initializeAMDGPUUnifyMetadataPass(*PR);
initializeSIAnnotateControlFlowLegacyPass(*PR);
initializeAMDGPUInsertDelayAluLegacyPass(*PR);
initializeSIInsertHardClausesLegacyPass(*PR);
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUUnifyMetadata.cpp b/llvm/lib/Target/AMDGPU/AMDGPUUnifyMetadata.cpp
index cd7866b86d55b..e400491c3860e 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUUnifyMetadata.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUUnifyMetadata.cpp
@@ -32,17 +32,6 @@ namespace {
} // end namespace kOCLMD
- /// Unify multiple OpenCL metadata due to linking.
- class AMDGPUUnifyMetadata : public ModulePass {
- public:
- static char ID;
-
- explicit AMDGPUUnifyMetadata() : ModulePass(ID) {}
-
- private:
- bool runOnModule(Module &M) override;
- };
-
/// Unify version metadata.
/// \return true if changes are made.
/// Assume the named metadata has operands each of which is a pair of
@@ -104,6 +93,7 @@ namespace {
return true;
}
+ /// Unify multiple OpenCL metadata due to linking.
bool unifyMetadataImpl(Module &M) {
const char *Vers[] = {kOCLMD::SpirVer, kOCLMD::OCLVer};
const char *Exts[] = {kOCLMD::UsedExt, kOCLMD::UsedOptCoreFeat,
@@ -122,21 +112,6 @@ namespace {
} // end anonymous namespace
- char AMDGPUUnifyMetadata::ID = 0;
-
- char &llvm::AMDGPUUnifyMetadataID = AMDGPUUnifyMetadata::ID;
-
- INITIALIZE_PASS(AMDGPUUnifyMetadata, "amdgpu-unify-metadata",
- "Unify multiple OpenCL metadata due to linking", false, false)
-
- ModulePass *llvm::createAMDGPUUnifyMetadataPass() {
- return new AMDGPUUnifyMetadata();
- }
-
- bool AMDGPUUnifyMetadata::runOnModule(Module &M) {
- return unifyMetadataImpl(M);
- }
-
PreservedAnalyses AMDGPUUnifyMetadataPass::run(Module &M,
ModuleAnalysisManager &AM) {
return unifyMetadataImpl(M) ? PreservedAnalyses::none()