[SYCL] Next redesign step

Pavel V Chupin · smaslov-intel · commit 02771884af15 · 2022-12-01T20:34:05.000-08:00
* Fix issues on level_zero build based on FetchContent
* Remove installation of level_zero loader into the toolchain
* Fix dependencies

At this point there are undefined references at unified runtime link as
.so library. WIP.
diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt
@@ -5,6 +5,7 @@ project(sycl-solution)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_INCLUDE_CURRENT_DIR OFF)
 option(SYCL_ENABLE_WERROR "Treat all warnings as errors in SYCL project" OFF)
 option(SYCL_DISABLE_STL_ASSERTIONS "Disable assertions in STL containers" OFF)
 option(SYCL_ADD_DEV_VERSION_POSTFIX "Adds -V postfix to version string" ON)
diff --git a/sycl/plugins/level_zero/CMakeLists.txt b/sycl/plugins/level_zero/CMakeLists.txt
@@ -27,23 +27,6 @@ FetchContent_GetProperties(level-zero-loader)
 
 set(LEVEL_ZERO_INCLUDE_DIR
   ${level-zero-loader_SOURCE_DIR}/include CACHE PATH "Path to Level Zero Headers")
-set(LEVEL_ZERO_LOADER_LIBRARY ${level-zero-loader_TARGET_LOADER_NAME})
-
-#ExternalProject_Add_Step(level-zero-loader llvminstall
-#COMMAND ${CMAKE_COMMAND} -E copy_directory <INSTALL_DIR>/lib/ ${LLVM_BINARY_DIR}/lib
-#COMMAND ${CMAKE_COMMAND} -E copy_directory <INSTALL_DIR>/include/ ${LLVM_BINARY_DIR}/include/sycl
-#COMMENT "Installing level-zero-loader into the LLVM binary directory"
-#DEPENDEES install
-#)
-
-list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS level-zero-loader level-zero-headers)
-
-include_directories("${LEVEL_ZERO_INCLUDE_DIR}")
-
-add_library (LevelZeroLoader INTERFACE)
-target_link_libraries(LevelZeroLoader
-  INTERFACE ${LEVEL_ZERO_LOADER_LIBRARY}
-)
 
 add_library (LevelZeroLoader-Headers INTERFACE)
 add_library (LevelZeroLoader::Headers ALIAS LevelZeroLoader-Headers)
@@ -67,7 +50,10 @@ add_sycl_plugin(level_zero
     "${CMAKE_CURRENT_SOURCE_DIR}/tracing.cpp"
     ${XPTI_PROXY_SRC}
   LIBRARIES
-    ${LEVEL_ZERO_LOADER_LIBRARY}
+#    ${LEVEL_ZERO_LOADER_LIBRARY}
+    LevelZeroLoader-Headers
+    UnifiedRuntime-Headers
+    ze_loader
     Threads::Threads
     pi_unified_runtime
 )
diff --git a/sycl/plugins/level_zero/pi_level_zero.cpp b/sycl/plugins/level_zero/pi_level_zero.cpp
@@ -24,7 +24,7 @@
 #include <thread>
 #include <utility>
 
-#include <level_zero/zet_api.h>
+#include <zet_api.h>
 
 #include "usm_allocator.hpp"
 
diff --git a/sycl/plugins/level_zero/pi_level_zero.hpp b/sycl/plugins/level_zero/pi_level_zero.hpp
@@ -40,8 +40,8 @@
 #include <unordered_set>
 #include <vector>
 
-#include <level_zero/ze_api.h>
-#include <level_zero/zes_api.h>
+#include <ze_api.h>
+#include <zes_api.h>
 #include <sycl/detail/iostream_proxy.hpp>
 
 // Share code between this PI L0 Plugin and UR L0 Adapter
diff --git a/sycl/plugins/level_zero/tracing.cpp b/sycl/plugins/level_zero/tracing.cpp
@@ -8,8 +8,8 @@
 
 #include "xpti/xpti_data_types.h"
 #include <exception>
