From 2ef280bc08b58e6562dbf7f70b33fcd55f27d1b0 Mon Sep 17 00:00:00 2001 From: Mike Lothian Date: Wed, 27 Aug 2025 16:22:28 +0100 Subject: [PATCH] Disable gfx940/941 --- rocrtst/suites/test_common/CMakeLists.txt | 2 +- .../core/runtime/amd_gpu_agent.cpp | 30 +------------------ .../core/runtime/blit_shaders/CMakeLists.txt | 4 +-- .../core/runtime/trap_handler/CMakeLists.txt | 6 ++-- .../hsa-runtime/image/blit_src/CMakeLists.txt | 2 +- 5 files changed, 8 insertions(+), 36 deletions(-) diff --git a/rocrtst/suites/test_common/CMakeLists.txt b/rocrtst/suites/test_common/CMakeLists.txt index 1da7a39..cf5000d 100755 --- a/rocrtst/suites/test_common/CMakeLists.txt +++ b/rocrtst/suites/test_common/CMakeLists.txt @@ -110,7 +110,7 @@ else() endif() set(DEFAULT_TARGETS "gfx700;gfx701;gfx702;gfx801;gfx802;gfx803;gfx805;gfx810" - "gfx900;gfx902;gfx904;gfx906;gfx908;gfx909;gfx90a;gfx90c;gfx940;gfx941;gfx942;gfx950" + "gfx900;gfx902;gfx904;gfx906;gfx908;gfx909;gfx90a;gfx90c;gfx942;gfx950" "gfx1010;gfx1011;gfx1012;gfx1013;gfx1030;gfx1031;gfx1032;gfx1033;gfx1034;gfx1035;gfx1036" "gfx1100;gfx1101;gfx1102;gfx1103;gfx1150;gfx1151;gfx1152;gfx1153;gfx1200;gfx1201") diff --git a/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp b/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp index b096848..e73871b 100644 --- a/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp +++ b/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp @@ -290,7 +290,6 @@ void GpuAgent::AssembleShader(const char* func_name, AssembleTarget assemble_tar ASICShader compute_8; ASICShader compute_9; ASICShader compute_90a; - ASICShader compute_940; ASICShader compute_942; ASICShader compute_1010; ASICShader compute_10; @@ -305,8 +304,6 @@ void GpuAgent::AssembleShader(const char* func_name, AssembleTarget assemble_tar {kCodeTrapHandler8, sizeof(kCodeTrapHandler8), 2, 4}, // gfx8 {kCodeTrapHandler9, sizeof(kCodeTrapHandler9), 2, 4}, // gfx9 {kCodeTrapHandler90a, sizeof(kCodeTrapHandler90a), 2, 4}, // gfx90a - {NULL, 0, 0, 0}, // gfx940 - {NULL, 0, 0, 0}, // gfx942 {kCodeTrapHandler1010, sizeof(kCodeTrapHandler1010), 2, 4}, // gfx1010 {kCodeTrapHandler10, sizeof(kCodeTrapHandler10), 2, 4}, // gfx10 {NULL, 0, 0, 0}, // gfx11 @@ -320,8 +317,6 @@ void GpuAgent::AssembleShader(const char* func_name, AssembleTarget assemble_tar {kCodeTrapHandler8, sizeof(kCodeTrapHandler8), 2, 4}, // gfx8 {kCodeTrapHandlerV2_9, sizeof(kCodeTrapHandlerV2_9), 2, 4}, // gfx9 {kCodeTrapHandlerV2_9, sizeof(kCodeTrapHandlerV2_9), 2, 4}, // gfx90a - {kCodeTrapHandlerV2_940, sizeof(kCodeTrapHandlerV2_940), 2, 4}, // gfx940 - {kCodeTrapHandlerV2_940, sizeof(kCodeTrapHandlerV2_940), 2, 4}, // gfx942 {kCodeTrapHandlerV2_1010, sizeof(kCodeTrapHandlerV2_1010), 2, 4},// gfx1010 {kCodeTrapHandlerV2_10, sizeof(kCodeTrapHandlerV2_10), 2, 4}, // gfx10 {kCodeTrapHandlerV2_11, sizeof(kCodeTrapHandlerV2_11), 2, 4}, // gfx11 @@ -333,8 +328,6 @@ void GpuAgent::AssembleShader(const char* func_name, AssembleTarget assemble_tar {kCodeCopyAligned8, sizeof(kCodeCopyAligned8), 32, 12}, // gfx8 {kCodeCopyAligned9, sizeof(kCodeCopyAligned9), 32, 12}, // gfx9 {kCodeCopyAligned9, sizeof(kCodeCopyAligned9), 32, 12}, // gfx90a - {kCodeCopyAligned940, sizeof(kCodeCopyAligned940), 32, 12}, // gfx940 - {kCodeCopyAligned9, sizeof(kCodeCopyAligned9), 32, 12}, // gfx942 {kCodeCopyAligned10, sizeof(kCodeCopyAligned10), 32, 12}, // gfx1010 {kCodeCopyAligned10, sizeof(kCodeCopyAligned10), 32, 12}, // gfx10 {kCodeCopyAligned11, sizeof(kCodeCopyAligned11), 32, 12}, // gfx11 @@ -346,8 +339,6 @@ void GpuAgent::AssembleShader(const char* func_name, AssembleTarget assemble_tar {kCodeCopyMisaligned8, sizeof(kCodeCopyMisaligned8), 23, 10}, // gfx8 {kCodeCopyMisaligned9, sizeof(kCodeCopyMisaligned9), 23, 10}, // gfx9 {kCodeCopyMisaligned9, sizeof(kCodeCopyMisaligned9), 23, 10}, // gfx90a - {kCodeCopyMisaligned940, sizeof(kCodeCopyMisaligned940), 23, 10},// gfx940 - {kCodeCopyMisaligned9, sizeof(kCodeCopyMisaligned9), 23, 10}, // gfx942 {kCodeCopyMisaligned10, sizeof(kCodeCopyMisaligned10), 23, 10}, // gfx1010 {kCodeCopyMisaligned10, sizeof(kCodeCopyMisaligned10), 23, 10}, // gfx10 {kCodeCopyMisaligned11, sizeof(kCodeCopyMisaligned11), 23, 10}, // gfx11 @@ -359,8 +350,6 @@ void GpuAgent::AssembleShader(const char* func_name, AssembleTarget assemble_tar {kCodeFill8, sizeof(kCodeFill8), 19, 8}, // gfx8 {kCodeFill9, sizeof(kCodeFill9), 19, 8}, // gfx9 {kCodeFill9, sizeof(kCodeFill9), 19, 8}, // gfx90a - {kCodeFill940, sizeof(kCodeFill940), 19, 8}, // gfx940 - {kCodeFill9, sizeof(kCodeFill9), 19, 8}, // gfx942 {kCodeFill10, sizeof(kCodeFill10), 19, 8}, // gfx1010 {kCodeFill10, sizeof(kCodeFill10), 19, 8}, // gfx10 {kCodeFill11, sizeof(kCodeFill11), 19, 8}, // gfx11 @@ -381,24 +370,7 @@ void GpuAgent::AssembleShader(const char* func_name, AssembleTarget assemble_tar asic_shader = &compiled_shader_it->second.compute_8; break; case 9: - if((isa_->GetMinorVersion() == 0) && (isa_->GetStepping() == 10)) { - asic_shader = &compiled_shader_it->second.compute_90a; - } else if(isa_->GetMinorVersion() == 4) { - switch(isa_->GetStepping()) { - case 0: - case 1: - asic_shader = &compiled_shader_it->second.compute_940; - break; - case 2: - default: - asic_shader = &compiled_shader_it->second.compute_942; - break; - } - } else if(isa_->GetMinorVersion() == 5) { - asic_shader = &compiled_shader_it->second.compute_942; - } else { - asic_shader = &compiled_shader_it->second.compute_9; - } + asic_shader = &compiled_shader_it->second.compute_9; break; case 10: if(isa_->GetMinorVersion() == 1) diff --git a/runtime/hsa-runtime/core/runtime/blit_shaders/CMakeLists.txt b/runtime/hsa-runtime/core/runtime/blit_shaders/CMakeLists.txt index e63d380..e1a973b 100644 --- a/runtime/hsa-runtime/core/runtime/blit_shaders/CMakeLists.txt +++ b/runtime/hsa-runtime/core/runtime/blit_shaders/CMakeLists.txt @@ -49,10 +49,10 @@ find_package(Clang REQUIRED HINTS ${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm find_package(LLVM REQUIRED HINTS ${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ) # Set the target devices -set (TARGET_DEVS "gfx900;gfx940;gfx1010;gfx1030;gfx1100;gfx1200") +set (TARGET_DEVS "gfx900;gfx1010;gfx1030;gfx1100;gfx1200") # Set the postfix for each target device -set (POSTFIX "9;940;1010;10;11;12") +set (POSTFIX "9;1010;10;11;12") # If verbose output is enabled, print paths and target devices if(${CMAKE_VERBOSE_MAKEFILE}) diff --git a/runtime/hsa-runtime/core/runtime/trap_handler/CMakeLists.txt b/runtime/hsa-runtime/core/runtime/trap_handler/CMakeLists.txt index 6f37e9e..e70e9dd 100644 --- a/runtime/hsa-runtime/core/runtime/trap_handler/CMakeLists.txt +++ b/runtime/hsa-runtime/core/runtime/trap_handler/CMakeLists.txt @@ -46,9 +46,9 @@ cmake_minimum_required ( VERSION 3.7 ) find_package(Clang REQUIRED HINTS ${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ) find_package(LLVM REQUIRED HINTS ${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ) -set (TARGET_DEVS "gfx900;gfx940;gfx941;gfx942;gfx950;gfx1010;gfx1030;gfx1100;gfx1200") -set (POSTFIX "9;940;941;942;950;1010;10;11;12") -set (SOURCE_SUFFIX ";;;;;;;;_gfx12") +set (TARGET_DEVS "gfx900;gfx942;gfx950;gfx1010;gfx1030;gfx1100;gfx1200") +set (POSTFIX "9;942;950;1010;10;11;12") +set (SOURCE_SUFFIX ";;;;;;_gfx12") if(${CMAKE_VERBOSE_MAKEFILE}) get_property(clang_path TARGET clang PROPERTY LOCATION) diff --git a/runtime/hsa-runtime/image/blit_src/CMakeLists.txt b/runtime/hsa-runtime/image/blit_src/CMakeLists.txt index 7bc2194..b6ac600 100644 --- a/runtime/hsa-runtime/image/blit_src/CMakeLists.txt +++ b/runtime/hsa-runtime/image/blit_src/CMakeLists.txt @@ -48,7 +48,7 @@ find_package(Clang REQUIRED HINTS ${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm # Determine the target devices if not specified if (NOT DEFINED TARGET_DEVICES) set (TARGET_DEVICES "gfx700;gfx701;gfx702;gfx801;gfx802;gfx803;gfx805;gfx810" - "gfx900;gfx902;gfx904;gfx906;gfx908;gfx909;gfx90a;gfx90c;gfx940;gfx941;gfx942;gfx950" + "gfx900;gfx902;gfx904;gfx906;gfx908;gfx909;gfx90a;gfx90c;gfx942;gfx950" "gfx1010;gfx1011;gfx1012;gfx1013;gfx1030;gfx1031;gfx1032;gfx1033;gfx1034;gfx1035;gfx1036" "gfx1100;gfx1101;gfx1102;gfx1103;gfx1150;gfx1151;gfx1152;gfx1153;gfx1200;gfx1201") endif() -- 2.51.0