[SYCL][COMPAT] Improved Windows library unittests

Author: Alcpz

sycl/cmake/modules/AddSYCLLibraryUnitTest.cmake

@@ -7,50 +7,89 @@
 # Will compile the list of files together using clang.
 # Produces a single binary using all the .cpp files
 # named 'test_suite_name' at ${CMAKE_CURRENT_BINARY_DIR}.
-macro(add_sycl_library_unittest test_suite_name sycl_extra_flags)
+macro(add_sycl_library_unittest test_suite_name)
+  cmake_parse_arguments(ARG
+    ""
+    ""
+    "SYCL_EXTRA_FLAGS;SOURCES"
+    ${ARGN})
 
-  add_custom_target(check-sycl-${test_suite_name}
-    ${CMAKE_COMMAND} -E env
-    LD_LIBRARY_PATH="${CMAKE_BINARY_DIR}/lib"
-    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_suite_name}
-  )
+  set(CXX_COMPILER clang++)
+  if(MSVC)
+    set(CXX_COMPILER clang-cl.exe)
+    set(LIB_POSTFIX ".lib")
+  else()
+    set(LIB_PREFIX "-l")
+  endif()
 
-  add_dependencies(check-sycl-unittests-libs check-sycl-${test_suite_name})
+  set(DEVICE_COMPILER_EXECUTABLE ${LLVM_RUNTIME_OUTPUT_INTDIR}/${CXX_COMPILER})
+  set(_OUTPUT_BIN ${CMAKE_CURRENT_BINARY_DIR}/${test_suite_name}Tests)
+  set(_TESTS_TARGET ${test_suite_name}Tests)
+  set(_BIN_TARGET ${_TESTS_TARGET}_bin)
+  set(_TARGET_DEPENDENCIES 
+      "llvm_gtest_main;llvm_gtest;LLVMTestingSupport;LLVMSupport;LLVMDemangle")
+
+  foreach(_lib ${_TARGET_DEPENDENCIES})
+    list(APPEND _LIBRARIES $<TARGET_FILE:${_lib}>)
+  endforeach()
+  
+  # Enable exception handling on Windows
+  if(WIN32)
+    list(APPEND _INTERNAL_EXTRA_FLAGS "/EHs")
+    set(LIBRARIES_PREFIX ${CMAKE_BINARY_DIR}/lib/)
+    list(APPEND _LIBRARIES $<TARGET_FILE:sycl>)
+  endif()
+
+  if(UNIX)
+    foreach(_lib "pthread;dl;ncurses")
+      list(APPEND _LIBRARIES "-l${_lib}">)
+    endforeach()
+  endif()
 
   if (SYCL_ENABLE_COVERAGE)
-    list(APPEND sycl_extra_flags "-fprofile-instr-generate")
-    list(APPEND sycl_extra_flags "-fcoverage-mapping")
+    list(APPEND _INTERNAL_EXTRA_FLAGS "-fprofile-instr-generate")
+    list(APPEND _INTERNAL_EXTRA_FLAGS "-fcoverage-mapping")
   endif()
-  
+
   get_target_property(GTEST_INCLUDES llvm_gtest INCLUDE_DIRECTORIES)
   foreach(_dir ${GTEST_INCLUDES})
     # Avoid -I when _dir contains an empty generator expression.
     list(APPEND INCLUDE_COMPILER_STRING "$<$<BOOL:${_dir}>:-I${_dir}>")
   endforeach()
 
-  add_sycl_executable(
-    # 'Tests' suffix needed by lit framework to detect the tests
-    ${test_suite_name}Tests
-    OPTIONS
-      ${sycl_extra_flags}
+  add_custom_target(${_BIN_TARGET}
+    COMMAND ${DEVICE_COMPILER_EXECUTABLE} -fsycl ${ARG_SOURCES}
+      -o ${_OUTPUT_BIN}
+      ${ARG_SYCL_EXTRA_FLAGS}
+      ${_INTERNAL_EXTRA_FLAGS}
       ${INCLUDE_COMPILER_STRING}
-    LIBRARIES
-      llvm_gtest_main
-      llvm_gtest
-      LLVMSupport
-      LLVMDemangle
-      pthread
-      dl
-      ncurses
-    SOURCES
-      ${ARGN}
-    DEPENDANTS
-      check-sycl-${test_suite_name}
-      SYCLUnitTests)
+      ${_LIBRARIES}
+    BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/${_TESTS_TARGET}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMAND_EXPAND_LISTS)
 