-#include <level_zero/layers/zel_tracing_api.h>
-#include <level_zero/ze_api.h>
+#include <layers/zel_tracing_api.h>
+#include <ze_api.h>
 #include <xpti/xpti_trace_framework.h>
 
 #include <sycl/detail/iostream_proxy.hpp>
diff --git a/sycl/plugins/opencl/CMakeLists.txt b/sycl/plugins/opencl/CMakeLists.txt
@@ -14,6 +14,8 @@ add_sycl_plugin(opencl
   SOURCES
     "${sycl_inc_dir}/sycl/detail/pi.h"
     "pi_opencl.cpp"
+  INCLUDE_DIRS
+    "."
   LIBRARIES
     OpenCL-ICD
 )
diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt
@@ -20,12 +20,11 @@ set(UNIFIED_RUNTIME_SOURCE_DIR
 set(UNIFIED_RUNTIME_INCLUDE_DIR "${UNIFIED_RUNTIME_SOURCE_DIR}/include")
 
 
-#include_directories("${LEVEL_ZERO_INCLUDE_DIR}")
-include_directories("${UNIFIED_RUNTIME_INCLUDE_DIR}")
-
 add_library (UnifiedRuntime-Headers INTERFACE)
 target_include_directories(UnifiedRuntime-Headers
-  INTERFACE "${UNIFIED_RUNTIME_INCLUDE_DIR}"
+  INTERFACE
+    "${UNIFIED_RUNTIME_INCLUDE_DIR}"
+    "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 
 list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS unified-runtime)
@@ -40,26 +39,17 @@ find_package(Threads REQUIRED)
 add_sycl_plugin(unified_runtime
   SOURCES
     "${sycl_inc_dir}/sycl/detail/pi.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/pi2ur.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/pi2ur.hpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/ur.hpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/adapters/level_zero/ur_level_zero.hpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/adapters/level_zero/ur_level_zero.cpp"
-   LIBRARIES
+    "pi2ur.cpp"
+    "pi2ur.hpp"
+    "ur.hpp"
+    "adapters/level_zero/ur_level_zero.hpp"
+    "adapters/level_zero/ur_level_zero.cpp"
+  INCLUDE_DIRS
+    "."
+    "${UNIFIED_RUNTIME_INCLUDE_DIR}"
+  LIBRARIES
     Threads::Threads
     UnifiedRuntime-Headers
     LevelZeroLoader-Headers
-    LevelZeroLoader
-)
-
-target_include_directories(pi_unified_runtime INTERFACE
-  "${UNIFIED_RUNTIME_INCLUDE_DIR}"
-  "${CMAKE_CURRENT_SOURCE_DIR}"
+#    ze_loader
 )
-
-target_link_libraries(pi_unified_runtime PRIVATE
-  UnifiedRuntime-Headers
-  LevelZeroLoader-Headers
-)
-
-add_dependencies(pi_unified_runtime ze-api)
diff --git a/sycl/plugins/unified_runtime/adapters/level_zero/ur_level_zero.hpp b/sycl/plugins/unified_runtime/adapters/level_zero/ur_level_zero.hpp
@@ -14,8 +14,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include <level_zero/ze_api.h>
-#include <level_zero/zes_api.h>
+#include <ze_api.h>
+#include <zes_api.h>
 #include <ur.hpp>
 #include <zer_api.h>
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ add_sycl_plugin(opencl`
`14`	`14`	`SOURCES`
`15`	`15`	`"${sycl_inc_dir}/sycl/detail/pi.h"`
`16`	`16`	`"pi_opencl.cpp"`
	`17`	`+ INCLUDE_DIRS`
	`18`	`+ "."`
`17`	`19`	`LIBRARIES`
`18`	`20`	`OpenCL-ICD`
`19`	`21`	`)`