oneapi-src · kbenzie · Nov 3, 2023 · Oct 31, 2023
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -203,6 +203,10 @@ jobs:
       run: LD_LIBRARY_PATH=${{github.workspace}}/dpcpp_compiler/lib
         cmake --build ${{github.workspace}}/build -j $(nproc)
 
+    - name: Test adapter specific
+      working-directory: ${{github.workspace}}/build
+      run: ctest -C ${{matrix.build_type}} --output-on-failure -L "adapter-specific" --timeout 180
+
     # Temporarily disabling platform test for L0, because of hang
     # See issue: #824
     - name: Test L0 adapter

diff --git a/source/adapters/cuda/CMakeLists.txt b/source/adapters/cuda/CMakeLists.txt
@@ -3,8 +3,6 @@
 # See LICENSE.TXT
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-set(CUDA_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE PATH "CUDA adapter directory")
-
 set(TARGET_NAME ur_adapter_cuda)
 
 add_ur_adapter(${TARGET_NAME}

diff --git a/source/adapters/hip/CMakeLists.txt b/source/adapters/hip/CMakeLists.txt
@@ -3,8 +3,6 @@
 # See LICENSE.TXT
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-set(HIP_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE PATH "HIP adapter directory")
-
 set(TARGET_NAME ur_adapter_hip)
 
 # Set default UR HIP platform to AMD

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -16,6 +16,7 @@ enable_testing()
 
 add_subdirectory(python)
 add_subdirectory(loader)
+add_subdirectory(adapters)
 add_subdirectory(conformance)
 add_subdirectory(unified_malloc_framework)
 add_subdirectory(usm)

diff --git a/test/adapters/CMakeLists.txt b/test/adapters/CMakeLists.txt
@@ -0,0 +1,46 @@
+# Copyright (C) 2023 Intel Corporation
+# Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM Exceptions.
+# See LICENSE.TXT
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+function(add_adapter_test name)
+    cmake_parse_arguments(args
+        ""                      # options
+        "FIXTURE"               # one value keywords
+        "SOURCES;ENVIRONMENT"   # multi value keywords
+        ${ARGN})
+
+    set(target test-adapter-${name})
+    add_ur_executable(${target} ${args_SOURCES}
+        ${PROJECT_SOURCE_DIR}/test/conformance/source/environment.cpp
+        ${PROJECT_SOURCE_DIR}/test/conformance/source/main.cpp
+    )
+
+    set(fixtures "PLATFORM;DEVICES;KERNELS")
+    if(NOT args_FIXTURE IN_LIST fixtures)
+        message(FATAL_ERROR
+            "FIXTURE must be one of: ${fixtures}. Found: ${args_FIXTURE}")
+    endif()
+
+    target_compile_definitions(${target} PRIVATE
+        ${args_FIXTURE}_ENVIRONMENT)
+    target_link_libraries(${target} PRIVATE
+        ${PROJECT_NAME}::loader
+        ${PROJECT_NAME}::headers
+        ${PROJECT_NAME}::testing
+        ${PROJECT_NAME}::common
+        GTest::gtest)
+
+    add_test(NAME ${target} COMMAND $<TARGET_FILE:${target}>)
+    set_tests_properties(${target} PROPERTIES
+        LABELS "adapter-specific;${name}"
+        ENVIRONMENT "${args_ENVIRONMENT}")
+endfunction()
+
+if(UR_BUILD_ADAPTER_CUDA)
+    add_subdirectory(cuda)
+endif()
+
+if(UR_BUILD_ADAPTER_HIP)
+    add_subdirectory(hip)
+endif()
diff --git a/test/adapters/cuda/CMakeLists.txt b/test/adapters/cuda/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Copyright (C) 2023 Intel Corporation
+# Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM Exceptions.
+# See LICENSE.TXT
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+add_adapter_test(cuda
+    FIXTURE DEVICES
+    SOURCES
+        fixtures.h
+        context_tests.cpp
+        urContextGetNativeHandle.cpp
+        urDeviceGetNativeHandle.cpp
+        urDeviceCreateWithNativeHandle.cpp
+        urEventGetNativeHandle.cpp
+        urEventCreateWithNativeHandle.cpp
+        kernel_tests.cpp
+        memory_tests.cpp
+    ENVIRONMENT
+        "UR_ADAPTERS_FORCE_LOAD=\"$<TARGET_FILE:ur_adapter_cuda>\""
+)
+
+target_include_directories(test-adapter-cuda PRIVATE
+    ${PROJECT_SOURCE_DIR}/source
+    ${PROJECT_SOURCE_DIR}/source/adapters/cuda
+)
+
+target_link_libraries(test-adapter-cuda PRIVATE cudadrv)
diff --git a/...nformance/adapters/cuda/context_tests.cpp → test/adapters/cuda/context_tests.cpp b/...nformance/adapters/cuda/context_tests.cpp → test/adapters/cuda/context_tests.cpp
diff --git a/test/conformance/adapters/cuda/fixtures.h → test/adapters/cuda/fixtures.h b/test/conformance/adapters/cuda/fixtures.h → test/adapters/cuda/fixtures.h
diff --git a/...onformance/adapters/cuda/kernel_tests.cpp → test/adapters/cuda/kernel_tests.cpp b/...onformance/adapters/cuda/kernel_tests.cpp → test/adapters/cuda/kernel_tests.cpp
diff --git a/...onformance/adapters/cuda/memory_tests.cpp → test/adapters/cuda/memory_tests.cpp b/...onformance/adapters/cuda/memory_tests.cpp → test/adapters/cuda/memory_tests.cpp
diff --git a/...dapters/cuda/urContextGetNativeHandle.cpp → ...dapters/cuda/urContextGetNativeHandle.cpp b/...dapters/cuda/urContextGetNativeHandle.cpp → ...dapters/cuda/urContextGetNativeHandle.cpp
diff --git a/...s/cuda/urDeviceCreateWithNativeHandle.cpp → ...s/cuda/urDeviceCreateWithNativeHandle.cpp b/...s/cuda/urDeviceCreateWithNativeHandle.cpp → ...s/cuda/urDeviceCreateWithNativeHandle.cpp
diff --git a/...adapters/cuda/urDeviceGetNativeHandle.cpp → ...adapters/cuda/urDeviceGetNativeHandle.cpp b/...adapters/cuda/urDeviceGetNativeHandle.cpp → ...adapters/cuda/urDeviceGetNativeHandle.cpp
diff --git a/...rs/cuda/urEventCreateWithNativeHandle.cpp → ...rs/cuda/urEventCreateWithNativeHandle.cpp b/...rs/cuda/urEventCreateWithNativeHandle.cpp → ...rs/cuda/urEventCreateWithNativeHandle.cpp
diff --git a/.../adapters/cuda/urEventGetNativeHandle.cpp → .../adapters/cuda/urEventGetNativeHandle.cpp b/.../adapters/cuda/urEventGetNativeHandle.cpp → .../adapters/cuda/urEventGetNativeHandle.cpp
diff --git a/test/adapters/hip/CMakeLists.txt b/test/adapters/hip/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Copyright (C) 2023 Intel Corporation
+# Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM Exceptions.
+# See LICENSE.TXT
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+add_adapter_test(hip
+    FIXTURE DEVICES
+    SOURCES
+        fixtures.h
+        urContextGetNativeHandle.cpp
+        urDeviceGetNativeHandle.cpp
+        urEventGetNativeHandle.cpp
+        test_context.cpp
+    ENVIRONMENT
+        "UR_ADAPTERS_FORCE_LOAD=\"$<TARGET_FILE:ur_adapter_hip>\""
+)
+
+target_include_directories(test-adapter-hip PRIVATE
+    ${PROJECT_SOURCE_DIR}/source
+    ${PROJECT_SOURCE_DIR}/source/adapters/hip
+)
+
+get_target_property(HIP_COMPILE_DEFINITIONS
+    ur_adapter_hip COMPILE_DEFINITIONS)
+target_compile_definitions(test-adapter-hip PRIVATE
+    ${HIP_COMPILE_DEFINITIONS}
+)
+
+target_link_libraries(test-adapter-hip PRIVATE rocmdrv)
diff --git a/test/conformance/adapters/hip/fixtures.h → test/adapters/hip/fixtures.h b/test/conformance/adapters/hip/fixtures.h → test/adapters/hip/fixtures.h
diff --git a/...conformance/adapters/hip/test_context.cpp → test/adapters/hip/test_context.cpp b/...conformance/adapters/hip/test_context.cpp → test/adapters/hip/test_context.cpp
diff --git a/...adapters/hip/urContextGetNativeHandle.cpp → ...adapters/hip/urContextGetNativeHandle.cpp b/...adapters/hip/urContextGetNativeHandle.cpp → ...adapters/hip/urContextGetNativeHandle.cpp
diff --git a/.../adapters/hip/urDeviceGetNativeHandle.cpp → .../adapters/hip/urDeviceGetNativeHandle.cpp b/.../adapters/hip/urDeviceGetNativeHandle.cpp → .../adapters/hip/urDeviceGetNativeHandle.cpp
diff --git a/...e/adapters/hip/urEventGetNativeHandle.cpp → test/adapters/hip/urEventGetNativeHandle.cpp b/...e/adapters/hip/urEventGetNativeHandle.cpp → test/adapters/hip/urEventGetNativeHandle.cpp
diff --git a/test/conformance/CMakeLists.txt b/test/conformance/CMakeLists.txt
@@ -39,28 +39,22 @@ function(add_conformance_test name)
         ${PROJECT_NAME}::common
         GTest::gtest_main)
 
-    if(USE_LOCAL_TEST_CONFIGURATION)
-	    add_test(NAME ${name}
-            COMMAND ${TEST_TARGET_NAME}
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    else()
-        if(UR_BUILD_ADAPTER_CUDA)
-            add_test_adapter(${name} adapter_cuda)
-        endif()
-        if(UR_BUILD_ADAPTER_HIP)
-            add_test_adapter(${name} adapter_hip)
-        endif()
-        if(UR_BUILD_ADAPTER_L0)
-            add_test_adapter(${name} adapter_level_zero)
-        endif()
-        if(UR_BUILD_ADAPTER_OPENCL)
-            add_test_adapter(${name} adapter_opencl)
-        endif()
-
-        if(NOT (UR_BUILD_ADAPTER_CUDA OR UR_BUILD_ADAPTER_HIP
-                OR UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_OPENCL))
-            add_test_adapter(${name} adapter_null)
-        endif()
+    if(UR_BUILD_ADAPTER_CUDA)
+        add_test_adapter(${name} adapter_cuda)
+    endif()
+    if(UR_BUILD_ADAPTER_HIP)
+        add_test_adapter(${name} adapter_hip)
+    endif()
+    if(UR_BUILD_ADAPTER_L0)
+        add_test_adapter(${name} adapter_level_zero)
+    endif()
+    if(UR_BUILD_ADAPTER_OPENCL)
+        add_test_adapter(${name} adapter_opencl)
+    endif()
+
+    if(NOT (UR_BUILD_ADAPTER_CUDA OR UR_BUILD_ADAPTER_HIP
+            OR UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_OPENCL))
+        add_test_adapter(${name} adapter_null)
     endif()
 endfunction()
 
@@ -83,7 +77,6 @@ function(add_conformance_test_with_platform_environment name)
 endfunction()
 
 add_subdirectory(testing)
-add_subdirectory(adapters)
 
 add_subdirectory(runtime)
 add_subdirectory(platform)

diff --git a/test/conformance/adapters/CMakeLists.txt b/test/conformance/adapters/CMakeLists.txt
diff --git a/test/conformance/adapters/cuda/CMakeLists.txt b/test/conformance/adapters/cuda/CMakeLists.txt
diff --git a/test/conformance/adapters/hip/CMakeLists.txt b/test/conformance/adapters/hip/CMakeLists.txt