From 828eaf2e5fc42923b9af7dc54466299989ac5d52 Mon Sep 17 00:00:00 2001 From: coconutruben Date: Mon, 24 Feb 2025 09:57:55 -0800 Subject: [PATCH] device_prop.hpp - replace map with compile time hash and switch (#1898) * device_prop.hpp - replace map with compile time hash and switch Summary: We replace a static const map with a compile time hash function and a switch statement to achieve the same goal: translate names to architectures. Most of these are very old, however the function needs to continue to work. Why? because the static map can cause issues when compiling into libraries that get dynamically loaded/unloaded, leading to memory corruption Test Plan: Running pytorch `torch.compile()` with CK enabled, and seeing it not segfault on the 2nd kernel (1st reload of the library) Reviewers: Subscribers: Tasks: Tags: * clang-format [ROCm/composable_kernel commit: fcd4a6f3d1c956f3e78e937c9437a253ab91b0ec] --- include/ck/host_utility/device_prop.hpp | 50 ++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/include/ck/host_utility/device_prop.hpp b/include/ck/host_utility/device_prop.hpp index e04e27b761..402d924cbd 100644 --- a/include/ck/host_utility/device_prop.hpp +++ b/include/ck/host_utility/device_prop.hpp @@ -5,11 +5,17 @@ #ifndef __HIPCC_RTC__ #include -#include +#include #include namespace ck { +constexpr unsigned int fnv1a_hash(std::string_view str, unsigned int h = 2166136261u) +{ + return str.empty() ? h + : fnv1a_hash(str.substr(1), + (h ^ static_cast(str.front())) * 16777619u); +} inline std::string get_device_name() { hipDeviceProp_t props{}; @@ -19,37 +25,31 @@ inline std::string get_device_name() { return std::string(); } - status = hipGetDeviceProperties(&props, device); if(status != hipSuccess) { return std::string(); } const std::string raw_name(props.gcnArchName); - - // https://github.com/ROCm/MIOpen/blob/8498875aef84878e04c1eabefdf6571514891086/src/target_properties.cpp#L40 - static std::map device_name_map = { - {"Ellesmere", "gfx803"}, - {"Baffin", "gfx803"}, - {"RacerX", "gfx803"}, - {"Polaris10", "gfx803"}, - {"Polaris11", "gfx803"}, - {"Tonga", "gfx803"}, - {"Fiji", "gfx803"}, - {"gfx800", "gfx803"}, - {"gfx802", "gfx803"}, - {"gfx804", "gfx803"}, - {"Vega10", "gfx900"}, - {"gfx901", "gfx900"}, - {"10.3.0 Sienna_Cichlid 18", "gfx1030"}, - }; - const auto name = raw_name.substr(0, raw_name.find(':')); // str.substr(0, npos) returns str. - - auto match = device_name_map.find(name); - if(match != device_name_map.end()) - return match->second; - return name; + switch(fnv1a_hash(name)) + { + // https://github.com/ROCm/MIOpen/blob/8498875aef84878e04c1eabefdf6571514891086/src/target_properties.cpp#L40 + case fnv1a_hash("Ellesmere"): + case fnv1a_hash("Baffin"): + case fnv1a_hash("RacerX"): + case fnv1a_hash("Polaris10"): + case fnv1a_hash("Polaris11"): + case fnv1a_hash("Tonga"): + case fnv1a_hash("Fiji"): + case fnv1a_hash("gfx800"): + case fnv1a_hash("gfx802"): + case fnv1a_hash("gfx804"): return "gfx803"; + case fnv1a_hash("Vega10"): + case fnv1a_hash("gfx901"): return "gfx900"; + case fnv1a_hash("10.3.0 Sienna_Cichlid 18"): return "gfx1030"; + default: return name; + } } inline bool is_xdl_supported()