-endmacro()
+  add_dependencies(${_BIN_TARGET} sycl)
+  foreach(_lib ${ARG_LIBRARIES})
+      add_dependencies(${_BIN_TARGET} ${_TARGET_DEPENDENCIES})
+  endforeach()
+
+  add_dependencies(SYCLUnitTests ${_BIN_TARGET})
 
+  add_executable(${_TESTS_TARGET} IMPORTED GLOBAL)
+  set_target_properties(${_TESTS_TARGET} PROPERTIES
+    IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR})
+
+  # Check target (Unix Only)
+  add_custom_target(check-sycl-${test_suite_name}
+    ${CMAKE_COMMAND} -E 
+    env LD_LIBRARY_PATH="${CMAKE_BINARY_DIR}/lib"
+    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_suite_name}
+  )
+  
+  add_dependencies(check-sycl-${test_suite_name} ${_BIN_TARGET})
+  add_dependencies(check-sycl-unittests-libs check-sycl-${test_suite_name})
+  
+endmacro()

sycl/include/syclcompat/defs.hpp

@@ -35,7 +35,7 @@
 template <class... Args> class sycl_compat_kernel_name;
 template <int Arg> class sycl_compat_kernel_scalar;
 
-#define __sycl_compat_align__(n) __attribute__((aligned(n)))
+#define __sycl_compat_align__(n) alignas(n)
 #define __sycl_compat_inline__ __inline__ __attribute__((always_inline))
 
 #define __sycl_compat_noinline__ __attribute__((noinline))

sycl/include/syclcompat/dims.hpp

@@ -32,11 +32,11 @@ class dim3 {
 public:
   const size_t x, y, z;
 
-  constexpr dim3(const sycl::range<3> &r) : x(r[2]), y(r[1]), z(r[0]) {}
+  dim3(const sycl::range<3> &r) : x(r[2]), y(r[1]), z(r[0]) {}
 
-  constexpr dim3(const sycl::range<2> &r) : x(r[1]), y(r[0]), z(1) {}
+  dim3(const sycl::range<2> &r) : x(r[1]), y(r[0]), z(1) {}
 
-  constexpr dim3(const sycl::range<1> &r) : x(r[0]), y(1), z(1) {}
+  dim3(const sycl::range<1> &r) : x(r[0]), y(1), z(1) {}
 
   constexpr dim3(size_t x, size_t y = 1, size_t z = 1) : x(x), y(y), z(z) {}
 

sycl/unittests/syclcompat/CMakeLists.txt

@@ -16,11 +16,18 @@
 
 set(SYCL_EXTRA_FLAGS "-fsycl-unnamed-lambda;-fsycl-device-code-split=per_kernel")
 
-add_custom_target(check-sycl-syclcompat)
-add_dependencies(check-sycl-unittests check-sycl-syclcompat)
+# add_custom_target(check-sycl-syclcompat)
+# add_dependencies(check-sycl-unittests check-sycl-syclcompat)
 
-add_sycl_library_unittest(syclcompat-base ${SYCL_EXTRA_FLAGS}
-  Dim.cpp
-  Defs.cpp)
+# add_sycl_library_unittest(syclcompat-base 
+#   SYCL_EXTRA_FLAGS
+#     ${SYCL_EXTRA_FLAGS}
+#   SOURCES
+#     Dim.cpp
+#     Defs.cpp)
+
+# add_dependencies(check-sycl-syclcompat check-sycl-syclcompat-base)
 
-add_dependencies(check-sycl-syclcompat check-sycl-syclcompat-base)
+add_sycl_unittest(syclcompat-baseTests OBJECT
+  Dim.cpp
+  Defs.cpp)

sycl/unittests/syclcompat/Defs.cpp

@@ -25,9 +25,9 @@
 #include <syclcompat/defs.hpp>
 
 TEST(DEFS, Align) {
-  struct {
+  struct __sycl_compat_align__(16) {
     int a;
     char c;
-  } __sycl_compat_align__(16) s;
+  } s;
   EXPECT_EQ(sizeof(s), 16);
 }