From 02ce969c6712ebc804f754d320072c9ada65f711 Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Mon, 17 Apr 2023 18:52:38 -0700
Subject: [PATCH] Fix width mismatch for source logger

---
 src/main/resources/csrc/SimMemTraceLogger.cc |  2 +-
 src/main/scala/tilelink/Coalescing.scala     | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/csrc/SimMemTraceLogger.cc b/src/main/resources/csrc/SimMemTraceLogger.cc
index 75a1822..6df995c 100644
--- a/src/main/resources/csrc/SimMemTraceLogger.cc
+++ b/src/main/resources/csrc/SimMemTraceLogger.cc
@@ -35,7 +35,7 @@ MemTraceWriter::~MemTraceWriter() {
 }
 
 void MemTraceWriter::write_line_to_trace(const MemTraceLine line) {
-  fprintf(outfile, "%ld %s %d %d %d, 0x%lx 0x%lx %u\n", line.cycle,
+  fprintf(outfile, "%ld %s %d %d %d 0x%lx 0x%lx %u\n", line.cycle,
           (line.is_store ? "STORE" : "LOAD"), line.core_id, line.lane_id,
           line.source, line.address, line.data, (1u << line.log_data_size));
 }
diff --git a/src/main/scala/tilelink/Coalescing.scala b/src/main/scala/tilelink/Coalescing.scala
index 4ff21dd..b892c1e 100644
--- a/src/main/scala/tilelink/Coalescing.scala
+++ b/src/main/scala/tilelink/Coalescing.scala
@@ -824,6 +824,7 @@ class MemTraceLogger(
         req.size := tlIn.a.bits.size
         req.is_store := tlAOpcodeIsStore(tlIn.a.bits.opcode)
         req.source := tlIn.a.bits.source
+        printf("======== req.source=%d\n", req.source)
         // TL always carries the exact unaligned address that the client
         // originally requested, so no postprocessing required
         req.address := tlIn.a.bits.address
@@ -863,6 +864,7 @@ class MemTraceLogger(
         resp.size := tlOut.d.bits.size
         resp.is_store := tlDOpcodeIsStore(tlOut.d.bits.opcode)
         resp.source := tlOut.d.bits.source
+        printf("======== resp.source=%d\n", resp.source)
         // NOTE: TL D channel doesn't carry address nor mask, so there's no easy
         // way to figure out which bytes the master actually use.  Since we
         // don't care too much about addresses in the trace anyway, just store
@@ -876,19 +878,19 @@ class MemTraceLogger(
     // assignment to a bitfield range of a wide signal.
     def flattenTrace(traceLogIO: Bundle with HasTraceLine, perLane: Vec[TraceLine]) = {
       // these will get optimized out
-      val vecValid = Wire(Vec(numLanes, Bool()))
-      val vecSource = Wire(Vec(numLanes, Bool()))
+      val vecValid = Wire(Vec(numLanes, chiselTypeOf(perLane(0).valid)))
+      val vecSource = Wire(Vec(numLanes, chiselTypeOf(perLane(0).source)))
       val vecAddress = Wire(Vec(numLanes, chiselTypeOf(perLane(0).address)))
       val vecIsStore = Wire(Vec(numLanes, chiselTypeOf(perLane(0).is_store)))
       val vecSize = Wire(Vec(numLanes, chiselTypeOf(perLane(0).size)))
       val vecData = Wire(Vec(numLanes, chiselTypeOf(perLane(0).data)))
-      perLane.zipWithIndex.foreach { case (req, i) =>
-        vecValid(i) := req.valid
-        vecSource(i) := req.source
-        vecAddress(i) := req.address
-        vecIsStore(i) := req.is_store
-        vecSize(i) := req.size
-        vecData(i) := req.data
+      perLane.zipWithIndex.foreach { case (l, i) =>
+        vecValid(i) := l.valid
+        vecSource(i) := l.source
+        vecAddress(i) := l.address
+        vecIsStore(i) := l.is_store
+        vecSize(i) := l.size
+        vecData(i) := l.data
       }
       traceLogIO.valid := vecValid.asUInt
       traceLogIO.source := vecSource.asUInt