Skip to content

[Offload][AMDGPU] accept generic target #118919

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

Merged
merged 4 commits into from
Dec 10, 2024
Merged

[Offload][AMDGPU] accept generic target #118919

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07d439c
[Offload][AMDGPU] accept generic target
hidekisaito Dec 6, 2024
84399a9
Code Review adjustments
hidekisaito Dec 7, 2024
1ac5b2d
Code Review adjustments
hidekisaito Dec 9, 2024
8eab21c
Code Review adjustments
hidekisaito Dec 9, 2024
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
15 changes: 10 additions & 5 deletions offload/DeviceRTL/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,16 @@ set(devicertl_base_directory ${CMAKE_CURRENT_SOURCE_DIR})
set(include_directory ${devicertl_base_directory}/include)
set(source_directory ${devicertl_base_directory}/src)

set(all_amdgpu_architectures "gfx700;gfx701;gfx801;gfx803;gfx900;gfx902;gfx906"
"gfx908;gfx90a;gfx90c;gfx940;gfx941;gfx942;gfx950;gfx1010"
"gfx1012;gfx1030;gfx1031;gfx1032;gfx1033;gfx1034;gfx1035"
"gfx1036;gfx1100;gfx1101;gfx1102;gfx1103;gfx1150"
"gfx1151;gfx1152;gfx1153")
set(all_amdgpu_architectures "gfx700;gfx701;gfx801;gfx803"
"gfx9-generic;gfx900;gfx902;gfx906;gfx908"
"gfx90a;gfx90c"
"gfx9-4-generic;gfx940;gfx941;gfx942;gfx950"
"gfx10-1-generic;gfx1010;gfx1012"
"gfx10-3-generic;gfx1030;gfx1031;gfx1032;gfx1033"
"gfx1034;gfx1035;gfx1036"
"gfx11-generic;gfx1100;gfx1101;gfx1102;gfx1103"
"gfx1150;gfx1151;gfx1152;gfx1153"
"gfx12-generic")
set(all_nvptx_architectures "sm_35;sm_37;sm_50;sm_52;sm_53;sm_60;sm_61;sm_62"
"sm_70;sm_72;sm_75;sm_80;sm_86;sm_87;sm_89;sm_90")
set(all_gpu_architectures
Expand Down
40 changes: 26 additions & 14 deletions offload/plugins-nextgen/amdgpu/src/rtl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,9 @@ Error asyncMemCopy(bool UseMultipleSdmaEngines, void *Dst, hsa_agent_t DstAgent,
#endif
}

Expected<std::string> getTargetTripleAndFeatures(hsa_agent_t Agent) {
std::string Target;
Expected<StringRef>
getTargetTripleAndFeatures(hsa_agent_t Agent, SmallVector<StringRef> &Targets) {
StringRef SpecificTarget;
auto Err = hsa_utils::iterateAgentISAs(Agent, [&](hsa_isa_t ISA) {
uint32_t Length;
hsa_status_t Status;
Expand All @@ -205,13 +206,19 @@ Expected<std::string> getTargetTripleAndFeatures(hsa_agent_t Agent) {
return Status;

llvm::StringRef TripleTarget(ISAName.begin(), Length);
if (TripleTarget.consume_front("amdgcn-amd-amdhsa"))
Target = TripleTarget.ltrim('-').rtrim('\0').str();
return HSA_STATUS_INFO_BREAK;
if (TripleTarget.consume_front("amdgcn-amd-amdhsa")) {
auto Target = TripleTarget.ltrim('-').rtrim('\0');
Targets.push_back(Target);
if (!Target.ends_with("generic"))
SpecificTarget = Target; // Expect one (and only one) to be found
}
return HSA_STATUS_SUCCESS;
});
if (Err)
return Err;
return Target;
if (SpecificTarget.empty())
return Plugin::error("Specific Target ISA not found");
return SpecificTarget;
}
} // namespace hsa_utils

Expand Down Expand Up @@ -1988,8 +1995,9 @@ struct AMDGPUDeviceTy : public GenericDeviceTy, AMDGenericDeviceTy {
return Err;

// Detect if XNACK is enabled
SmallVector<StringRef> Targets;
auto TargeTripleAndFeaturesOrError =
hsa_utils::getTargetTripleAndFeatures(Agent);
hsa_utils::getTargetTripleAndFeatures(Agent, Targets);
if (!TargeTripleAndFeaturesOrError)
return TargeTripleAndFeaturesOrError.takeError();
if (static_cast<StringRef>(*TargeTripleAndFeaturesOrError)
Expand Down Expand Up @@ -3207,13 +3215,17 @@ struct AMDGPUPluginTy final : public GenericPluginTy {
if (!Processor)
return false;

auto TargeTripleAndFeaturesOrError =
hsa_utils::getTargetTripleAndFeatures(getKernelAgent(DeviceId));
if (!TargeTripleAndFeaturesOrError)
return TargeTripleAndFeaturesOrError.takeError();
return offloading::amdgpu::isImageCompatibleWithEnv(
Processor ? *Processor : "", ElfOrErr->getPlatformFlags(),
*TargeTripleAndFeaturesOrError);
SmallVector<StringRef> Targets;
auto TargetTripleAndFeaturesOrError = hsa_utils::getTargetTripleAndFeatures(
getKernelAgent(DeviceId), Targets);
if (!TargetTripleAndFeaturesOrError)
return TargetTripleAndFeaturesOrError.takeError();
for (auto &Target : Targets)
if (offloading::amdgpu::isImageCompatibleWithEnv(
Processor ? *Processor : "", ElfOrErr->getPlatformFlags(),
Target.str()))
return true;
return false;
}

bool isDataExchangable(int32_t SrcDeviceId, int32_t DstDeviceId) override {
Expand Down
3 changes: 2 additions & 1 deletion offload/plugins-nextgen/common/src/Utils/ELF.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ checkMachineImpl(const object::ELFObjectFile<ELFT> &ELFObj, uint16_t EMachine) {
Header.e_ident[EI_ABIVERSION] != ELFABIVERSION_AMDGPU_HSA_V6)
return createError("Invalid AMD ABI version, must be version 4 or above");
if ((Header.e_flags & EF_AMDGPU_MACH) < EF_AMDGPU_MACH_AMDGCN_GFX700 ||
(Header.e_flags & EF_AMDGPU_MACH) > EF_AMDGPU_MACH_AMDGCN_GFX1201)
(Header.e_flags & EF_AMDGPU_MACH) >
EF_AMDGPU_MACH_AMDGCN_GFX9_4_GENERIC)
return createError("Unsupported AMDGPU architecture");
} else if (Header.e_machine == EM_CUDA) {
if (~Header.e_flags & EF_CUDA_64BIT_ADDRESS)
Expand Down
Loading