[gem5-dev] changeset in gem5: cpu: TraceGen fix for tick frequency check

[Matteo Andreozzi]

changeset bfc1285c61eb in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=bfc1285c61eb
description:
        cpu: TraceGen fix for tick frequency check

        Bug fix for check on protobuf file frequency being different than
        global frequency.

        The ASCII encoder script is also fixed, and the example trace used in
        the regressions is updated.

diffstat:

 src/cpu/testers/traffic_gen/generators.cc  |  8 +++-----
 tests/quick/se/70.tgen/tgen-simple-mem.trc |  4 ++--
 util/encode_packet_trace.py                |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diffs (40 lines):

diff -r ef6e57ac0d70 -r bfc1285c61eb src/cpu/testers/traffic_gen/generators.cc
--- a/src/cpu/testers/traffic_gen/generators.cc Tue Feb 23 11:49:35 2016 +0000
+++ b/src/cpu/testers/traffic_gen/generators.cc Wed Feb 24 04:16:55 2016 -0500
@@ -420,11 +420,9 @@
     ProtoMessage::PacketHeader header_msg;
     if (!trace.read(header_msg)) {
         panic("Failed to read packet header from trace\n");
-
-        if (header_msg.tick_freq() != SimClock::Frequency) {
-            panic("Trace was recorded with a different tick frequency %d\n",
-                  header_msg.tick_freq());
-        }
+    } else if (header_msg.tick_freq() != SimClock::Frequency) {
+        panic("Trace was recorded with a different tick frequency %d\n",
+              header_msg.tick_freq());
     }
 }
 
diff -r ef6e57ac0d70 -r bfc1285c61eb tests/quick/se/70.tgen/tgen-simple-mem.trc
--- a/tests/quick/se/70.tgen/tgen-simple-mem.trc        Tue Feb 23 11:49:35 
2016 +0000
+++ b/tests/quick/se/70.tgen/tgen-simple-mem.trc        Wed Feb 24 04:16:55 
2016 -0500
@@ -1,2 +1,2 @@
-gem51
-)Converted ASCII trace tgen-simple-mem.trc€”ëÜè
犍      @ ïý @
\ No newline at end of file
+gem5)
+ Converted ASCII trace output.txt€ ”¥è
犍      @ ïý @
\ No newline at end of file
diff -r ef6e57ac0d70 -r bfc1285c61eb util/encode_packet_trace.py
--- a/util/encode_packet_trace.py       Tue Feb 23 11:49:35 2016 +0000
+++ b/util/encode_packet_trace.py       Wed Feb 24 04:16:55 2016 -0500
@@ -105,7 +105,7 @@
     header = packet_pb2.PacketHeader()
     header.obj_id = "Converted ASCII trace " + sys.argv[1]
     # Assume the default tick rate
-    header.tick_freq = 1000000000
+    header.tick_freq = 1000000000000
     protolib.encodeMessage(proto_out, header)
 
     # For each line in the ASCII trace, create a packet message and
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev