From cc9b424077e3c79c035afd2862041303ded1fc5d Mon Sep 17 00:00:00 2001 From: Aaron Greig Date: Wed, 24 Jan 2024 14:15:38 +0000 Subject: [PATCH] Fix typo in FindRocmAgentEnumerator.cmake Also reset HIP compiler args between targets in device code generation to avoid generating unused argument warnings. --- cmake/FindRocmAgentEnumerator.cmake | 2 +- test/conformance/device_code/CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/FindRocmAgentEnumerator.cmake b/cmake/FindRocmAgentEnumerator.cmake index 987c1bb74f..6c32410265 100644 --- a/cmake/FindRocmAgentEnumerator.cmake +++ b/cmake/FindRocmAgentEnumerator.cmake @@ -9,7 +9,7 @@ # rocm_agent_enumerator is found. # -find_program(ROCM_AGENT_ENUMERATOR NAMES not_rocm_agent_enumerator) +find_program(ROCM_AGENT_ENUMERATOR NAMES rocm_agent_enumerator) if(ROCM_AGENT_ENUMERATOR) set(ROCM_AGENT_ENUMERATOR_FOUND TRUE) diff --git a/test/conformance/device_code/CMakeLists.txt b/test/conformance/device_code/CMakeLists.txt index 2942dc8ef1..4a60503d23 100644 --- a/test/conformance/device_code/CMakeLists.txt +++ b/test/conformance/device_code/CMakeLists.txt @@ -58,6 +58,10 @@ macro(add_device_binary SOURCE_FILE) set(AMD_TARGET_BACKEND -Xsycl-target-backend=${TRIPLE}) set(AMD_OFFLOAD_ARCH --offload-arch=${AMD_ARCH}) set(AMD_NOGPULIB -nogpulib) + else() + set(AMD_TARGET_BACKEND) + set(AMD_OFFLOAD_ARCH) + set(AMD_NOGPULIB) endif() # images are not yet supported in sycl on AMD if(${TRIPLE} MATCHES "amd" AND ${KERNEL_NAME} MATCHES "image_copy")