[llvm-commits] CVS: llvm/test/Programs/TEST.micro.Makefile TEST.micro.report

[Chris Lattner]

Changes in directory llvm/test/Programs:

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

---
Log message:

Update scripts to generate real numbers!


---
Diffs of the changes:

Index: llvm/test/Programs/TEST.micro.Makefile
diff -u llvm/test/Programs/TEST.micro.Makefile:1.3 llvm/test/Programs/TEST.micro.Makefile:1.4
--- llvm/test/Programs/TEST.micro.Makefile:1.3	Mon Sep 29 10:39:48 2003
+++ llvm/test/Programs/TEST.micro.Makefile	Mon Sep 29 11:42:26 2003
@@ -12,11 +12,11 @@
 EXTRA_LLI_OPTS = $(TIMEOPT)
 
 $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
-Output/%.$(TEST).report.txt: Output/%.llvm.bc Output/%.LOC.txt Output/%.out-nat Output/%.out-jit $(LLI) $(LOPT)
+Output/%.$(TEST).report.txt: Output/%.llvm.bc Output/%.LOC.txt Output/%.out-nat Output/%.out-jit Output/%.llc $(LLI) $(LOPT)
 	@echo -n "LOC: " > $@
 	- at cat Output/$*.LOC.txt >> $@
 	@echo -n "LLC SIZE: " >> $@
-	#- at wc -c Output/$*.llc >> $@
+	- at wc -c Output/$*.llc >> $@
 	@echo >> $@
 	@echo -n "NAT TIME: " >> $@
 	- at grep real Output/$*.out-nat.time >> $@


Index: llvm/test/Programs/TEST.micro.report
diff -u llvm/test/Programs/TEST.micro.report:1.2 llvm/test/Programs/TEST.micro.report:1.3
--- llvm/test/Programs/TEST.micro.report:1.2	Sun Jun 22 15:11:18 2003
+++ llvm/test/Programs/TEST.micro.report	Mon Sep 29 11:42:26 2003
@@ -69,6 +69,16 @@
   return sprintf("%0.3f", shift);
 }
 
+# FormatTime - Convert a time from 1m23.45 into 83.45
+sub FormatTime {
+  my $Time = shift;
+  if ($Time =~ m/([0-9]+)[m:]([0-9.]+)/) {
+    $Time = sprintf("%7.3f", $1*60.0+$2);
+  }
+  return $Time;
+}
+
+
 @LatexColumns = (1, 15, 12,    # LOC, LLC Size, BytecodeSize
                  10, 9, 11,     # #LLVM Insts, # MachineInsts, Ratio
                  5, 4, 6);     # JIT Time, Nat Run Time, Ratio
@@ -127,8 +137,8 @@
  ["LOC:"  , 'LOC: *([0-9]+)'],
  [],
 # Times
- ["Total"  , 'JIT TIME: real ([0-9.]+)'],
- ["NatTotal", 'NAT TIME: real ([0-9.]+)'],
+ ["Total"  , 'JIT TIME: real\s*([.0-9m:]+)', \&FormatTime],
+ ["NatTotal", 'NAT TIME: real\s*([.0-9m:]+)', \&FormatTime],
  ["CodeGen", 'Total Execution Time: ([0-9.]+)'],
  ["CodeGenRatio", \&InvRatio],
  [],