Address PR feedback

Author: EwanC

sycl/doc/extensions/supported/sycl_ext_oneapi_backend_level_zero.md

@@ -275,8 +275,8 @@ struct {
 <td>
 
 ``` C++
-using syclext = sycl::ext::oneapi::experimental;
-syclext::command_graph<syclext::graph_state::executable>
+ext::oneapi::experimental::command_graph<
+    ext::oneapi::experimental::graph_state::executable>
 ```
 
 See [sycl_ext_oneapi_graph](../experimental/sycl_ext_oneapi_graph.asciidoc)

sycl/source/detail/queue_impl.hpp

@@ -1016,7 +1016,7 @@ class queue_impl {
 #ifndef __INTEL_PREVIEW_BREAKING_CHANGES
   // CMPLRLLVM-66082
   // This member should be part of the sycl::interop_handle class, but it
-  // in an API breaking change. So member lives here temporarily where it can
+  // is an API breaking change. So member lives here temporarily where it can
   // be accessed through the queue member of the interop_handle
   ur_exp_command_buffer_handle_t MInteropGraph{};
 #endif

sycl/source/detail/scheduler/commands.cpp

@@ -3089,19 +3089,18 @@ ur_result_t ExecCGCommand::enqueueImpCommandBuffer() {
 
     ur_exp_command_buffer_handle_t InteropCommandBuffer =
         ChildCommandBuffer ? ChildCommandBuffer : MCommandBuffer;
-#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
+    interop_handle IH{ReqToMem, MQueue, DeviceImpl, ContextImpl,
+                      InteropCommandBuffer};
+    CommandBufferNativeCommandData CustomOpData{
+        IH, HostTask->MHostTask->MInteropTask};
+
+#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
     // CMPLRLLVM-66082
     // The native command-buffer should be a member of the sycl::interop_handle
     // class, but it is in an ABI breaking change to add it. So member lives in
     // the queue as a intermediate workaround.
-    interop_handle IH{ReqToMem, MQueue, DeviceImpl, ContextImpl,
-                      InteropCommandBuffer};
-#else
     MQueue->setInteropGraph(InteropCommandBuffer);
-    interop_handle IH{ReqToMem, MQueue, DeviceImpl, ContextImpl};
 #endif
-    CommandBufferNativeCommandData CustomOpData{
-        IH, HostTask->MHostTask->MInteropTask};
 
     Adapter->call<UrApiKind::urCommandBufferAppendNativeCommandExp>(
         MCommandBuffer, CommandBufferInteropFreeFunc, &CustomOpData,

sycl/test-e2e/EnqueueNativeCommand/Graph/cuda_explicit_usm.cpp

@@ -71,7 +71,6 @@ int main() {
   Queue.ext_oneapi_graph(ExecGraph).wait();
 
   std::vector<int> HostData(Size);
-
   Queue.copy(PtrY, HostData.data(), Size).wait();
   for (size_t i = 0; i < Size; i++) {
     const int Ref = i * 2;

sycl/test-e2e/EnqueueNativeCommand/Graph/cuda_multiple_native_commands.cpp

@@ -116,7 +116,7 @@ int main() {
   Graph.end_recording();
 
   auto ExecGraph = Graph.finalize();
-  Queue.ext_oneapi_graph(ExecGraph).wait();
+  Queue.ext_oneapi_graph(ExecGraph);
 
   std::vector<int> HostDataY(Size);
   std::vector<int> HostDataZ(Size);

sycl/test-e2e/EnqueueNativeCommand/Graph/cuda_record_usm.cpp

@@ -99,7 +99,6 @@ int main() {
   Queue.ext_oneapi_graph(ExecGraph).wait();
 
   std::vector<int> HostData(Size);
-
   Queue.copy(PtrY, HostData.data(), Size).wait();
   for (size_t i = 0; i < Size; i++) {
     const int Ref = i * 2;

sycl/test-e2e/EnqueueNativeCommand/Graph/hip_explicit_usm.cpp

@@ -67,7 +67,6 @@ int main() {
   Queue.ext_oneapi_graph(ExecGraph).wait();
 
   std::vector<int> HostData(Size);
-
   Queue.copy(PtrY, HostData.data(), Size).wait();
   for (size_t i = 0; i < Size; i++) {
     const int Ref = i * 2;

sycl/test-e2e/EnqueueNativeCommand/Graph/hip_record_usm.cpp

@@ -105,7 +105,6 @@ int main() {
   Queue.ext_oneapi_graph(ExecGraph).wait();
 
   std::vector<int> HostData(Size);
-
   Queue.copy(PtrY, HostData.data(), Size).wait();
   for (size_t i = 0; i < Size; i++) {
     const int Ref = i * 2;

sycl/test-e2e/EnqueueNativeCommand/Graph/level-zero_usm.cpp

@@ -58,7 +58,6 @@ int main() {
   Queue.ext_oneapi_graph(ExecGraph).wait();
 
   std::vector<int> HostData(Size);
-
   Queue.copy(PtrY, HostData.data(), Size).wait();
   for (size_t i = 0; i < Size; i++) {
     const int Ref = i * 2;

unified-runtime/scripts/core/EXP-COMMAND-BUFFER.rst

@@ -532,7 +532,7 @@ Changelog
 | 1.10      | Remove extension string macro, make device info enum  |
 |           | primary mechanism for reporting support.              |
 +-----------+-------------------------------------------------------+
-| 1.11       | Support native commands.                             |
+| 1.11      | Support native commands.                              |
 +-----------+-------------------------------------------------------+
 
 Contributors

unified-runtime/source/adapters/level_zero/v2/api.cpp

@@ -199,6 +199,7 @@ ur_result_t UR_APICALL urUSMPoolCreateExp(ur_context_handle_t hContext,
   logger::error("{} function not implemented!", __FUNCTION__);
   return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
 }
+
 ur_result_t UR_APICALL urUSMPoolDestroyExp(ur_context_handle_t hContext,
                                            ur_device_handle_t hDevice,
                                            ur_usm_pool_handle_t hPool) {