[SYCL][E2E] Remove build-and-run-mode feature and run-mode ignore line filtering workaround
#17023
Conversation
| @@ -2,9 +2,8 @@ | |||
| // using fp64 can be compiled AOT. | |||
|
|
|||
| // REQUIRES: ocloc, opencl-aot, any-device-is-cpu | |||
| // REQUIRES: build-and-run-mode | |||
| // RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_tgllp -o %t.tgllp.out %s | |||
There was a problem hiding this comment.
I think I'd prefer to use %{run-aux} on all build lines in most cases if we need it at one.
There was a problem hiding this comment.
Sure, I can do that. My initial reasoning for this is that the rest of the build lines are never ran so we could get away with building them just once on the build system.
|
|
||
| // RUN: %clangxx -fsycl -fsycl-targets=spir64,spir64_gen -Xsycl-target-backend=spir64_gen "-device dg1" %s -o %t.out | ||
| // RUN: %{run-aux} %clangxx -fsycl -fsycl-targets=spir64,spir64_gen -Xsycl-target-backend=spir64_gen "-device dg1" %s -o %t.out |
There was a problem hiding this comment.
Do we really require the device to be present when building for specific HW? That looks strange.
There was a problem hiding this comment.
From what I understand the reason that the AOT cpu tests compile fine, but fail on the run stage is that the test is built for the specific cpu architecture of the build machine, which may be different than that of the run system. If we passed in an architecture to opencl-aot with the --march option we could possibly get around this, but then we would need to make sure we are running the correct executable, based on the run-systems cpu architecture.
There was a problem hiding this comment.
But we are compiling for a specific gpu here, aren't we?
There was a problem hiding this comment.
hmmm, the following line is wrapped in %if cpu and the test has "cpu" in its title? am I missing something here?
There was a problem hiding this comment.
These two lines seem to compile for AOT GPU + SPIR-V JIT, and then execute on CPU via JIT compilation. The execution scenario is similar to play %{build}/%{run}.
Lines 11 does need run-aux because it AOT compiles for host CPU, so we need that to be executed during "run" stage.
| @@ -1,10 +1,9 @@ | |||
| // RUN: %{build} -o %t.out | |||
| // RUN: %{run} %t.out | |||
| // | |||
| // RUN: %if any-device-is-cpu && opencl-aot %{ %clangxx -fsycl -fsycl-targets=spir64_x86_64 -o %t.x86.out %s %} | |||
| // RUN: %if any-device-is-cpu && opencl-aot %{ %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -o %t.x86.out %s %} | |||
There was a problem hiding this comment.
I'm fine with limited run-aux usage here though.
| @@ -107,7 +107,7 @@ jobs: | |||
| image: ${{ matrix.image }} | |||
| image_options: ${{ matrix.image_options }} | |||
| target_devices: ${{ matrix.target_devices }} | |||
| extra_lit_opts: --param fallback-to-build-if-requires-build-and-run=True ${{ matrix.extra_lit_opts }} | |||
| extra_lit_opts: ${{ matrix.extra_lit_opts }} | |||
There was a problem hiding this comment.
is my understanding that the basic idea of this PR is to merge the build-and-test mode with the run mode, so we build all tests that can't be built in build mode in the run mode?
There was a problem hiding this comment.
Main motivation is to remove the build-and-run-mode feature, which was just introduced as a way to temporarily mark tests as not available for the split build/run mode while we figured out how to properly react to requires/unsupported statements.
The remaining tests that had this markup (which are all changed in this pr) had not yet had that requirement removed because they either never ran on CI and have regular build failures, or were AOT cpu tests and if we build these on a seperate machine we end up building for that machine's cpu architecture which if it is different than the run system's architecture it causes execution failures.
The fallback-to-build-if-requires-build-and-run option is also removed since that option only functions when a test has REQUIRES: build-and-run-mode
Removes the
build-and-run-modefeature from e2e lit infrastructure, as well as the remainingREQUIRES: build-and-run-modemarkups found in tests. Also removes therun-onlymode ignore line filtering workaround onREQUIRES: build-and-run-mode. For tests that still need to be ran completely on the run-only side (mainly AOT tests), explicitly mark the compilation lines with%{run-aux}