[llvm-commits] [poolalloc] r126411 - in /poolalloc/trunk/test: TEST.types.Makefile TEST.types.report

[Arushi Aggarwal]

Author: aggarwa4
Date: Thu Feb 24 13:32:17 2011
New Revision: 126411

URL: http://llvm.org/viewvc/llvm-project?rev=126411&view=rev
Log:
Make sure we run all the optimized files too.

Added a few more stats.

Modified:
    poolalloc/trunk/test/TEST.types.Makefile
    poolalloc/trunk/test/TEST.types.report

Modified: poolalloc/trunk/test/TEST.types.Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.types.Makefile?rev=126411&r1=126410&r2=126411&view=diff
==============================================================================
--- poolalloc/trunk/test/TEST.types.Makefile (original)
+++ poolalloc/trunk/test/TEST.types.Makefile Thu Feb 24 13:32:17 2011
@@ -47,14 +47,66 @@
 
 $(PROGRAMS_TO_TEST:%=Output/%.opt.bc): \
 Output/%.opt.bc: Output/%.llvm1.bc $(LOPT) $(ASSIST_SO)
-	-$(RUNOPT) -load $(ASSIST_SO) -disable-opt -info-output-file=$(CURDIR)/$@.info -instnamer -internalize  -varargsfunc -indclone -funcspec -ipsccp -deadargelim  -simplifygep -die -mergegep -die -globaldce -simplifycfg -deadargelim -arg-simplify -varargsfunc  -deadargelim -globaldce -die -simplifycfg -stats -time-passes $< -f -o $@ 
+	-$(RUNOPT) -load $(ASSIST_SO) -disable-opt -info-output-file=$(CURDIR)/$@.info -instnamer -internalize -varargsfunc -indclone -funcspec -ipsccp -deadargelim  -simplifygep -die -mergegep  -die -globaldce -simplifycfg -deadargelim -arg-simplify -varargsfunc -indclone -funcspec -deadargelim -globaldce -die -simplifycfg -gep-args -deadargelim -die -mergegep -die -globaldce -stats -time-passes $< -f -o $@ 
 
 $(PROGRAMS_TO_TEST:%=Output/%.temp2.bc): \
 Output/%.temp2.bc: Output/%.temp1.bc $(LOPT) $(ASSIST_SO)
 	-$(RUNOPT) -load $(ASSIST_SO) -disable-opt -info-output-file=$(CURDIR)/$@.info -instnamer -internalize  -varargsfunc -indclone -funcspec -ipsccp -deadargelim  -mergegep -die -globaldce -stats -time-passes $< -f -o $@ 
 
+$(PROGRAMS_TO_TEST:%=Output/%.opt.s): \
+Output/%.opt.s: Output/%.opt.bc $(LLC)
+	-$(LLC) -f $< -o $@
+$(PROGRAMS_TO_TEST:%=Output/%.llvm1.s): \
+Output/%.llvm1.s: Output/%.llvm1.bc $(LLC)
+	-$(LLC) -f $< -o $@
+
+$(PROGRAMS_TO_TEST:%=Output/%.opt): \
+Output/%.opt: Output/%.opt.s 
+	-$(CC) $(CFLAGS) $<  $(LLCLIBS) $(LDFLAGS) -o $@
+$(PROGRAMS_TO_TEST:%=Output/%.llvm1): \
+Output/%.llvm1: Output/%.llvm1.s 
+	-$(CC) $(CFLAGS) $<  $(LLCLIBS) $(LDFLAGS) -o $@
+
+ifndef PROGRAMS_HAVE_CUSTOM_RUN_RULES
+
+$(PROGRAMS_TO_TEST:%=Output/%.opt.out): \
+Output/%.opt.out: Output/%.opt
+	-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
+$(PROGRAMS_TO_TEST:%=Output/%.llvm1.out): \
+Output/%.llvm1.out: Output/%.llvm1
+	-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
+
+else
+$(PROGRAMS_TO_TEST:%=Output/%.opt.out): \
+Output/%.opt.out: Output/%.opt
+	-$(SPEC_SANDBOX) opt-$(RUN_TYPE) $@ $(REF_IN_DIR) \
+             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
+                  ../../$< $(RUN_OPTIONS)
+	-(cd Output/opt-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
+	-cp Output/opt-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
+$(PROGRAMS_TO_TEST:%=Output/%.llvm1.out): \
+Output/%.llvm1.out: Output/%.llvm1
+	-$(SPEC_SANDBOX) llvm1-$(RUN_TYPE) $@ $(REF_IN_DIR) \
+             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
+                  ../../$< $(RUN_OPTIONS)
+	-(cd Output/opt-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
+	-cp Output/opt-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
+
+endif
+
+$(PROGRAMS_TO_TEST:%=Output/%.opt.diff-nat): \
+Output/%.opt.diff-nat: Output/%.out-nat Output/%.opt.out
+	@cp Output/$*.out-nat Output/$*.opt.out-nat
+	-$(DIFFPROG) nat $*.opt $(HIDEDIFF)
+
+$(PROGRAMS_TO_TEST:%=Output/%.llvm1.diff-nat): \
+Output/%.llvm1.diff-nat: Output/%.out-nat Output/%.llvm1.out
+	@cp Output/$*.out-nat Output/$*.llvm1.out-nat
+	-$(DIFFPROG) nat $*.opt $(HIDEDIFF)
+
+
 $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
-Output/%.$(TEST).report.txt: Output/%.opt.bc Output/%.LOC.txt $(LOPT)
+Output/%.$(TEST).report.txt: Output/%.opt.bc Output/%.LOC.txt $(LOPT) Output/%.out-nat Output/%.opt.diff-nat Output/%.llvm1.diff-nat
 	@# Gather data
 	-($(RUNOPT) -dsa-$(PASS) -enable-type-inference-opts -dsa-stdlib-no-fold $(ANALYZE_OPTS) $<)> $@.time.1 2>&1
 	-($(RUNOPT) -dsa-$(PASS) $(ANALYZE_OPTS) $<)> $@.time.2 2>&1

Modified: poolalloc/trunk/test/TEST.types.report
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.types.report?rev=126411&r1=126410&r2=126411&view=diff
==============================================================================
--- poolalloc/trunk/test/TEST.types.report (original)
+++ poolalloc/trunk/test/TEST.types.report Thu Feb 24 13:32:17 2011
@@ -156,7 +156,6 @@
             ["I", "ACCESSES I: *([0-9]+)"],
             ["E", "ACCESSES E: *([0-9]+)"],
             ["U", "ACCESSES U: *([0-9]+)"],
-            [],
 # Nodes Folded
             [],
             ["VAFUNC", "VARARGS_CALLS: *([0-9]+)"],