Skip to content
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

[SYCL][E2E] Fix two Windows ocloc tests #14560

Merged
merged 2 commits into from
Jul 16, 2024
Merged

[SYCL][E2E] Fix two Windows ocloc tests #14560

merged 2 commits into from
Jul 16, 2024

Conversation

sarnex
Copy link
Contributor

@sarnex sarnex commented Jul 12, 2024

I recently found out ocloc tests weren't running in Windows CI because the ocloc tool wasn't installed on the runners.

When trying to fix it, I hit two failures that would have always failed if we were testing (the other two are going to be fixed here).

The first fix disables the test on Windows because it is using pvc which is not available on Windows.

The seconds add a requirement for the OCL CPU driver to be installed because the test is using ocloc-aot, as per the ocloc-aot doc.

The CI testing in this PR is only confirming I didn't break the tests on non-win ocloc because I haven't enabled Windows ocloc testing yet, but I manually verified the fix.

Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
@sarnex sarnex marked this pull request as ready for review July 12, 2024 16:30
@sarnex sarnex requested a review from a team as a code owner July 12, 2024 16:30
Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
Copy link
Contributor

@maksimsab maksimsab left a comment

Choose a reason for hiding this comment

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

LGTM

@sarnex sarnex merged commit 781b00c into intel:sycl Jul 16, 2024
13 checks passed
smanna12 pushed a commit to smanna12/llvm that referenced this pull request Jul 16, 2024
I recently found out ocloc tests weren't running in Windows CI because
the ocloc tool wasn't installed on the runners.

When trying to fix it, I
[hit](https://github.com/intel/llvm/actions/runs/9909706895/job/27379893885?pr=14114)
two failures that would have always failed if we were testing (the other
two are going to be fixed
[here](intel#14556)).

The first fix disables the test on Windows because it is using `pvc`
which is not available on Windows.

The seconds add a requirement for the OCL CPU driver to be installed
because the test is using `ocloc-aot`, as per the [ocloc-aot
doc](https://github.com/intel/llvm/blob/56e88d591c52a978abdd5e4279853311cae4a55e/opencl/opencl-aot/README.md?plain=1#L11).

The CI testing in this PR is only confirming I didn't break the tests on
non-win ocloc because I haven't enabled Windows ocloc testing yet, but I
manually verified the fix.

---------

Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
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