fixed mixed output of adapter and regular traces

Fixed oneapi-src#2002 issue. Regular UR tracing prints now calls in two separate lines like PI does.
lslusarczyk · Sep 20, 2024 · 12e0cee · 12e0cee
1 parent 7384e2d
commit 12e0cee
Show file tree

Hide file tree

Showing 3 changed files with 2,569 additions and 1,015 deletions.
diff --git a/scripts/templates/trcddi.cpp.mako b/scripts/templates/trcddi.cpp.mako
@@ -46,17 +46,22 @@ namespace ur_tracing_layer
         uint64_t instance = getContext()->notify_begin(${th.make_func_etor(n, tags, obj)}, "${th.make_func_name(n, tags, obj)}", &params);
 
         auto &logger = getContext()->logger;
+        const bool should_log = (logger.getLevel() <= logger::Level::INFO);
 
-        logger.info("---> ${th.make_func_name(n, tags, obj)}");
+        if (should_log) {
+            std::ostringstream args_str_before;
+            ur::extras::printFunctionParams(args_str_before, ${th.make_func_etor(n, tags, obj)}, &params);
+            logger.info("   ---> ${th.make_func_name(n, tags, obj)}({})\n", args_str_before.str());
+        }
 
         ${x}_result_t result = ${th.make_pfn_name(n, tags, obj)}( ${", ".join(th.make_param_lines(n, tags, obj, format=["name"]))} );
 
         getContext()->notify_end(${th.make_func_etor(n, tags, obj)}, "${th.make_func_name(n, tags, obj)}", &params, &result, instance);
 
-        if (logger.getLevel() <= logger::Level::INFO) {
-            std::ostringstream args_str;
-            ur::extras::printFunctionParams(args_str, ${th.make_func_etor(n, tags, obj)}, &params);
-            logger.info("({}) -> {};\n", args_str.str(), result);
+        if (should_log) {
+            std::ostringstream args_str_after;
+            ur::extras::printFunctionParams(args_str_after, ${th.make_func_etor(n, tags, obj)}, &params);
+            logger.info("   <--- ${th.make_func_name(n, tags, obj)}({}) -> {};\n", args_str_after.str(), result);
         }
 
         return result;