[llvm-commits] [poolalloc] r131976 - /poolalloc/trunk/test/TEST.types.Makefile

Arushi Aggarwal aggarwa4 at illinois.edu
Tue May 24 11:38:34 PDT 2011 

Author: aggarwa4
Date: Tue May 24 13:38:34 2011
New Revision: 131976

URL: http://llvm.org/viewvc/llvm-project?rev=131976&view=rev
Log:
More changes to make sure the diff works correctly.

Also some minor cleanup.

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

Modified: poolalloc/trunk/test/TEST.types.Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.types.Makefile?rev=131976&r1=131975&r2=131976&view=diff
==============================================================================
--- poolalloc/trunk/test/TEST.types.Makefile (original)
+++ poolalloc/trunk/test/TEST.types.Makefile Tue May 24 13:38:34 2011
@@ -13,9 +13,6 @@
 # Pathname to poolalloc object tree
 PADIR   := $(LLVM_OBJ_ROOT)/projects/poolalloc
 
-# Bits of runtime to improve analysis
-PA_PRE_RT := $(PADIR)/$(CONFIGURATION)/lib/libpa_pre_rt.bca
-
 # Pathame to the DSA pass dynamic library
 DSA_SO   := $(PADIR)/$(CONFIGURATION)/lib/libLLVMDataStructure$(SHLIBEXT)
 ASSIST_SO := $(PADIR)/$(CONFIGURATION)/lib/libAssistDS$(SHLIBEXT)
@@ -35,7 +32,7 @@
 MEM := -track-memory -time-passes -disable-output
 
 #SAFE_OPTS := -internalize -scalarrepl -deadargelim -globaldce -basiccg -inline 
-SAFE_OPTS := -internalize  -deadargelim -globaldce -basiccg -inline  
+SAFE_OPTS := -internalize  -deadargelim -globaldce -basiccg -inline
 #SAFE_OPTS := -internalize   -deadargelim -globaldce 
 
 $(PROGRAMS_TO_TEST:%=Output/%.linked1.bc): \
@@ -46,10 +43,6 @@
 Output/%.llvm1.bc: Output/%.linked1.bc $(LLVM_LDDPROG)
 	-$(RUNTOOLSAFELY) $(LLVMLD) -disable-opt $(SAFE_OPTS) -info-output-file=$(CURDIR)/$@.info -stats -time-passes  $(LLVMLD_FLAGS) $< -lc $(LIBS) -o Output/$*.llvm1
 
