Address feedback

Author: uditagarwal97

sycl/source/detail/kernel_program_cache.hpp

@@ -179,47 +179,50 @@ class KernelProgramCache {
 
   void setContextPtr(const ContextPtr &AContext) { MParentContext = AContext; }
 
-  /* Sends message to std:cerr stream when SYCL_CACHE_TRACE environemnt is
-   * set.*/
+  // Sends message to std:cerr stream when SYCL_CACHE_TRACE environemnt is
+  // set.
   static inline void traceProgram(const std::string &Msg,
                                   const ProgramCacheKeyT &CacheKey) {
     static const bool traceEnabled =
         SYCLConfig<SYCL_CACHE_TRACE>::isTraceInMemCache();
-    if (traceEnabled) {
 
-      int ImageId = CacheKey.first.second;
-      std::stringstream DeviceList;
-      for (const auto &Device : CacheKey.second)
-        DeviceList << "0x" << std::setbase(16)
-                   << reinterpret_cast<uintptr_t>(Device) << ",";
+    if (!traceEnabled)
+      return;
 
-      std::string Identifier = "[Key:{imageId = " + std::to_string(ImageId) +
-                               ",urDevice = " + DeviceList.str() + "}]: ";
+    int ImageId = CacheKey.first.second;
+    std::stringstream DeviceList;
+    for (const auto &Device : CacheKey.second)
+      DeviceList << "0x" << std::setbase(16)
+                 << reinterpret_cast<uintptr_t>(Device) << ",";
 
-      // Get TID of current thread.
-      thread_local std::thread::id this_id = std::this_thread::get_id();
-      std::cerr << "[In-Memory Cache][Thread Id:" << this_id
-                << "][Program Cache]" << Identifier << Msg << std::endl;
-    }
+    std::string Identifier = "[Key:{imageId = " + std::to_string(ImageId) +
+                             ",urDevice = " + DeviceList.str() + "}]: ";
+
+    // Get TID of current thread.
+    thread_local std::thread::id this_id = std::this_thread::get_id();
+    std::cerr << "[In-Memory Cache][Thread Id:" << this_id << "][Program Cache]"
+              << Identifier << Msg << std::endl;
   }
 
-  /* Sends message to std:cerr stream when SYCL_CACHE_TRACE environemnt is
-   * set.*/
+  // Sends message to std:cerr stream when SYCL_CACHE_TRACE environemnt is
+  // set.
   static inline void traceKernel(const std::string &Msg,
                                  const std::string &KernelName,
                                  bool IsKernelFastCache = false) {
     static const bool traceEnabled =
         SYCLConfig<SYCL_CACHE_TRACE>::isTraceInMemCache();
-    if (traceEnabled) {
-      std::string Identifier =
-          "[IsFastCache: " + std::to_string(IsKernelFastCache) +
-          "][Key:{Name = " + KernelName + "}]: ";
-
-      // Get TID of current thread.
-      thread_local std::thread::id this_id = std::this_thread::get_id();
-      std::cerr << "[In-Memory Cache][Thread Id:" << this_id
-                << "][Kernel Cache]" << Identifier << Msg << std::endl;
-    }
+
+    if (!traceEnabled)
+      return;
+
+    std::string Identifier =
+        "[IsFastCache: " + std::to_string(IsKernelFastCache) +
+        "][Key:{Name = " + KernelName + "}]: ";
+
+    // Get TID of current thread.
+    thread_local std::thread::id this_id = std::this_thread::get_id();
+    std::cerr << "[In-Memory Cache][Thread Id:" << this_id << "][Kernel Cache]"
+              << Identifier << Msg << std::endl;
   }
 
   Locked<ProgramCache> acquireCachedPrograms() {

sycl/test-e2e/KernelAndProgram/trace_kernel_program_cache.cpp

@@ -5,15 +5,13 @@
 // There should be no tracing output when SYCL_CACHE_IN_MEM is not set
 // or SYCL_CACHE_TRACE is set to 0.
 
-// RUN: env SYCL_CACHE_IN_MEM=0 %{run} %t.out \
-// RUN: | FileCheck --allow-empty --check-prefix=CHECK-NO-TRACE %s
-// RUN: env SYCL_CACHE_TRACE=0 %{run} %t.out \
-// RUN: | FileCheck --allow-empty --check-prefix=CHECK-NO-TRACE %s
+// RUN: env SYCL_CACHE_IN_MEM=0 %{run} %t.out 2> %t.trace1
+// RUN: FileCheck --allow-empty --input-file=%t.trace1 --implicit-check-not "In-Memory Cache" %s
+// RUN: env SYCL_CACHE_TRACE=0 %{run} %t.out 2> %t.trace2
+// RUN: FileCheck --allow-empty --input-file=%t.trace2 --implicit-check-not "In-Memory Cache" %s
 
-// CHECK-NO-TRACE-NOT: [In-Memory Cache]{{.*}}
-
-// RUN: env SYCL_CACHE_TRACE=2 %{run} %t.out 2> %t.trace
-// RUN: FileCheck %s --input-file=%t.trace --check-prefix=CHECK-CACHE-TRACE
+// RUN: env SYCL_CACHE_TRACE=2 %{run} %t.out 2> %t.trace3
+// RUN: FileCheck %s --input-file=%t.trace3 --check-prefix=CHECK-CACHE-TRACE
 
 #include <sycl/detail/core.hpp>