From 01406eb569c495e79c92f503e053b7e370a1f8be Mon Sep 17 00:00:00 2001
From: "Bushi, Lorenc" <lorenc.bushi@intel.com>
Date: Tue, 21 Oct 2025 22:17:52 +0200
Subject: [PATCH 1/2] Fix enum parameter free function kernel test failure

---
 sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp b/sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp
index 2c36d679649b2..5756264535346 100644
--- a/sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp
+++ b/sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp
@@ -49,7 +49,7 @@ int main() {
     Queue.submit([&](sycl::handler &Handler) {
       flagType flagAcc1{flagBuffer1, Handler};
       rAccType acc1;
-
+      Handler.require(acc1);
       Handler.set_args(acc1, rMode, flagAcc1);
       Handler.single_task(Kernel1);
     });
@@ -57,7 +57,7 @@ int main() {
     Queue.submit([&](sycl::handler &Handler) {
       flagType flagAcc2{flagBuffer2, Handler};
       wAccType acc2;
-
+      Handler.require(acc2);
       Handler.set_args(acc2, wMode, flagAcc2);
       Handler.single_task(Kernel2);
     });
@@ -65,7 +65,7 @@ int main() {
     Queue.submit([&](sycl::handler &Handler) {
       flagType flagAcc3{flagBuffer3, Handler};
       rwAccType acc3;
-
+      Handler.require(acc3);
       Handler.set_args(acc3, rwMode, flagAcc3);
       Handler.single_task(Kernel3);
     });

From 17f3a708c562d0f7cdd0e800d05f344463e786eb Mon Sep 17 00:00:00 2001
From: Lorenc Bushi <lorenc.bushi@intel.com>
Date: Wed, 22 Oct 2025 00:22:03 -0400
Subject: [PATCH 2/2] Move the default accessor declarations outside the
 command group scope

---
 sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp b/sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp
index 5756264535346..bd54aa54efc38 100644
--- a/sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp
+++ b/sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp
@@ -42,30 +42,27 @@ int main() {
 
   bool flag1, flag2, flag3;
   flag1 = (flag2 = (flag3 = false));
+  rAccType acc1;
+  wAccType acc2;
+  rwAccType acc3;
   {
     sycl::buffer<bool, 1> flagBuffer1(&flag1, 1);
     sycl::buffer<bool, 1> flagBuffer2(&flag2, 1);
     sycl::buffer<bool, 1> flagBuffer3(&flag3, 1);
     Queue.submit([&](sycl::handler &Handler) {
       flagType flagAcc1{flagBuffer1, Handler};
-      rAccType acc1;
-      Handler.require(acc1);
       Handler.set_args(acc1, rMode, flagAcc1);
       Handler.single_task(Kernel1);
     });
 
     Queue.submit([&](sycl::handler &Handler) {
       flagType flagAcc2{flagBuffer2, Handler};
-      wAccType acc2;
-      Handler.require(acc2);
       Handler.set_args(acc2, wMode, flagAcc2);
       Handler.single_task(Kernel2);
     });
 
     Queue.submit([&](sycl::handler &Handler) {
       flagType flagAcc3{flagBuffer3, Handler};
-      rwAccType acc3;
-      Handler.require(acc3);
       Handler.set_args(acc3, rwMode, flagAcc3);
       Handler.single_task(Kernel3);
     });