Moved creating events to makeNative instead of the constructor

Author: Konrad Kusiak

source/adapters/hip/event.cpp

@@ -16,23 +16,13 @@
 ur_event_handle_t_::ur_event_handle_t_(ur_command_t Type,
                                        ur_context_handle_t Context,
                                        ur_queue_handle_t Queue,
-                                       hipStream_t Stream, uint32_t StreamToken)
+                                       hipEvent_t EvEnd, hipEvent_t EvQueued,
+                                       hipEvent_t EvStart, hipStream_t Stream,
+                                       uint32_t StreamToken)
     : CommandType{Type}, RefCount{1}, HasOwnership{true},
       HasBeenWaitedOn{false}, IsRecorded{false}, IsStarted{false},
-      StreamToken{StreamToken}, EventId{0}, EvEnd{nullptr}, EvStart{nullptr},
-      EvQueued{nullptr}, Queue{Queue}, Stream{Stream}, Context{Context} {
-
-  bool ProfilingEnabled =
-      Queue->URFlags & UR_QUEUE_FLAG_PROFILING_ENABLE || isTimestampEvent();
-
-  UR_CHECK_ERROR(hipEventCreateWithFlags(
-      &EvEnd, ProfilingEnabled ? hipEventDefault : hipEventDisableTiming));
-
-  if (ProfilingEnabled) {
-    UR_CHECK_ERROR(hipEventCreateWithFlags(&EvQueued, hipEventDefault));
-    UR_CHECK_ERROR(hipEventCreateWithFlags(&EvStart, hipEventDefault));
-  }
-
+      StreamToken{StreamToken}, EventId{0}, EvEnd{EvEnd}, EvQueued{EvQueued},
+      EvStart{EvStart}, Queue{Queue}, Stream{Stream}, Context{Context} {
   urQueueRetain(Queue);
   urContextRetain(Context);
 }
@@ -62,7 +52,7 @@ ur_result_t ur_event_handle_t_::start() {
     if (Queue->URFlags & UR_QUEUE_FLAG_PROFILING_ENABLE || isTimestampEvent()) {
       // NOTE: This relies on the default stream to be unused.
       UR_CHECK_ERROR(hipEventRecord(EvQueued, 0));
-      UR_CHECK_ERROR(hipEventRecord(EvStart, Queue->get()));
+      UR_CHECK_ERROR(hipEventRecord(EvStart, Stream));
     }
   } catch (ur_result_t Error) {
     Result = Error;

source/adapters/hip/event.hpp

@@ -80,8 +80,20 @@ struct ur_event_handle_t_ {
   static ur_event_handle_t
   makeNative(ur_command_t Type, ur_queue_handle_t Queue, hipStream_t Stream,
              uint32_t StreamToken = std::numeric_limits<uint32_t>::max()) {
-    return new ur_event_handle_t_(Type, Queue->getContext(), Queue, Stream,
-                                  StreamToken);
+    const bool RequiresTimings =
+        Queue->URFlags & UR_QUEUE_FLAG_PROFILING_ENABLE ||
+        Type == UR_COMMAND_TIMESTAMP_RECORDING_EXP;
+    native_type EvEnd{nullptr}, EvQueued{nullptr}, EvStart{nullptr};
+    UR_CHECK_ERROR(hipEventCreateWithFlags(
+        &EvEnd, RequiresTimings ? hipEventDefault : hipEventDisableTiming));
+
+    if (RequiresTimings) {
+      UR_CHECK_ERROR(hipEventCreateWithFlags(&EvQueued, hipEventDefault));
+      UR_CHECK_ERROR(hipEventCreateWithFlags(&EvStart, hipEventDefault));
+    }
+
+    return new ur_event_handle_t_(Type, Queue->getContext(), Queue, EvEnd,
+                                  EvQueued, EvStart, Stream, StreamToken);
   }
 
   static ur_event_handle_t makeWithNative(ur_context_handle_t context,