[CI] Enable check-sycl-unittests in CI (#12858)

This PR enables testing unittests in CI.
intel · Mar 21, 2024 · 445893a · 445893a
1 parent 2d0ee99
commit 445893a
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 12 deletions.
diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml
@@ -186,6 +186,12 @@ jobs:
         # TODO consider moving this to Dockerfile.
         export LD_LIBRARY_PATH=/usr/local/cuda/compat/:/usr/local/cuda/lib64:$LD_LIBRARY_PATH
         cmake --build $GITHUB_WORKSPACE/build --target check-sycl
+    - name: check-sycl-unittests
+      if: always() && !cancelled() && contains(inputs.changes, 'sycl')
+      run: |
+        # TODO consider moving this to Dockerfile.
+        export LD_LIBRARY_PATH=/usr/local/cuda/compat/:/usr/local/cuda/lib64:$LD_LIBRARY_PATH
+        cmake --build $GITHUB_WORKSPACE/build --target check-sycl-unittests
     - name: check-llvm-spirv
       if: always() && !cancelled() && contains(inputs.changes, 'llvm_spirv')
       run: |

diff --git a/.github/workflows/sycl-windows-build.yml b/.github/workflows/sycl-windows-build.yml
@@ -109,6 +109,10 @@ jobs:
       if: always() && !cancelled() && contains(inputs.changes, 'sycl')
       run: |
         cmake --build build --target check-sycl
+    - name: check-sycl-unittests
+      if: always() && !cancelled() && contains(inputs.changes, 'sycl')
+      run: |
+        cmake --build build --target check-sycl-unittests
     - name: check-llvm-spirv
       if: always() && !cancelled() && contains(inputs.changes, 'llvm_spirv')
       run: |

diff --git a/sycl/cmake/modules/AddSYCLUnitTest.cmake b/sycl/cmake/modules/AddSYCLUnitTest.cmake
@@ -37,16 +37,34 @@ macro(add_sycl_unittest test_dirname link_variant)
     )
   endif()
 
-  add_custom_target(check-sycl-${test_dirname}
-    ${CMAKE_COMMAND} -E env
-    LLVM_PROFILE_FILE="${SYCL_COVERAGE_PATH}/${test_dirname}.profraw"
-    env SYCL_CONFIG_FILE_NAME=null.cfg
-    env SYCL_DEVICELIB_NO_FALLBACK=1
-    env SYCL_CACHE_DIR="${CMAKE_BINARY_DIR}/sycl_cache"
-    ${CMAKE_CURRENT_BINARY_DIR}/${test_dirname}
-    DEPENDS
-    ${test_dirname}
-  )
+  # check-sycl-unittests was using an old sycl library. So, to get
+  # around this problem, we add the new sycl library to the PATH and
+  # LD_LIBRARY_PATH on Windows and Linux respectively.
+  if (WIN32)
+    add_custom_target(check-sycl-${test_dirname}
+        ${CMAKE_COMMAND} -E env
+        LLVM_PROFILE_FILE="${SYCL_COVERAGE_PATH}/${test_dirname}.profraw"
+        SYCL_CONFIG_FILE_NAME=null.cfg
+        SYCL_DEVICELIB_NO_FALLBACK=1
+        SYCL_CACHE_DIR="${CMAKE_BINARY_DIR}/sycl_cache"
+        "PATH=${CMAKE_BINARY_DIR}/bin;$ENV{PATH}"
+        ${CMAKE_CURRENT_BINARY_DIR}/${test_dirname}
+        DEPENDS
+        ${test_dirname}
+    )
+  else()
+    add_custom_target(check-sycl-${test_dirname}
+        ${CMAKE_COMMAND} -E env
+        LLVM_PROFILE_FILE="${SYCL_COVERAGE_PATH}/${test_dirname}.profraw"
+        SYCL_CONFIG_FILE_NAME=null.cfg
+        SYCL_DEVICELIB_NO_FALLBACK=1
+        SYCL_CACHE_DIR="${CMAKE_BINARY_DIR}/sycl_cache"
+        "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH}"
+        ${CMAKE_CURRENT_BINARY_DIR}/${test_dirname}
+        DEPENDS
+        ${test_dirname}
+    )
+  endif()
 
   add_dependencies(check-sycl-unittests check-sycl-${test_dirname})
 
@@ -60,7 +78,7 @@ macro(add_sycl_unittest test_dirname link_variant)
   if(SYCL_ENABLE_KERNEL_FUSION)
     target_link_libraries(${test_dirname} PRIVATE sycl-fusion)
   endif(SYCL_ENABLE_KERNEL_FUSION)
-  
+
   target_include_directories(${test_dirname}
     PRIVATE SYSTEM
       ${sycl_inc_dir}

diff --git a/sycl/unittests/xpti_trace/QueueIDCheck.cpp b/sycl/unittests/xpti_trace/QueueIDCheck.cpp
@@ -136,7 +136,9 @@ TEST_F(QueueID, QueueCreationAndKernelWithDeps) {
   checkTaskBeginEnd(QueueIDSTr);
 }
 
-TEST_F(QueueID, QueueCreationUSMOperations) {
+// Re-enable this test after fixing
+// https://github.com/intel/llvm/issues/12963
+TEST_F(QueueID, DISABLED_QueueCreationUSMOperations) {
   sycl::queue Q0;
   auto Queue0ImplPtr = sycl::detail::getSyclObjImpl(Q0);
   auto QueueIDSTr = std::to_string(Queue0ImplPtr->getQueueID());