Fixes after review 2

Author: KFilipek

unified-runtime/include/ur_api.h

@@ -149,6 +149,7 @@ if(UR_BUILD_ADAPTER_L0_V2)
         ${CMAKE_CURRENT_SOURCE_DIR}/physical_mem.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/program.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/helpers/kernel_helpers.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/graph.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/helpers/memory_helpers.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/helpers/mutable_helpers.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/usm_p2p.cpp

unified-runtime/source/adapters/level_zero/CMakeLists.txt

@@ -930,11 +930,9 @@ ur_result_t urQueueFlush(
   return Queue->executeAllOpenCommandLists();
 }
 
-// Graph capture experimental functions - not yet supported
-ur_result_t urQueueBeginGraphCaptureExp(ur_queue_handle_t hQueue,
-                                        void *pProperties) {
+ur_result_t urQueueBeginGraphCaptureExp(ur_queue_handle_t hQueue, void *pNext) {
   std::ignore = hQueue;
-  std::ignore = pProperties;
+  std::ignore = pNext;
   UR_LOG_LEGACY(ERR,
                 logger::LegacyMessage("[UR][L0] {} function not implemented!"),
                 "{} function not implemented!", __FUNCTION__);
@@ -943,10 +941,10 @@ ur_result_t urQueueBeginGraphCaptureExp(ur_queue_handle_t hQueue,
 
 ur_result_t urQueueBeginCaptureIntoGraphExp(ur_queue_handle_t hQueue,
                                             ur_exp_graph_handle_t hGraph,
-                                            void *pProperties) {
+                                            void *pNext) {
   std::ignore = hQueue;
   std::ignore = hGraph;
-  std::ignore = pProperties;
+  std::ignore = pNext;
   UR_LOG_LEGACY(ERR,
                 logger::LegacyMessage("[UR][L0] {} function not implemented!"),
                 "{} function not implemented!", __FUNCTION__);
@@ -955,9 +953,9 @@ ur_result_t urQueueBeginCaptureIntoGraphExp(ur_queue_handle_t hQueue,
 
 ur_result_t urQueueEndGraphCaptureExp(ur_queue_handle_t hQueue,
                                       ur_exp_graph_handle_t *phGraph,
-                                      void *pProperties) {
+                                      void *pNext) {
   std::ignore = hQueue;
-  std::ignore = pProperties;
+  std::ignore = pNext;
   if (phGraph)
     *phGraph = nullptr;
   UR_LOG_LEGACY(ERR,
@@ -980,28 +978,28 @@ urQueueInstantiateGraphExp(ur_exp_graph_handle_t hGraph,
   return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
 }
 
-ur_result_t urQueueAppendGraphExp(
-    ur_queue_handle_t hQueue, ur_exp_executable_graph_handle_t hExecutableGraph,
-    void *pProperties, ur_event_handle_t *phEvent, uint32_t numEventsInWaitList,
-    const ur_event_handle_t *phEventWaitList) {
+ur_result_t urQueueAppendGraphExp(ur_queue_handle_t hQueue,
+                                  ur_exp_executable_graph_handle_t hGraph,
+                                  void *pNext, ur_event_handle_t hSignalEvent,
+                                  uint32_t numWaitEvents,
+                                  ur_event_handle_t *phWaitEvents) {
   std::ignore = hQueue;
-  std::ignore = hExecutableGraph;
-  std::ignore = pProperties;
-  std::ignore = numEventsInWaitList;
-  std::ignore = phEventWaitList;
-  if (phEvent)
-    *phEvent = nullptr;
+  std::ignore = hGraph;
+  std::ignore = pNext;
+  std::ignore = hSignalEvent;
+  std::ignore = numWaitEvents;
+  std::ignore = phWaitEvents;
   UR_LOG_LEGACY(ERR,
                 logger::LegacyMessage("[UR][L0] {} function not implemented!"),
                 "{} function not implemented!", __FUNCTION__);
   return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
 }
 
 ur_result_t urQueueIsGraphCaptureEnabledExp(ur_queue_handle_t hQueue,
-                                            bool *pCaptureEnabled) {
+                                            bool *hResult) {
   std::ignore = hQueue;
-  if (pCaptureEnabled)
-    *pCaptureEnabled = false;
+  if (hResult)
+    *hResult = false;
   UR_LOG_LEGACY(ERR,
                 logger::LegacyMessage("[UR][L0] {} function not implemented!"),
                 "{} function not implemented!", __FUNCTION__);

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

@@ -63,54 +63,4 @@ ur_result_t UR_APICALL urUSMPoolTrimToExp(ur_context_handle_t hContext,
   return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
 }
 
-ur_result_t urGraphCreateExp(ur_context_handle_t hContext,
-                             ur_exp_graph_handle_t *phGraph, void *pNext) {
-  (void)hContext;
-  (void)phGraph;
-  (void)pNext;
-  UR_LOG(ERR, "{} function not implemented!", __FUNCTION__);
-  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
-}
-
-ur_result_t
-urQueueInstantiateGraphExp(ur_exp_graph_handle_t hGraph,
-                           ur_exp_executable_graph_handle_t *phExecutableGraph,
-                           void *pNext) {
-  (void)hGraph;
-  (void)phExecutableGraph;
-  (void)pNext;
-  UR_LOG(ERR, "{} function not implemented!", __FUNCTION__);
-  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
-}
-
-ur_result_t urGraphDestroyExp(ur_exp_graph_handle_t hGraph) {
-  (void)hGraph;
-  UR_LOG(ERR, "{} function not implemented!", __FUNCTION__);
-  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
-}
-
-ur_result_t urGraphExecutableGraphDestroyExp(
-    ur_exp_executable_graph_handle_t hExecutableGraph) {
-  (void)hExecutableGraph;
-  UR_LOG(ERR, "{} function not implemented!", __FUNCTION__);
-  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
-}
-
-ur_result_t urGraphIsEmptyExp(ur_exp_graph_handle_t hGraph, bool *hResult) {
-  (void)hGraph;
-  if (hResult)
-    *hResult = false;
-  UR_LOG(ERR, "{} function not implemented!", __FUNCTION__);
-  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
-}
-
-ur_result_t urGraphDumpContentsExp(ur_exp_graph_handle_t hGraph,
-                                   const char *filePath, void *pNext) {
-  (void)hGraph;
-  (void)filePath;
-  (void)pNext;
-  UR_LOG(ERR, "{} function not implemented!", __FUNCTION__);
-  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
-}
-
 } // namespace ur::level_zero

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

@@ -503,6 +503,15 @@ struct ur_queue_immediate_in_order_t : ur_object, ur_queue_t_ {
       *pResult = false;
     return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
   }
+  ur_result_t
+  queueInstantiateGraphExp(ur_exp_graph_handle_t hGraph,
+                           ur_exp_executable_graph_handle_t *phExecutableGraph,
+                           void *pProperties) override {
+    (void)hGraph;
+    (void)phExecutableGraph;
+    (void)pProperties;
+    return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
+  }
 
   ur::RefCount RefCount;
 };

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

@@ -557,6 +557,15 @@ struct ur_queue_immediate_out_of_order_t : ur_object, ur_queue_t_ {
       *pResult = false;
     return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
   }
+  ur_result_t
+  queueInstantiateGraphExp(ur_exp_graph_handle_t hGraph,
+                           ur_exp_executable_graph_handle_t *phExecutableGraph,
+                           void *pProperties) override {
+    (void)hGraph;
+    (void)phExecutableGraph;
+    (void)pProperties;
+    return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
+  }
 
   ur::RefCount RefCount;
 };