Skip to content

Commit

Permalink
[SYCL][E2E] Fix two Windows ocloc tests (#14560)
Browse files Browse the repository at this point in the history
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](#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>
  • Loading branch information
sarnex authored Jul 16, 2024
1 parent d2f6fb3 commit 781b00c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions sycl/test-e2e/OptionalKernelFeatures/fp64-conv-emu.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: ocloc, gpu
// REQUIRES: ocloc, gpu, linux
// UNSUPPORTED: cuda, hip

// RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend "-device pvc" -fsycl-fp64-conv-emu %if system-windows %{ -Od %} %else %{ -O0 %} %s -o %t_opt.out
// RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend "-device pvc" -fsycl-fp64-conv-emu -O0 %s -o %t_opt.out
// TODO: Enable when GPU driver is updated.
// RUNx: %{run} %t_opt.out

Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/ProgramManager/uneven_kernel_split.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// REQUIRES: gpu, opencl-aot, ocloc
// REQUIRES: any-device-is-cpu, gpu, opencl-aot, ocloc
// UNSUPPORTED: cuda, hip

// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 -I %S/Inputs/ %S/uneven_kernel_split.cpp -c -o %t.o
Expand Down

0 comments on commit 781b00c

Please sign in to comment.