[PTI-LIB] Fix Level Zero Loader Build (#455)

Fix Level Zero Loader build on both Windows and Linux.
 * On Windows, there was a conflict in which DLLs were being loaded.
   E.g., sometimes it would use the DLL in System32 rather than in the build.
   We want it to default to the system drivers, so I relocate the DLLs in the
   build to a place where they won't be found by the tests.
 * On Linux, when build with the g++ compiler, there is a warning
   because of extra semi-colons.

Stabilize build by only copying gemm.spv once.

Signed-off-by: Schilling, Matthew <[email protected]>

Author: mschilling0

sdk/CMakeLists.txt

@@ -14,13 +14,15 @@ project(
   LANGUAGES C CXX
 )
 
-# Global Settings
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin CACHE STRING "")
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib CACHE STRING "")
-
 ProjectIsTopLevel()
 SetBuildType()
 
+# Global Settings
+if(PROJECT_IS_TOP_LEVEL)
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin CACHE STRING "")
+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib CACHE STRING "")
+endif()
+
 # For developer use with tools like clangd (can be used by vscode and vim
 # plugins).
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -78,11 +80,11 @@ find_package(Xpti)
 if(NOT PROJECT_IS_TOP_LEVEL)
   find_package(LevelZero ${PTI_L0_LOADER} REQUIRED)  
 else()
-  find_package(LevelZero ${PTI_L0_LOADER} )
+  find_package(LevelZero ${PTI_L0_LOADER})
 endif()
 
 if(NOT TARGET LevelZero::level-zero)
-  GetLevelZero()
+  GetLevelZero(${PTI_L0_LOADER} ${PTI_L0_LOADER_COMMIT_HASH})
 endif()
 
 find_package(Threads REQUIRED)

sdk/cmake/Modules/macros.cmake

@@ -222,7 +222,7 @@ macro(CheckSOVersion PROJ_SOVERSION)
   endif()
 endmacro()
 
-macro(GetLevelZero)
+macro(GetLevelZero PTI_L0_LOADER PTI_L0_LOADER_COMMIT_HASH)
   if (NOT TARGET LevelZero::level-zero)
     # Need zelEnableTracingLayer
     message("-- Fetching L0: ${PTI_L0_LOADER}")
@@ -253,23 +253,43 @@ macro(GetLevelZero)
         add_subdirectory(${levelzero_SOURCE_DIR} ${levelzero_BINARY_DIR} EXCLUDE_FROM_ALL)
     endif()
 
+    get_target_property(PTI_ZE_LOADER_RUNTIME_DIR ze_loader RUNTIME_OUTPUT_DIRECTORY)
+
     # Create new target to treat level zero loader as an external dependency.
     # This prevents it from being added to the export set.
     # (Basically treat as if including via find_package)
     add_library(pti_ze_loader INTERFACE IMPORTED)
-    add_dependencies(pti_ze_loader ze_tracing_layer)
-
-    set(PTI_LZ_COMPILE_OPTIONS $<$<CXX_COMPILER_ID:IntelLLVM>:-Wno-unused-parameter -Wno-cast-function-type-mismatch -Wno-extra-semi>
-                               $<$<CXX_COMPILER_ID:MSVC>:/wd6285
-                                $<$<CONFIG:Release>:/wd4702 /wd6385 /wd6386>>)
+    add_dependencies(pti_ze_loader ze_tracing_layer ze_validation_layer)
+
+    set(PTI_LZ_COMPILE_OPTIONS
+        $<$<CXX_COMPILER_ID:IntelLLVM>:
+            -Wno-error
+            -Wno-unused-parameter
+            -Wno-cast-function-type-mismatch
+            -Wno-extra-semi
+        >
+        $<$<CXX_COMPILER_ID:MSVC>:
+            /wd6285
+            $<$<CONFIG:Release>:/wd4702 /wd6385 /wd6386>
+        >
+        $<$<CXX_COMPILER_ID:GNU>:
+            -Wno-error
+            -Wno-unused-parameter
+            $<$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,8.0.0>:-Wno-extra-semi>
+        >
+        $<$<CXX_COMPILER_ID:Clang>:
+            -Wno-error
+            -Wno-unused-parameter
+            $<$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,3.0.0>:-Wno-extra-semi>
+        >
+    )
 
     # Silence Warnings from Level Zero Loader. Allows us to better detect PTI
     # warnings and errors.
-    target_compile_options(ze_loader PRIVATE ${PTI_LZ_COMPILE_OPTIONS})
-    target_compile_options(ze_tracing_layer PRIVATE ${PTI_LZ_COMPILE_OPTIONS})
-    target_compile_options(ze_null PRIVATE ${PTI_LZ_COMPILE_OPTIONS})
-    target_compile_options(ze_validation_layer PRIVATE ${PTI_LZ_COMPILE_OPTIONS})
-    #target_compile_options(utils PRIVATE ${PTI_LZ_COMPILE_OPTIONS})
+    set_target_properties(ze_loader ze_tracing_layer ze_null ze_validation_layer
+      PROPERTIES
+        COMPILE_OPTIONS "${PTI_LZ_COMPILE_OPTIONS}"
+        RUNTIME_OUTPUT_DIRECTORY "${PTI_ZE_LOADER_RUNTIME_DIR}/loader")
 
     # Pull Headers out of source tree and add them to level_zero/
     # This allows us to keep the normal way to include level zero
