[llvm-commits] CVS: poolalloc/test/TEST.p4perf.Makefile TEST.p4perf.report

[Chris Lattner]

Changes in directory poolalloc/test:

TEST.p4perf.Makefile updated: 1.2 -> 1.3
TEST.p4perf.report updated: 1.3 -> 1.4

---
Log message:

Minor bugfixes


---
Diffs of the changes:  (+6 -34)

Index: poolalloc/test/TEST.p4perf.Makefile
diff -u poolalloc/test/TEST.p4perf.Makefile:1.2 poolalloc/test/TEST.p4perf.Makefile:1.3
--- poolalloc/test/TEST.p4perf.Makefile:1.2	Fri Mar  5 18:02:26 2004
+++ poolalloc/test/TEST.p4perf.Makefile	Fri Mar  5 18:18:18 2004
@@ -129,10 +129,10 @@
 Output/test.$(TEST).pa.%: Output/%.poolalloc.cbe
 	-$(SPEC_SANDBOX) poolalloccbe-$(RUN_TYPE) /dev/null $(REF_IN_DIR) \
              $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
-                  $(PERFEX) -o $@.2 $(P4_L2_READ_MISSES) ../../$< $(RUN_OPTIONS)
+                  $(PERFEX) -o ../../$@.2 $(P4_L2_READ_MISSES) ../../$< $(RUN_OPTIONS)
 	-$(SPEC_SANDBOX) poolalloccbe-$(RUN_TYPE) /dev/null $(REF_IN_DIR) \
              $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
-                  $(PERFEX) -o $@.1 $(P4_L1_READ_MISSES) ../../$< $(RUN_OPTIONS)
+                  $(PERFEX) -o ../../$@.1 $(P4_L1_READ_MISSES) ../../$< $(RUN_OPTIONS)
 	@cat $@.1 $@.2 > $@
 
 # This rule runs the generated executable, generating timing information, for
@@ -141,10 +141,10 @@
 Output/test.$(TEST).allpa.%: Output/%.allnodes.cbe
 	-$(SPEC_SANDBOX) allnodescbe-$(RUN_TYPE) /dev/null $(REF_IN_DIR) \
              $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
-                  $(PERFEX) -o $@.2 $(P4_L2_READ_MISSES) ../../$< $(RUN_OPTIONS)
+                  $(PERFEX) -o ../../$@.2 $(P4_L2_READ_MISSES) ../../$< $(RUN_OPTIONS)
 	-$(SPEC_SANDBOX) allnodescbe-$(RUN_TYPE) /dev/null $(REF_IN_DIR) \
              $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
-                  $(PERFEX) -o $@.1 $(P4_L1_READ_MISSES) ../../$< $(RUN_OPTIONS)
+                  $(PERFEX) -o ../../$@.1 $(P4_L1_READ_MISSES) ../../$< $(RUN_OPTIONS)
 	@cat $@.1 $@.2 > $@
 
 
@@ -154,10 +154,10 @@
 Output/test.$(TEST).%: Output/%.nonpa.cbe
 	-$(SPEC_SANDBOX) nonpacbe-$(RUN_TYPE) /dev/null $(REF_IN_DIR) \
              $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
-                  $(PERFEX) -o $@.2 $(P4_L2_READ_MISSES) ../../$< $(RUN_OPTIONS)
+                  $(PERFEX) -o ../../$@.2 $(P4_L2_READ_MISSES) ../../$< $(RUN_OPTIONS)
 	-$(SPEC_SANDBOX) nonpacbe-$(RUN_TYPE) /dev/null $(REF_IN_DIR) \
              $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
-                  $(PERFEX) -o $@.1 $(P4_L1_READ_MISSES) ../../$< $(RUN_OPTIONS)
+                  $(PERFEX) -o ../../$@.1 $(P4_L1_READ_MISSES) ../../$< $(RUN_OPTIONS)
 	@cat $@.1 $@.2 > $@
 endif
 


Index: poolalloc/test/TEST.p4perf.report
diff -u poolalloc/test/TEST.p4perf.report:1.3 poolalloc/test/TEST.p4perf.report:1.4
--- poolalloc/test/TEST.p4perf.report:1.3	Fri Mar  5 18:04:38 2004
+++ poolalloc/test/TEST.p4perf.report	Fri Mar  5 18:18:18 2004
@@ -8,34 +8,6 @@
 $SortCol = 0;
 $TrimRepeatedPrefix = 1;
 
-sub Ratio {
-  my ($Cols, $Col) = @_;
-  if ($Cols->[$Col-1] ne "*" and $Cols->[$Col-4] ne "*" and
-      $Cols->[$Col-1] != "0") {
-    return sprintf "%1.3f", $Cols->[$Col-4]/$Cols->[$Col-1];
-  } else {
-    return "n/a";
-  }
-}
-
-sub Sum {
-  my ($Cols, $Col) = @_;
-  if ($Cols->[$Col-1] ne "*" and $Cols->[$Col-2] ne "*") {
-    return sprintf "%1.3f", $Cols->[$Col-2]+$Cols->[$Col-1];
-  } else {
-    return "n/a";
-  }
-}
-
-
-sub FormatTime {
-  my $Time = shift;
-  if ($Time =~ m/([0-9]+)[m:]([0-9.]+)/) {
-    $Time = sprintf("%7.3f", $1*60.0+$2);
-  }
-  return $Time;
-}
-
 @LatexColumns = (2, 3, 4, 5, 6, 7);
 
 my $OLDEN     = 'MultiSource/Benchmarks/Olden';