From 4d38209e5937645ce6ababfc55843a4ccb6cc03b Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 13 Dec 2017 11:30:01 -0500 Subject: [PATCH] P4 to Git Change 1493912 by gandryey@gera-w8 on 2017/12/13 11:20:09 SWDEV-79445 - OCL generic changes and code clean-up - Remove hardcoded binary signatures Review: http://ocltc.amd.com/reviews/r/13996/ Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#28 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#52 edit [ROCm/clr commit: e9411fa2d09af0f38246a9ba5f973aa25ac1bb68] --- .../clr/rocclr/runtime/device/pal/paldefs.hpp | 39 ----- .../rocclr/runtime/device/pal/palprogram.cpp | 135 ++++-------------- 2 files changed, 30 insertions(+), 144 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp index 9475da3330..6146c9ef11 100644 --- a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp +++ b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp @@ -165,45 +165,6 @@ static const AMDDeviceInfo Gfx9PlusSubDeviceInfo[] = { /* Navi10 XNACK */{ "", "", 4, 16, 1, 256, 64 * Ki, 32, 1001}, }; -enum gfx_handle { - gfx700 = 700, - gfx701 = 701, - gfx702 = 702, - gfx800 = 800, - gfx801 = 801, - gfx802 = 802, - gfx803 = 803, - gfx810 = 810, - gfx900 = 900, - gfx901 = 901, - gfx902 = 902, - gfx903 = 903, - gfx904 = 904, - gfx905 = 905, - gfx906 = 906, - gfx907 = 907, - gfx1000 = 1000, - gfx1001 = 1001 -}; - -static const char* Gfx700 = "AMD:AMDGPU:7:0:0"; -static const char* Gfx701 = "AMD:AMDGPU:7:0:1"; -static const char* Gfx800 = "AMD:AMDGPU:8:0:0"; -static const char* Gfx801 = "AMD:AMDGPU:8:0:1"; -static const char* Gfx802 = "AMD:AMDGPU:8:0:2"; -static const char* Gfx803 = "AMD:AMDGPU:8:0:3"; -static const char* Gfx810 = "AMD:AMDGPU:8:1:0"; -static const char* Gfx900 = "AMD:AMDGPU:9:0:0"; -static const char* Gfx901 = "AMD:AMDGPU:9:0:1"; -static const char* Gfx902 = "AMD:AMDGPU:9:0:2"; -static const char* Gfx903 = "AMD:AMDGPU:9:0:3"; -static const char* Gfx904 = "AMD:AMDGPU:9:0:4"; -static const char* Gfx905 = "AMD:AMDGPU:9:0:5"; -static const char* Gfx906 = "AMD:AMDGPU:9:0:6"; -static const char* Gfx907 = "AMD:AMDGPU:9:0:7"; -static const char* Gfx1000 = "AMD:AMDGPU:10:0:0"; -static const char* Gfx1001 = "AMD:AMDGPU:10:0:1"; - // Supported OpenCL versions enum OclVersion { OpenCL10, OpenCL11, OpenCL12, OpenCL20, OpenCL21 }; diff --git a/projects/clr/rocclr/runtime/device/pal/palprogram.cpp b/projects/clr/rocclr/runtime/device/pal/palprogram.cpp index 8daad62bdd..6cd74ea278 100644 --- a/projects/clr/rocclr/runtime/device/pal/palprogram.cpp +++ b/projects/clr/rocclr/runtime/device/pal/palprogram.cpp @@ -859,117 +859,42 @@ bool HSAILProgram::saveBinaryAndSetType(type_t type) { hsa_isa_t PALHSALoaderContext::IsaFromName(const char* name) { hsa_isa_t isa = {0}; - if (!strcmp(Gfx700, name)) { - isa.handle = gfx700; - return isa; - } - if (!strcmp(Gfx701, name)) { - isa.handle = gfx701; - return isa; - } - if (!strcmp(Gfx800, name)) { - isa.handle = gfx800; - return isa; - } - if (!strcmp(Gfx801, name)) { - isa.handle = gfx801; - return isa; - } - if (!strcmp(Gfx802, name)) { - isa.handle = gfx802; - return isa; - } - if (!strcmp(Gfx803, name)) { - isa.handle = gfx803; - return isa; - } - if (!strcmp(Gfx810, name)) { - isa.handle = gfx810; - return isa; - } - if (!strcmp(Gfx900, name)) { - isa.handle = gfx900; - return isa; - } - if (!strcmp(Gfx901, name)) { - isa.handle = gfx901; - return isa; - } - if (!strcmp(Gfx902, name)) { - isa.handle = gfx902; - return isa; - } - if (!strcmp(Gfx903, name)) { - isa.handle = gfx903; - return isa; - } - if (!strcmp(Gfx904, name)) { - isa.handle = gfx904; - return isa; - } - if (!strcmp(Gfx905, name)) { - isa.handle = gfx905; - return isa; - } - if (!strcmp(Gfx906, name)) { - isa.handle = gfx906; - return isa; - } - if (!strcmp(Gfx907, name)) { - isa.handle = gfx907; - return isa; - } - if (!strcmp(Gfx1000, name)) { - isa.handle = gfx1000; - return isa; - } - if (!strcmp(Gfx1001, name)) { - isa.handle = gfx1001; - return isa; - } - + uint32_t gfxip = 0; + std::string gfx_target(name); + uint32_t shift = 1; + size_t first; + size_t last = gfx_target.length(); + std::string ver; + do { + first = gfx_target.find_last_of(':', last); + ver = gfx_target.substr(first + 1, last - first); + last = first - 1; + gfxip += static_cast(atoi(ver.c_str())) * shift; + shift *= 10; + } while (shift <= 100); + isa.handle = gfxip; return isa; } bool PALHSALoaderContext::IsaSupportedByAgent(hsa_agent_t agent, hsa_isa_t isa) { - switch (program_->dev().hwInfo()->gfxipVersion_) { - default: - LogError("Unsupported gfxip version"); - return false; - case gfx700: - case gfx701: - case gfx702: - // gfx701 only differs from gfx700 by faster fp operations and can be loaded on either device. - return isa.handle == gfx700 || isa.handle == gfx701; - case gfx800: - return isa.handle == gfx800; - case gfx801: - return isa.handle == gfx801; - case gfx802: - return isa.handle == gfx800 || isa.handle == gfx801 || isa.handle == gfx802; - case gfx803: - // gfx800 ISA has only sgrps limited and can be loaded. - // gfx801 ISA has XNACK limitations and can be loaded. - return isa.handle == gfx800 || isa.handle == gfx801 || isa.handle == gfx802 || isa.handle == gfx803; - case gfx810: - return isa.handle == gfx810; - case gfx900: - case gfx901: - return isa.handle == gfx900 || isa.handle == gfx901; - case gfx902: - case gfx903: - return isa.handle == gfx902 || isa.handle == gfx903; - case gfx904: - case gfx905: - return isa.handle == gfx904 || isa.handle == gfx905; - case gfx906: - case gfx907: - return isa.handle == gfx906 || isa.handle == gfx907; - case gfx1000: - case gfx1001: - return isa.handle == gfx1000 || isa.handle == gfx1001; + uint32_t majorSrc = program_->dev().hwInfo()->gfxipVersion_ / 10; + uint32_t minorSrc = program_->dev().hwInfo()->gfxipVersion_ % 10; + uint32_t majorTrg = isa.handle / 10; + uint32_t minorTrg = isa.handle % 10; + + if (majorSrc != majorTrg) { + return false; } + else if (minorTrg == minorSrc) { + return true; + } + else if (minorTrg < minorSrc) { + LogWarning("ISA downgrade for execution!"); + return true; + } + + return false; } void* PALHSALoaderContext::SegmentAlloc(amdgpu_hsa_elf_segment_t segment, hsa_agent_t agent,