Move away from using the statusChange function on snoops. Clean up snooping code...

[gem5.git] / util / tracediff

diff --git a/util/tracediff b/util/tracediff
index a95ce8b824a9ed127f09f445dc8e17e1ce64e2b4..f2377a9993c6ba5f92fe13a3cd31a847987685f0 100755 (executable)
--- a/util/tracediff
+++ b/util/tracediff
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright (c) 2003-2004 The Regents of The University of Michigan
+# Copyright (c) 2003-2006 The Regents of The University of Michigan
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -30,17 +30,17 @@
 # Script to simplify using rundiff on trace outputs from two
 # invocations of m5.
 #
-# Note that you need to enable some trace flags in the args in order
-# to do anything useful!
+# ******Note that you need to enable some trace flags in the args in order
+# to do anything useful!******
 #
 # If you want to pass different arguments to the two instances of m5,
 # you can embed them in the simulator arguments like this:
 #
-# % tracediff "m5.opt --foo:bar=1" "m5.opt --foo:bar=2" [common args]
+# % tracediff "m5.opt --option1" "m5.opt --option2" [common args]
 #
 
 if (@ARGV < 2) {
-    die "Usage: tracediff sim1 sim2 [--trace:flags=X args...]\n";
+    die "Usage: tracediff sim1 sim2 [--root.trace.flags=X args...]\n";
 }
 
 # First two args are the two simulator binaries to compare
@@ -51,12 +51,15 @@ $sim2 = shift;
 # be given to both invocations
 $simargs = '"' . join('" "', @ARGV) . '"';
 
-# Redirect config output to cout so that gets diffed too (in case
-# that's the source of the problem).
-$simargs += " --Universe:config_output_file=cout";
+# Run individual invocations in separate dirs so output and intermediate
+# files (particularly config.py and config.ini) don't conflict.
+$dir1 = "tracediff-$$-1";
+$dir2 = "tracediff-$$-2";
+mkdir($dir1) or die "Can't create dir $dir1\n";
+mkdir($dir2) or die "Can't create dir $dir2\n";
 
-$cmd1 = "$sim1 $simargs --stats:text_file=tracediff-$$-1.stats 2>&1 |";
-$cmd2 = "$sim2 $simargs --stats:text_file=tracediff-$$-2.stats 2>&1 |";
+$cmd1 = "$sim1 -d $dir1 $simargs 2>&1 |";
+$cmd2 = "$sim2 -d $dir2 $simargs 2>&1 |";
 
 # This only works if you have rundiff in your path.  I just edit it
 # with an explicit path if necessary.