@@ -338,9 +358,8 @@ macro(AddApiGenTarget L0_GEN_SCRIPT GEN_FILE_NAME L0_TARGET)
   # Use the target that links level zero to find the level zero library
   if(TARGET LevelZero::level-zero)
     get_target_property(L0_TARGET_PATH ${L0_TARGET} INTERFACE_INCLUDE_DIRECTORIES)
-    message("L0_Target_Path: ${L0_TARGET_PATH}")
-    message("L0 Version: ${PTI_L0_LOADER}")
-    message("L0 Hash: ${PTI_L0_LOADER_COMMIT_HASH}")
+    include(CMakePrintHelpers)
+    cmake_print_variables(PTI_L0_LOADER PTI_L0_LOADER_COMMIT_HASH L0_TARGET_PATH)
   endif()
 
   # HINTS before PATHS

sdk/test/CMakeLists.txt

@@ -38,6 +38,23 @@ if(PTI_IS_MULTI_CONFIG)
 endif()
 
 if(HAVE_SYCL)
+  set(PTI_TEST_SPV_SRC ${PROJECT_SOURCE_DIR}/test/gemm.spv)
+  set(PTI_TEST_SPV_TEST ${PTI_TEST_BIN_DIR}/gemm.spv)
+
+  if(TARGET LevelZero::level-zero OR TARGET unified-runtime::loader)
+    add_custom_command(
+      OUTPUT ${PTI_TEST_SPV_TEST}
+      POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different
+              ${PTI_TEST_SPV_SRC} ${PTI_TEST_SPV_TEST}
+      DEPENDS ${PTI_TEST_SPV_SRC})
+
+    add_custom_target(
+      copy_test_spv
+      DEPENDS ${PTI_TEST_SPV_TEST}
+    )
+  endif()
+
   add_executable(dpcgemm_suite main_dpcgemm_fixture.cc)
   target_include_directories(
     dpcgemm_suite
@@ -164,17 +181,6 @@ if(HAVE_SYCL)
          "${PROJECT_SOURCE_DIR}/samples/samples_utilities"
     PRIVATE "${PROJECT_SOURCE_DIR}/src/utils")
 
-  add_custom_command(
-    TARGET zegemm_suite
-    PRE_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-          ${PROJECT_SOURCE_DIR}/test/gemm.spv ${PTI_TEST_BIN_DIR}/gemm.spv)
-  add_custom_command(
-    TARGET zegemm_suite
-    PRE_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-          ${PROJECT_SOURCE_DIR}/test/gemm.cl ${PTI_TEST_BIN_DIR}/gemm.cl)
-
   target_compile_options(zegemm_suite  PUBLIC -fsycl -gline-tables-only)
   target_link_options(zegemm_suite PUBLIC -fsycl -gline-tables-only)
 
@@ -308,6 +314,8 @@ if(HAVE_SYCL)
     TEST_LIST ZEGEMM_SUITE_TEST_LIST
     PROPERTIES LABELS "unit")
 
+  add_dependencies(zegemm_suite copy_test_spv)
+
   gtest_discover_tests(
     multi_threaded_submission
     DISCOVERY_TIMEOUT 60
@@ -369,17 +377,6 @@ if (HAVE_SYCL AND TARGET unified-runtime::loader)
            "${PROJECT_SOURCE_DIR}/src/levelzero"
     PRIVATE "${PROJECT_SOURCE_DIR}/src/utils")
 
-  add_custom_command(
-    TARGET urgemm_suite
-    PRE_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            ${PROJECT_SOURCE_DIR}/test/gemm.spv ${PTI_TEST_BIN_DIR}/gemm.spv)
-  add_custom_command(
-    TARGET urgemm_suite
-    PRE_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            ${PROJECT_SOURCE_DIR}/test/gemm.cl ${PTI_TEST_BIN_DIR}/gemm.cl)
-
   target_compile_options(urgemm_suite  PUBLIC -fsycl -gline-tables-only)
   target_link_options(urgemm_suite PUBLIC -fsycl -gline-tables-only)
   target_link_libraries(urgemm_suite PUBLIC spdlog::spdlog
@@ -394,6 +391,8 @@ if (HAVE_SYCL AND TARGET unified-runtime::loader)
     DISCOVERY_TIMEOUT 60
     TEST_LIST URGEMM_SUITE_TEST_LIST
     PROPERTIES LABELS "unit" "sycl" "unified-runtime")
+
+  add_dependencies(urgemm_suite copy_test_spv)
 endif()
 
 add_executable(view_record_test view_buffer_test.cc)