[SYCL][NFC] Move khr_free_function_commands extension to common khr directory (#18556)

dyniols · web-flow · commit ccb079c62ce3 · 2025-05-20T15:28:53.000Z
Purpose of this PR is to move `khr_free_function_commands` extension to common `khr` directory based on discussion #17595 (comment) Extension spec: KhronosGroup/SYCL-Docs#644
diff --git a/sycl/include/sycl/khr/free_function_commands.hpp b/sycl/include/sycl/khr/free_function_commands.hpp
diff --git a/sycl/include/sycl/sycl.hpp b/sycl/include/sycl/sycl.hpp
@@ -74,7 +74,6 @@
 #include <sycl/ext/intel/experimental/task_sequence_properties.hpp>
 #include <sycl/ext/intel/experimental/usm_properties.hpp>
 #include <sycl/ext/intel/usm_pointers.hpp>
-#include <sycl/ext/khr/free_function_commands.hpp>
 #include <sycl/ext/oneapi/bfloat16.hpp>
 #include <sycl/ext/oneapi/bindless_images.hpp>
 #include <sycl/ext/oneapi/device_global/device_global.hpp>
@@ -123,4 +122,5 @@
 #include <sycl/ext/oneapi/virtual_mem/physical_mem.hpp>
 #include <sycl/ext/oneapi/virtual_mem/virtual_mem.hpp>
 #include <sycl/ext/oneapi/weak_object.hpp>
+#include <sycl/khr/free_function_commands.hpp>
 #include <sycl/khr/group_interface.hpp>
diff --git a/sycl/test-e2e/FreeFunctionCommands/launch.cpp b/sycl/test-e2e/FreeFunctionCommands/launch.cpp
@@ -6,7 +6,7 @@
 #define __DPCPP_ENABLE_UNFINISHED_KHR_EXTENSIONS
 
 #include <sycl/detail/core.hpp>
-#include <sycl/ext/khr/free_function_commands.hpp>
+#include <sycl/khr/free_function_commands.hpp>
 #include <sycl/usm.hpp>
 
 #include <array>
diff --git a/sycl/test-e2e/FreeFunctionCommands/launch_grouped.cpp b/sycl/test-e2e/FreeFunctionCommands/launch_grouped.cpp
@@ -7,7 +7,7 @@
 #define __DPCPP_ENABLE_UNFINISHED_KHR_EXTENSIONS
 
 #include <sycl/detail/core.hpp>
-#include <sycl/ext/khr/free_function_commands.hpp>
+#include <sycl/khr/free_function_commands.hpp>
 #include <sycl/usm.hpp>
 
 #include "helpers.hpp"
diff --git a/sycl/test-e2e/FreeFunctionCommands/launch_grouped_reduce.cpp b/sycl/test-e2e/FreeFunctionCommands/launch_grouped_reduce.cpp
@@ -8,7 +8,7 @@
 #define __DPCPP_ENABLE_UNFINISHED_KHR_EXTENSIONS
 
 #include <sycl/detail/core.hpp>
-#include <sycl/ext/khr/free_function_commands.hpp>
+#include <sycl/khr/free_function_commands.hpp>
 #include <sycl/reduction.hpp>
 #include <sycl/usm.hpp>
 
diff --git a/sycl/test-e2e/FreeFunctionCommands/launch_reduce.cpp b/sycl/test-e2e/FreeFunctionCommands/launch_reduce.cpp
@@ -6,7 +6,7 @@
 #define __DPCPP_ENABLE_UNFINISHED_KHR_EXTENSIONS
 
 #include <sycl/detail/core.hpp>
-#include <sycl/ext/khr/free_function_commands.hpp>
+#include <sycl/khr/free_function_commands.hpp>
 #include <sycl/reduction.hpp>
 #include <sycl/usm.hpp>
 
diff --git a/sycl/test-e2e/FreeFunctionCommands/launch_task.cpp b/sycl/test-e2e/FreeFunctionCommands/launch_task.cpp
@@ -7,7 +7,7 @@
 #define __DPCPP_ENABLE_UNFINISHED_KHR_EXTENSIONS
 
 #include <sycl/detail/core.hpp>
-#include <sycl/ext/khr/free_function_commands.hpp>
+#include <sycl/khr/free_function_commands.hpp>
 #include <sycl/usm.hpp>
 
 #include <array>
diff --git a/sycl/test-e2e/FreeFunctionCommands/mem_advise.cpp b/sycl/test-e2e/FreeFunctionCommands/mem_advise.cpp
@@ -7,7 +7,7 @@
 #define __DPCPP_ENABLE_UNFINISHED_KHR_EXTENSIONS
 
 #include <sycl/detail/core.hpp>
-#include <sycl/ext/khr/free_function_commands.hpp>
+#include <sycl/khr/free_function_commands.hpp>
 #include <sycl/usm.hpp>
 
 int main() {
diff --git a/sycl/test-e2e/FreeFunctionCommands/memory_operations.cpp b/sycl/test-e2e/FreeFunctionCommands/memory_operations.cpp
@@ -7,7 +7,7 @@
 #define __DPCPP_ENABLE_UNFINISHED_KHR_EXTENSIONS
 
 #include <sycl/detail/core.hpp>
-#include <sycl/ext/khr/free_function_commands.hpp>
+#include <sycl/khr/free_function_commands.hpp>
 #include <sycl/usm.hpp>
 
 #include "helpers.hpp"
diff --git a/sycl/test-e2e/FreeFunctionCommands/prefetch.cpp b/sycl/test-e2e/FreeFunctionCommands/prefetch.cpp
@@ -7,7 +7,7 @@
 #define __DPCPP_ENABLE_UNFINISHED_KHR_EXTENSIONS
 
 #include <sycl/detail/core.hpp>
-#include <sycl/ext/khr/free_function_commands.hpp>
+#include <sycl/khr/free_function_commands.hpp>
 #include <sycl/usm.hpp>
 
 int main() {
diff --git a/sycl/unittests/Extensions/FreeFunctionCommands/Barrier.cpp b/sycl/unittests/Extensions/FreeFunctionCommands/Barrier.cpp
@@ -4,7 +4,7 @@
 #include <gtest/gtest.h>
 
 #define __DPCPP_ENABLE_UNFINISHED_KHR_EXTENSIONS
-#include <sycl/ext/khr/free_function_commands.hpp>
+#include <sycl/khr/free_function_commands.hpp>
 
 thread_local size_t NumOfEnqueueEventsWaitWithBarrier = 0;
 
diff --git a/sycl/unittests/Extensions/FreeFunctionCommands/FreeFunctionCommandsEvents.cpp b/sycl/unittests/Extensions/FreeFunctionCommands/FreeFunctionCommandsEvents.cpp
@@ -13,7 +13,7 @@
 #include "helpers/MockKernelInfo.hpp"
 
 #define __DPCPP_ENABLE_UNFINISHED_KHR_EXTENSIONS
-#include <sycl/ext/khr/free_function_commands.hpp>
+#include <sycl/khr/free_function_commands.hpp>
 
 class TestFunctor {
 public:
