-
Notifications
You must be signed in to change notification settings - Fork 770
[SYCL][NFC] Refactor plugin CMakeLists.txt #5799
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
bd0e579
[SYCL][NFC] Refactor plugin CMakeLists.txt
alexbatashev ba81250
Merge branch 'sycl' into refactor_plugin_cmake
84f13a4
get rid of old stuff
33a77b7
restore cyclic dependency
7eda431
address some comments
5178117
more comments
69bddaf
fix failing tests
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| function(add_sycl_library LIB_NAME TYPE) | ||
| cmake_parse_arguments("ARG" | ||
| "TOOLCHAIN" | ||
| "LINKER_SCRIPT" | ||
| "SOURCES;INCLUDE_DIRS;LIBRARIES" | ||
| ${ARGN} | ||
| ) | ||
| add_library(${LIB_NAME} ${TYPE} ${ARG_SOURCES}) | ||
| target_include_directories(${LIB_NAME} PRIVATE ${ARG_INCLUDE_DIRS}) | ||
| target_link_libraries(${LIB_NAME} PRIVATE ${ARG_LIBRARIES}) | ||
|
|
||
| if (ARG_TOOLCHAIN) | ||
| add_dependencies(sycl-toolchain ${LIB_NAME}) | ||
| endif() | ||
|
|
||
| if (ARG_LINKER_SCRIPT AND UNIX) | ||
| target_link_libraries(${LIB_NAME} PRIVATE | ||
| "-Wl,--version-script=${ARG_LINKER_SCRIPT}") | ||
| endif() | ||
|
|
||
| target_compile_definitions(${LIB_NAME} PRIVATE __SYCL_BUILD_SYCL_DLL) | ||
|
|
||
| if (UNIX) | ||
| target_compile_options(${LIB_NAME} PRIVATE -fvisibility=hidden) | ||
| else() | ||
| add_stripped_pdb(${LIB_NAME}) | ||
| endif() | ||
|
|
||
| # TODO remove add_common_options | ||
| add_common_options(${LIB_NAME}) | ||
| endfunction() | ||
|
|
||
| function(add_sycl_plugin PLUGIN_NAME) | ||
| cmake_parse_arguments("ARG" | ||
| "" | ||
| "" | ||
| "SOURCES;INCLUDE_DIRS;LIBRARIES" | ||
| ${ARGN} | ||
| ) | ||
|
|
||
| add_sycl_library("pi_${PLUGIN_NAME}" SHARED | ||
| TOOLCHAIN | ||
| LINKER_SCRIPT "${PROJECT_SOURCE_DIR}/plugins/ld-version-script.txt" | ||
| SOURCES ${ARG_SOURCES} | ||
| INCLUDE_DIRS | ||
| ${ARG_INCLUDE_DIRS} | ||
| ${sycl_inc_dir} | ||
| LIBRARIES | ||
| ${ARG_LIBRARIES} | ||
| OpenCL-Headers | ||
| ) | ||
|
|
||
| install(TARGETS pi_${PLUGIN_NAME} | ||
| LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT pi_${PLUGIN_NAME} | ||
| RUNTIME DESTINATION "bin" COMPONENT pi_${PLUGIN_NAME}) | ||
|
|
||
| set (manifest_file | ||
| ${CMAKE_CURRENT_BINARY_DIR}/install_manifest_pi_${PLUGIN_NAME}.txt) | ||
| add_custom_command(OUTPUT ${manifest_file} | ||
| COMMAND "${CMAKE_COMMAND}" | ||
| "-DCMAKE_INSTALL_COMPONENT=pi_${PLUGIN_NAME}" | ||
| -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" | ||
| COMMENT "Deploying component pi_${PLUGIN_NAME}" | ||
| USES_TERMINAL | ||
| ) | ||
| add_custom_target(install-sycl-plugin-${PLUGIN_NAME} | ||
| DEPENDS | ||
| ${manifest_file} pi_${PLUGIN_NAME} | ||
| ) | ||
|
|
||
| set_property(GLOBAL APPEND PROPERTY SYCL_TOOLCHAIN_INSTALL_COMPONENTS | ||
| pi_${PLUGIN_NAME}) | ||
| endfunction() |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pvchupin , is this typo?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dongkyunahn-intel, yes, I think so. Looks like that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll apply fix in my PR later - #6027.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be SYCL_BUILD_PI_ESIMD_EMULATOR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for catching that!