[SYCL][Test E2E] Use %{build}/%{run} in Plugin tests by aelovikov-intel · Pull Request #9331 · intel/llvm

aelovikov-intel · 2023-05-06T04:02:34Z

No description provided.

cperkinsintel · 2023-05-08T21:49:06Z

sycl/test-e2e/Plugin/enqueue-arg-order-buffer.cpp

-// 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


We support multiple // UNSUPPORTED: directives? ( As opposed to having to construct a boolean expression with hip_nvidia )

cperkinsintel · 2023-05-08T21:59:06Z

sycl/test-e2e/Plugin/interop-level-zero-thread.cpp

-// 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


Did BE_RUN_PLACEHOLDER somehow also pipe to FileCheck? In any case, we'll need to add that now, corect?

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.

cperkinsintel · 2023-05-08T22:02:48Z

sycl/test-e2e/Plugin/level-zero-event-leak.cpp

-// 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


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.

Yes, it should be removed.

cperkinsintel · 2023-05-08T22:05:54Z

sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp

@@ -1,21 +1,17 @@
 // REQUIRES: aspect-ext_intel_device_id


Probably needs level_zero added to the // REQUIRES: directive

Someone put it at the bottom of the test. Guess their backspace key was broken.

cperkinsintel · 2023-05-08T22:08:09Z

sycl/test-e2e/Plugin/level_zero_imm_cmdlist.cpp

-// 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


Again, let's remove ONEAPI_DEVICE_SELECTOR

cperkinsintel · 2023-05-08T22:08:42Z

sycl/test-e2e/Plugin/level_zero_inorder.cpp

-// 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


remove ONEAPI_DEVICE_SELECTOR

cperkinsintel · 2023-05-08T22:09:17Z

sycl/test-e2e/Plugin/level_zero_inorder_interleaving_kernel_copy.cpp

-// 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


ibid. ( remove ONEAPI_DEVICE_SELECTOR )

cperkinsintel · 2023-05-08T22:10:09Z

sycl/test-e2e/Plugin/level_zero_track_indirect_access_memory.cpp

-// 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


probably can remove ONEAPI_DEVICE_SELECTOR=level_zero:*

cperkinsintel

sweet

aelovikov-intel · 2023-05-09T05:15:42Z

Unexpectedly Passed Tests (1):
  SYCL :: KernelFusion/device_info_descriptor.cpp

is failing on other PRs as well. Reported in #8747 (comment).

[SYCL][Test E2E] Use %{build}/%{run} in Plugin tests

0f5f61f

aelovikov-intel requested a review from a team as a code owner May 6, 2023 04:02

aelovikov-intel requested a review from cperkinsintel May 6, 2023 04:02

aelovikov-intel temporarily deployed to aws May 6, 2023 05:18 — with GitHub Actions Inactive

aelovikov-intel temporarily deployed to aws May 6, 2023 09:30 — with GitHub Actions Inactive

cperkinsintel reviewed May 8, 2023

View reviewed changes

Address CR comments

7712dc2

aelovikov-intel requested a review from cperkinsintel May 8, 2023 22:25

cperkinsintel approved these changes May 8, 2023

View reviewed changes

aelovikov-intel temporarily deployed to aws May 8, 2023 23:56 — with GitHub Actions Inactive

aelovikov-intel temporarily deployed to aws May 9, 2023 02:11 — with GitHub Actions Inactive

aelovikov-intel closed this May 9, 2023

aelovikov-intel reopened this May 9, 2023

aelovikov-intel temporarily deployed to aws May 9, 2023 03:58 — with GitHub Actions Inactive

aelovikov-intel temporarily deployed to aws May 9, 2023 05:13 — with GitHub Actions Inactive

aelovikov-intel merged commit fa89b05 into intel:sycl May 9, 2023

aelovikov-intel deleted the e2e-run-plugin branch May 9, 2023 05:15

Conversation

aelovikov-intel commented May 6, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cperkinsintel May 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cperkinsintel left a comment

Choose a reason for hiding this comment

Uh oh!

aelovikov-intel commented May 9, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

cperkinsintel May 8, 2023 •

edited

Loading