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

Arushi Aggarwal aggarwa4 at illinois.edu
Wed May 11 21:35:44 PDT 2011 

Author: aggarwa4
Date: Wed May 11 23:35:44 2011
New Revision: 131226

URL: http://llvm.org/viewvc/llvm-project?rev=131226&view=rev
Log:
Adding tcoo version, uses TypeChecks, that uses 
TypeSafety pass(with DSA optimizations).

Also, link in the runtime earlier, allow for optimizations.

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=131226&r1=131225&r2=131226&view=diff
==============================================================================
--- poolalloc/trunk/test/TEST.types.Makefile (original)
+++ poolalloc/trunk/test/TEST.types.Makefile Wed May 11 23:35:44 2011
@@ -27,6 +27,7 @@
 PASS := td
 
 TYPE_RT_O := $(PADIR)/$(CONFIGURATION)/lib/libtypechecks_rt.a
+TYPE_RT_BC := $(PADIR)/$(CONFIGURATION)/lib/libtypechecks_rt.bca
 DYNCOUNT_RT_O := $(PADIR)/$(CONFIGURATION)/lib/libcount.a
 ANALYZE_OPTS := -stats -time-passes -disable-output -dsstats
 #ANALYZE_OPTS := -stats -time-passes -dsstats 
@@ -63,11 +64,22 @@
 
 $(PROGRAMS_TO_TEST:%=Output/%.tc.bc): \
 Output/%.tc.bc: Output/%.opt.bc $(LOPT) $(ASSIST_SO)
-	-$(RUNOPT) -load $(ASSIST_SO) -typechecks -dce -ipsccp -stats -info-output-file=$(CURDIR)/$@.info $< -f -o $@ 
+	-$(RUNOPT) -load $(ASSIST_SO) -typechecks -dce -ipsccp -dce -stats -info-output-file=$(CURDIR)/$@.info $< -f -o $@.temp
+	-$(LLVMLD) -disable-opt -o $@.ld $@.temp $(TYPE_RT_BC)
+	-$(LOPT) $(SAFE_OPTS) $@.ld.bc -o $@ -f
+
 
 $(PROGRAMS_TO_TEST:%=Output/%.tco.bc): \
 Output/%.tco.bc: Output/%.opt.bc $(LOPT) $(ASSIST_SO)
-	-$(RUNOPT) -load $(ASSIST_SO) -typechecks -enable-type-safe-opt -dce -ipsccp -stats -info-output-file=$(CURDIR)/$@.info $< -f -o $@ 
+	-$(RUNOPT) -load $(ASSIST_SO) -typechecks -enable-type-safe-opt -dce -ipsccp -dce -stats -info-output-file=$(CURDIR)/$@.info $< -f -o $@.temp 
+	-$(LLVMLD) -disable-opt -o $@.ld $@.temp $(TYPE_RT_BC)
+	-$(LOPT) $(SAFE_OPTS) $@.ld.bc -o $@ -f
+
+$(PROGRAMS_TO_TEST:%=Output/%.tcoo.bc): \
+Output/%.tcoo.bc: Output/%.opt.bc $(LOPT) $(ASSIST_SO)
+	-$(RUNOPT) -load $(ASSIST_SO) -typechecks -enable-type-safe-opt -enable-type-inference-opts -dsa-stdlib-no-fold -dce -ipsccp -dce -stats -info-output-file=$(CURDIR)/$@.info $< -f -o $@.temp 
+	-$(LLVMLD) -disable-opt -o $@.ld $@.temp $(TYPE_RT_BC)
+	-$(LOPT) $(SAFE_OPTS) $@.ld.bc -o $@ -f
 
 $(PROGRAMS_TO_TEST:%=Output/%.count.s): \
 Output/%.count.s: Output/%.count.bc $(LLC)
@@ -87,6 +99,9 @@
 $(PROGRAMS_TO_TEST:%=Output/%.tco.s): \
 Output/%.tco.s: Output/%.tco.bc $(LLC)
 	-$(LLC) -f $< -o $@
+$(PROGRAMS_TO_TEST:%=Output/%.tcoo.s): \
+Output/%.tcoo.s: Output/%.tcoo.bc $(LLC)
+	-$(LLC) -f $< -o $@
 
 $(PROGRAMS_TO_TEST:%=Output/%.opt): \
 Output/%.opt: Output/%.opt.s
