[SYCL][Test E2E] Use %{build}/%{run} in Plugin tests #9331
Conversation
| // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out | ||
| // RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER | ||
| // RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER | ||
| // UNSUPPORTED: accelerator |
There was a problem hiding this comment.
We support multiple // UNSUPPORTED: directives? ( As opposed to having to construct a boolean expression with hip_nvidia )
| // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %level_zero_options %threads_lib | ||
| // RUN: %BE_RUN_PLACEHOLDER %t.out | ||
| // RUN: %{build} -o %t.out %level_zero_options %threads_lib | ||
| // RUN: %{run} %t.out |
There was a problem hiding this comment.
Did BE_RUN_PLACEHOLDER somehow also pipe to FileCheck? In any case, we'll need to add that now, corect?
There was a problem hiding this comment.
No, we never ran FileCheck on that test. I think the author supposed we need (hence checks below), but enabling that should be a separate PR.
| // RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out wait 2>&1 %GPU_CHECK_PLACEHOLDER | ||
| // RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out nowait 2>&1 %GPU_CHECK_PLACEHOLDER | ||
| // RUN: %{build} %level_zero_options -o %t.out | ||
| // RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %{run} %t.out wait 2>&1 | FileCheck %s |
There was a problem hiding this comment.
Since we have the //REQUIRES: level_zero already in the test, do we really need the ONEAPI_DEVICE_SELECTOR="level_zero:*" ?
The other tests have foregone it and I think they are improved for the change. Probably should remove it everyhwere in this test.
There was a problem hiding this comment.
Yes, it should be removed.
| @@ -1,21 +1,17 @@ | |||
| // REQUIRES: aspect-ext_intel_device_id | |||
There was a problem hiding this comment.
Probably needs level_zero added to the // REQUIRES: directive
There was a problem hiding this comment.
Someone put it at the bottom of the test. Guess their backspace key was broken.
| // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out | ||
| // RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER | ||
| // RUN: %{build} %level_zero_options -o %t.out | ||
| // RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s |
There was a problem hiding this comment.
Again, let's remove ONEAPI_DEVICE_SELECTOR
| // RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=1 ONEAPI_DEVICE_SELECTOR="level_zero:*" %GPU_RUN_PLACEHOLDER %t.out | ||
| // RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=2 ONEAPI_DEVICE_SELECTOR="level_zero:*" %GPU_RUN_PLACEHOLDER %t.out | ||
| // RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=3 ONEAPI_DEVICE_SELECTOR="level_zero:*" %GPU_RUN_PLACEHOLDER %t.out | ||
| // RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=0 ONEAPI_DEVICE_SELECTOR="level_zero:*" %{run} %t.out |
There was a problem hiding this comment.
remove ONEAPI_DEVICE_SELECTOR
| // RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=1 ONEAPI_DEVICE_SELECTOR="level_zero:*" %GPU_RUN_PLACEHOLDER %t.out | ||
| // RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=2 ONEAPI_DEVICE_SELECTOR="level_zero:*" %GPU_RUN_PLACEHOLDER %t.out | ||
| // RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=3 ONEAPI_DEVICE_SELECTOR="level_zero:*" %GPU_RUN_PLACEHOLDER %t.out | ||
| // RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=0 ONEAPI_DEVICE_SELECTOR="level_zero:*" %{run} %t.out |
There was a problem hiding this comment.
ibid. ( remove ONEAPI_DEVICE_SELECTOR )
| // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %threads_lib %s -o %t.out | ||
| // RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 ONEAPI_DEVICE_SELECTOR="level_zero:*" %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER | ||
| // RUN: %{build} %level_zero_options %threads_lib -o %t.out | ||
| // RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 ONEAPI_DEVICE_SELECTOR="level_zero:*" %{run} %t.out 2>&1 | FileCheck %s |
There was a problem hiding this comment.
probably can remove ONEAPI_DEVICE_SELECTOR=level_zero:*
is failing on other PRs as well. Reported in #8747 (comment). |
No description provided.