Skip to content

[SYCL] Add delayloading for ze_loader #11902

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.

Sign up for GitHub

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 12 commits into from
Dec 5, 2023
Merged

[SYCL] Add delayloading for ze_loader #11902

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4cc3c48
[SYCL] Add delayloading for ze_loader
ykhatav Nov 15, 2023
0b4f022
[SYCL] remove delayimp
ykhatav Nov 15, 2023
9673d6b
apply clang-format
ykhatav Nov 15, 2023
4129de9
add delayimp only on win
ykhatav Nov 16, 2023
05c6ebe
add delayimp only for windows
ykhatav Nov 16, 2023
9b73e99
add delay unload for ze_loader
ykhatav Nov 16, 2023
7102637
apply clang-format
ykhatav Nov 16, 2023
4fe8e15
Revert "apply clang-format"
ykhatav Nov 17, 2023
3340f0a
Revert "add delay unload for ze_loader"
ykhatav Nov 17, 2023
6255aea
use strncmp instead of strcmp
ykhatav Nov 23, 2023
07ee2b6
apply clang-format
ykhatav Nov 23, 2023
563eb9e
remove the delay load hook function
ykhatav Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion sycl/plugins/level_zero/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,13 @@ add_sycl_plugin(level_zero
Threads::Threads
${XPTI_LIBS}
)

add_dependencies(pi_level_zero ze-api)

if (WIN32)
target_link_libraries(pi_level_zero PRIVATE delayimp)
target_link_options(pi_level_zero PRIVATE /DELAYLOAD:ze_loader.dll)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we somehow use LevelZeroLoader as above at https://github.com/intel/llvm/pull/11902/files#diff-e162c7afd5dbcb57ced84354c427518f0f37b190538d136e871855d78975533bR98 and not hardcode ze_loader.dll?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Passing LevelZeroLoader to /DELAYLOAD doesn't seem to work, it needs the exact name of the DLL.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

target_link_options supports generator expressions and LevelZeroLoader is a target, try TARGET_FILE like this:

Suggested change
target_link_options(pi_level_zero PRIVATE /DELAYLOAD:ze_loader.dll)
target_link_options(pi_level_zero PRIVATE /DELAYLOAD:$<TARGET_FILE:LevelZeroLoader>)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the suggestion @kbenzie! However, i get a build error: Error evaluating generator expression:
$<TARGET_FILE:LevelZeroLoader>
Target "LevelZeroLoader" is not an executable or library.

endif()

if (SYCL_ENABLE_XPTI_TRACING)
target_compile_definitions(pi_level_zero PRIVATE
XPTI_ENABLE_INSTRUMENTATION
Expand Down