[L0] Create v2::context

that inherits from the old context and extends it with v2 functionality.
urContextCreate will now always create v2::context. All legacy
functions will continue to operate as normal and the optimized
code path can levarage additional features implemented in v2.

Author: igchor

source/adapters/level_zero/CMakeLists.txt

@@ -115,6 +115,8 @@ add_ur_adapter(${TARGET_NAME}
     ${CMAKE_CURRENT_SOURCE_DIR}/sampler.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/v2/queue_immediate_in_order.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/v2/queue_factory.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/v2/context.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/v2/command_list_cache.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ur_level_zero.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/common.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/context.cpp
@@ -135,6 +137,8 @@ add_ur_adapter(${TARGET_NAME}
     ${CMAKE_CURRENT_SOURCE_DIR}/image.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/../../ur/ur.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/v2/queue_immediate_in_order.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/v2/context.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/v2/command_list_cache.cpp
 )
 
 if(NOT WIN32)

source/adapters/level_zero/context.cpp

@@ -18,6 +18,8 @@
 #include "queue.hpp"
 #include "ur_level_zero.hpp"
 
+#include "v2/context.hpp"
+
 UR_APIEXPORT ur_result_t UR_APICALL urContextCreate(
     uint32_t DeviceCount, ///< [in] the number of devices given in phDevices
     const ur_device_handle_t
@@ -36,7 +38,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urContextCreate(
   ZE2UR_CALL(zeContextCreate, (Platform->ZeDriver, &ContextDesc, &ZeContext));
   try {
     ur_context_handle_t_ *Context =
-        new ur_context_handle_t_(ZeContext, DeviceCount, Devices, true);
+        new v2::ur_context_handle_t_(ZeContext, DeviceCount, Devices, true);
 
     Context->initialize();
     *RetContext = reinterpret_cast<ur_context_handle_t>(Context);

source/adapters/level_zero/v2/command_list_cache.cpp

@@ -10,8 +10,8 @@
 
 #include "command_list_cache.hpp"
 
-#include "context.hpp"
-#include "device.hpp"
+#include "../context.hpp"
+#include "../device.hpp"
 
 bool v2::immediate_command_list_descriptor_t::operator==(
     const immediate_command_list_descriptor_t &rhs) const {

source/adapters/level_zero/v2/command_list_cache.hpp

@@ -15,7 +15,7 @@
 #include <ur_api.h>
 #include <ze_api.h>
 
-#include "common.hpp"
+#include "../common.hpp"
 
 namespace v2 {
 namespace raii {

source/adapters/level_zero/v2/context.cpp

@@ -0,0 +1,22 @@
+//===--------- context.cpp - Level Zero Adapter --------------------------===//
+//
+// Copyright (C) 2024 Intel Corporation
+//
+// Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM
+// Exceptions. See LICENSE.TXT
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "context.hpp"
+
+namespace v2 {
+
+ur_context_handle_t_::ur_context_handle_t_(ze_context_handle_t hContext,
+                                           uint32_t numDevices,
+                                           const ur_device_handle_t *phDevices,
+                                           bool ownZeContext)
+    : ::ur_context_handle_t_(hContext, numDevices, phDevices, ownZeContext),
+      commandListCache(hContext) {}
+
+} // namespace v2

source/adapters/level_zero/v2/context.hpp

@@ -0,0 +1,29 @@
+//===--------- context.hpp - Level Zero Adapter --------------------------===//
+//
+// Copyright (C) 2024 Intel Corporation
+//
+// Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM
+// Exceptions. See LICENSE.TXT
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#pragma once
+
+#include "command_list_cache.hpp"
+
+#include "../context.hpp"
+
+namespace v2 {
+
+struct ur_context_handle_t_;
+using ur_context_handle_t = ur_context_handle_t_ *;
+
+struct ur_context_handle_t_ : public ::ur_context_handle_t_ {
+  ur_context_handle_t_(ze_context_handle_t hContext, uint32_t numDevices,
+                       const ur_device_handle_t *phDevices, bool ownZeContext);
+
+  command_list_cache_t commandListCache;
+};
+
+} // namespace v2

source/adapters/level_zero/v2/queue_factory.hpp

@@ -11,29 +11,30 @@
 #pragma once
 
 #include "../queue.hpp"
+#include "context.hpp"
 
 #include "queue_immediate_in_order.hpp"
 
 namespace v2 {
 
-inline bool shouldUseQueueV2(ur_device_handle_t Device,
-                             ur_queue_flags_t Flags) {
-  std::ignore = Device;
-  std::ignore = Flags;
+inline bool shouldUseQueueV2(ur_device_handle_t hDevice,
+                             ur_queue_flags_t flags) {
+  std::ignore = hDevice;
+  std::ignore = flags;
 
   const char *UrRet = std::getenv("UR_L0_USE_QUEUE_V2");
   return UrRet && std::stoi(UrRet);
 }
 
-inline ur_queue_handle_t createQueue(ur_context_handle_t Context,
-                                     ur_device_handle_t Device,
-                                     ur_queue_flags_t Flags) {
-  if (!shouldUseQueueV2(Device, Flags)) {
+inline ur_queue_handle_t createQueue(::ur_context_handle_t hContext,
+                                     ur_device_handle_t hDevice,
+                                     const ur_queue_properties_t *pProps) {
+  if (!shouldUseQueueV2(hDevice, pProps ? pProps->flags : ur_queue_flags_t{})) {
     throw UR_RESULT_ERROR_INVALID_ARGUMENT;
   }
-
   // TODO: For now, always use immediate, in-order
-  return new ur_queue_immediate_in_order_t(Context, Device, Flags);
+  return new ur_queue_immediate_in_order_t(
+      static_cast<v2::ur_context_handle_t>(hContext), hDevice, pProps->flags);
 }
 
 } // namespace v2

source/adapters/level_zero/v2/queue_immediate_in_order.cpp

@@ -12,7 +12,7 @@
 
 namespace v2 {
 ur_queue_immediate_in_order_t::ur_queue_immediate_in_order_t(
-    ur_context_handle_t, ur_device_handle_t, ur_queue_flags_t) {}
+    v2::ur_context_handle_t, ur_device_handle_t, ur_queue_flags_t) {}
 
 ur_result_t
 ur_queue_immediate_in_order_t::queueGetInfo(ur_queue_info_t propName,

source/adapters/level_zero/v2/queue_immediate_in_order.hpp

@@ -11,12 +11,13 @@
 
 #include "../common.hpp"
 #include "../queue.hpp"
+#include "context.hpp"
 
 #include "ur/ur.hpp"
 
 namespace v2 {
 struct ur_queue_immediate_in_order_t : _ur_object, public ur_queue_handle_t_ {
-  ur_queue_immediate_in_order_t(ur_context_handle_t, ur_device_handle_t,
+  ur_queue_immediate_in_order_t(v2::ur_context_handle_t, ur_device_handle_t,
                                 ur_queue_flags_t);
 
   ur_result_t queueGetInfo(ur_queue_info_t propName, size_t propSize,