From 6b75c0831201bef24b53b3fc8440a6bc75246a1d Mon Sep 17 00:00:00 2001 From: Sean Keely Date: Fri, 7 Feb 2020 19:20:22 -0600 Subject: [PATCH] Add gfx1030 to image blit kernel build list. Change-Id: I2ddb6a595bb7ca5f6a94f38f8ecc2e40831c52fd [ROCm/ROCR-Runtime commit: 1d919adc7504d824dec92e95b9c5d5069888d510] --- .../rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt | 2 +- .../rocr-runtime/runtime/hsa-runtime/image/blit_kernel.cpp | 4 ++++ .../runtime/hsa-runtime/image/blit_src/CMakeLists.txt | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt b/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt index 70081c212d..175e7529bd 100755 --- a/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt +++ b/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt @@ -41,7 +41,7 @@ set(PROJECT_NAME "rocrtst64") project (${PROJECT_NAME}) -set(DEFAULT_TARGETS "gfx803;gfx701;gfx801;gfx802;gfx900;gfx902;gfx906;gfx908;gfx1010;gfx1011;gfx1012") +set(DEFAULT_TARGETS "gfx803;gfx701;gfx801;gfx802;gfx900;gfx902;gfx906;gfx908;gfx1010;gfx1011;gfx1012;gfx1030") # # Currently support for Windows platform is not present diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/blit_kernel.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/blit_kernel.cpp index c8ab67ac5d..475235336b 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/image/blit_kernel.cpp +++ b/projects/rocr-runtime/runtime/hsa-runtime/image/blit_kernel.cpp @@ -83,6 +83,7 @@ extern uint8_t ocl_blit_object_gfx908[]; extern uint8_t ocl_blit_object_gfx1010[]; extern uint8_t ocl_blit_object_gfx1011[]; extern uint8_t ocl_blit_object_gfx1012[]; +extern uint8_t ocl_blit_object_gfx1030[]; // Arguments inserted by OCL compiler, all zero here. struct OCLHiddenArgs { @@ -1005,6 +1006,9 @@ hsa_status_t BlitKernel::GetPatchedBlitObject(const char* agent_name, case 1012: *blit_code_object = ocl_blit_object_gfx1012; break; + case 1030: + *blit_code_object = ocl_blit_object_gfx1030; + break; default: return HSA_STATUS_ERROR_INVALID_ISA_NAME; } diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/blit_src/CMakeLists.txt b/projects/rocr-runtime/runtime/hsa-runtime/image/blit_src/CMakeLists.txt index c3e2838a00..f8bf0fa842 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/image/blit_src/CMakeLists.txt +++ b/projects/rocr-runtime/runtime/hsa-runtime/image/blit_src/CMakeLists.txt @@ -75,7 +75,7 @@ set( XNACK_DEVS ${XNACK_DEVS} CACHE STRING "XNACK targets" FORCE ) # Determine the target devices if not specified if (NOT DEFINED TARGET_DEVICES) - set (TARGET_DEVICES "gfx700;gfx701;gfx702;gfx801;gfx802;gfx803;gfx900;gfx902;gfx904;gfx906;gfx908;gfx1010;gfx1011;gfx1012") + set (TARGET_DEVICES "gfx700;gfx701;gfx702;gfx801;gfx802;gfx803;gfx900;gfx902;gfx904;gfx906;gfx908;gfx1010;gfx1011;gfx1012;gfx1030") endif() set( TARGET_DEVICES ${TARGET_DEVICES} CACHE STRING "Build targets" FORCE )