[llvm-commits] CVS: llvm/test/Programs/GetTraceTime.pl Makefile.programs

[Brian Gaeke]

Changes in directory llvm/test/Programs:

GetTraceTime.pl updated: 1.2 -> 1.3
Makefile.programs updated: 1.82 -> 1.83

---
Log message:

GetTraceTime.pl: Determine $prog from $llc instead of passing it in as a
 separate argument. Pass output file in as a separate argument.
Makefile.programs: Remove GetTraceTime, TIMESCRIPT, and GETTIMECOMPARISON
 for now.  *.out-tracing are actually named *.out-trace. Remove *.performance
 rules that don't seem to work.


---
Diffs of the changes:

Index: llvm/test/Programs/GetTraceTime.pl
diff -u llvm/test/Programs/GetTraceTime.pl:1.2 llvm/test/Programs/GetTraceTime.pl:1.3
--- llvm/test/Programs/GetTraceTime.pl:1.2	Mon Jul 21 17:00:30 2003
+++ llvm/test/Programs/GetTraceTime.pl	Thu Aug  7 14:37:22 2003
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
-($prog, $llc, $trace, @rest) = @ARGV;
-$runs = $llc;  $runs =~ s/llc/runs/;
+($llc, $trace, $out) = @ARGV;
+$prog = $llc; $prog =~ s/\.out.*$//;
 
 open LLC, $llc;
 foreach $line (<LLC>){
@@ -36,7 +36,7 @@
 $pct = "n/a";
 $pct = sprintf("%.2f", ($time_t2/$time_t)*100.0) if ($time_t != 0);
 $report = "$prog  percentage: $pct; time: $time_t2\n";
-if (open(OUTPUT, ">>$runs")) {
+if (open(OUTPUT, ">>$out")) {
 	print OUTPUT $report;
 	close OUTPUT;
 }


Index: llvm/test/Programs/Makefile.programs
diff -u llvm/test/Programs/Makefile.programs:1.82 llvm/test/Programs/Makefile.programs:1.83
--- llvm/test/Programs/Makefile.programs:1.82	Wed Aug  6 15:52:59 2003
+++ llvm/test/Programs/Makefile.programs	Thu Aug  7 14:37:22 2003
@@ -56,8 +56,6 @@
 # TIMEPROG - The program used to get timing results for a program
 TIMEPROG := $(PROGDIR)/TimeProgram.sh
 
-TIMESCRIPT := $(PROGDIR)/GetTraceTime.pl
-
 # DIFFPROG - The program used to diff the output
 DIFFPROG := $(PROGDIR)/DiffOutput.sh
 
@@ -107,7 +105,7 @@
 CBEOUTPUT := $(addsuffix .out-cbe,  $(PREFIXED_PROGRAMS_TO_TEST))
 
 #output for tracing framework
-TRACINGOUTPUT := $(addsuffix .out-tracing,  $(PREFIXED_PROGRAMS_TO_TEST))
+TRACINGOUTPUT := $(addsuffix .out-trace,  $(PREFIXED_PROGRAMS_TO_TEST))
 
 # Diffs of program runs vs the native program
 LLIDIFFS  := $(addsuffix .diff-lli, $(PREFIXED_PROGRAMS_TO_TEST))
@@ -115,11 +113,8 @@
 LLCDIFFS  := $(addsuffix .diff-llc, $(PREFIXED_PROGRAMS_TO_TEST))
 CBEDIFFS  := $(addsuffix .diff-cbe, $(PREFIXED_PROGRAMS_TO_TEST))
 
-#Diffs for tracing framework
-GETTIMECOMPARISON := $(addsuffix .performance, $(PREFIXED_PROGRAMS_TO_TEST))
-
 # Build Program outputs:
-.PRECIOUS: Output/%.out-lli Output/%.out-jit Output/%.out-llc Output/%.out-tracing 
+.PRECIOUS: Output/%.out-lli Output/%.out-jit Output/%.out-llc Output/%.out-trace
 .PRECIOUS: Output/%.out-nat Output/%.out-cbe Output/%.llc.bc
 
 # Build diffs from the output...
@@ -178,7 +173,7 @@
 all:: $(TRACINGCODEGEN)
 all:: $(TRACINGLLCCODEGEN)
 all:: $(TRACINGEXECUTABLE)
-all:: $(GETTIMECOMPARISON)
+all:: $(TRACINGOUTPUT)
 
 DISABLE_CBE = 1
 DISABLE_LLC_DIFFS = 1
@@ -379,13 +374,9 @@
 Output/%.out-cbe: Output/%.cbe
 	-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
 
-$(PROGRAMS_TO_TEST:%=Output/%.out-tracing): \
-Output/%.out-tracing: Output/%.trace
+$(PROGRAMS_TO_TEST:%=Output/%.out-trace): \
+Output/%.out-trace: Output/%.trace
 	-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
-
-$(PROGRAMS_TO_TEST:%=Output/%.performance): \
-Output/%.performance: Output/%.out-llc.time Output/%.out-tracing.time
-	-$(TIMESCRIPT) $* Output/$*.out-llc.time Output/$*.out-tracing.time $@
 
 endif