@@ -97,6 +112,9 @@
 $(PROGRAMS_TO_TEST:%=Output/%.tco): \
 Output/%.tco: Output/%.tco.s $(TYPE_RT_O)
 	-$(CC) $(CFLAGS) $<  $(LLCLIBS) $(TYPE_RT_O) $(LDFLAGS) -o $@
+$(PROGRAMS_TO_TEST:%=Output/%.tcoo): \
+Output/%.tcoo: Output/%.tcoo.s $(TYPE_RT_O)
+	-$(CC) $(CFLAGS) $<  $(LLCLIBS) $(TYPE_RT_O) $(LDFLAGS) -o $@
 $(PROGRAMS_TO_TEST:%=Output/%.llvm1): \
 Output/%.llvm1: Output/%.llvm1.s 
 	-$(CC) $(CFLAGS) $<  $(LLCLIBS) $(LDFLAGS) -o $@
@@ -129,6 +147,9 @@
 $(PROGRAMS_TO_TEST:%=Output/%.tco.out): \
 Output/%.tco.out: Output/%.tco
 	-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
+$(PROGRAMS_TO_TEST:%=Output/%.tcoo.out): \
+Output/%.tcoo.out: Output/%.tcoo
+	-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
 
 else
 $(PROGRAMS_TO_TEST:%=Output/%.opt.out): \
@@ -159,6 +180,13 @@
                   ../../$< $(RUN_OPTIONS)
 	-(cd Output/tco-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
 	-cp Output/tco-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
+$(PROGRAMS_TO_TEST:%=Output/%.tcoo.out): \
+Output/%.tcoo.out: Output/%.tcoo
+	-$(SPEC_SANDBOX) tcoo-$(RUN_TYPE) $@ $(REF_IN_DIR) \
+             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
+                  ../../$< $(RUN_OPTIONS)
+	-(cd Output/tcoo-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
+	-cp Output/tcoo-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
 $(PROGRAMS_TO_TEST:%=Output/%.count.out): \
 Output/%.count.out: Output/%.count
 	-$(SPEC_SANDBOX) count-$(RUN_TYPE) $@ $(REF_IN_DIR) \
@@ -192,6 +220,11 @@
 	@cp Output/$*.out-nat Output/$*.tco.out-nat
 	-$(DIFFPROG) nat $*.tco $(HIDEDIFF)
 
+$(PROGRAMS_TO_TEST:%=Output/%.tcoo.diff-nat): \
+Output/%.tcoo.diff-nat: Output/%.out-nat Output/%.tcoo.out
+	@cp Output/$*.out-nat Output/$*.tcoo.out-nat
+	-$(DIFFPROG) nat $*.tcoo $(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
@@ -208,7 +241,7 @@
 
 
 $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
-Output/%.$(TEST).report.txt: Output/%.opt.bc Output/%.LOC.txt $(LOPT) Output/%.out-nat Output/%.opt.diff-nat Output/%.tc.diff-nat Output/%.count.diff-nat Output/%.count1.diff-nat Output/%.tco.diff-nat
+Output/%.$(TEST).report.txt: Output/%.opt.bc Output/%.LOC.txt $(LOPT) Output/%.out-nat Output/%.opt.diff-nat Output/%.tc.diff-nat Output/%.tco.diff-nat Output/%.tcoo.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
@@ -314,6 +347,10 @@
 	  printf "TCO-RUN_TIME: " >> $@;\
 	  grep 'program' Output/$*.tco.out.time >> $@;\
 	fi
+	@-if test -f Output/$*.tcoo.diff-nat; then \
+	  printf "TCOO-RUN_TIME: " >> $@;\
+	  grep 'program' Output/$*.tcoo.out.time >> $@;\
+	fi
 	@# Emit AssistDS stats
 	@/bin/echo -n "CLONED_FUNCSPEC: " >> $@
 	- at grep 'Number of Functions Cloned in FuncSpec' $<.info >> $@

Modified: poolalloc/trunk/test/TEST.types.report
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.types.report?rev=131226&r1=131225&r2=131226&view=diff
==============================================================================
--- poolalloc/trunk/test/TEST.types.report (original)
+++ poolalloc/trunk/test/TEST.types.report Wed May 11 23:35:44 2011
@@ -190,4 +190,5 @@
             ["OptTime", "OPT-RUN_TIME: program *([.0-9]+)"],
             ["TcTime", "TC-RUN_TIME: program *([.0-9]+)"],
             ["TcoTime", "TCO-RUN_TIME: program *([.0-9]+)"],
+            ["TcooTime", "TCOO-RUN_TIME: program *([.0-9]+)"],
            );

More information about the llvm-commits mailing list