[SYCL] Remove plugin interface #14145
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,13 @@ | ||
| # Either fetches UR from the appropriate repo or sets up variables based on user | ||
| # preference. | ||
|
|
||
| # TODO: taken from sycl/plugins/CMakeLists.txt - maybe we should handle this | ||
| # within UR (although it is an obscure warning that the build system here | ||
| # seems to specifically enable) | ||
| if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang|IntelLLVM" ) | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-covered-switch-default") | ||
| endif() | ||
|
|
||
|
|
||
| # Options to override the default behaviour of the FetchContent to include UR | ||
| # source code. | ||
|
|
@@ -15,8 +23,11 @@ option(SYCL_PI_UR_USE_FETCH_CONTENT | |
| set(SYCL_PI_UR_SOURCE_DIR | ||
| "" CACHE PATH "Path to root of Unified Runtime repository") | ||
|
|
||
| # Here we override the defaults to disable building tests from unified-runtime | ||
| set(UR_BUILD_EXAMPLES OFF CACHE BOOL "Build example applications." FORCE) | ||
| set(UR_BUILD_TESTS OFF CACHE BOOL "Build unit tests." FORCE) | ||
| set(UR_BUILD_XPTI_LIBS OFF) | ||
| set(UR_ENABLE_TRACING ON) | ||
|
|
||
| if("level_zero" IN_LIST SYCL_ENABLE_PLUGINS) | ||
| set(UR_BUILD_ADAPTER_L0 ON) | ||
|
|
@@ -26,6 +37,9 @@ if("cuda" IN_LIST SYCL_ENABLE_PLUGINS) | |
| endif() | ||
| if("hip" IN_LIST SYCL_ENABLE_PLUGINS) | ||
| set(UR_BUILD_ADAPTER_HIP ON) | ||
| if (SYCL_ENABLE_KERNEL_FUSION) | ||
| set(UR_ENABLE_COMGR ON) | ||
| endif() | ||
| endif() | ||
| if("opencl" IN_LIST SYCL_ENABLE_PLUGINS) | ||
| set(UR_BUILD_ADAPTER_OPENCL ON) | ||
|
|
@@ -99,13 +113,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) | |
| endfunction() | ||
|
|
||
| set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") | ||
| # commit b7b0c8b3d17aa7d511c67ec219d58091d07cfa60 | ||
| # Merge: 2baf0951 5b8936da | ||
| # Author: Piotr Balcer <[email protected]> | ||
| # Date: Fri Jul 26 15:48:04 2024 +0200 | ||
| # Merge pull request #1903 from kswiecicki/umf-version-bump | ||
| # Bump UMF version again | ||
| set(UNIFIED_RUNTIME_TAG b7b0c8b3d17aa7d511c67ec219d58091d07cfa60) | ||
|
|
||
| set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") | ||
| # Due to the use of dependentloadflag and no installer for UMF and hwloc we need | ||
|
|
@@ -210,86 +224,69 @@ target_include_directories(UnifiedRuntime-Headers | |
|
|
||
| find_package(Threads REQUIRED) | ||
|
|
||
| if(TARGET UnifiedRuntimeLoader) | ||
| # Install the UR loader. | ||
| # TODO: this is piggy-backing on the existing target component level-zero-sycl-dev | ||
| # When UR is moved to its separate repo perhaps we should introduce new component, | ||
| # e.g. unified-runtime-sycl-dev. | ||
| # See github issue #14598 | ||
| install(TARGETS ur_loader | ||
| LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT level-zero-sycl-dev | ||
| ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT level-zero-sycl-dev | ||
| RUNTIME DESTINATION "bin" COMPONENT level-zero-sycl-dev | ||
| ) | ||
| endif() | ||
|
|
||
| add_custom_target(UnifiedRuntimeAdapters) | ||
|
|
||
| function(add_sycl_ur_adapter NAME) | ||
| add_dependencies(UnifiedRuntimeAdapters ur_adapter_${NAME}) | ||
|
|
||
| install(TARGETS ur_adapter_${NAME} | ||
| LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT ur_adapter_${NAME} | ||
| RUNTIME DESTINATION "bin" COMPONENT ur_adapter_${NAME}) | ||
|
|
||
| set(manifest_file | ||
| ${CMAKE_CURRENT_BINARY_DIR}/install_manifest_ur_adapter_${NAME}.txt) | ||
| add_custom_command(OUTPUT ${manifest_file} | ||
| COMMAND "${CMAKE_COMMAND}" | ||
| "-DCMAKE_INSTALL_COMPONENT=ur_adapter_${NAME}" | ||
| -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" | ||
| COMMENT "Deploying component ur_adapter_${NAME}" | ||
| USES_TERMINAL | ||
| ) | ||
| add_custom_target(install-sycl-ur-adapter-${NAME} | ||
| DEPENDS ${manifest_file} ur_adapter_${NAME} | ||
| ) | ||
|
|
||
| set_property(GLOBAL APPEND PROPERTY | ||
| SYCL_TOOLCHAIN_INSTALL_COMPONENTS ur_adapter_${NAME}) | ||
| endfunction() | ||
|
|
||
| if("level_zero" IN_LIST SYCL_ENABLE_PLUGINS) | ||
| add_sycl_ur_adapter(level_zero) | ||
|
|
||
| # TODO: L0 adapter does other... things in its cmake - make sure they get | ||
| # added to the new build system | ||
| endif() | ||
|
|
||
| if("cuda" IN_LIST SYCL_ENABLE_PLUGINS) | ||
| add_sycl_ur_adapter(cuda) | ||
| endif() | ||
|
|
||
| if("hip" IN_LIST SYCL_ENABLE_PLUGINS) | ||
| add_sycl_ur_adapter(hip) | ||
| endif() | ||
|
|
||
| if("opencl" IN_LIST SYCL_ENABLE_PLUGINS) | ||
| add_sycl_ur_adapter(opencl) | ||
| endif() | ||
|
|
||
| if("native_cpu" IN_LIST SYCL_ENABLE_PLUGINS) | ||
| add_sycl_ur_adapter(native_cpu) | ||
|
|
||
| # Deal with OCK option | ||
| option(NATIVECPU_USE_OCK "Use the oneAPI Construction Kit for Native CPU" ON) | ||
|
|
||
| if(NATIVECPU_USE_OCK) | ||
| message(STATUS "Compiling Native CPU adapter with OCK support.") | ||
|
|
@@ -300,8 +297,6 @@ if ("native_cpu" IN_LIST SYCL_ENABLE_PLUGINS) | |
| endif() | ||
| endif() | ||
|
|
||
| # TODO: this is piggy-backing on the existing target component level-zero-sycl-dev | ||
| install(TARGETS umf | ||
| LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT level-zero-sycl-dev | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.