From bd228af5cf8618e4c8da2d6ca7f1f7da8bc590c3 Mon Sep 17 00:00:00 2001
From: Saili Karkare <128432136+penguin235@users.noreply.github.com>
Date: Wed, 7 Aug 2024 02:31:21 -0700
Subject: [PATCH] Updating hex addr printing (#1385)

This change changes the addresses that are printed when TrafficGen
DebugFlag is enabled. Previously, hex strings were printed without a
preceding 0x. This change fixes that to distinguish between decimal and
hex.
---
 src/cpu/testers/traffic_gen/dram_gen.cc     | 2 +-
 src/cpu/testers/traffic_gen/dram_rot_gen.cc | 2 +-
 src/cpu/testers/traffic_gen/hybrid_gen.cc   | 2 +-
 src/cpu/testers/traffic_gen/linear_gen.cc   | 2 +-
 src/cpu/testers/traffic_gen/nvm_gen.cc      | 2 +-
 src/cpu/testers/traffic_gen/random_gen.cc   | 2 +-
 src/cpu/testers/traffic_gen/strided_gen.cc  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/cpu/testers/traffic_gen/dram_gen.cc b/src/cpu/testers/traffic_gen/dram_gen.cc
index 73f56fcf16..4511be4d18 100644
--- a/src/cpu/testers/traffic_gen/dram_gen.cc
+++ b/src/cpu/testers/traffic_gen/dram_gen.cc
@@ -124,7 +124,7 @@ DramGen::getNextPacket()
         }
     }
 
-    DPRINTF(TrafficGen, "DramGen::getNextPacket: %c to addr %x, "
+    DPRINTF(TrafficGen, "DramGen::getNextPacket: %c to addr %#x, "
             "size %d, countNumSeqPkts: %d, numSeqPkts: %d\n",
             isRead ? 'r' : 'w', addr, blocksize, countNumSeqPkts, numSeqPkts);
 
diff --git a/src/cpu/testers/traffic_gen/dram_rot_gen.cc b/src/cpu/testers/traffic_gen/dram_rot_gen.cc
index e9fb85c39c..d238120645 100644
--- a/src/cpu/testers/traffic_gen/dram_rot_gen.cc
+++ b/src/cpu/testers/traffic_gen/dram_rot_gen.cc
@@ -118,7 +118,7 @@ DramRotGen::getNextPacket()
         }
     }
 
-    DPRINTF(TrafficGen, "DramRotGen::getNextPacket: %c to addr %x, "
+    DPRINTF(TrafficGen, "DramRotGen::getNextPacket: %c to addr %#x, "
             "size %d, countNumSeqPkts: %d, numSeqPkts: %d\n",
             isRead ? 'r' : 'w', addr, blocksize, countNumSeqPkts, numSeqPkts);
 
diff --git a/src/cpu/testers/traffic_gen/hybrid_gen.cc b/src/cpu/testers/traffic_gen/hybrid_gen.cc
index 3be569bc56..f2ce9701aa 100644
--- a/src/cpu/testers/traffic_gen/hybrid_gen.cc
+++ b/src/cpu/testers/traffic_gen/hybrid_gen.cc
@@ -216,7 +216,7 @@ HybridGen::getNextPacket()
         }
     }
 
-    DPRINTF(TrafficGen, "HybridGen::getNextPacket: %c to addr %x, "
+    DPRINTF(TrafficGen, "HybridGen::getNextPacket: %c to addr %#x, "
             "size %d, countNumSeqPkts: %d, numSeqPkts: %d\n",
             isRead ? 'r' : 'w', addr, blocksize, countNumSeqPkts, numSeqPkts);
 
diff --git a/src/cpu/testers/traffic_gen/linear_gen.cc b/src/cpu/testers/traffic_gen/linear_gen.cc
index 7b90ba2836..8b5c52d0c3 100644
--- a/src/cpu/testers/traffic_gen/linear_gen.cc
+++ b/src/cpu/testers/traffic_gen/linear_gen.cc
@@ -64,7 +64,7 @@ LinearGen::getNextPacket()
     assert((readPercent == 0 && !isRead) || (readPercent == 100 && isRead) ||
            readPercent != 100);
 
-    DPRINTF(TrafficGen, "LinearGen::getNextPacket: %c to addr %x, size %d\n",
+    DPRINTF(TrafficGen, "LinearGen::getNextPacket: %c to addr %#x, size %d\n",
             isRead ? 'r' : 'w', nextAddr, blocksize);
 
     // Add the amount of data manipulated to the total
diff --git a/src/cpu/testers/traffic_gen/nvm_gen.cc b/src/cpu/testers/traffic_gen/nvm_gen.cc
index 2b43c87e16..053ac8f6c4 100644
--- a/src/cpu/testers/traffic_gen/nvm_gen.cc
+++ b/src/cpu/testers/traffic_gen/nvm_gen.cc
@@ -125,7 +125,7 @@ NvmGen::getNextPacket()
         }
     }
 
-    DPRINTF(TrafficGen, "NvmGen::getNextPacket: %c to addr %x, "
+    DPRINTF(TrafficGen, "NvmGen::getNextPacket: %c to addr %#x, "
             "size %d, countNumSeqPkts: %d, numSeqPkts: %d\n",
             isRead ? 'r' : 'w', addr, blocksize, countNumSeqPkts, numSeqPkts);
 
diff --git a/src/cpu/testers/traffic_gen/random_gen.cc b/src/cpu/testers/traffic_gen/random_gen.cc
index 8a692dcb4d..c1e2ac1fd4 100644
--- a/src/cpu/testers/traffic_gen/random_gen.cc
+++ b/src/cpu/testers/traffic_gen/random_gen.cc
@@ -69,7 +69,7 @@ RandomGen::getNextPacket()
     // round down to start address of block
     addr -= addr % blocksize;
 
-    DPRINTF(TrafficGen, "RandomGen::getNextPacket: %c to addr %x, size %d\n",
+    DPRINTF(TrafficGen, "RandomGen::getNextPacket: %c to addr %#x, size %d\n",
             isRead ? 'r' : 'w', addr, blocksize);
 
     // add the amount of data manipulated to the total
diff --git a/src/cpu/testers/traffic_gen/strided_gen.cc b/src/cpu/testers/traffic_gen/strided_gen.cc
index 073bac4f1a..0115cf3686 100644
--- a/src/cpu/testers/traffic_gen/strided_gen.cc
+++ b/src/cpu/testers/traffic_gen/strided_gen.cc
@@ -81,7 +81,7 @@ StridedGen::getNextPacket()
     assert((readPercent == 0 && !isRead) || (readPercent == 100 && isRead) ||
            readPercent != 100);
 
-    DPRINTF(TrafficGen, "StridedGen::getNextPacket: %c to addr %x, size %d\n",
+    DPRINTF(TrafficGen, "StridedGen::getNextPacket: %c to addr %#x, size %d\n",
             isRead ? 'r' : 'w', nextAddr, blocksize);
 
     // Add the amount of data manipulated to the total