[SYCL][E2E] Fix two Windows ocloc tests#14560
Merged
sarnex merged 2 commits intointel:syclfrom Jul 16, 2024
Merged
Conversation
Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
aelovikov-intel
approved these changes
Jul 15, 2024
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>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
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
pvcwhich 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.