[UR][L0v2] Add support for ZE_COMMAND_LIST_FLAG_COPY_OFFLOAD_HINT (#21387)

Signed-off-by: Lukasz Dorau <[email protected]>

Author: ldorau

unified-runtime/cmake/FetchLevelZero.cmake

@@ -55,7 +55,7 @@ if(NOT LEVEL_ZERO_LIB_NAME AND NOT LEVEL_ZERO_LIBRARY)
   set(UR_LEVEL_ZERO_LOADER_REPO "https://github.com/oneapi-src/level-zero.git")
   # Remember to update the pkg_check_modules minimum version above when updating the
   # clone tag
-  set(UR_LEVEL_ZERO_LOADER_TAG v1.26.0)
+  set(UR_LEVEL_ZERO_LOADER_TAG v1.28.0)
 
   # Disable due to a bug https://github.com/oneapi-src/level-zero/issues/104
   set(CMAKE_INCLUDE_CURRENT_DIR OFF)
@@ -130,7 +130,7 @@ if(L0_COMPUTE_RUNTIME_HEADERS)
     set(COMPUTE_RUNTIME_REPO_PATH "${L0_COMPUTE_RUNTIME_HEADERS}")
 else()
     set(UR_COMPUTE_RUNTIME_REPO "https://github.com/intel/compute-runtime.git")
-    set(UR_COMPUTE_RUNTIME_TAG 25.35.35096.9)
+    set(UR_COMPUTE_RUNTIME_TAG 26.05.37020.3)
 
     include(FetchContent)
     # Sparse fetch only the dir with level zero headers for experimental features to avoid pulling in the entire compute-runtime.

unified-runtime/source/adapters/level_zero/platform.cpp

@@ -586,7 +586,13 @@ ur_result_t ur_platform_handle_t_::initialize() {
   ZeHostTaskExt.Supported =
       ZeHostTaskExt.zeCommandListAppendHostFunction != nullptr;
 
-  ZeCopyOffloadFlagSupported = this->isDriverVersionNewerOrSimilar(1, 14, 0);
+  // ZE_COMMAND_QUEUE_FLAG_COPY_OFFLOAD_HINT flag is support since L0 v1.14.0
+  ZeCopyOffloadQueueFlagSupported =
+      this->isDriverVersionNewerOrSimilar(1, 14, 0);
+
+  // ZE_COMMAND_LIST_FLAG_COPY_OFFLOAD_HINT flag is support since L0 v1.15.0
+  ZeCopyOffloadListFlagSupported =
+      this->isDriverVersionNewerOrSimilar(1, 15, 0);
 
   return UR_RESULT_SUCCESS;
 }

unified-runtime/source/adapters/level_zero/platform.hpp

@@ -69,7 +69,8 @@ struct ur_platform_handle_t_ : ur::handle_base<ur::level_zero::ddi_getter>,
   bool zeDriverImmediateCommandListAppendFound{false};
   bool ZeDriverEuCountExtensionFound{false};
   bool ZeCopyOffloadExtensionSupported{false};
-  bool ZeCopyOffloadFlagSupported{false};
+  bool ZeCopyOffloadQueueFlagSupported{false};
+  bool ZeCopyOffloadListFlagSupported{false};
   bool ZeBindlessImagesExtensionSupported{false};
   bool ZeLUIDSupported{false};
 

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

@@ -82,8 +82,10 @@ command_list_cache_t::command_list_cache_t(
           supportedExtensions.ZeCopyOffloadExtensionSupported},
       ZeMutableCmdListExtentionSupported{
           supportedExtensions.ZeMutableCmdListExtentionSupported},
-      ZeCopyOffloadFlagSupported{
-          supportedExtensions.ZeCopyOffloadFlagSupported} {}
+      ZeCopyOffloadQueueFlagSupported{
+          supportedExtensions.ZeCopyOffloadQueueFlagSupported},
+      ZeCopyOffloadListFlagSupported{
+          supportedExtensions.ZeCopyOffloadListFlagSupported} {}
 
 static bool ForceDisableCopyOffload = [] {
   return getenv_tobool("UR_L0_V2_FORCE_DISABLE_COPY_OFFLOAD");
@@ -123,8 +125,8 @@ command_list_cache_t::createCommandList(const command_list_descriptor_t &desc) {
       QueueDesc.index = ImmCmdDesc->Index.value();
     }
 
-    // ZeCopyOffloadFlagSupported is set during platform initialization
-    if (requestedCopyOffload && ZeCopyOffloadFlagSupported) {
+    // ZeCopyOffloadQueueFlagSupported is set during platform initialization
+    if (requestedCopyOffload && ZeCopyOffloadQueueFlagSupported) {
       QueueDesc.flags |= ZE_COMMAND_QUEUE_FLAG_COPY_OFFLOAD_HINT;
       QueueDesc.pNext = nullptr;
     } else {
@@ -153,11 +155,25 @@ command_list_cache_t::createCommandList(const command_list_descriptor_t &desc) {
     CmdListDesc.flags =
         RegCmdDesc.IsInOrder ? ZE_COMMAND_LIST_FLAG_IN_ORDER : 0;
     CmdListDesc.commandQueueGroupOrdinal = RegCmdDesc.Ordinal;
-    CmdListDesc.pNext = &offloadDesc;
+
+    // Pointer to the last element in the pNext chain,
+    // used to append extensions.
+    const void **ppNext;
+
+    // ZeCopyOffloadListFlagSupported is set during platform initialization
+    if (requestedCopyOffload && ZeCopyOffloadListFlagSupported) {
+      CmdListDesc.flags |= ZE_COMMAND_LIST_FLAG_COPY_OFFLOAD_HINT;
+      CmdListDesc.pNext = nullptr;
+      ppNext = &CmdListDesc.pNext;
+    } else {
+      CmdListDesc.pNext = &offloadDesc;
+      ppNext = &offloadDesc.pNext;
+    }
+
     ZeStruct<ze_mutable_command_list_exp_desc_t> ZeMutableCommandListDesc;
     if (IsMutable) {
       ZeMutableCommandListDesc.flags = 0;
-      offloadDesc.pNext = &ZeMutableCommandListDesc;
+      *ppNext = &ZeMutableCommandListDesc;
     }
 
     UR_LOG(DEBUG,

unified-runtime/source/adapters/level_zero/v2/command_list_cache.hpp

@@ -29,13 +29,16 @@ using command_list_unique_handle =
 struct supported_extensions_descriptor_t {
   supported_extensions_descriptor_t(bool ZeCopyOffloadExtensionSupported,
                                     bool ZeMutableCmdListExtentionSupported,
-                                    bool ZeCopyOffloadFlagSupported)
+                                    bool ZeCopyOffloadQueueFlagSupported,
+                                    bool ZeCopyOffloadListFlagSupported)
       : ZeCopyOffloadExtensionSupported(ZeCopyOffloadExtensionSupported),
         ZeMutableCmdListExtentionSupported(ZeMutableCmdListExtentionSupported),
-        ZeCopyOffloadFlagSupported(ZeCopyOffloadFlagSupported) {}
+        ZeCopyOffloadQueueFlagSupported(ZeCopyOffloadQueueFlagSupported),
+        ZeCopyOffloadListFlagSupported(ZeCopyOffloadListFlagSupported) {}
   bool ZeCopyOffloadExtensionSupported;
   bool ZeMutableCmdListExtentionSupported;
-  bool ZeCopyOffloadFlagSupported;
+  bool ZeCopyOffloadQueueFlagSupported;
+  bool ZeCopyOffloadListFlagSupported;
 };
 
 struct command_list_desc_t {
@@ -100,7 +103,8 @@ struct command_list_cache_t {
   ze_context_handle_t ZeContext;
   bool ZeCopyOffloadExtensionSupported;
   bool ZeMutableCmdListExtentionSupported;
-  bool ZeCopyOffloadFlagSupported;
+  bool ZeCopyOffloadQueueFlagSupported;
+  bool ZeCopyOffloadListFlagSupported;
   std::unordered_map<command_list_descriptor_t,
                      std::stack<raii::ze_command_list_handle_t>,
                      command_list_descriptor_hash_t>

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

@@ -75,10 +75,11 @@ ur_context_handle_t_::ur_context_handle_t_(ze_context_handle_t hContext,
                                            bool ownZeContext)
     : hContext(hContext, ownZeContext),
       hDevices(uniqueDevices(numDevices, phDevices)),
-      commandListCache(hContext,
-                       {phDevices[0]->Platform->ZeCopyOffloadExtensionSupported,
-                        phDevices[0]->Platform->ZeMutableCmdListExt.Supported,
-                        phDevices[0]->Platform->ZeCopyOffloadFlagSupported}),
+      commandListCache(
+          hContext, {phDevices[0]->Platform->ZeCopyOffloadExtensionSupported,
+                     phDevices[0]->Platform->ZeMutableCmdListExt.Supported,
+                     phDevices[0]->Platform->ZeCopyOffloadQueueFlagSupported,
+                     phDevices[0]->Platform->ZeCopyOffloadListFlagSupported}),
       eventPoolCacheImmediate(
           this, phDevices[0]->Platform->getNumDevices(),
           [context = this, platform = phDevices[0]->Platform](

unified-runtime/test/adapters/level_zero/v2/command_list_cache_test.cpp

@@ -35,7 +35,7 @@ struct CommandListCacheTest : public uur::urContextTest {
 UUR_INSTANTIATE_DEVICE_TEST_SUITE(CommandListCacheTest);
 
 TEST_P(CommandListCacheTest, CanStoreAndRetriveImmediateAndRegularCmdLists) {
-  v2::supported_extensions_descriptor_t supportedExtensions(false, false,
+  v2::supported_extensions_descriptor_t supportedExtensions(false, false, false,
                                                             false);
   v2::command_list_cache_t cache(context->getZeHandle(), supportedExtensions);
 
@@ -92,7 +92,7 @@ TEST_P(CommandListCacheTest, CanStoreAndRetriveImmediateAndRegularCmdLists) {
 }
 
 TEST_P(CommandListCacheTest, ImmediateCommandListsHaveProperAttributes) {
-  v2::supported_extensions_descriptor_t supportedExtensions(false, false,
+  v2::supported_extensions_descriptor_t supportedExtensions(false, false, false,
                                                             false);
   v2::command_list_cache_t cache(context->getZeHandle(), supportedExtensions);