Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions llvm/lib/Target/AMDGPU/AMDGPU.h
Original file line number Diff line number Diff line change
Expand Up @@ -443,10 +443,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);
};
Expand Down
1 change: 0 additions & 1 deletion llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,6 @@ extern "C" LLVM_ABI LLVM_EXTERNAL_VISIBILITY void LLVMInitializeAMDGPUTarget() {
initializeAMDGPUReserveWWMRegsLegacyPass(*PR);
initializeAMDGPURewriteOutArgumentsPass(*PR);
initializeAMDGPURewriteUndefForPHILegacyPass(*PR);
initializeAMDGPUUnifyMetadataPass(*PR);
initializeSIAnnotateControlFlowLegacyPass(*PR);
initializeAMDGPUInsertDelayAluLegacyPass(*PR);
initializeSIInsertHardClausesLegacyPass(*PR);
Expand Down
27 changes: 1 addition & 26 deletions llvm/lib/Target/AMDGPU/AMDGPUUnifyMetadata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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()
Expand Down
Loading