-$(PROGRAMS_TO_TEST:%=Output/%.temp1.bc): \
-Output/%.temp1.bc: Output/%.llvm1.bc 
-	-$(RUNTOOLSAFELY) $(LLVMLD) -disable-opt $(SAFE_OPTS) -link-as-library $< $(PA_PRE_RT) -o $@
-
 $(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 -mem2reg -dce -basiccg -inline -dce -arg-cast -indclone -funcspec -ipsccp -deadargelim -simplify-gep -die -mergearrgep -die -globaldce -simplifycfg -deadargelim -arg-simplify -die -arg-cast -die -simplifycfg -globaldce -indclone -funcspec -deadargelim -globaldce -die -simplifycfg -gep-expr-arg -deadargelim -die -mergefunc -die -mergearrgep -die -globaldce -int2ptrcmp -die -dce -inline -mem2reg -dce -arg-cast -dce -sretpromotion -struct-ret -deadargelim -simplify-ev -simplify-iv -dce -ld-args -gep-expr-arg -deadargelim -mergefunc -dce -stats -time-passes $< -f -o $@ 
@@ -206,50 +199,51 @@
 
 endif
 
-$(PROGRAMS_TO_TEST:%=Output/%.opt.diff-nat): \
-Output/%.opt.diff-nat: Output/%.out-nat Output/%.opt.out
+$(PROGRAMS_TO_TEST:%=Output/%.opt.diff-opt): \
+Output/%.opt.diff-opt: Output/%.out-nat Output/%.opt.out
 	@cp Output/$*.out-nat Output/$*.opt.out-nat
-	@cp Output/$*.opt.out Output/$*.tco.out-opt
+	@cp Output/$*.opt.out Output/$*.opt.out-opt
 	-$(DIFFPROG) opt $*.opt $(HIDEDIFF)
 
-$(PROGRAMS_TO_TEST:%=Output/%.tc.diff-nat): \
-Output/%.tc.diff-nat: Output/%.out-nat Output/%.tc.out
+$(PROGRAMS_TO_TEST:%=Output/%.tc.diff-tc): \
+Output/%.tc.diff-tc: Output/%.out-nat Output/%.tc.out
 	@cp Output/$*.out-nat Output/$*.tc.out-nat
-	@cp Output/$*.tc.out Output/$*.tco.out-tc
+	@cp Output/$*.tc.out Output/$*.tc.out-tc
 	-$(DIFFPROG) tc $*.tc $(HIDEDIFF)
 
-$(PROGRAMS_TO_TEST:%=Output/%.tco.diff-nat): \
-Output/%.tco.diff-nat: Output/%.out-nat Output/%.tco.out
+$(PROGRAMS_TO_TEST:%=Output/%.tco.diff-tco): \
+Output/%.tco.diff-tco: Output/%.out-nat Output/%.tco.out
 	@cp Output/$*.out-nat Output/$*.tco.out-nat
 	@cp Output/$*.tco.out Output/$*.tco.out-tco
 	-$(DIFFPROG) tco $*.tco $(HIDEDIFF)
 
-$(PROGRAMS_TO_TEST:%=Output/%.tcoo.diff-nat): \
-Output/%.tcoo.diff-nat: Output/%.out-nat Output/%.tcoo.out
+$(PROGRAMS_TO_TEST:%=Output/%.tcoo.diff-tcoo): \
+Output/%.tcoo.diff-tcoo: Output/%.out-nat Output/%.tcoo.out
 	@cp Output/$*.out-nat Output/$*.tcoo.out-nat
-	@cp Output/$*.tcoo.out Output/$*.tco.out-tcoo
+	@cp Output/$*.tcoo.out Output/$*.tcoo.out-tcoo
 	-$(DIFFPROG) tcoo $*.tcoo $(HIDEDIFF)
 
-$(PROGRAMS_TO_TEST:%=Output/%.llvm1.diff-nat): \
-Output/%.llvm1.diff-nat: Output/%.out-nat Output/%.llvm1.out
+$(PROGRAMS_TO_TEST:%=Output/%.llvm1.diff-llvm1): \
+Output/%.llvm1.diff-llvm1: Output/%.out-nat Output/%.llvm1.out
 	@cp Output/$*.out-nat Output/$*.llvm1.out-nat
 	@cp Output/$*.llvm1.out Output/$*.llvm1.out-llvm1
 	-$(DIFFPROG) llvm1 $*.llvm1 $(HIDEDIFF)
 
-$(PROGRAMS_TO_TEST:%=Output/%.count.diff-nat): \
-Output/%.count.diff-nat: Output/%.out-nat Output/%.count.out
+$(PROGRAMS_TO_TEST:%=Output/%.count.diff-count): \
+Output/%.count.diff-count: Output/%.out-nat Output/%.count.out
 	@cp Output/$*.out-nat Output/$*.count.out-nat
-	@cp Output/$*.count.out Output/$*.llvm1.out-count
+	@cp Output/$*.count.out Output/$*.count.out-count
 	-$(DIFFPROG) count $*.count $(HIDEDIFF)
-$(PROGRAMS_TO_TEST:%=Output/%.count1.diff-nat): \
-Output/%.count1.diff-nat: Output/%.out-nat Output/%.count1.out
+
+$(PROGRAMS_TO_TEST:%=Output/%.count1.diff-count1): \
+Output/%.count1.diff-count1: Output/%.out-nat Output/%.count1.out
 	@cp Output/$*.out-nat Output/$*.count1.out-nat
-	@cp Output/$*.count1.out Output/$*.llvm1.out-count1
+	@cp Output/$*.count1.out Output/$*.count1.out-count1
 	-$(DIFFPROG) count1 $*.count1 $(HIDEDIFF)
 
 
 $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
-Output/%.$(TEST).report.txt: Output/%.opt.bc Output/%.LOC.txt $(LOPT) Output/%.out-nat Output/%.llvm1.diff-nat Output/%.opt.diff-nat Output/%.tc.diff-nat Output/%.tco.diff-nat Output/%.tcoo.diff-nat
+Output/%.$(TEST).report.txt: Output/%.opt.bc Output/%.LOC.txt $(LOPT) Output/%.out-nat Output/%.llvm1.diff-llvm1 Output/%.opt.diff-opt Output/%.tc.diff-tc Output/%.tco.diff-tco Output/%.tcoo.diff-tcoo Output/%.count.diff-count Output/%.count1.diff-count1
 	@# 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
@@ -343,19 +337,19 @@
 	- at grep '  Top-down Data Structure' $@.time.1 >> $@
 	@echo >> $@
 	@# Emit runtime data.
-	@-if test -f Output/$*.opt.diff-nat; then \
+	@-if test -f Output/$*.opt.diff-opt; then \
 	  printf "OPT-RUN_TIME: " >> $@;\
 	  grep 'program' Output/$*.opt.out.time >> $@;\
 	fi
-	@-if test -f Output/$*.tc.diff-nat; then \
+	@-if test -f Output/$*.tc.diff-tc; then \
 	  printf "TC-RUN_TIME: " >> $@;\
 	  grep 'program' Output/$*.tc.out.time >> $@;\
 	fi
-	@-if test -f Output/$*.tco.diff-nat; then \
+	@-if test -f Output/$*.tco.diff-tco; then \
 	  printf "TCO-RUN_TIME: " >> $@;\
 	  grep 'program' Output/$*.tco.out.time >> $@;\
 	fi
-	@-if test -f Output/$*.tcoo.diff-nat; then \
+	@-if test -f Output/$*.tcoo.diff-tcoo; then \
 	  printf "TCOO-RUN_TIME: " >> $@;\
 	  grep 'program' Output/$*.tcoo.out.time >> $@;\
 	fi

More information about the llvm-commits mailing list