[SYCL][XPTI] Addressing review feedback

Signed-off-by: Vasanth Tovinkere <[email protected]>

Author: tovinkere

sycl/source/detail/queue_impl.cpp

@@ -679,11 +679,9 @@ void queue_impl::wait(const detail::code_location &CodeLoc) {
 void queue_impl::constructorNotification() {
 #if XPTI_ENABLE_INSTRUMENTATION
   if (xptiTraceEnabled()) {
-    // Making it ABI compatible and not removing the member variable
-    MStreamID = detail::GSYCLStreamID;
     constexpr uint16_t NotificationTraceType =
         static_cast<uint16_t>(xpti::trace_point_type_t::queue_create);
-    if (xptiCheckTraceEnabled(MStreamID, NotificationTraceType)) {
+    if (xptiCheckTraceEnabled(detail::GSYCLStreamID, NotificationTraceType)) {
       xpti::utils::StringHelper SH;
       std::string AddrStr = SH.addressAsString<size_t>(MQueueID);
       std::string QueueName = SH.nameWithAddressString("queue", AddrStr);
@@ -711,9 +709,10 @@ void queue_impl::constructorNotification() {
                         reinterpret_cast<size_t>(getHandleRef()));
       // Also publish to TLS before notification
       xpti::framework::stash_tuple(XPTI_QUEUE_INSTANCE_ID_KEY, MQueueID);
-      xptiNotifySubscribers(
-          MStreamID, (uint16_t)xpti::trace_point_type_t::queue_create, nullptr,
-          TEvent, MInstanceID, static_cast<const void *>("queue_create"));
+      xptiNotifySubscribers(detail::GSYCLStreamID,
+                            (uint16_t)xpti::trace_point_type_t::queue_create,
+                            nullptr, TEvent, MInstanceID,
+                            static_cast<const void *>("queue_create"));
     }
   }
 #endif
@@ -723,10 +722,10 @@ void queue_impl::destructorNotification() {
 #if XPTI_ENABLE_INSTRUMENTATION
   constexpr uint16_t NotificationTraceType =
       static_cast<uint16_t>(xpti::trace_point_type_t::queue_destroy);
-  if (xptiCheckTraceEnabled(MStreamID, NotificationTraceType)) {
+  if (xptiCheckTraceEnabled(detail::GSYCLStreamID, NotificationTraceType)) {
     // Use the cached trace event, stream id and instance IDs for the
     // destructor
-    xptiNotifySubscribers(MStreamID, NotificationTraceType, nullptr,
+    xptiNotifySubscribers(detail::GSYCLStreamID, NotificationTraceType, nullptr,
                           (xpti::trace_event_data_t *)MTraceEvent, MInstanceID,
                           static_cast<const void *>("queue_destroy"));
     xptiReleaseEvent((xpti::trace_event_data_t *)MTraceEvent);

sycl/source/detail/queue_impl.hpp

@@ -105,7 +105,7 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
   queue_impl(device_impl &Device, const async_handler &AsyncHandler,
              const property_list &PropList, private_tag tag)
       : queue_impl(Device, getDefaultOrNew(Device), AsyncHandler, PropList,
-                   tag) {};
+                   tag){};
 
   /// Constructs a SYCL queue with an async_handler and property_list provided
   /// form a device and a context.
@@ -278,7 +278,8 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
     ur_native_handle_t nativeHandle = 0;
     getAdapter().call<UrApiKind::urQueueGetNativeHandle>(MQueue, nullptr,
                                                          &nativeHandle);
-    __SYCL_OCL_CALL(clRetainCommandQueue, ur::cast<cl_command_queue>(nativeHandle));
+    __SYCL_OCL_CALL(clRetainCommandQueue,
+                    ur::cast<cl_command_queue>(nativeHandle));
     return ur::cast<cl_command_queue>(nativeHandle);
   }
 
@@ -1036,8 +1037,6 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
   // to ensure we have the same object layout when the macro in the library and
   // SYCL app are not the same.
   void *MTraceEvent = nullptr;
-  /// The stream under which the traces are emitted from the queue object
-  uint8_t MStreamID = 0;
   /// The instance ID of the trace event for queue object
   uint64_t MInstanceID = 0;
 

sycl/test-e2e/XPTI/basic_event_collection_linux.cpp

@@ -10,12 +10,12 @@
 // CHECK-DAG: xptiTraceInit: Stream Name = sycl.experimental.image
 // CHECK-DAG: xptiTraceInit: Stream Name = sycl.experimental.mem_alloc
 // CHECK-DAG: xptiTraceInit: Stream Name = ur.api
-// CHECK-DAG: xptiTraceInit: Stream Name = ur.call
-// CHECK-DAG:  Graph create
-// CHECK-DAG:  UR Call Begin : urPlatformGet
-// CHECK-DAG:  UR Call Begin : urContextCreate
-// CHECK-DAG:  UR Call Begin : urQueueCreate
-// CHECK-DAG:  UR Call Begin : urDeviceSelectBinary
+// CHECK:      Graph create
+// CHECK:     xptiTraceInit: Stream Name = ur.call
+// CHECK:      UR Call Begin : urPlatformGet
+// CHECK:      UR Call Begin : urContextCreate
+// CHECK:      UR Call Begin : urQueueCreate
+// CHECK:      UR Call Begin : urDeviceSelectBinary
 // CHECK:      UR Call Begin : urKernelCreate
 // CHECK-NEXT: UR Call Begin : urPlatformGetInfo
 // CHECK-NEXT: UR Call Begin : urPlatformGetInfo