Skip to content

Commit cf8dab2

Browse files
BensuoEwanC
andauthored
[SYCL][Graph] Fix E2E test problems with preview/build-only mode (#19178)
- Fix incorrect REQUIRE in NativeCommand/invalid.cpp causing issues in build-only mode - Fix setting dynamic parameter args in preview mode not passing the raw impl ptr --------- Co-authored-by: Ewan Crawford <ewan@codeplay.com>
1 parent 2f36f11 commit cf8dab2

35 files changed

+8
-105
lines changed

sycl/include/sycl/handler.hpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -730,9 +730,14 @@ class __SYCL_EXPORT handler {
730730
// Set the arg in the handler as normal
731731
setArgHelper(ArgIndex, std::move(ArgValue));
732732

733-
// Register the dynamic parameter with the handler for later association
734-
// with the node being added
733+
// Register the dynamic parameter with the handler for later association
734+
// with the node being added
735+
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
736+
registerDynamicParameter(detail::getSyclObjImpl(DynamicParam).get(),
737+
ArgIndex);
738+
#else
735739
registerDynamicParameter(DynamicParam, ArgIndex);
740+
#endif
736741
}
737742

738743
template <typename DataT, typename PropertyListT>

sycl/test-e2e/Graph/NativeCommand/invalid.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
// RUN: %{run} %t.out
33
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %}
44
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
5-
// REQUIRES: cuda
6-
7-
// XFAIL: preview-mode
8-
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911
5+
// REQUIRES: target-nvidia
96

107
// Test that interop_handle::ext_codeplay_get_native_graph() throws if no
118
// backend graph object is available.

sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_before_finalize.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
// Extra run to check for immediate-command-list in Level Zero
66
// RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
77

8-
// XFAIL: preview-mode
9-
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911
10-
118
// Tests updating a graph node before finalization
129

1310
#include "../../graph_common.hpp"

sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_multiple_exec_graphs.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
// Extra run to check for immediate-command-list in Level Zero
66
// RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
77

8-
// XFAIL: preview-mode
9-
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911
10-
118
// Tests creating multiple executable graphs from the same modifiable graph and
129
// only updating one of them.
1310

sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ordering.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
// Extra run to check for immediate-command-list in Level Zero
66
// RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
77

8-
// XFAIL: preview-mode
9-
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911
10-
118
// Tests that updating a graph is ordered with respect to previous executions of
129
// the graph which may be in flight.
1310

sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
// Extra run to check for immediate-command-list in Level Zero
66
// RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
77

8-
// XFAIL: preview-mode
9-
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911
10-
118
// Tests updating a graph node using index-based explicit update
129

1310
#include "../../graph_common.hpp"

sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_3D.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
// Extra run to check for immediate-command-list in Level Zero
66
// RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
77

8-
// XFAIL: preview-mode
9-
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911
10-
118
// Tests updating a 3D ND-Range graph kernel node using index-based explicit
129
// update
1310

sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_double_update.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
// Extra run to check for immediate-command-list in Level Zero
66
// RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
77

8-
// XFAIL: preview-mode
9-
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911
10-
118
// Tests updating a graph node using index-based explicit update
129

1310
#include "../../graph_common.hpp"

sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_multiple_nodes.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
// Extra run to check for immediate-command-list in Level Zero
66
// RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
77

8-
// XFAIL: preview-mode
9-
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911
10-
118
// Tests updating a single dynamic parameter which is registered with multiple
129
// graph nodes
1310

sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_multiple_params.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
// Extra run to check for immediate-command-list in Level Zero
66
// RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
77

8-
// XFAIL: preview-mode
9-
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911
10-
118
// Tests updating multiple parameters to a singlegraph node using index-based
129
// explicit update
1310

0 commit comments

Comments
 (0)