Fix device binary extension for nvptx

oneapi-src · Sep 4, 2023 · ba9432a · ba9432a
1 parent 022bbae
commit ba9432a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/test/conformance/CMakeLists.txt b/test/conformance/CMakeLists.txt
@@ -65,7 +65,8 @@ if(DEFINED UR_DPCXX)
     file(MAKE_DIRECTORY ${UR_CONFORMANCE_DEVICE_BINARIES_DIR})
 
     if(NOT "${UR_CONFORMANCE_TARGET_TRIPLES}" STREQUAL "")
-        string(REPLACE "," ";" TARGET_TRIPLES ${UR_CONFORMANCE_TARGET_TRIPLES})
+        string(REPLACE "," ";" ${UR_CONFORMANCE_TARGET_TRIPLES} ${UR_CONFORMANCE_TARGET_TRIPLES})
+        list(APPEND TARGET_TRIPLES ${UR_CONFORMANCE_TARGET_TRIPLES})
     else()
         message(WARNING "UR_CONFORMANCE_TARGET_TRIPLES wasn't set, defaulting to only generate spir64 device binaries")
         list(APPEND TARGET_TRIPLES "spir64")

diff --git a/test/conformance/device_code/CMakeLists.txt b/test/conformance/device_code/CMakeLists.txt
@@ -8,7 +8,15 @@ macro(add_device_binary SOURCE_FILE)
     set(DEVICE_BINARY_DIR "${UR_CONFORMANCE_DEVICE_BINARIES_DIR}/${KERNEL_NAME}")
     file(MAKE_DIRECTORY ${DEVICE_BINARY_DIR})
     foreach(TRIPLE ${TARGET_TRIPLES})
-        set(EXE_PATH "${DEVICE_BINARY_DIR}/${KERNEL_NAME}_${TRIPLE}")
+
+        if ("${TRIPLE}" MATCHES "spir64")
+            set(EXTENSION ".spv")
+        elseif("${TRIPLE}" MATCHES "nvptx64")
+            set(EXTENSION ".bin")
+        endif()
+
+        set(EXE_PATH "${DEVICE_BINARY_DIR}/${KERNEL_NAME}_${TRIPLE}${EXTENSION}")
+
         add_custom_command(OUTPUT ${EXE_PATH}
             COMMAND ${UR_DPCXX} -fsycl -fsycl-targets=${TRIPLE} -fsycl-device-code-split=off
             ${SOURCE_FILE} -o ${EXE_PATH}