add one more test and fix

Signed-off-by: Tikhomirova, Kseniya <[email protected]>

Author: KseniyaTikhomirova

sycl/source/detail/scheduler/commands.cpp

@@ -2094,7 +2094,7 @@ std::pair<xpti_td *, uint64_t> emitKernelInstrumentationData(
 void ExecCGCommand::emitInstrumentationData() {
 #ifdef XPTI_ENABLE_INSTRUMENTATION
   constexpr uint16_t NotificationTraceType = xpti::trace_node_create;
-  if (!xptiCheckTraceEnabled(MStreamID, NotificationTraceType))
+  if (!xptiCheckTraceEnabled(MStreamID))
     return;
 
   std::string KernelName;
@@ -3200,7 +3200,7 @@ void KernelFusionCommand::resetQueue() {
 void KernelFusionCommand::emitInstrumentationData() {
 #ifdef XPTI_ENABLE_INSTRUMENTATION
   constexpr uint16_t NotificationTraceType = xpti::trace_node_create;
-  if (!xptiCheckTraceEnabled(MStreamID, NotificationTraceType)) {
+  if (!xptiCheckTraceEnabled(MStreamID)) {
     return;
   }
   // Create a payload with the command name and an event using this payload to

sycl/test-e2e/Tracing/task_execution_handler.cpp

@@ -0,0 +1,47 @@
+// REQUIRES: cpu
+// UNSUPPORTED: windows
+// RUN: %{build} -o %t.out
+// RUN: %{run} sycl-trace --sycl --print-format=verbose %t.out | FileCheck %s
+
+#include <sycl/sycl.hpp>
+
+int main() {
+  {
+    sycl::queue Q;
+    unsigned char *AllocSrc = (unsigned char *)sycl::malloc_device(1, Q);
+    unsigned char *AllocDst = (unsigned char *)sycl::malloc_device(1, Q);
+    Q.submit([&](sycl::handler &cgh)
+
+             { cgh.memset(AllocSrc, 0, 1); })
+        .wait();
+    // CHECK: [SYCL] Task begin (event={{.*}},instanceID={{.*}})
+    // CHECK-DAG:          queue_id : 0
+    // CHECK-DAG:          sym_column_no : {{.*}}
+    // CHECK-DAG:          sym_function_name : {{.*}}
+    // CHECK-DAG:          kernel_name : {{.*}}
+    // CHECK-DAG:          sym_source_file_name : {{.*}}/task_execution_handler.cpp
+    // CHECK-DAG:          sycl_device_name : {{.*}}
+    // CHECK-DAG:          sycl_device_type : {{.*}}
+    // CHECK-DAG:          sym_line_no : {{.*}}
+    // CHECK-DAG:          sycl_device : {{.*}}
+    // CHECK-NEXT: [SYCL] Task end   (event={{.*}},instanceID={{.*}})
+    // CHECK-NEXT: [SYCL] Task begin (event={{.*}},instanceID={{.*}})
+    // CHECK-DAG:          queue_id : 0
+    // CHECK-DAG:          sym_column_no : {{.*}}
+    // CHECK-DAG:          sym_function_name : {{.*}}
+    // CHECK-DAG:          kernel_name : {{.*}}
+    // CHECK-DAG:          sym_source_file_name : {{.*}}/task_execution_handler.cpp
+    // CHECK-DAG:          sycl_device_name : {{.*}}
+    // CHECK-DAG:          sycl_device_type : {{.*}}
+    // CHECK-DAG:          sym_line_no : {{.*}}
+    // CHECK-DAG:          sycl_device : {{.*}}
+    // CHECK-NEXT: [SYCL] Task end   (event={{.*}},instanceID={{.*}})
+    Q.submit([&](sycl::handler &cgh)
+
+             { cgh.memcpy(AllocDst, AllocSrc, 1); })
+        .wait();
+    sycl::free(AllocSrc, Q);
+    sycl::free(AllocDst, Q);
+  }
+  return 0;
+}