diff --git a/shared/tensile/Tensile/Common.py b/shared/tensile/Tensile/Common.py index 9ca48e06f9a..09d448cf6cc 100644 --- a/shared/tensile/Tensile/Common.py +++ b/shared/tensile/Tensile/Common.py @@ -326,7 +326,7 @@ class DeveloperWarning(Warning): 'gfx1010':'navi10', 'gfx1011':'navi12', 'gfx1012':'navi14', 'gfx1030':'navi21', 'gfx1031':'navi22', 'gfx1032':'navi23', 'gfx1034':'navi24', 'gfx1035':'rembrandt', 'gfx1100':'navi31', 'gfx1101':'navi32', 'gfx1102':'navi33', - 'gfx1151':'gfx1151', + 'gfx1151':'strixhalo', 'gfx1200':'gfx1200', 'gfx1201':'gfx1201' } diff --git a/shared/tensile/Tensile/Source/CMakeLists.txt b/shared/tensile/Tensile/Source/CMakeLists.txt index e02b209a262..f350b26caf7 100644 --- a/shared/tensile/Tensile/Source/CMakeLists.txt +++ b/shared/tensile/Tensile/Source/CMakeLists.txt @@ -51,9 +51,9 @@ if(CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" OR CMAKE_CXX_COMPILER MATCHES ".*clang endif() if(CMAKE_CXX_COMPILER STREQUAL "hipcc") - set(TENSILE_GPU_ARCHS gfx803 gfx900 gfx906:xnack- gfx908:xnack- gfx90a:xnack- gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 gfx1035 gfx1100 gfx1101 gfx1102 CACHE STRING "GPU architectures") + set(TENSILE_GPU_ARCHS gfx803 gfx900 gfx906:xnack- gfx908:xnack- gfx90a:xnack- gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 gfx1035 gfx1100 gfx1101 gfx1102 gfx1151 CACHE STRING "GPU architectures") else() - set(TENSILE_GPU_ARCHS gfx803 gfx900 gfx906 gfx908 gfx90a gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 gfx1035 gfx1100 gfx1101 gfx1102 CACHE STRING "GPU architectures") + set(TENSILE_GPU_ARCHS gfx803 gfx900 gfx906 gfx908 gfx90a gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 gfx1035 gfx1100 gfx1101 gfx1102 gfx1151 CACHE STRING "GPU architectures") endif() include(CMakeDependentOption) diff --git a/shared/tensile/Tensile/Source/lib/include/Tensile/AMDGPU.hpp b/shared/tensile/Tensile/Source/lib/include/Tensile/AMDGPU.hpp index 0d99a35f669..27c2305e3c4 100644 --- a/shared/tensile/Tensile/Source/lib/include/Tensile/AMDGPU.hpp +++ b/shared/tensile/Tensile/Source/lib/include/Tensile/AMDGPU.hpp @@ -72,7 +72,8 @@ namespace Tensile gfx1035 = 1035, gfx1100 = 1100, gfx1101 = 1101, - gfx1102 = 1102 + gfx1102 = 1102, + gfx1151 = 1151 }; static std::string toString(Processor p) @@ -115,6 +116,8 @@ namespace Tensile return "gfx1101"; case AMDGPU::Processor::gfx1102: return "gfx1102"; + case AMDGPU::Processor::gfx1151: + return "gfx1151"; } return ""; } @@ -177,6 +180,10 @@ namespace Tensile { return AMDGPU::Processor::gfx1102; } + else if(deviceString.find("gfx1151") != std::string::npos) + { + return AMDGPU::Processor::gfx1151; + } else { return static_cast(0); diff --git a/shared/tensile/Tensile/Source/lib/include/Tensile/PlaceholderLibrary.hpp b/shared/tensile/Tensile/Source/lib/include/Tensile/PlaceholderLibrary.hpp index 2ea803e1fd5..826b86721cf 100644 --- a/shared/tensile/Tensile/Source/lib/include/Tensile/PlaceholderLibrary.hpp +++ b/shared/tensile/Tensile/Source/lib/include/Tensile/PlaceholderLibrary.hpp @@ -57,6 +57,7 @@ namespace Tensile gfx1100, gfx1101, gfx1102, + gfx1151, All }; @@ -103,6 +104,10 @@ namespace Tensile return "TensileLibrary_*_gfx1101"; case LazyLoadingInit::gfx1102: return "TensileLibrary_*_gfx1102"; + case LazyLoadingInit::gfx1150: + return "TensileLibrary_*_gfx1150"; + case LazyLoadingInit::gfx1151: + return "TensileLibrary_*_gfx1151"; case LazyLoadingInit::None: return ""; } diff --git a/shared/tensile/Tensile/Source/lib/include/Tensile/Serialization/Predicates.hpp b/shared/tensile/Tensile/Source/lib/include/Tensile/Serialization/Predicates.hpp index 5480eb5481f..661474d34bb 100644 --- a/shared/tensile/Tensile/Source/lib/include/Tensile/Serialization/Predicates.hpp +++ b/shared/tensile/Tensile/Source/lib/include/Tensile/Serialization/Predicates.hpp @@ -233,6 +233,7 @@ namespace Tensile iot::enumCase(io, value, "gfx1100", AMDGPU::Processor::gfx1100); iot::enumCase(io, value, "gfx1101", AMDGPU::Processor::gfx1101); iot::enumCase(io, value, "gfx1102", AMDGPU::Processor::gfx1102); + iot::enumCase(io, value, "gfx1151", AMDGPU::Processor::gfx1151); } }; diff --git a/shared/tensile/pytest.ini b/shared/tensile/pytest.ini index 3614a7f0ab7..da1f29cc698 100644 --- a/shared/tensile/pytest.ini +++ b/shared/tensile/pytest.ini @@ -107,6 +107,7 @@ markers = xfail-gfx1100: architecture xfail-gfx1101: architecture xfail-gfx1102: architecture + xfail-gfx1151: architecture skip-gfx000: architecture skip-gfx900: architecture skip-gfx906: architecture