From 94da6de162b454e70320caf898d85080fbb5abf2 Mon Sep 17 00:00:00 2001 From: Ben Tracy Date: Thu, 26 Jun 2025 16:37:18 +0100 Subject: [PATCH 1/5] [SYCL][Graph] Fix E2E test problems with preview/build-only mode - Fix incorrect REQUIRE in NativeCommand/invalid.cpp - Fix setting dynamic parameter args in preview mode not passing the raw impl ptr --- sycl/include/sycl/handler.hpp | 12 +++++++++--- sycl/test-e2e/Graph/NativeCommand/invalid.cpp | 5 +---- .../FreeFunctionKernels/update_before_finalize.cpp | 3 --- .../update_with_indices_multiple_exec_graphs.cpp | 3 --- .../update_with_indices_ordering.cpp | 3 --- .../FreeFunctionKernels/update_with_indices_ptr.cpp | 3 --- .../update_with_indices_ptr_3D.cpp | 3 --- .../update_with_indices_ptr_double_update.cpp | 3 --- .../update_with_indices_ptr_multiple_nodes.cpp | 3 --- .../update_with_indices_ptr_multiple_params.cpp | 3 --- .../update_with_indices_ptr_subgraph.cpp | 3 --- .../update_with_indices_scalar.cpp | 3 --- .../Graph/Update/dyn_cgf_with_all_dyn_params.cpp | 3 --- .../dyn_cgf_with_different_type_dyn_params.cpp | 3 --- .../Graph/Update/dyn_cgf_with_some_dyn_params.cpp | 3 --- .../test-e2e/Graph/Update/update_before_finalize.cpp | 3 --- sycl/test-e2e/Graph/Update/update_nullptr.cpp | 3 --- .../Graph/Update/update_with_indices_accessor.cpp | 3 --- .../update_with_indices_accessor_double_update.cpp | 3 --- ...ces_accessor_multiple_nodes_different_indices.cpp | 3 --- .../Update/update_with_indices_accessor_ordering.cpp | 3 --- .../Update/update_with_indices_accessor_spv.cpp | 3 --- .../update_with_indices_multiple_exec_graphs.cpp | 3 --- .../Graph/Update/update_with_indices_ordering.cpp | 3 --- .../Graph/Update/update_with_indices_ptr.cpp | 3 --- .../Graph/Update/update_with_indices_ptr_3D.cpp | 3 --- .../Update/update_with_indices_ptr_double_update.cpp | 3 --- .../update_with_indices_ptr_multiple_nodes.cpp | 3 --- ..._indices_ptr_multiple_nodes_different_indices.cpp | 3 --- .../update_with_indices_ptr_multiple_params.cpp | 3 --- .../Update/update_with_indices_ptr_subgraph.cpp | 3 --- .../Graph/Update/update_with_indices_scalar.cpp | 3 --- .../Graph/Update/update_with_raw_kernel_arg.cpp | 3 --- .../Graph/Update/whole_update_dynamic_param.cpp | 3 --- ...oup_static_memory_with_dyn_cgf_and_dyn_params.cpp | 3 --- 35 files changed, 10 insertions(+), 106 deletions(-) diff --git a/sycl/include/sycl/handler.hpp b/sycl/include/sycl/handler.hpp index 852045e2bf3f0..089be691ce327 100644 --- a/sycl/include/sycl/handler.hpp +++ b/sycl/include/sycl/handler.hpp @@ -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); @@ -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 paramete r 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 diff --git a/sycl/test-e2e/Graph/NativeCommand/invalid.cpp b/sycl/test-e2e/Graph/NativeCommand/invalid.cpp index c8be4ca973f7f..cdd2345bfb849 100644 --- a/sycl/test-e2e/Graph/NativeCommand/invalid.cpp +++ b/sycl/test-e2e/Graph/NativeCommand/invalid.cpp @@ -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. diff --git a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_before_finalize.cpp b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_before_finalize.cpp index e325a2c6a606f..211bc8d37bd04 100644 --- a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_before_finalize.cpp +++ b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_before_finalize.cpp @@ -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" diff --git a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_multiple_exec_graphs.cpp b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_multiple_exec_graphs.cpp index 16cf91b7f0b98..6de8bfbe03965 100644 --- a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_multiple_exec_graphs.cpp +++ b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_multiple_exec_graphs.cpp @@ -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. diff --git a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ordering.cpp b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ordering.cpp index e06c26cc010bd..b3152fa1527c1 100644 --- a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ordering.cpp +++ b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ordering.cpp @@ -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. diff --git a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr.cpp b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr.cpp index 4e347dc740033..d4452ab6e2a6b 100644 --- a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr.cpp +++ b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr.cpp @@ -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" diff --git a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_3D.cpp b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_3D.cpp index ac54c6b5daba5..820b5b81793a9 100644 --- a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_3D.cpp +++ b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_3D.cpp @@ -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 diff --git a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_double_update.cpp b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_double_update.cpp index 07c819b1d2b9f..8a0a86253542f 100644 --- a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_double_update.cpp +++ b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_double_update.cpp @@ -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" diff --git a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_multiple_nodes.cpp b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_multiple_nodes.cpp index 02c1abed8c83a..3247b7edf27a0 100644 --- a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_multiple_nodes.cpp +++ b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_multiple_nodes.cpp @@ -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 diff --git a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_multiple_params.cpp b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_multiple_params.cpp index a7c498274a751..0c01f44bc4333 100644 --- a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_multiple_params.cpp +++ b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_multiple_params.cpp @@ -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 diff --git a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_subgraph.cpp b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_subgraph.cpp index 6ed2b2776a40d..0a9d4eb9372e2 100644 --- a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_subgraph.cpp +++ b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_ptr_subgraph.cpp @@ -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. diff --git a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_scalar.cpp b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_scalar.cpp index b8fccf1108cc8..7f141555493a0 100644 --- a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_scalar.cpp +++ b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_with_indices_scalar.cpp @@ -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" diff --git a/sycl/test-e2e/Graph/Update/dyn_cgf_with_all_dyn_params.cpp b/sycl/test-e2e/Graph/Update/dyn_cgf_with_all_dyn_params.cpp index 6d9e9d0cab340..3207bca714605 100644 --- a/sycl/test-e2e/Graph/Update/dyn_cgf_with_all_dyn_params.cpp +++ b/sycl/test-e2e/Graph/Update/dyn_cgf_with_all_dyn_params.cpp @@ -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" diff --git a/sycl/test-e2e/Graph/Update/dyn_cgf_with_different_type_dyn_params.cpp b/sycl/test-e2e/Graph/Update/dyn_cgf_with_different_type_dyn_params.cpp index 8dd217cf3fc95..19f36ca6cfe6e 100644 --- a/sycl/test-e2e/Graph/Update/dyn_cgf_with_different_type_dyn_params.cpp +++ b/sycl/test-e2e/Graph/Update/dyn_cgf_with_different_type_dyn_params.cpp @@ -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 diff --git a/sycl/test-e2e/Graph/Update/dyn_cgf_with_some_dyn_params.cpp b/sycl/test-e2e/Graph/Update/dyn_cgf_with_some_dyn_params.cpp index 16538a4cede39..990c8762836f9 100644 --- a/sycl/test-e2e/Graph/Update/dyn_cgf_with_some_dyn_params.cpp +++ b/sycl/test-e2e/Graph/Update/dyn_cgf_with_some_dyn_params.cpp @@ -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. diff --git a/sycl/test-e2e/Graph/Update/update_before_finalize.cpp b/sycl/test-e2e/Graph/Update/update_before_finalize.cpp index 0290eacc844b3..14d00e3b3763d 100644 --- a/sycl/test-e2e/Graph/Update/update_before_finalize.cpp +++ b/sycl/test-e2e/Graph/Update/update_before_finalize.cpp @@ -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" diff --git a/sycl/test-e2e/Graph/Update/update_nullptr.cpp b/sycl/test-e2e/Graph/Update/update_nullptr.cpp index 04e774f4e8522..6b7c4003b5ea6 100644 --- a/sycl/test-e2e/Graph/Update/update_nullptr.cpp +++ b/sycl/test-e2e/Graph/Update/update_nullptr.cpp @@ -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" diff --git a/sycl/test-e2e/Graph/Update/update_with_indices_accessor.cpp b/sycl/test-e2e/Graph/Update/update_with_indices_accessor.cpp index abdea3f6f1064..d52a99042ff96 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_accessor.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_accessor.cpp @@ -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 diff --git a/sycl/test-e2e/Graph/Update/update_with_indices_accessor_double_update.cpp b/sycl/test-e2e/Graph/Update/update_with_indices_accessor_double_update.cpp index 92a2294eb455a..5f1e4f4b43b5f 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_accessor_double_update.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_accessor_double_update.cpp @@ -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 diff --git a/sycl/test-e2e/Graph/Update/update_with_indices_accessor_multiple_nodes_different_indices.cpp b/sycl/test-e2e/Graph/Update/update_with_indices_accessor_multiple_nodes_different_indices.cpp index 372589e7909de..1223d872cfc18 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_accessor_multiple_nodes_different_indices.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_accessor_multiple_nodes_different_indices.cpp @@ -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 diff --git a/sycl/test-e2e/Graph/Update/update_with_indices_accessor_ordering.cpp b/sycl/test-e2e/Graph/Update/update_with_indices_accessor_ordering.cpp index 7133a234c15be..029dbc1b1d710 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_accessor_ordering.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_accessor_ordering.cpp @@ -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 diff --git a/sycl/test-e2e/Graph/Update/update_with_indices_accessor_spv.cpp b/sycl/test-e2e/Graph/Update/update_with_indices_accessor_spv.cpp index 23c20213ab4c0..9b69121f44bfb 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_accessor_spv.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_accessor_spv.cpp @@ -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 diff --git a/sycl/test-e2e/Graph/Update/update_with_indices_multiple_exec_graphs.cpp b/sycl/test-e2e/Graph/Update/update_with_indices_multiple_exec_graphs.cpp index 8d99019c47b44..dc71c041dd2f8 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_multiple_exec_graphs.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_multiple_exec_graphs.cpp @@ -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. diff --git a/sycl/test-e2e/Graph/Update/update_with_indices_ordering.cpp b/sycl/test-e2e/Graph/Update/update_with_indices_ordering.cpp index cef76b5bd9654..d73b1e69ae61d 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_ordering.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_ordering.cpp @@ -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. diff --git a/sycl/test-e2e/Graph/Update/update_with_indices_ptr.cpp b/sycl/test-e2e/Graph/Update/update_with_indices_ptr.cpp index 9c4e0ef1b79ad..ae394742d84ef 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_ptr.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_ptr.cpp @@ -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" diff --git a/sycl/test-e2e/Graph/Update/update_with_indices_ptr_3D.cpp b/sycl/test-e2e/Graph/Update/update_with_indices_ptr_3D.cpp index 71571c60f8ebb..fd94b8c139297 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_ptr_3D.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_ptr_3D.cpp @@ -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 diff --git a/sycl/test-e2e/Graph/Update/update_with_indices_ptr_double_update.cpp b/sycl/test-e2e/Graph/Update/update_with_indices_ptr_double_update.cpp index 75a28394eba63..e2f2cb6253123 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_ptr_double_update.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_ptr_double_update.cpp @@ -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" diff --git a/sycl/test-e2e/Graph/Update/update_with_indices_ptr_multiple_nodes.cpp b/sycl/test-e2e/Graph/Update/update_with_indices_ptr_multiple_nodes.cpp index 2313179c0c1c1..cbf1fcd10db06 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_ptr_multiple_nodes.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_ptr_multiple_nodes.cpp @@ -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 diff --git a/sycl/test-e2e/Graph/Update/update_with_indices_ptr_multiple_nodes_different_indices.cpp b/sycl/test-e2e/Graph/Update/update_with_indices_ptr_multiple_nodes_different_indices.cpp index 8a8ec7bcd15d7..46f4751cdab77 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_ptr_multiple_nodes_different_indices.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_ptr_multiple_nodes_different_indices.cpp @@ -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 diff --git a/sycl/test-e2e/Graph/Update/update_with_indices_ptr_multiple_params.cpp b/sycl/test-e2e/Graph/Update/update_with_indices_ptr_multiple_params.cpp index 6224d155453e8..7e92e7664b3cf 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_ptr_multiple_params.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_ptr_multiple_params.cpp @@ -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 diff --git a/sycl/test-e2e/Graph/Update/update_with_indices_ptr_subgraph.cpp b/sycl/test-e2e/Graph/Update/update_with_indices_ptr_subgraph.cpp index 75ad875db31a1..308e3839cfa94 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_ptr_subgraph.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_ptr_subgraph.cpp @@ -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. diff --git a/sycl/test-e2e/Graph/Update/update_with_indices_scalar.cpp b/sycl/test-e2e/Graph/Update/update_with_indices_scalar.cpp index fbf0038d6de93..c38c94889fe15 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_scalar.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_scalar.cpp @@ -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" diff --git a/sycl/test-e2e/Graph/Update/update_with_raw_kernel_arg.cpp b/sycl/test-e2e/Graph/Update/update_with_raw_kernel_arg.cpp index 765eddb21ff12..ce14436c9af91 100644 --- a/sycl/test-e2e/Graph/Update/update_with_raw_kernel_arg.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_raw_kernel_arg.cpp @@ -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" diff --git a/sycl/test-e2e/Graph/Update/whole_update_dynamic_param.cpp b/sycl/test-e2e/Graph/Update/whole_update_dynamic_param.cpp index a8fe0dd682de3..64e1d154ef886 100644 --- a/sycl/test-e2e/Graph/Update/whole_update_dynamic_param.cpp +++ b/sycl/test-e2e/Graph/Update/whole_update_dynamic_param.cpp @@ -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" diff --git a/sycl/test-e2e/Graph/Update/work_group_static_memory_with_dyn_cgf_and_dyn_params.cpp b/sycl/test-e2e/Graph/Update/work_group_static_memory_with_dyn_cgf_and_dyn_params.cpp index 86c420b9cd6a4..79451d864a307 100644 --- a/sycl/test-e2e/Graph/Update/work_group_static_memory_with_dyn_cgf_and_dyn_params.cpp +++ b/sycl/test-e2e/Graph/Update/work_group_static_memory_with_dyn_cgf_and_dyn_params.cpp @@ -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 From 0e9eb45e4a41c890e8dda1399560f12c9dddb558 Mon Sep 17 00:00:00 2001 From: Ben Tracy Date: Thu, 26 Jun 2025 17:04:49 +0100 Subject: [PATCH 2/5] Fix typo in sycl/include/sycl/handler.hpp Co-authored-by: Ewan Crawford --- sycl/include/sycl/handler.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/include/sycl/handler.hpp b/sycl/include/sycl/handler.hpp index 089be691ce327..768fe7465962f 100644 --- a/sycl/include/sycl/handler.hpp +++ b/sycl/include/sycl/handler.hpp @@ -730,7 +730,7 @@ class __SYCL_EXPORT handler { // Set the arg in the handler as normal setArgHelper(ArgIndex, std::move(ArgValue)); -// Register the dynamic paramete r with the handler for later association +// 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(), From a75e4b9d57f29783ed55c9937f6b22dd56da4b39 Mon Sep 17 00:00:00 2001 From: Ben Tracy Date: Wed, 2 Jul 2025 16:56:06 +0100 Subject: [PATCH 3/5] Remove unrelated formatting change --- sycl/include/sycl/handler.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sycl/include/sycl/handler.hpp b/sycl/include/sycl/handler.hpp index 768fe7465962f..21ec48f720ba9 100644 --- a/sycl/include/sycl/handler.hpp +++ b/sycl/include/sycl/handler.hpp @@ -559,8 +559,7 @@ 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); From 8619553f1e5df4123c3eddcb3c968de86640d467 Mon Sep 17 00:00:00 2001 From: Ben Tracy Date: Wed, 2 Jul 2025 17:52:35 +0100 Subject: [PATCH 4/5] Revert REQUIRES change for NativeCommand/invalid.cpp --- sycl/test-e2e/Graph/NativeCommand/invalid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/Graph/NativeCommand/invalid.cpp b/sycl/test-e2e/Graph/NativeCommand/invalid.cpp index cdd2345bfb849..d783937b6e1d8 100644 --- a/sycl/test-e2e/Graph/NativeCommand/invalid.cpp +++ b/sycl/test-e2e/Graph/NativeCommand/invalid.cpp @@ -2,7 +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: target-nvidia, cuda_dev_kit +// REQUIRES: cuda // Test that interop_handle::ext_codeplay_get_native_graph() throws if no // backend graph object is available. From 89d1a01037f59ed0720e7d50d079056242cb5af7 Mon Sep 17 00:00:00 2001 From: Ben Tracy Date: Thu, 3 Jul 2025 12:57:19 +0100 Subject: [PATCH 5/5] Restore target-nvidia in invalid.cpp --- sycl/test-e2e/Graph/NativeCommand/invalid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/Graph/NativeCommand/invalid.cpp b/sycl/test-e2e/Graph/NativeCommand/invalid.cpp index d783937b6e1d8..a1eddf5e7954f 100644 --- a/sycl/test-e2e/Graph/NativeCommand/invalid.cpp +++ b/sycl/test-e2e/Graph/NativeCommand/invalid.cpp @@ -2,7 +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 +// REQUIRES: target-nvidia // Test that interop_handle::ext_codeplay_get_native_graph() throws if no // backend graph object is available.