Address changes in graph tests

steffenlarsen · steffenlarsen · commit 23f60a61a4c2 · 2025-11-14T04:59:51.000-08:00
Signed-off-by: Larsen, Steffen &lt;steffen.larsen@intel.com&gt;
diff --git a/libdevice/nativecpu_utils.cpp b/libdevice/nativecpu_utils.cpp
@@ -243,15 +243,15 @@ DefineLogicalGroupOp(bool, bool, i1);
   }                                                                            \
                                                                                \
   DEVICE_EXTERNAL Type __spirv_GroupBroadcast(                                 \
-      int32_t g, Type v, ncpu_types::vector_t<IDType, 2> l) noexcept {          \
+      int32_t g, Type v, ncpu_types::vector_t<IDType, 2> l) noexcept {         \
     if (__spv::Scope::Flag::Subgroup == g)                                     \
       return __mux_sub_group_broadcast_##Sfx(v, l[0]);                         \
     else                                                                       \
       return __mux_work_group_broadcast_##Sfx(0, v, l[0], l[1], 0);            \
   }                                                                            \
                                                                                \
   DEVICE_EXTERNAL Type __spirv_GroupBroadcast(                                 \
-      int32_t g, Type v, ncpu_types::vector_t<IDType, 3> l) noexcept {          \
+      int32_t g, Type v, ncpu_types::vector_t<IDType, 3> l) noexcept {         \
     if (__spv::Scope::Flag::Subgroup == g)                                     \
       return __mux_sub_group_broadcast_##Sfx(v, l[0]);                         \
     else                                                                       \
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
@@ -19,7 +19,7 @@ int main() {
   std::vector<int> HostDataA(Size);
 
   exp_ext::command_graph Graph{Ctxt, Queue.get_device()};
-  exp_ext::dynamic_work_group_memory<int[]> DynLocalMem{Graph, LocalSize};
+  exp_ext::dynamic_work_group_memory<int[]> 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
@@ -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<bundle_state::executable>(Ctxt);
   kernel_id Kernel_id = exp_ext::get_kernel_id<ff_0>();
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
@@ -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<bundle_state::executable>(Ctxt);
   kernel_id Kernel_id = exp_ext::get_kernel_id<ff_1>();
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
@@ -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<bundle_state::executable>(Ctxt);
   kernel_id Kernel_id = exp_ext::get_kernel_id<ff_2>();
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
@@ -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<bundle_state::executable>(Ctxt);
   kernel_id Kernel_id = exp_ext::get_kernel_id<ff_0>();
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
@@ -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
@@ -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<bundle_state::executable>(Ctxt);
   kernel_id Kernel_id = exp_ext::get_kernel_id<ff_0>();
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
@@ -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<bundle_state::executable>(Ctxt);
   kernel_id Kernel_id_A = exp_ext::get_kernel_id<ff_0>();
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
@@ -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
@@ -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<bundle_state::executable>(Ctxt);
   kernel_id SubKernel_id = exp_ext::get_kernel_id<ff_1>();
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
@@ -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<bundle_state::executable>(Ctxt);
   kernel_id Kernel_id = exp_ext::get_kernel_id<ff_6>();
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
@@ -19,8 +19,8 @@ int main() {
   std::vector<int> HostDataB(Size);
   std::vector<int> 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
@@ -21,8 +21,8 @@ int main() {
   std::vector<int> 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
@@ -21,7 +21,7 @@ int main() {
   std::vector<int> HostDataA(Size);
   std::vector<int> HostDataB(Size);
 
-  exp_ext::dynamic_local_accessor<int, 1> DynLocalMem(Graph, LocalSizeA);
+  exp_ext::dynamic_local_accessor<int, 1> 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
@@ -21,7 +21,7 @@ int main() {
   std::vector<int> HostDataA(Size);
   std::vector<int> HostDataB(Size);
 
-  exp_ext::dynamic_work_group_memory<int[]> DynLocalMem(Graph, LocalSizeA);
+  exp_ext::dynamic_work_group_memory<int[]> 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
@@ -20,7 +20,7 @@ int main() {
   std::vector<int> HostDataB(Size);
   std::vector<int> 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
@@ -19,7 +19,7 @@ int main() {
   int *PtrA = malloc_device<T>(Size, Queue);
   std::vector<T> HostDataA(Size);
 
-  exp_ext::dynamic_local_accessor<T, 1> DynLocalMem{Graph, LocalSize};
+  exp_ext::dynamic_local_accessor<T, 1> 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
@@ -20,8 +20,8 @@ int main() {
   int *PtrA = malloc_device<T>(Size, Queue);
   std::vector<T> HostDataA(Size);
 
-  exp_ext::dynamic_local_accessor<T, 1> DynLocalMemA{Graph, LocalSize};
-  exp_ext::dynamic_local_accessor<T, 1> DynLocalMemB{Graph, LocalSize};
+  exp_ext::dynamic_local_accessor<T, 1> DynLocalMemA{LocalSize};
+  exp_ext::dynamic_local_accessor<T, 1> 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
@@ -21,9 +21,8 @@ int main() {
   std::vector<T> HostDataA(Size * Size);
 
   exp_ext::dynamic_local_accessor<T, 2> DynLocalMemA{
-      Graph, range<2>{LocalSize, LocalSize}};
-  exp_ext::dynamic_local_accessor<T, 1> DynLocalMemC{Graph,
-                                                     range<1>{LocalSize}};
+      range<2>{LocalSize, LocalSize}};
+  exp_ext::dynamic_local_accessor<T, 1> 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
@@ -19,7 +19,7 @@ int main() {
   int *PtrA = malloc_device<T>(Size, Queue);
   std::vector<T> HostDataA(Size);
 
-  exp_ext::dynamic_work_group_memory<T[]> DynLocalMem{Graph, LocalSize};
+  exp_ext::dynamic_work_group_memory<T[]> 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
@@ -20,8 +20,8 @@ int main() {
   int *PtrA = malloc_device<T>(Size, Queue);
   std::vector<T> HostDataA(Size);
 
-  exp_ext::dynamic_work_group_memory<T[]> DynLocalMemA{Graph, LocalSize};
-  exp_ext::dynamic_work_group_memory<T[]> DynLocalMemB{Graph, LocalSize};
+  exp_ext::dynamic_work_group_memory<T[]> DynLocalMemA{LocalSize};
+  exp_ext::dynamic_work_group_memory<T[]> 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
@@ -20,9 +20,8 @@ int main() {
   int *PtrA = malloc_device<T>(Size * Size, Queue);
   std::vector<T> HostDataA(Size * Size);
 
-  exp_ext::dynamic_work_group_memory<T[][LocalSize]> DynLocalMemA{Graph,
-                                                                  LocalSize};
-  exp_ext::dynamic_work_group_memory<T[]> DynLocalMemC{Graph, LocalSize};
+  exp_ext::dynamic_work_group_memory<T[][LocalSize]> DynLocalMemA{LocalSize};
+  exp_ext::dynamic_work_group_memory<T[]> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/sycl/test-e2e/Graph/Update/whole_update_dynamic_param.cpp b/sycl/test-e2e/Graph/Update/whole_update_dynamic_param.cpp
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
