From 1a90ad52ac213bb218a0e52c7937474839ee2c3b Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Mon, 17 Apr 2023 15:50:17 -0700
Subject: [PATCH] Cleanup tracer debug prints

---
 src/main/scala/tilelink/Coalescing.scala | 30 ++++++++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/tilelink/Coalescing.scala b/src/main/scala/tilelink/Coalescing.scala
index 15271ea..9d0adc1 100644
--- a/src/main/scala/tilelink/Coalescing.scala
+++ b/src/main/scala/tilelink/Coalescing.scala
@@ -672,15 +672,15 @@ class MemTraceDriverImp(outer: MemTraceDriver, numLanes: Int, traceFile: String)
     val bits = Mux(req.is_store, pbits, gbits)
 
     when(tlOut.a.valid) {
-      printf(
-        "MemTraceDriver: TL addr=%x, size=%d, mask=%x, store=%d, tlData=%x, reqData=%x\n",
+      TracePrintf(
+        "MemTraceDriver",
         tlOut.a.bits.address,
         tlOut.a.bits.size,
         tlOut.a.bits.mask,
         req.is_store,
         tlOut.a.bits.data,
         req.data
-      );
+      )
     }
 
     assert(legal, "illegal TL req gen")
@@ -818,8 +818,8 @@ class MemTraceLogger(numLanes: Int = 4, filename: String = "vecadd.core1.thread4
       req.data := mask & (tlIn.a.bits.data >> (trailingZerosInMask * 8.U))
 
       when(req.valid) {
-        printf(
-          "MemTraceLogger: TL addr=%x, size=%d, mask=%x, store=%d, tlData=%x, reqData=%x\n",
+        TracePrintf(
+          "MemTraceLogger",
           tlIn.a.bits.address,
           tlIn.a.bits.size,
           tlIn.a.bits.mask,
@@ -885,6 +885,26 @@ class SimMemTraceLogger(filename: String, numLanes: Int)
   addResource("/csrc/SimMemTraceLogger.h")
 }
 
+class TracePrintf {}
+
+object TracePrintf {
+  def apply(
+      printer: String,
+      address: UInt,
+      size: UInt,
+      mask: UInt,
+      is_store: Bool,
+      tlData: UInt,
+      reqData: UInt
+  ) = {
+    printf(s"${printer}: TL addr=%x, size=%d, mask=%x, store=%d", address, size, mask, is_store)
+    when(is_store) {
+      printf(", tlData=%x, reqData=%x", tlData, reqData)
+    }
+    printf("\n")
+  }
+}
+
 // Synthesizable unit tests
 
 // tracedriver --> coalescer --> tracelogger --> tlram