Skip to content

Commit c361bff

Browse files
authored
AMDGPU: Remove legacy pass manager version of AMDGPUUnifyMetadata (#144985)
This is only run in the new pass manager now.
1 parent 1cae21d commit c361bff

File tree

3 files changed

+1
-31
lines changed

3 files changed

+1
-31
lines changed

llvm/lib/Target/AMDGPU/AMDGPU.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -439,10 +439,6 @@ struct AMDGPUPrintfRuntimeBindingPass
439439
PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
440440
};
441441

442-
ModulePass* createAMDGPUUnifyMetadataPass();
443-
void initializeAMDGPUUnifyMetadataPass(PassRegistry&);
444-
extern char &AMDGPUUnifyMetadataID;
445-
446442
struct AMDGPUUnifyMetadataPass : PassInfoMixin<AMDGPUUnifyMetadataPass> {
447443
PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
448444
};

llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,6 @@ extern "C" LLVM_ABI LLVM_EXTERNAL_VISIBILITY void LLVMInitializeAMDGPUTarget() {
537537
initializeAMDGPUReserveWWMRegsLegacyPass(*PR);
538538
initializeAMDGPURewriteOutArgumentsPass(*PR);
539539
initializeAMDGPURewriteUndefForPHILegacyPass(*PR);
540-
initializeAMDGPUUnifyMetadataPass(*PR);
541540
initializeSIAnnotateControlFlowLegacyPass(*PR);
542541
initializeAMDGPUInsertDelayAluLegacyPass(*PR);
543542
initializeSIInsertHardClausesLegacyPass(*PR);

llvm/lib/Target/AMDGPU/AMDGPUUnifyMetadata.cpp

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,6 @@ namespace {
3232

3333
} // end namespace kOCLMD
3434

35-
/// Unify multiple OpenCL metadata due to linking.
36-
class AMDGPUUnifyMetadata : public ModulePass {
37-
public:
38-
static char ID;
39-
40-
explicit AMDGPUUnifyMetadata() : ModulePass(ID) {}
41-
42-
private:
43-
bool runOnModule(Module &M) override;
44-
};
45-
4635
/// Unify version metadata.
4736
/// \return true if changes are made.
4837
/// Assume the named metadata has operands each of which is a pair of
@@ -104,6 +93,7 @@ namespace {
10493
return true;
10594
}
10695

96+
/// Unify multiple OpenCL metadata due to linking.
10797
bool unifyMetadataImpl(Module &M) {
10898
const char *Vers[] = {kOCLMD::SpirVer, kOCLMD::OCLVer};
10999
const char *Exts[] = {kOCLMD::UsedExt, kOCLMD::UsedOptCoreFeat,
@@ -122,21 +112,6 @@ namespace {
122112

123113
} // end anonymous namespace
124114

125-
char AMDGPUUnifyMetadata::ID = 0;
126-
127-
char &llvm::AMDGPUUnifyMetadataID = AMDGPUUnifyMetadata::ID;
128-
129-
INITIALIZE_PASS(AMDGPUUnifyMetadata, "amdgpu-unify-metadata",
130-
"Unify multiple OpenCL metadata due to linking", false, false)
131-
132-
ModulePass *llvm::createAMDGPUUnifyMetadataPass() {
133-
return new AMDGPUUnifyMetadata();
134-
}
135-
136-
bool AMDGPUUnifyMetadata::runOnModule(Module &M) {
137-
return unifyMetadataImpl(M);
138-
}
139-
140115
PreservedAnalyses AMDGPUUnifyMetadataPass::run(Module &M,
141116
ModuleAnalysisManager &AM) {
142117
return unifyMetadataImpl(M) ? PreservedAnalyses::none()

0 commit comments

Comments
 (0)