Skip to content

[SYCL][Driver] Base libspirv path on sycl install candidates #19134

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

Open
wants to merge 1 commit into
base: sycl
Choose a base branch
from

Conversation

Maetveis
Copy link
Contributor

@Maetveis Maetveis commented Jun 25, 2025

Based on PR #19131

Chain of upstream PRs & tree of downstream PRs as of 2025-06-25

... instead of the resource directory. This matches the behaviour of
SYCL device libraries. The resource directory has nothing to do with
libspirv, and it might be changed by the -resource-dir option, which
would lead us to not find it.

@Maetveis Maetveis force-pushed the review/Maetveis/deduplicate-libspirv-logic branch from d04b05d to 830c773 Compare June 26, 2025 15:53
@Maetveis Maetveis force-pushed the review/Maetveis/libspirv-path-install-dir branch 2 times, most recently from 491016c to c1b5a53 Compare June 27, 2025 07:22
steffenlarsen pushed a commit that referenced this pull request Jun 27, 2025
)

<!-- start git-machete generated -->

# Based on PR #18956

## Tree of downstream PRs as of 2025-06-25

* **PR #19130 (THIS ONE)**

    * PR #19131

      * PR #19134

        * PR #19135

          * PR #19136

<!-- end git-machete generated -->

In the next commits I'd like to refactor and fix SYCL libspirv linking.
This adds a few tests to cover the current behavior. Some of it is
buggy, and not consistent between NVPTX and AMDGPU, it will be improved
in the next commits.
@Maetveis Maetveis force-pushed the review/Maetveis/deduplicate-libspirv-logic branch from d183788 to f08825e Compare June 27, 2025 07:37
@Maetveis Maetveis force-pushed the review/Maetveis/libspirv-path-install-dir branch 2 times, most recently from 63704bf to c0793c1 Compare June 27, 2025 08:33
bader pushed a commit that referenced this pull request Jun 27, 2025
<!-- start git-machete generated -->

# Based on PR #19130

## Chain of upstream PRs & tree of downstream PRs as of 2025-06-25

* PR #19130

  * **PR #19131 (THIS ONE)**

      * PR #19134

        * PR #19135

          * PR #19136

<!-- end git-machete generated -->

Move the logic for finding and linking libspirv into
SYCLInstallationDetector.
This code was basically duplicated between the CUDA and HIP toolchains,
and was also present in the Driver sources.
This is NFC, aside from the fact that the code in the HIP toolchain
lacked the special handling for the `-###` driver option present in the
other two places.
Base automatically changed from review/Maetveis/deduplicate-libspirv-logic to sycl June 27, 2025 15:15
@bader
Copy link
Contributor

bader commented Jun 27, 2025

@Maetveis, please, resolve conflicts.

... instead of the resource directory. This matches the behaviour of
SYCL device libraries. The resource directory has nothing to do with
libspirv, and it might be changed by the `-resource-dir` option, which
would lead us to not find it.
@Maetveis Maetveis force-pushed the review/Maetveis/libspirv-path-install-dir branch from c0793c1 to 3339a77 Compare June 28, 2025 06:47
@bader
Copy link
Contributor

bader commented Jun 28, 2025

These unexpected passes don't seem to be related.

Unexpectedly Passed Tests (5):
  SYCL :: bindless_images/array/fetch_handle_carray2d.cpp
  SYCL :: bindless_images/read_1D_O0.cpp
  SYCL :: bindless_images/sampled_fetch/fetch_1D_O0.cpp
  SYCL :: bindless_images/sampled_fetch/fetch_2D_O0.cpp
  SYCL :: bindless_images/sampling_1D_O0.cpp

@intel/dpcpp-devops-reviewers, any GPU driver updates recently?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants