31c31,33
< # invocations of m5.
---
> # invocations of m5. Takes a common m5 command line with embedded
> # alternatives and executes the two alternative commands in separate
> # subdirectories with output piped to rundiff.
42a45,48
> # - Arguments with '#' characters are split at those characters,
> # processed for alternatives ('|'s) as independent terms, then
> # pasted back into a single argument (without the '#'s). (Sort of
> # inspired by the C preprocessor '##' token pasting operator.)
50c56
< # % tracediff m5.opt --opt1 "--opt2|--opt3" --opt4
---
> # % tracediff m5.opt --opt1 '--opt2|--opt3' --opt4
55,59c61,68
< # If you want to compare two different simulator binaries, put a '|'
< # in the first script argument ("path1/m5.opt|path2/m5.opt"). If you
< # want to add arguments to one run only, just put a '|' in with text
< # only on one side ("--onlyOn1|"). You can do this with multiple
< # arguments together too ("|-a -b -c" adds three args to the second
---
> # % tracediff 'path1|path2#/m5.opt' --opt1 --opt2
> # would compare these two runs:
> # path1/m5.opt --opt1 --opt2
> # path2/m5.opt --opt1 --opt2
> #
> # If you want to add arguments to one run only, just put a '|' in with
> # text only on one side ('--onlyOn1|'). You can do this with multiple
> # arguments together too ('|-a -b -c' adds three args to the second
61a71,73
> # The '-n' argument to tracediff allows you to preview the two
> # generated command lines without running them.
> #
65,66c77,81
< if (@ARGV < 2) {
< die "Usage: tracediff \"sim1|sim2\" [common-arg \"arg1|arg2\" ...]\n";
---
> $dryrun = 0;
>
> if (@ARGV >= 1 && $ARGV[0] eq '-n') {
> $dryrun = 1;
> shift @ARGV;
68a84,87
> if (@ARGV < 1) {
> die "Usage: tracediff [-n] \"sim1|sim2\" [common-arg \"arg1|arg2\" ...]\n";
> }
>
70,76c89,102
< @pair = split('\|', $arg, -1); # -1 enables null trailing fields
< if ($#pair > 0) {
< push @cmd1, $pair[0];
< push @cmd2, $pair[1];
< } else {
< push @cmd1, $arg;
< push @cmd2, $arg;
---
> $a1 = $a2 = '';
> @subargs = split('#', $arg, -1);
> foreach $subarg (@subargs) {
> @pair = split('\|', $subarg, -1); # -1 enables null trailing fields
> if (@pair == 1) {
> $a1 .= $subarg;
> $a2 .= $subarg;
> } elsif (@pair == 2) {
> $a1 .= $pair[0];
> $a2 .= $pair[1];
> } else {
> print 'Parse error: too many |s in ', $arg, '\n';
> exit(1);
> }
77a104,106
>
> push @cmd1, $a1;
> push @cmd2, $a2;
79a109,115
>
> if ($dryrun) {
> print "CMD1: ", join(' ', @cmd1), "\n";
> print "CMD2: ", join(' ', @cmd2), "\n";
> exit(0);
> }
>