Add UR_PROFILING_INFO_COMMAND_COMPLETE to ur_profling_info_t.

Author: martygrant

include/ur.py

@@ -1652,6 +1652,9 @@ class ur_profiling_info_v(IntEnum):
                                                     ## when the event starts execution
     COMMAND_END = 3                                 ## [uint64_t] A 64-bit value of current device counter in nanoseconds
                                                     ## when the event has finished execution
+    COMMAND_COMPLETE = 4                            ## [uint64_t] A 64-bit value of current device counter in nanoseconds
+                                                    ## when the event and any child events enqueued by this event on the
+                                                    ## device have finished execution
 
 class ur_profiling_info_t(c_int):
     def __str__(self):

include/ur_api.h

@@ -4369,14 +4369,17 @@ typedef enum ur_event_info_t {
 ///////////////////////////////////////////////////////////////////////////////
 /// @brief Profiling query information type
 typedef enum ur_profiling_info_t {
-    UR_PROFILING_INFO_COMMAND_QUEUED = 0, ///< [uint64_t] A 64-bit value of current device counter in nanoseconds
-                                          ///< when the event is enqueued
-    UR_PROFILING_INFO_COMMAND_SUBMIT = 1, ///< [uint64_t] A 64-bit value of current device counter in nanoseconds
-                                          ///< when the event is submitted
-    UR_PROFILING_INFO_COMMAND_START = 2,  ///< [uint64_t] A 64-bit value of current device counter in nanoseconds
-                                          ///< when the event starts execution
-    UR_PROFILING_INFO_COMMAND_END = 3,    ///< [uint64_t] A 64-bit value of current device counter in nanoseconds
-                                          ///< when the event has finished execution
+    UR_PROFILING_INFO_COMMAND_QUEUED = 0,   ///< [uint64_t] A 64-bit value of current device counter in nanoseconds
+                                            ///< when the event is enqueued
+    UR_PROFILING_INFO_COMMAND_SUBMIT = 1,   ///< [uint64_t] A 64-bit value of current device counter in nanoseconds
+                                            ///< when the event is submitted
+    UR_PROFILING_INFO_COMMAND_START = 2,    ///< [uint64_t] A 64-bit value of current device counter in nanoseconds
+                                            ///< when the event starts execution
+    UR_PROFILING_INFO_COMMAND_END = 3,      ///< [uint64_t] A 64-bit value of current device counter in nanoseconds
+                                            ///< when the event has finished execution
+    UR_PROFILING_INFO_COMMAND_COMPLETE = 4, ///< [uint64_t] A 64-bit value of current device counter in nanoseconds
+                                            ///< when the event and any child events enqueued by this event on the
+                                            ///< device have finished execution
     /// @cond
     UR_PROFILING_INFO_FORCE_UINT32 = 0x7fffffff
     /// @endcond
@@ -4434,7 +4437,7 @@ urEventGetInfo(
 ///     - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
 ///         + `NULL == hEvent`
 ///     - ::UR_RESULT_ERROR_INVALID_ENUMERATION
-///         + `::UR_PROFILING_INFO_COMMAND_END < propName`
+///         + `::UR_PROFILING_INFO_COMMAND_COMPLETE < propName`
 ///     - ::UR_RESULT_ERROR_INVALID_VALUE
 ///         + `pPropValue && propSize == 0`
 ///     - ::UR_RESULT_ERROR_INVALID_EVENT

scripts/core/event.yml

@@ -122,6 +122,8 @@ etors:
       desc: "[uint64_t] A 64-bit value of current device counter in nanoseconds when the event starts execution"
     - name: COMMAND_END
       desc: "[uint64_t] A 64-bit value of current device counter in nanoseconds when the event has finished execution"
+    - name: COMMAND_COMPLETE
+      desc: "[uint64_t] A 64-bit value of current device counter in nanoseconds when the event and any child events enqueued by this event on the device have finished execution"
 --- #--------------------------------------------------------------------------
 type: function
 desc: "Get event object information"

source/common/ur_params.hpp

@@ -7542,6 +7542,10 @@ inline std::ostream &operator<<(std::ostream &os,
     case UR_PROFILING_INFO_COMMAND_END:
         os << "UR_PROFILING_INFO_COMMAND_END";
         break;
+
+    case UR_PROFILING_INFO_COMMAND_COMPLETE:
+        os << "UR_PROFILING_INFO_COMMAND_COMPLETE";
+        break;
     default:
         os << "unknown enumerator";
         break;
@@ -7614,6 +7618,20 @@ inline void serializeTagged(std::ostream &os, const void *ptr,
 
         os << ")";
     } break;
+
+    case UR_PROFILING_INFO_COMMAND_COMPLETE: {
+        const uint64_t *tptr = (const uint64_t *)ptr;
+        if (sizeof(uint64_t) > size) {
+            os << "invalid size (is: " << size
+               << ", expected: >=" << sizeof(uint64_t) << ")";
+            return;
+        }
+        os << (void *)(tptr) << " (";
+
+        os << *tptr;
+
+        os << ")";
+    } break;
     default:
         os << "unknown enumerator";
         break;

source/loader/layers/validation/ur_valddi.cpp

@@ -3186,7 +3186,7 @@ __urdlllocal ur_result_t UR_APICALL urEventGetProfilingInfo(
             return UR_RESULT_ERROR_INVALID_NULL_HANDLE;
         }
 
-        if (UR_PROFILING_INFO_COMMAND_END < propName) {
+        if (UR_PROFILING_INFO_COMMAND_COMPLETE < propName) {
             return UR_RESULT_ERROR_INVALID_ENUMERATION;
         }
 

source/loader/ur_libapi.cpp

@@ -3525,7 +3525,7 @@ ur_result_t UR_APICALL urEventGetInfo(
 ///     - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
 ///         + `NULL == hEvent`
 ///     - ::UR_RESULT_ERROR_INVALID_ENUMERATION
-///         + `::UR_PROFILING_INFO_COMMAND_END < propName`
+///         + `::UR_PROFILING_INFO_COMMAND_COMPLETE < propName`
 ///     - ::UR_RESULT_ERROR_INVALID_VALUE
 ///         + `pPropValue && propSize == 0`
 ///     - ::UR_RESULT_ERROR_INVALID_EVENT

source/ur_api.cpp

@@ -2946,7 +2946,7 @@ ur_result_t UR_APICALL urEventGetInfo(
 ///     - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
 ///         + `NULL == hEvent`
 ///     - ::UR_RESULT_ERROR_INVALID_ENUMERATION
-///         + `::UR_PROFILING_INFO_COMMAND_END < propName`
+///         + `::UR_PROFILING_INFO_COMMAND_COMPLETE < propName`
 ///     - ::UR_RESULT_ERROR_INVALID_VALUE
 ///         + `pPropValue && propSize == 0`
 ///     - ::UR_RESULT_ERROR_INVALID_EVENT