Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[mlir][ROCDL] Construct AMDGCN ISA control variable explicitly #98912

Merged
merged 1 commit into from
Jul 16, 2024
Merged

[mlir][ROCDL] Construct AMDGCN ISA control variable explicitly #98912

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions mlir/lib/Target/LLVM/ROCDL/Target.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,6 @@ LogicalResult SerializeGPUModuleBase::appendStandardLibs(AMDGCNLibraries libs) {
return failure();
}

// Get the ISA version.
StringRef isaVersion =
llvm::AMDGPU::getArchNameAMDGCN(llvm::AMDGPU::parseArchAMDGCN(chip));
isaVersion.consume_front("gfx");

// Helper function for adding a library.
auto addLib = [&](const Twine &lib) -> bool {
auto baseSize = path.size();
Expand All @@ -175,9 +170,7 @@ LogicalResult SerializeGPUModuleBase::appendStandardLibs(AMDGCNLibraries libs) {
if ((any(libs & AMDGCNLibraries::Ocml) && addLib("ocml.bc")) ||
(any(libs & AMDGCNLibraries::Ockl) && addLib("ockl.bc")) ||
(any(libs & AMDGCNLibraries::Hip) && addLib("hip.bc")) ||
(any(libs & AMDGCNLibraries::OpenCL) && addLib("opencl.bc")) ||
(any(libs & (AMDGCNLibraries::Ocml | AMDGCNLibraries::Ockl)) &&
addLib("oclc_isa_version_" + isaVersion + ".bc")))
(any(libs & AMDGCNLibraries::OpenCL) && addLib("opencl.bc")))
return failure();
return success();
}
Expand Down Expand Up @@ -270,6 +263,14 @@ void SerializeGPUModuleBase::addControlVariables(
// Add ocml or ockl related control variables.
if (any(libs & (AMDGCNLibraries::Ocml | AMDGCNLibraries::Ockl))) {
addControlVariable("__oclc_wavefrontsize64", wave64, 8);

// Get the ISA version.
llvm::AMDGPU::IsaVersion isaVersion = llvm::AMDGPU::getIsaVersion(chip);
// Add the ISA control variable.
addControlVariable("__oclc_ISA_version",
isaVersion.Minor + 100 * isaVersion.Stepping +
1000 * isaVersion.Major,
32);
int abi = 500;
abiVer.getAsInteger(0, abi);
addControlVariable("__oclc_ABI_version", abi, 32);
Expand Down
Loading