From a72f6f45432e99159258b59697088673f0c495b7 Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Wed, 26 Nov 2025 12:14:29 -0800 Subject: [PATCH] [SYCL] Remove deprecated graph APIs and cleanup ABI entry points --- .../ext/oneapi/experimental/graph/dynamic.hpp | 72 ++----------------- .../experimental/graph/modifiable_graph.hpp | 21 ------ sycl/source/detail/graph/dynamic_impl.cpp | 19 +---- sycl/source/detail/graph/graph_impl.hpp | 7 -- .../dyn_work_group_memory_basic.cpp | 2 +- .../update_before_finalize.cpp | 2 +- ...date_with_indices_multiple_exec_graphs.cpp | 2 +- .../update_with_indices_ordering.cpp | 2 +- .../update_with_indices_ptr.cpp | 2 +- .../update_with_indices_ptr_3D.cpp | 2 +- .../update_with_indices_ptr_double_update.cpp | 2 +- ...update_with_indices_ptr_multiple_nodes.cpp | 2 +- ...pdate_with_indices_ptr_multiple_params.cpp | 6 +- .../update_with_indices_ptr_subgraph.cpp | 2 +- .../update_with_indices_scalar.cpp | 2 +- .../Update/dyn_cgf_with_all_dyn_params.cpp | 4 +- ...dyn_cgf_with_different_type_dyn_params.cpp | 4 +- .../dyn_cgf_with_dyn_local_accessor.cpp | 2 +- .../dyn_cgf_with_dyn_work_group_mem.cpp | 2 +- .../Update/dyn_cgf_with_some_dyn_params.cpp | 2 +- .../Graph/Update/dyn_local_accessor_basic.cpp | 2 +- .../Update/dyn_local_accessor_multiple.cpp | 4 +- .../dyn_local_accessor_multiple_nodes.cpp | 5 +- .../Update/dyn_work_group_memory_basic.cpp | 2 +- .../Update/dyn_work_group_memory_multiple.cpp | 4 +- .../dyn_work_group_memory_multiple_nodes.cpp | 5 +- .../Graph/Update/update_before_finalize.cpp | 2 +- sycl/test-e2e/Graph/Update/update_nullptr.cpp | 2 +- .../Update/update_with_indices_accessor.cpp | 2 +- ...te_with_indices_accessor_double_update.cpp | 2 +- ...essor_multiple_nodes_different_indices.cpp | 2 +- .../update_with_indices_accessor_ordering.cpp | 2 +- .../update_with_indices_accessor_spv.cpp | 2 +- ...date_with_indices_multiple_exec_graphs.cpp | 2 +- .../Update/update_with_indices_ordering.cpp | 2 +- .../Graph/Update/update_with_indices_ptr.cpp | 2 +- .../Update/update_with_indices_ptr_3D.cpp | 2 +- .../update_with_indices_ptr_double_update.cpp | 2 +- ...update_with_indices_ptr_multiple_nodes.cpp | 2 +- ...s_ptr_multiple_nodes_different_indices.cpp | 2 +- ...pdate_with_indices_ptr_multiple_params.cpp | 6 +- .../update_with_indices_ptr_subgraph.cpp | 2 +- .../Update/update_with_indices_scalar.cpp | 2 +- .../Update/update_with_raw_kernel_arg.cpp | 4 +- .../Update/whole_update_dynamic_param.cpp | 2 +- ...tic_memory_with_dyn_cgf_and_dyn_params.cpp | 2 +- sycl/test/abi/sycl_abi_neutrality_test.cpp | 4 -- sycl/test/abi/sycl_symbols_linux.dump | 13 ++-- sycl/test/abi/sycl_symbols_windows.dump | 5 +- .../Extensions/CommandGraph/CommandGraph.cpp | 4 +- .../CommandGraph/CommonReferenceSemantics.cpp | 12 ++-- .../Extensions/CommandGraph/Update.cpp | 12 ++-- 52 files changed, 79 insertions(+), 198 deletions(-) diff --git a/sycl/include/sycl/ext/oneapi/experimental/graph/dynamic.hpp b/sycl/include/sycl/ext/oneapi/experimental/graph/dynamic.hpp index c02ca02b0d0d9..e617f2c6dc270 100644 --- a/sycl/include/sycl/ext/oneapi/experimental/graph/dynamic.hpp +++ b/sycl/include/sycl/ext/oneapi/experimental/graph/dynamic.hpp @@ -74,25 +74,12 @@ class __SYCL_EXPORT dynamic_command_group { namespace detail { class __SYCL_EXPORT dynamic_parameter_base { public: -#ifdef __INTEL_PREVIEW_BREAKING_CHANGES dynamic_parameter_base(size_t ParamSize, const void *Data); dynamic_parameter_base(); -#else - dynamic_parameter_base() = default; -#endif dynamic_parameter_base( const std::shared_ptr &impl); - dynamic_parameter_base(const sycl::ext::oneapi::experimental::command_graph< - graph_state::modifiable> - Graph); - - dynamic_parameter_base(const sycl::ext::oneapi::experimental::command_graph< - graph_state::modifiable> - Graph, - size_t ParamSize, const void *Data); - /// Common Reference Semantics friend bool operator==(const dynamic_parameter_base &LHS, const dynamic_parameter_base &RHS) { @@ -126,13 +113,7 @@ class __SYCL_EXPORT dynamic_work_group_memory_base public: dynamic_work_group_memory_base() = default; -#ifdef __INTEL_PREVIEW_BREAKING_CHANGES dynamic_work_group_memory_base(size_t BufferSizeInBytes); -#endif - // TODO: Remove in next ABI breaking window - dynamic_work_group_memory_base( - const experimental::command_graph Graph, - size_t BufferSizeInBytes); protected: void updateWorkGroupMem(size_t NewBufferSizeInBytes); @@ -171,7 +152,6 @@ class __SYCL_SPECIAL_CLASS __SYCL_TYPE(dynamic_work_group_memory) // closed. dynamic_work_group_memory() = default; -#ifdef __INTEL_PREVIEW_BREAKING_CHANGES #ifndef __SYCL_DEVICE_ONLY__ /// Constructs a new dynamic_work_group_memory object. /// @param Num Number of elements in the unbounded array DataT. @@ -181,30 +161,6 @@ class __SYCL_SPECIAL_CLASS __SYCL_TYPE(dynamic_work_group_memory) #else dynamic_work_group_memory(size_t /*Num*/) {} #endif -#endif - -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES - __SYCL_DEPRECATED("Dynamic_work_group_memory constructors taking a graph " - "object have been deprecated " - "and will be removed in the next ABI breaking window.") -#endif - -#ifndef __SYCL_DEVICE_ONLY__ - /// Constructs a new dynamic_work_group_memory object. - /// @param Graph The graph associated with this object. - /// @param Num Number of elements in the unbounded array DataT. - dynamic_work_group_memory( - const experimental::command_graph &Graph, - size_t Num) - : detail::dynamic_work_group_memory_base( - Graph, Num * sizeof(std::remove_extent_t)) {} - -#else - dynamic_work_group_memory( - const experimental::command_graph & - /* Graph */, - size_t /* Num */) {} -#endif work_group_memory get() const { #ifndef __SYCL_DEVICE_ONLY__ @@ -259,21 +215,16 @@ class __SYCL_SPECIAL_CLASS __SYCL_TYPE(dynamic_local_accessor) #ifndef __SYCL_DEVICE_ONLY__ /// Constructs a new dynamic_local_accessor object. - /// @param Graph The graph associated with this object. /// @param AllocationSize The size of the local accessor. /// @param PropList List of properties for the underlying accessor. - dynamic_local_accessor( - const experimental::command_graph & /* Graph */, - range AllocationSize, const property_list &PropList = {}) + dynamic_local_accessor(range AllocationSize, + const property_list &PropList = {}) : detail::dynamic_local_accessor_base( detail::convertToArrayOfN<3, 1>(AllocationSize), Dimensions, sizeof(DataT), PropList) {} #else - dynamic_local_accessor( - const experimental::command_graph & - /* Graph */, - range /* AllocationSize */, - const property_list & /*PropList */ = {}) {} + dynamic_local_accessor(range /* AllocationSize */, + const property_list & /*PropList */ = {}) {} #endif local_accessor get() const { @@ -320,26 +271,11 @@ class dynamic_parameter : public detail::dynamic_parameter_base { : sycl::detail::kernel_param_kind_t::kind_std_layout; public: -#ifdef __INTEL_PREVIEW_BREAKING_CHANGES /// Constructs a new dynamic parameter. /// @param Graph The graph associated with this parameter. /// @param Param A reference value for this parameter used for CTAD. dynamic_parameter(const ValueT &Param) : detail::dynamic_parameter_base(sizeof(ValueT), &Param) {} -#endif - -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES - __SYCL_DEPRECATED("Dynamic_parameter constructors taking a graph object have " - "been deprecated " - "and will be removed in the next ABI breaking window.") -#endif - /// Constructs a new dynamic parameter. - /// @param Graph The graph associated with this parameter. - /// @param Param A reference value for this parameter used for CTAD. - dynamic_parameter( - const experimental::command_graph &Graph, - const ValueT &Param) - : detail::dynamic_parameter_base(Graph, sizeof(ValueT), &Param) {} /// Updates this dynamic parameter and all registered nodes with a new value. /// @param NewValue The new value for the parameter. diff --git a/sycl/include/sycl/ext/oneapi/experimental/graph/modifiable_graph.hpp b/sycl/include/sycl/ext/oneapi/experimental/graph/modifiable_graph.hpp index 99808f76575f9..1b66edadf566b 100644 --- a/sycl/include/sycl/ext/oneapi/experimental/graph/modifiable_graph.hpp +++ b/sycl/include/sycl/ext/oneapi/experimental/graph/modifiable_graph.hpp @@ -147,13 +147,9 @@ class __SYCL_EXPORT modifiable_command_graph /// @param path The path to write the DOT file to. /// @param verbose If true, print additional information about the nodes such /// as kernel args or memory access where applicable. -#ifdef __INTEL_PREVIEW_BREAKING_CHANGES void print_graph(const std::string path, bool verbose = false) const { print_graph(sycl::detail::string_view{path}, verbose); } -#else - void print_graph(const std::string path, bool verbose = false) const; -#endif /// Get a list of all nodes contained in this graph. std::vector get_nodes() const; @@ -216,23 +212,6 @@ class __SYCL_EXPORT modifiable_command_graph static void checkNodePropertiesAndThrow(const property_list &Properties); }; -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES -#ifdef __SYCL_GRAPH_IMPL_CPP -// Magic combination found by trial and error: -__SYCL_EXPORT -#if _WIN32 -inline -#endif -#else -inline -#endif - void - modifiable_command_graph::print_graph(const std::string path, - bool verbose) const { - print_graph(sycl::detail::string_view{path}, verbose); -} -#endif - } // namespace detail } // namespace experimental } // namespace oneapi diff --git a/sycl/source/detail/graph/dynamic_impl.cpp b/sycl/source/detail/graph/dynamic_impl.cpp index c8efe995aa7e5..f02205d248259 100644 --- a/sycl/source/detail/graph/dynamic_impl.cpp +++ b/sycl/source/detail/graph/dynamic_impl.cpp @@ -26,21 +26,15 @@ namespace oneapi { namespace experimental { namespace detail { -#ifdef __INTEL_PREVIEW_BREAKING_CHANGES dynamic_parameter_base::dynamic_parameter_base() : impl(std::make_shared()) {} -#endif dynamic_parameter_base::dynamic_parameter_base( const std::shared_ptr &impl) : impl(impl) {} -dynamic_parameter_base::dynamic_parameter_base( - const command_graph) - : impl(std::make_shared()) {} -dynamic_parameter_base::dynamic_parameter_base( - const command_graph, size_t ParamSize, - const void *Data) +dynamic_parameter_base::dynamic_parameter_base(size_t ParamSize, + const void *Data) : impl(std::make_shared(ParamSize, Data)) {} void dynamic_parameter_base::updateValue(const void *NewValue, size_t Size) { @@ -57,16 +51,7 @@ void dynamic_parameter_base::updateAccessor( impl->updateAccessor(Acc); } -#ifdef __INTEL_PREVIEW_BREAKING_CHANGES -dynamic_work_group_memory_base::dynamic_work_group_memory_base( - size_t BufferSizeInBytes) - : dynamic_parameter_base( - std::make_shared(BufferSizeInBytes)) { -} -#endif - dynamic_work_group_memory_base::dynamic_work_group_memory_base( - const experimental::command_graph /* Graph */, size_t BufferSizeInBytes) : dynamic_parameter_base( std::make_shared(BufferSizeInBytes)) { diff --git a/sycl/source/detail/graph/graph_impl.hpp b/sycl/source/detail/graph/graph_impl.hpp index d35b271493ed0..b99d56e024768 100644 --- a/sycl/source/detail/graph/graph_impl.hpp +++ b/sycl/source/detail/graph/graph_impl.hpp @@ -268,13 +268,6 @@ class graph_impl : public std::enable_shared_from_this { /// @return Context associated with graph. sycl::context getContext() const { return MContext; } -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES - /// Query for the context impl tied to this graph. - /// @return shared_ptr ref for the context impl associated with graph. - const std::shared_ptr &getContextImplPtr() const { - return sycl::detail::getSyclObjImpl(MContext); - } -#endif sycl::detail::context_impl &getContextImpl() const { return *sycl::detail::getSyclObjImpl(MContext); } diff --git a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/dyn_work_group_memory_basic.cpp b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/dyn_work_group_memory_basic.cpp index 37295354f7401..d3651ae884c0e 100644 --- a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/dyn_work_group_memory_basic.cpp +++ b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/dyn_work_group_memory_basic.cpp @@ -19,7 +19,7 @@ int main() { std::vector HostDataA(Size); exp_ext::command_graph Graph{Ctxt, Queue.get_device()}; - exp_ext::dynamic_work_group_memory DynLocalMem{Graph, LocalSize}; + exp_ext::dynamic_work_group_memory DynLocalMem{LocalSize}; Queue.memset(PtrA, 0, Size * sizeof(int)).wait(); 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 ee6590cc8961e..df34bb2a89434 100644 --- a/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_before_finalize.cpp +++ b/sycl/test-e2e/Graph/Update/FreeFunctionKernels/update_before_finalize.cpp @@ -23,7 +23,7 @@ int main() { Queue.memset(PtrA, 0, Size * sizeof(int)).wait(); Queue.memset(PtrB, 0, Size * sizeof(int)).wait(); - exp_ext::dynamic_parameter InputParam(Graph, PtrA); + exp_ext::dynamic_parameter InputParam(PtrA); kernel_bundle Bundle = get_kernel_bundle(Ctxt); kernel_id Kernel_id = exp_ext::get_kernel_id(); 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 d5f6503b56533..8914699c26288 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 @@ -24,7 +24,7 @@ int main() { Queue.memset(PtrA, 0, Size * sizeof(int)).wait(); Queue.memset(PtrB, 0, Size * sizeof(int)).wait(); - exp_ext::dynamic_parameter InputParam(Graph, PtrA); + exp_ext::dynamic_parameter InputParam(PtrA); kernel_bundle Bundle = get_kernel_bundle(Ctxt); kernel_id Kernel_id = exp_ext::get_kernel_id(); 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 e48ec3579b293..b60cd288f4076 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 @@ -33,7 +33,7 @@ int main() { Queue.memset(PtrA, 0, N * sizeof(int)).wait(); Queue.memset(PtrB, 0, N * sizeof(int)).wait(); - exp_ext::dynamic_parameter InputParam(Graph, PtrA); + exp_ext::dynamic_parameter InputParam(PtrA); kernel_bundle Bundle = get_kernel_bundle(Ctxt); kernel_id Kernel_id = exp_ext::get_kernel_id(); 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 2b0b5715426cb..3cad551185bec 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 @@ -23,7 +23,7 @@ int main() { Queue.memset(PtrA, 0, Size * sizeof(int)).wait(); Queue.memset(PtrB, 0, Size * sizeof(int)).wait(); - exp_ext::dynamic_parameter InputParam(Graph, PtrA); + exp_ext::dynamic_parameter InputParam(PtrA); kernel_bundle Bundle = get_kernel_bundle(Ctxt); kernel_id Kernel_id = exp_ext::get_kernel_id(); 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 f21909f87e8b4..b60dcb45e8dbf 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 @@ -28,7 +28,7 @@ int main() { Queue.memset(PtrA, 0, N * sizeof(int)).wait(); Queue.memset(PtrB, 0, N * sizeof(int)).wait(); - exp_ext::dynamic_parameter DynParam(Graph, PtrA); + exp_ext::dynamic_parameter DynParam(PtrA); nd_range<3> NDRange{GlobalWorkSize, LocalWorkSize}; 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 111e797bce4ff..7a7e62d1d8a38 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 @@ -26,7 +26,7 @@ int main() { Queue.memset(PtrB, 0, Size * sizeof(int)).wait(); Queue.memset(PtrUnused, 0, Size * sizeof(int)).wait(); - exp_ext::dynamic_parameter InputParam(Graph, PtrA); + exp_ext::dynamic_parameter InputParam(PtrA); kernel_bundle Bundle = get_kernel_bundle(Ctxt); kernel_id Kernel_id = exp_ext::get_kernel_id(); 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 e795a3be1976d..62e4f3bbaaa4e 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 @@ -24,7 +24,7 @@ int main() { Queue.memset(PtrA, 0, Size * sizeof(int)).wait(); Queue.memset(PtrB, 0, Size * sizeof(int)).wait(); - exp_ext::dynamic_parameter InputParam(Graph, PtrA); + exp_ext::dynamic_parameter InputParam(PtrA); kernel_bundle Bundle = get_kernel_bundle(Ctxt); kernel_id Kernel_id_A = exp_ext::get_kernel_id(); 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 2951532fa1ff8..bf3e6d9ed7396 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 @@ -31,9 +31,9 @@ int main() { Queue.memcpy(PtrB, HostDataB.data(), Size * sizeof(int)).wait(); Queue.memset(PtrC, 0, Size * sizeof(int)).wait(); - exp_ext::dynamic_parameter ParamA(Graph, PtrA); - exp_ext::dynamic_parameter ParamB(Graph, PtrB); - exp_ext::dynamic_parameter ParamOut(Graph, PtrC); + exp_ext::dynamic_parameter ParamA(PtrA); + exp_ext::dynamic_parameter ParamB(PtrB); + exp_ext::dynamic_parameter ParamOut(PtrC); nd_range<1> NDRange{Size, 32}; 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 0209ec3f2769e..a1ddff9356672 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 @@ -26,7 +26,7 @@ int main() { Queue.memset(PtrA, 0, Size * sizeof(int)).wait(); Queue.memset(PtrB, 0, Size * sizeof(int)).wait(); - exp_ext::dynamic_parameter InputParam(SubGraph, PtrA); + exp_ext::dynamic_parameter InputParam(PtrA); kernel_bundle Bundle = get_kernel_bundle(Ctxt); kernel_id SubKernel_id = exp_ext::get_kernel_id(); 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 af70483f21813..99a134a537ff0 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 @@ -22,7 +22,7 @@ int main() { Queue.memset(DeviceData, 0, Size * sizeof(int)).wait(); - exp_ext::dynamic_parameter InputParam(Graph, ScalarValue); + exp_ext::dynamic_parameter InputParam(ScalarValue); kernel_bundle Bundle = get_kernel_bundle(Ctxt); kernel_id Kernel_id = exp_ext::get_kernel_id(); 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 06f2b91a4d180..b8d2075e40a7b 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 @@ -19,8 +19,8 @@ int main() { std::vector HostDataB(Size); std::vector HostDataC(Size); - exp_ext::dynamic_parameter DynParam1(Graph, PtrA); - exp_ext::dynamic_parameter DynParam2(Graph, PtrC); + exp_ext::dynamic_parameter DynParam1(PtrA); + exp_ext::dynamic_parameter DynParam2(PtrC); auto CGFA = [&](handler &CGH) { CGH.set_arg(0, DynParam1); 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 8b1683db5e15b..4992b91ac3e4a 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 @@ -21,8 +21,8 @@ int main() { std::vector HostDataC(Size); int ScalarValue = 17; - exp_ext::dynamic_parameter DynParamScalar(Graph, ScalarValue); - exp_ext::dynamic_parameter DynParamPtr(Graph, PtrA); + exp_ext::dynamic_parameter DynParamScalar(ScalarValue); + exp_ext::dynamic_parameter DynParamPtr(PtrA); // Kernel has 2 dynamic parameters, one of scalar type & one of ptr type auto CGFA = [&](handler &CGH) { diff --git a/sycl/test-e2e/Graph/Update/dyn_cgf_with_dyn_local_accessor.cpp b/sycl/test-e2e/Graph/Update/dyn_cgf_with_dyn_local_accessor.cpp index f324571c676d5..82931c3aa5911 100644 --- a/sycl/test-e2e/Graph/Update/dyn_cgf_with_dyn_local_accessor.cpp +++ b/sycl/test-e2e/Graph/Update/dyn_cgf_with_dyn_local_accessor.cpp @@ -21,7 +21,7 @@ int main() { std::vector HostDataA(Size); std::vector HostDataB(Size); - exp_ext::dynamic_local_accessor DynLocalMem(Graph, LocalSizeA); + exp_ext::dynamic_local_accessor DynLocalMem(LocalSizeA); nd_range<1> NDrangeA{Size, LocalSizeA}; auto CGFA = [&](handler &CGH) { diff --git a/sycl/test-e2e/Graph/Update/dyn_cgf_with_dyn_work_group_mem.cpp b/sycl/test-e2e/Graph/Update/dyn_cgf_with_dyn_work_group_mem.cpp index e0932039ce880..b052c99ec7882 100644 --- a/sycl/test-e2e/Graph/Update/dyn_cgf_with_dyn_work_group_mem.cpp +++ b/sycl/test-e2e/Graph/Update/dyn_cgf_with_dyn_work_group_mem.cpp @@ -21,7 +21,7 @@ int main() { std::vector HostDataA(Size); std::vector HostDataB(Size); - exp_ext::dynamic_work_group_memory DynLocalMem(Graph, LocalSizeA); + exp_ext::dynamic_work_group_memory DynLocalMem(LocalSizeA); nd_range<1> NDrangeA{Size, LocalSizeA}; auto CGFA = [&](handler &CGH) { 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 67e61b26f904b..3b709400de63b 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 @@ -20,7 +20,7 @@ int main() { std::vector HostDataB(Size); std::vector HostDataC(Size); - exp_ext::dynamic_parameter DynParam(Graph, PtrA); + exp_ext::dynamic_parameter DynParam(PtrA); auto CGFA = [&](handler &CGH) { CGH.set_arg(0, DynParam); diff --git a/sycl/test-e2e/Graph/Update/dyn_local_accessor_basic.cpp b/sycl/test-e2e/Graph/Update/dyn_local_accessor_basic.cpp index 1e631b56c8bc0..91860828de03d 100644 --- a/sycl/test-e2e/Graph/Update/dyn_local_accessor_basic.cpp +++ b/sycl/test-e2e/Graph/Update/dyn_local_accessor_basic.cpp @@ -19,7 +19,7 @@ int main() { int *PtrA = malloc_device(Size, Queue); std::vector HostDataA(Size); - exp_ext::dynamic_local_accessor DynLocalMem{Graph, LocalSize}; + exp_ext::dynamic_local_accessor DynLocalMem{LocalSize}; Queue.memset(PtrA, 0, Size * sizeof(T)).wait(); diff --git a/sycl/test-e2e/Graph/Update/dyn_local_accessor_multiple.cpp b/sycl/test-e2e/Graph/Update/dyn_local_accessor_multiple.cpp index d7a5046b8f680..ebbc403748382 100644 --- a/sycl/test-e2e/Graph/Update/dyn_local_accessor_multiple.cpp +++ b/sycl/test-e2e/Graph/Update/dyn_local_accessor_multiple.cpp @@ -20,8 +20,8 @@ int main() { int *PtrA = malloc_device(Size, Queue); std::vector HostDataA(Size); - exp_ext::dynamic_local_accessor DynLocalMemA{Graph, LocalSize}; - exp_ext::dynamic_local_accessor DynLocalMemB{Graph, LocalSize}; + exp_ext::dynamic_local_accessor DynLocalMemA{LocalSize}; + exp_ext::dynamic_local_accessor DynLocalMemB{LocalSize}; Queue.memset(PtrA, 0, Size * sizeof(T)).wait(); diff --git a/sycl/test-e2e/Graph/Update/dyn_local_accessor_multiple_nodes.cpp b/sycl/test-e2e/Graph/Update/dyn_local_accessor_multiple_nodes.cpp index 01bbad81daf9c..71e3f8e0a15be 100644 --- a/sycl/test-e2e/Graph/Update/dyn_local_accessor_multiple_nodes.cpp +++ b/sycl/test-e2e/Graph/Update/dyn_local_accessor_multiple_nodes.cpp @@ -21,9 +21,8 @@ int main() { std::vector HostDataA(Size * Size); exp_ext::dynamic_local_accessor DynLocalMemA{ - Graph, range<2>{LocalSize, LocalSize}}; - exp_ext::dynamic_local_accessor DynLocalMemC{Graph, - range<1>{LocalSize}}; + range<2>{LocalSize, LocalSize}}; + exp_ext::dynamic_local_accessor DynLocalMemC{range<1>{LocalSize}}; Queue.memset(PtrA, 0, Size * Size * sizeof(T)).wait(); diff --git a/sycl/test-e2e/Graph/Update/dyn_work_group_memory_basic.cpp b/sycl/test-e2e/Graph/Update/dyn_work_group_memory_basic.cpp index 1baecdf69f60a..cba74780c9683 100644 --- a/sycl/test-e2e/Graph/Update/dyn_work_group_memory_basic.cpp +++ b/sycl/test-e2e/Graph/Update/dyn_work_group_memory_basic.cpp @@ -19,7 +19,7 @@ int main() { int *PtrA = malloc_device(Size, Queue); std::vector HostDataA(Size); - exp_ext::dynamic_work_group_memory DynLocalMem{Graph, LocalSize}; + exp_ext::dynamic_work_group_memory DynLocalMem{LocalSize}; Queue.memset(PtrA, 0, Size * sizeof(T)).wait(); diff --git a/sycl/test-e2e/Graph/Update/dyn_work_group_memory_multiple.cpp b/sycl/test-e2e/Graph/Update/dyn_work_group_memory_multiple.cpp index fc8a4293b7bd8..5e7e2367e1d47 100644 --- a/sycl/test-e2e/Graph/Update/dyn_work_group_memory_multiple.cpp +++ b/sycl/test-e2e/Graph/Update/dyn_work_group_memory_multiple.cpp @@ -20,8 +20,8 @@ int main() { int *PtrA = malloc_device(Size, Queue); std::vector HostDataA(Size); - exp_ext::dynamic_work_group_memory DynLocalMemA{Graph, LocalSize}; - exp_ext::dynamic_work_group_memory DynLocalMemB{Graph, LocalSize}; + exp_ext::dynamic_work_group_memory DynLocalMemA{LocalSize}; + exp_ext::dynamic_work_group_memory DynLocalMemB{LocalSize}; Queue.memset(PtrA, 0, Size * sizeof(T)).wait(); diff --git a/sycl/test-e2e/Graph/Update/dyn_work_group_memory_multiple_nodes.cpp b/sycl/test-e2e/Graph/Update/dyn_work_group_memory_multiple_nodes.cpp index d894f3acd431a..307e6baa0e010 100644 --- a/sycl/test-e2e/Graph/Update/dyn_work_group_memory_multiple_nodes.cpp +++ b/sycl/test-e2e/Graph/Update/dyn_work_group_memory_multiple_nodes.cpp @@ -20,9 +20,8 @@ int main() { int *PtrA = malloc_device(Size * Size, Queue); std::vector HostDataA(Size * Size); - exp_ext::dynamic_work_group_memory DynLocalMemA{Graph, - LocalSize}; - exp_ext::dynamic_work_group_memory DynLocalMemC{Graph, LocalSize}; + exp_ext::dynamic_work_group_memory DynLocalMemA{LocalSize}; + exp_ext::dynamic_work_group_memory DynLocalMemC{LocalSize}; Queue.memset(PtrA, 0, Size * Size * sizeof(T)).wait(); diff --git a/sycl/test-e2e/Graph/Update/update_before_finalize.cpp b/sycl/test-e2e/Graph/Update/update_before_finalize.cpp index baead0f9f2693..3a7298a3a4c6d 100644 --- a/sycl/test-e2e/Graph/Update/update_before_finalize.cpp +++ b/sycl/test-e2e/Graph/Update/update_before_finalize.cpp @@ -24,7 +24,7 @@ int main() { Queue.memset(PtrA, 0, N * sizeof(int)).wait(); Queue.memset(PtrB, 0, N * sizeof(int)).wait(); - exp_ext::dynamic_parameter InputParam(Graph, PtrA); + exp_ext::dynamic_parameter InputParam(PtrA); auto KernelNode = Graph.add([&](handler &cgh) { cgh.set_arg(0, InputParam); diff --git a/sycl/test-e2e/Graph/Update/update_nullptr.cpp b/sycl/test-e2e/Graph/Update/update_nullptr.cpp index e6bbadc9ed2cd..d200afbc6de20 100644 --- a/sycl/test-e2e/Graph/Update/update_nullptr.cpp +++ b/sycl/test-e2e/Graph/Update/update_nullptr.cpp @@ -21,7 +21,7 @@ int main() { int PtrPattern = 42; Queue.fill(PtrIn, PtrPattern, N).wait(); - exp_ext::dynamic_parameter InputParam(Graph, PtrIn); + exp_ext::dynamic_parameter InputParam(PtrIn); int DefaultPattern = 10; auto KernelNode = Graph.add([&](handler &cgh) { cgh.set_arg(0, InputParam); 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 b9734a23ba665..ab70794e54f3f 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_accessor.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_accessor.cpp @@ -27,7 +27,7 @@ int main() { BufB.set_write_back(false); // Initial accessor for use in kernel and dynamic parameter auto Acc = BufA.get_access(); - exp_ext::dynamic_parameter InputParam(Graph, Acc); + exp_ext::dynamic_parameter InputParam(Acc); auto KernelNode = Graph.add([&](handler &cgh) { cgh.require(InputParam); 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 b5ebd25c3ee0b..5f0b2faf88632 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 @@ -30,7 +30,7 @@ int main() { BufC.set_write_back(false); // Initial accessor for use in kernel and dynamic parameter auto Acc = BufA.get_access(); - exp_ext::dynamic_parameter InputParam(Graph, Acc); + exp_ext::dynamic_parameter InputParam(Acc); auto KernelNode = Graph.add([&](handler &cgh) { cgh.require(InputParam); 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 4f3951dd27e4c..c365564221a7e 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 @@ -29,7 +29,7 @@ int main() { // Initial accessor for use in kernel and dynamic parameter auto AccA = BufA.get_access(); auto AccB = BufB.get_access(); - exp_ext::dynamic_parameter InputParam(Graph, AccA); + exp_ext::dynamic_parameter InputParam(AccA); auto KernelNodeA = Graph.add([&](handler &cgh) { cgh.require(AccB); 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 cac82fca392f5..d08a1633dce52 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 @@ -28,7 +28,7 @@ int main() { // Initial accessor for use in kernel and dynamic parameter auto AccA = BufA.get_access(); auto AccB = BufB.get_access(); - exp_ext::dynamic_parameter InputParam(Graph, AccA); + exp_ext::dynamic_parameter InputParam(AccA); auto KernelNode = Graph.add([&](handler &cgh) { cgh.require(InputParam); 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 f15cb6ad595f2..2aaaa43a9ab73 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 @@ -37,7 +37,7 @@ int main(int, char **argv) { BufB.set_write_back(false); // Initial accessor for use in kernel and dynamic parameter auto Acc = BufA.get_access(); - exp_ext::dynamic_parameter InputParam(Graph, Acc); + exp_ext::dynamic_parameter InputParam(Acc); auto KernelNode = Graph.add([&](handler &cgh) { cgh.require(InputParam); 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 86a2ca3be9925..0a161b520f1f9 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 @@ -25,7 +25,7 @@ int main() { Queue.memset(PtrA, 0, N * sizeof(int)).wait(); Queue.memset(PtrB, 0, N * sizeof(int)).wait(); - exp_ext::dynamic_parameter InputParam(Graph, PtrA); + exp_ext::dynamic_parameter InputParam(PtrA); auto KernelNode = Graph.add([&](handler &cgh) { cgh.set_arg(0, InputParam); 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 1e8ad77870d50..a5808f15b8ecb 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_ordering.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_ordering.cpp @@ -29,7 +29,7 @@ int main() { Queue.memset(PtrA, 0, N * sizeof(int)).wait(); Queue.memset(PtrB, 0, N * sizeof(int)).wait(); - exp_ext::dynamic_parameter InputParam(Graph, PtrA); + exp_ext::dynamic_parameter InputParam(PtrA); auto KernelNode = Graph.add([&](handler &cgh) { cgh.set_arg(0, InputParam); 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 2325e4f5cd938..1d5ff53f49f68 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_ptr.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_ptr.cpp @@ -24,7 +24,7 @@ int main() { Queue.memset(PtrA, 0, N * sizeof(int)).wait(); Queue.memset(PtrB, 0, N * sizeof(int)).wait(); - exp_ext::dynamic_parameter InputParam(Graph, PtrA); + exp_ext::dynamic_parameter InputParam(PtrA); auto KernelNode = Graph.add([&](handler &cgh) { cgh.set_arg(0, InputParam); 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 8ae4061f66282..0cc4209b0d149 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 @@ -27,7 +27,7 @@ int main() { Queue.memset(PtrA, 0, N * sizeof(int)).wait(); Queue.memset(PtrB, 0, N * sizeof(int)).wait(); - exp_ext::dynamic_parameter DynParam(Graph, PtrA); + exp_ext::dynamic_parameter DynParam(PtrA); nd_range<3> NDRange{GlobalWorkSize, LocalWorkSize}; auto NodeA = Graph.add([&](handler &cgh) { 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 1cf8c19a6c66a..279a96bf5e035 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 @@ -27,7 +27,7 @@ int main() { Queue.memset(PtrB, 0, N * sizeof(int)).wait(); Queue.memset(PtrUnused, 0, N * sizeof(int)).wait(); - exp_ext::dynamic_parameter InputParam(Graph, PtrA); + exp_ext::dynamic_parameter InputParam(PtrA); auto KernelNode = Graph.add([&](handler &cgh) { cgh.set_arg(0, InputParam); 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 9cfceda9a4121..d079b72d1e66a 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 @@ -25,7 +25,7 @@ int main() { Queue.memset(PtrA, 0, N * sizeof(int)).wait(); Queue.memset(PtrB, 0, N * sizeof(int)).wait(); - exp_ext::dynamic_parameter InputParam(Graph, PtrA); + exp_ext::dynamic_parameter InputParam(PtrA); auto KernelNodeA = Graph.add([&](handler &cgh) { cgh.set_arg(0, InputParam); 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 bd951b7e1f2f8..d2c50997aecf2 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 @@ -25,7 +25,7 @@ int main() { Queue.memset(PtrA, 0, N * sizeof(int)).wait(); Queue.memset(PtrB, 0, N * sizeof(int)).wait(); - exp_ext::dynamic_parameter InputParam(Graph, PtrA); + exp_ext::dynamic_parameter InputParam(PtrA); auto KernelNodeA = Graph.add([&](handler &cgh) { // Arg index is 1 here 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 193a6493d7fbb..0d9dd827d1691 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 @@ -32,9 +32,9 @@ int main() { Queue.memcpy(PtrB, HostDataB.data(), N * sizeof(int)).wait(); Queue.memset(PtrC, 0, N * sizeof(int)).wait(); - exp_ext::dynamic_parameter ParamA(Graph, PtrA); - exp_ext::dynamic_parameter ParamB(Graph, PtrB); - exp_ext::dynamic_parameter ParamOut(Graph, PtrC); + exp_ext::dynamic_parameter ParamA(PtrA); + exp_ext::dynamic_parameter ParamB(PtrB); + exp_ext::dynamic_parameter ParamOut(PtrC); auto KernelNode = Graph.add([&](handler &cgh) { cgh.set_arg(0, ParamOut); 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 16b58c9a88458..58ac32b59dad0 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 @@ -27,7 +27,7 @@ int main() { Queue.memset(PtrA, 0, N * sizeof(int)).wait(); Queue.memset(PtrB, 0, N * sizeof(int)).wait(); - exp_ext::dynamic_parameter InputParam(SubGraph, PtrA); + exp_ext::dynamic_parameter InputParam(PtrA); auto SubKernelNode = SubGraph.add([&](handler &cgh) { cgh.set_arg(0, InputParam); 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 7f8d4240e7663..859f10dab2c14 100644 --- a/sycl/test-e2e/Graph/Update/update_with_indices_scalar.cpp +++ b/sycl/test-e2e/Graph/Update/update_with_indices_scalar.cpp @@ -23,7 +23,7 @@ int main() { Queue.memset(DeviceData, 0, N * sizeof(int)).wait(); - exp_ext::dynamic_parameter InputParam(Graph, ScalarValue); + exp_ext::dynamic_parameter InputParam(ScalarValue); auto KernelNode = Graph.add([&](handler &cgh) { cgh.set_arg(1, InputParam); 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 7802f33df8140..c3c9a4b140407 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 @@ -40,8 +40,8 @@ int main() { int32_t ScalarB = 0xA; exp_ext::raw_kernel_arg RawScalarB(&ScalarB, sizeof(int32_t)); - exp_ext::dynamic_parameter PtrParam(Graph, PtrA); - exp_ext::dynamic_parameter ScalarParam(Graph, RawScalarA); + exp_ext::dynamic_parameter PtrParam(PtrA); + exp_ext::dynamic_parameter ScalarParam(RawScalarA); auto KernelNode = Graph.add([&](handler &cgh) { cgh.set_arg(0, ScalarParam); 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 024db37b4bddf..ac26818ad57b0 100644 --- a/sycl/test-e2e/Graph/Update/whole_update_dynamic_param.cpp +++ b/sycl/test-e2e/Graph/Update/whole_update_dynamic_param.cpp @@ -31,7 +31,7 @@ int main() { exp_ext::command_graph GraphA{Queue.get_context(), Queue.get_device()}; - exp_ext::dynamic_parameter InputParam(GraphA, InputDataDevice1); + exp_ext::dynamic_parameter InputParam(InputDataDevice1); auto KernelLambda = [=]() { for (size_t i = 0; i < Size; i++) { OutputDataDevice1[i] = InputDataDevice1[i]; 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 2a811f6392293..545d56028307f 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 @@ -28,7 +28,7 @@ int main() { std::vector HostDataA(Size); std::vector HostDataB(Size); - exp_ext::dynamic_parameter DynParam(Graph, PtrA); + exp_ext::dynamic_parameter DynParam(PtrA); auto CGFA = [&](handler &CGH) { CGH.set_arg(0, DynParam); diff --git a/sycl/test/abi/sycl_abi_neutrality_test.cpp b/sycl/test/abi/sycl_abi_neutrality_test.cpp index 6e24a69173b13..a6afca7e26cdc 100644 --- a/sycl/test/abi/sycl_abi_neutrality_test.cpp +++ b/sycl/test/abi/sycl_abi_neutrality_test.cpp @@ -25,7 +25,3 @@ // https://github.com/intel/llvm/pull/16176 // CHECK:_ZN4sycl3_V16opencl13has_extensionERKNS0_6deviceERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE // CHECK:_ZN4sycl3_V16opencl13has_extensionERKNS0_8platformERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE -// -// https://github.com/intel/llvm/pull/15694 and -// https://github.com/intel/llvm/pull/16194 -// CHECK:_ZNK4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph11print_graphENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb diff --git a/sycl/test/abi/sycl_symbols_linux.dump b/sycl/test/abi/sycl_symbols_linux.dump index 4df0e60740a48..b4c6cc9aed9fd 100644 --- a/sycl/test/abi/sycl_symbols_linux.dump +++ b/sycl/test/abi/sycl_symbols_linux.dump @@ -3094,12 +3094,12 @@ _ZN4sycl3_V13ext6oneapi12experimental6detail19compile_from_sourceERNS0_13kernel_ _ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_base11updateValueEPKNS3_14raw_kernel_argEm _ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_base11updateValueEPKvm _ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_base14updateAccessorEPKNS0_6detail16AccessorBaseHostE -_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC1ENS3_13command_graphILNS3_11graph_stateE0EEE -_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC1ENS3_13command_graphILNS3_11graph_stateE0EEEmPKv _ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC1ERKSt10shared_ptrINS4_22dynamic_parameter_implEE -_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC2ENS3_13command_graphILNS3_11graph_stateE0EEE -_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC2ENS3_13command_graphILNS3_11graph_stateE0EEEmPKv +_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC1EmPKv +_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC1Ev _ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC2ERKSt10shared_ptrINS4_22dynamic_parameter_implEE +_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC2EmPKv +_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC2Ev _ZN4sycl3_V13ext6oneapi12experimental6detail24executable_command_graph12finalizeImplEv _ZN4sycl3_V13ext6oneapi12experimental6detail24executable_command_graph6updateERKNS3_13command_graphILNS3_11graph_stateE0EEE _ZN4sycl3_V13ext6oneapi12experimental6detail24executable_command_graph6updateERKNS3_4nodeE @@ -3128,8 +3128,8 @@ _ZN4sycl3_V13ext6oneapi12experimental6detail27dynamic_local_accessor_baseC1ENS0_ _ZN4sycl3_V13ext6oneapi12experimental6detail27dynamic_local_accessor_baseC2ENS0_5rangeILi3EEEiiRKNS0_13property_listE _ZN4sycl3_V13ext6oneapi12experimental6detail27export_device_mem_opaque_fdEPvRKNS0_6deviceERKNS0_7contextE _ZN4sycl3_V13ext6oneapi12experimental6detail30dynamic_work_group_memory_base18updateWorkGroupMemEm -_ZN4sycl3_V13ext6oneapi12experimental6detail30dynamic_work_group_memory_baseC1ENS3_13command_graphILNS3_11graph_stateE0EEEm -_ZN4sycl3_V13ext6oneapi12experimental6detail30dynamic_work_group_memory_baseC2ENS3_13command_graphILNS3_11graph_stateE0EEEm +_ZN4sycl3_V13ext6oneapi12experimental6detail30dynamic_work_group_memory_baseC1Em +_ZN4sycl3_V13ext6oneapi12experimental6detail30dynamic_work_group_memory_baseC2Em _ZN4sycl3_V13ext6oneapi12experimental6detail30make_kernel_bundle_from_sourceERKNS0_7contextENS3_15source_languageENS0_6detail11string_viewESt6vectorISt4pairISA_SA_ESaISD_EE _ZN4sycl3_V13ext6oneapi12experimental6detail30make_kernel_bundle_from_sourceERKNS0_7contextENS3_15source_languageERKSt6vectorISt4byteSaISA_EES9_ISt4pairINS0_6detail11string_viewESH_ESaISI_EE _ZN4sycl3_V13ext6oneapi12experimental6detail33export_device_mem_win32_nt_handleEPvRKNS0_6deviceERKNS0_7contextE @@ -3660,7 +3660,6 @@ _ZNK4sycl3_V13ext6oneapi12experimental4node16get_predecessorsEv _ZNK4sycl3_V13ext6oneapi12experimental4node8get_typeEv _ZNK4sycl3_V13ext6oneapi12experimental6detail24executable_command_graph21get_required_mem_sizeEv _ZNK4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph11print_graphENS0_6detail11string_viewEb -_ZNK4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph11print_graphENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb _ZNK4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph14get_root_nodesEv _ZNK4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph8finalizeERKNS0_13property_listE _ZNK4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph9get_nodesEv diff --git a/sycl/test/abi/sycl_symbols_windows.dump b/sycl/test/abi/sycl_symbols_windows.dump index f921ed7a1dddd..a2645bdf1199b 100644 --- a/sycl/test/abi/sycl_symbols_windows.dump +++ b/sycl/test/abi/sycl_symbols_windows.dump @@ -348,13 +348,12 @@ ??0dynamic_parameter_base@detail@experimental@oneapi@ext@_V1@sycl@@QEAA@$$QEAV0123456@@Z ??0dynamic_parameter_base@detail@experimental@oneapi@ext@_V1@sycl@@QEAA@AEBV0123456@@Z ??0dynamic_parameter_base@detail@experimental@oneapi@ext@_V1@sycl@@QEAA@AEBV?$shared_ptr@Vdynamic_parameter_impl@detail@experimental@oneapi@ext@_V1@sycl@@@std@@@Z -??0dynamic_parameter_base@detail@experimental@oneapi@ext@_V1@sycl@@QEAA@V?$command_graph@$0A@@23456@@Z -??0dynamic_parameter_base@detail@experimental@oneapi@ext@_V1@sycl@@QEAA@V?$command_graph@$0A@@23456@_KPEBX@Z ??0dynamic_parameter_base@detail@experimental@oneapi@ext@_V1@sycl@@QEAA@XZ +??0dynamic_parameter_base@detail@experimental@oneapi@ext@_V1@sycl@@QEAA@_KPEBX@Z ??0dynamic_work_group_memory_base@detail@experimental@oneapi@ext@_V1@sycl@@QEAA@$$QEAV0123456@@Z ??0dynamic_work_group_memory_base@detail@experimental@oneapi@ext@_V1@sycl@@QEAA@AEBV0123456@@Z -??0dynamic_work_group_memory_base@detail@experimental@oneapi@ext@_V1@sycl@@QEAA@V?$command_graph@$0A@@23456@_K@Z ??0dynamic_work_group_memory_base@detail@experimental@oneapi@ext@_V1@sycl@@QEAA@XZ +??0dynamic_work_group_memory_base@detail@experimental@oneapi@ext@_V1@sycl@@QEAA@_K@Z ??0event@_V1@sycl@@AEAA@V?$shared_ptr@Vevent_impl@detail@_V1@sycl@@@std@@@Z ??0event@_V1@sycl@@QEAA@$$QEAV012@@Z ??0event@_V1@sycl@@QEAA@AEBV012@@Z diff --git a/sycl/unittests/Extensions/CommandGraph/CommandGraph.cpp b/sycl/unittests/Extensions/CommandGraph/CommandGraph.cpp index dedd4ebbcb407..8ffd8d0dbe5bd 100644 --- a/sycl/unittests/Extensions/CommandGraph/CommandGraph.cpp +++ b/sycl/unittests/Extensions/CommandGraph/CommandGraph.cpp @@ -682,7 +682,7 @@ TEST_F(CommandGraphTest, DynamicWorkGroupMemoryGet) { Queue.get_device()}; ext::oneapi::experimental::dynamic_work_group_memory DynLocalMem{ - Graph, LocalSize}; + LocalSize}; ASSERT_ANY_THROW(DynLocalMem.get()); } @@ -697,6 +697,6 @@ TEST_F(CommandGraphTest, DynamicLocalAccessorGet) { Queue.get_device()}; ext::oneapi::experimental::dynamic_local_accessor DynLocalMem{ - Graph, LocalSize}; + LocalSize}; ASSERT_ANY_THROW(DynLocalMem.get()); } diff --git a/sycl/unittests/Extensions/CommandGraph/CommonReferenceSemantics.cpp b/sycl/unittests/Extensions/CommandGraph/CommonReferenceSemantics.cpp index d6fd4d1ec5e4b..498e3c39582f1 100644 --- a/sycl/unittests/Extensions/CommandGraph/CommonReferenceSemantics.cpp +++ b/sycl/unittests/Extensions/CommandGraph/CommonReferenceSemantics.cpp @@ -99,9 +99,7 @@ TEST_F(CommandGraphTest, DynamicParamSemantics) { sycl::queue Queue; experimental::command_graph Graph(Queue.get_context(), Queue.get_device()); - auto Factory = [&]() { - return experimental::dynamic_parameter(Graph, 1); - }; + auto Factory = [&]() { return experimental::dynamic_parameter(1); }; ASSERT_NO_FATAL_FAILURE( testSemantics>(Factory)); } @@ -111,7 +109,7 @@ TEST_F(CommandGraphTest, DynamicWorkGroupMemorySemantics) { experimental::command_graph Graph(Queue.get_context(), Queue.get_device()); auto Factory = [&]() { - return experimental::dynamic_work_group_memory(Graph, 1); + return experimental::dynamic_work_group_memory(1); }; ASSERT_NO_FATAL_FAILURE( testSemantics>(Factory)); @@ -122,7 +120,7 @@ TEST_F(CommandGraphTest, DynamicLocalAccessorSemantics) { experimental::command_graph Graph(Queue.get_context(), Queue.get_device()); auto Factory = [&]() { - return experimental::dynamic_local_accessor(Graph, 1); + return experimental::dynamic_local_accessor(1); }; ASSERT_NO_FATAL_FAILURE( (testSemantics>(Factory))); @@ -217,9 +215,7 @@ TEST_F(CommandGraphTest, DynamicParameterHash) { sycl::queue Queue; experimental::command_graph Graph(Queue.get_context(), Queue.get_device()); - auto Factory = [&]() { - return experimental::dynamic_parameter(Graph, 1); - }; + auto Factory = [&]() { return experimental::dynamic_parameter(1); }; ASSERT_NO_FATAL_FAILURE( testHash>(Factory)); } diff --git a/sycl/unittests/Extensions/CommandGraph/Update.cpp b/sycl/unittests/Extensions/CommandGraph/Update.cpp index a6eff48af35f7..c0ab775da1ee1 100644 --- a/sycl/unittests/Extensions/CommandGraph/Update.cpp +++ b/sycl/unittests/Extensions/CommandGraph/Update.cpp @@ -42,13 +42,13 @@ TEST_F(CommandGraphTest, DynamicObjRegister) { // TODO: Update test when deprecated constructors that take a graph have been // removed. - experimental::dynamic_parameter DynamicParam{Graph, int{}}; + experimental::dynamic_parameter DynamicParam{int{}}; ASSERT_NO_FATAL_FAILURE(CheckRegisterWrongGraph(DynamicParam)); - experimental::dynamic_work_group_memory DynamicWorkGroupMem{Graph, 1}; + experimental::dynamic_work_group_memory DynamicWorkGroupMem{1}; ASSERT_NO_FATAL_FAILURE(CheckRegisterWrongGraph(DynamicWorkGroupMem)); - experimental::dynamic_local_accessor DynamicLocalAcc{Graph, 1}; + experimental::dynamic_local_accessor DynamicLocalAcc{1}; ASSERT_NO_FATAL_FAILURE(CheckRegisterWrongGraph(DynamicLocalAcc)); } @@ -146,13 +146,13 @@ TEST_F(CommandGraphTest, UpdateNodeTypeExceptions) { })); }; - experimental::dynamic_parameter DynamicParam{Graph, int{}}; + experimental::dynamic_parameter DynamicParam{int{}}; ASSERT_NO_FATAL_FAILURE(CheckNodeCompatibility(DynamicParam)); - experimental::dynamic_work_group_memory DynamicWorkGroupMem{Graph, 1}; + experimental::dynamic_work_group_memory DynamicWorkGroupMem{1}; ASSERT_NO_FATAL_FAILURE(CheckNodeCompatibility(DynamicWorkGroupMem)); - experimental::dynamic_local_accessor DynamicLocalAcc{Graph, 1}; + experimental::dynamic_local_accessor DynamicLocalAcc{1}; ASSERT_NO_FATAL_FAILURE(CheckNodeCompatibility(DynamicLocalAcc)); }