Skip to content

[SYCL][Driver] Respect -nocudalib again after bad merge conflict resolution#19216

Merged
aelovikov-intel merged 3 commits intointel:syclfrom
Maetveis:fix-conflict-resolution
Jul 2, 2025
Merged

[SYCL][Driver] Respect -nocudalib again after bad merge conflict resolution#19216
aelovikov-intel merged 3 commits intointel:syclfrom
Maetveis:fix-conflict-resolution

Conversation

@Maetveis
Copy link
Copy Markdown
Contributor

@Maetveis Maetveis commented Jun 30, 2025

fc26ef4cf0cafce381395f2d422bff33227e80b8 is a bad resolution --offloadlib is a positive option to explicitly link offload device libraries (usually on by default), while the option it replaced (-nogpulib) was the negative option to disable linking them.
To behave correctly, we need to consider both positive and negative options.

The test did not catch this because the filecheck CHECK-NOT directive had a typo. Fix that as well.

…lution

fc26ef4 is a bad resolution
`--offloadlib` is a positive option to explicitly link offload device
libraries (usually on by default), while the option it replaced (`-nogpulib`)
was the negative option to disable linking them.
To behave correctly, we need to consider both positive and negative
options.

The test did not catch this because the filecheck CHECK-NOT directive
had a typo. Fix that as well.
@Maetveis Maetveis requested a review from a team as a code owner June 30, 2025 15:08
@Maetveis
Copy link
Copy Markdown
Contributor Author

Maetveis commented Jul 2, 2025

@intel/llvm-gatekeepers this should be ready to merge :)

@aelovikov-intel aelovikov-intel merged commit 8b09e59 into intel:sycl Jul 2, 2025
25 checks passed
@Maetveis Maetveis deleted the fix-conflict-resolution branch July 2, 2025 14:11
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