Skip to content

[SYCL][Graph] Fix E2E test problems with preview/build-only mode #19178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: sycl
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions sycl/include/sycl/handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,8 @@ class __SYCL_EXPORT handler {

/// Saves the location of user's code passed in \p CodeLoc for future usage in
/// finalize() method.
/// TODO: remove the first version of this func (the one without the IsTopCodeLoc arg)
/// TODO: remove the first version of this func (the one without the
/// IsTopCodeLoc arg)
/// at the next ABI breaking window since removing it breaks ABI on windows.
void saveCodeLoc(detail::code_location CodeLoc);
void saveCodeLoc(detail::code_location CodeLoc, bool IsTopCodeLoc);
Expand Down Expand Up @@ -729,9 +730,14 @@ class __SYCL_EXPORT handler {
// Set the arg in the handler as normal
setArgHelper(ArgIndex, std::move(ArgValue));

// Register the dynamic parameter with the handler for later association
// with the node being added
// Register the dynamic parameter with the handler for later association
// with the node being added
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
registerDynamicParameter(detail::getSyclObjImpl(DynamicParam).get(),
ArgIndex);
#else
registerDynamicParameter(DynamicParam, ArgIndex);
#endif
}

template <typename DataT, typename PropertyListT>
Expand Down
5 changes: 1 addition & 4 deletions sycl/test-e2e/Graph/NativeCommand/invalid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
// REQUIRES: cuda

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911
// REQUIRES: target-nvidia, cuda_dev_kit

// Test that interop_handle::ext_codeplay_get_native_graph() throws if no
// backend graph object is available.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
// Extra run to check for immediate-command-list in Level Zero
// 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 %}

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a graph node before finalization

#include "../../graph_common.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
// Extra run to check for immediate-command-list in Level Zero
// 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 %}

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests creating multiple executable graphs from the same modifiable graph and
// only updating one of them.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
// Extra run to check for immediate-command-list in Level Zero
// 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 %}

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests that updating a graph is ordered with respect to previous executions of
// the graph which may be in flight.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
// Extra run to check for immediate-command-list in Level Zero
// 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 %}

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a graph node using index-based explicit update

#include "../../graph_common.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
// Extra run to check for immediate-command-list in Level Zero
// 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 %}

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a 3D ND-Range graph kernel node using index-based explicit
// update

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
// Extra run to check for immediate-command-list in Level Zero
// 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 %}

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a graph node using index-based explicit update

#include "../../graph_common.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
// Extra run to check for immediate-command-list in Level Zero
// 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 %}

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a single dynamic parameter which is registered with multiple
// graph nodes

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
// Extra run to check for immediate-command-list in Level Zero
// 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 %}

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating multiple parameters to a singlegraph node using index-based
// explicit update

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
// Extra run to check for immediate-command-list in Level Zero
// 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 %}

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a graph node in an executable graph that was used as a
// subgraph node in another executable graph is not reflected in the graph
// containing the subgraph node.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
// Extra run to check for immediate-command-list in Level Zero
// 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 %}

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a graph node scalar argument using index-based explicit update

#include "../../graph_common.hpp"
Expand Down
3 changes: 0 additions & 3 deletions sycl/test-e2e/Graph/Update/dyn_cgf_with_all_dyn_params.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
// Extra run to check for immediate-command-list in Level Zero
// 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 %}

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests using a dynamic command-group object with dynamic parameters inside it

#include "../graph_common.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
// Extra run to check for immediate-command-list in Level Zero
// 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 %}

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests using a dynamic command-group object with dynamic parameters of
// different types

Expand Down
3 changes: 0 additions & 3 deletions sycl/test-e2e/Graph/Update/dyn_cgf_with_some_dyn_params.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
// Extra run to check for immediate-command-list in Level Zero
// 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 %}

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests using a dynamic command-group object where some but not all the
// command-groups use dynamic parameters.

Expand Down
3 changes: 0 additions & 3 deletions sycl/test-e2e/Graph/Update/update_before_finalize.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
// 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 %}
//

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a graph node before finalization

#include "../graph_common.hpp"
Expand Down
3 changes: 0 additions & 3 deletions sycl/test-e2e/Graph/Update/update_nullptr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
// Extra run to check for immediate-command-list in Level Zero
// 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 %}

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a graph node using a USM pointer set to nullptr

#include "../graph_common.hpp"
Expand Down
3 changes: 0 additions & 3 deletions sycl/test-e2e/Graph/Update/update_with_indices_accessor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
// 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 %}
//

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a graph node accessor argument using index-based explicit
// update

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
// 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 %}
//

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a graph node accessor argument multiple times before the graph
// is updated, using index-based explicit update

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
// 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 %}
//

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a single dynamic parameter which is registered with multiple
// graph nodes where it has a different argument index in each node

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
// 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 %}
//

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a graph node accessor argument using index-based explicit
// update while also submitting work using those accessors to a normal queue

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
// Extra run to check for immediate-command-list in Level Zero
// RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out %S/../Inputs/Kernels/update_with_indices_accessor.spv 2>&1 | FileCheck %s --implicit-check-not=LEAK %}

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// REQUIRES: level_zero

// Tests updating an accessor argument to a graph node created from SPIR-V
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
// 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 %}
//

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests creating multiple executable graphs from the same modifiable graph and
// only updating one of them.

Expand Down
3 changes: 0 additions & 3 deletions sycl/test-e2e/Graph/Update/update_with_indices_ordering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
// 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 %}
//

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests that updating a graph is ordered with respect to previous executions of
// the graph which may be in flight.

Expand Down
3 changes: 0 additions & 3 deletions sycl/test-e2e/Graph/Update/update_with_indices_ptr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
// 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 %}
//

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a graph node using index-based explicit update

#include "../graph_common.hpp"
Expand Down
3 changes: 0 additions & 3 deletions sycl/test-e2e/Graph/Update/update_with_indices_ptr_3D.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
// 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 %}
//

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a 3D ND-Range graph kernel node using index-based explicit
// update

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
// 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 %}
//

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a graph node using index-based explicit update

#include "../graph_common.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
// 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 %}
//

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a single dynamic parameter which is registered with multiple
// graph nodes

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
// 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 %}
//

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a single dynamic parameter which is registered with multiple
// graph nodes where it has a different argument index in each node

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
// 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 %}
//

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating multiple parameters to a singlegraph node using index-based
// explicit update

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
// 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 %}
//

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a graph node in an executable graph that was used as a
// subgraph node in another executable graph is not reflected in the graph
// containing the subgraph node.
Expand Down
3 changes: 0 additions & 3 deletions sycl/test-e2e/Graph/Update/update_with_indices_scalar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
// 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 %}
//

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a graph node scalar argument using index-based explicit update

#include "../graph_common.hpp"
Expand Down
3 changes: 0 additions & 3 deletions sycl/test-e2e/Graph/Update/update_with_raw_kernel_arg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@

// REQUIRES: ocloc && level_zero

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests updating a raw_kernel_arg with 32-bit sized scalars.

#include "../graph_common.hpp"
Expand Down
3 changes: 0 additions & 3 deletions sycl/test-e2e/Graph/Update/whole_update_dynamic_param.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
// Extra run to check for immediate-command-list in Level Zero
// 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 %}

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests that whole graph update works when using dynamic parameters.

#include "../graph_common.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
// UNSUPPORTED-INTENDED: sycl_ext_oneapi_work_group_static is not supported on
// AMD

// XFAIL: preview-mode
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18911

// Tests using sycl_ext_oneapi_work_group_static in a graph node with dynamic
// cgf and dynamic parameter

Expand Down