[llvm-commits] [poolalloc] r132384 - in /poolalloc/trunk/test: TEST.types.Makefile TEST.types.report
Arushi Aggarwal
aggarwa4 at illinois.edu
Tue May 31 20:16:52 PDT 2011
Author: aggarwa4
Date: Tue May 31 22:16:52 2011
New Revision: 132384
URL: http://llvm.org/viewvc/llvm-project?rev=132384&view=rev
Log:
Add test run for disable-ptr-types
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=132384&r1=132383&r2=132384&view=diff
==============================================================================
--- poolalloc/trunk/test/TEST.types.Makefile (original)
+++ poolalloc/trunk/test/TEST.types.Makefile Tue May 31 22:16:52 2011
@@ -61,6 +61,11 @@
-$(LLVMLD) -disable-opt -o $@.ld $@.temp $(TYPE_RT_BC)
-$(LOPT) $(SAFE_OPTS) $@.ld.bc -o $@ -f
+$(PROGRAMS_TO_TEST:%=Output/%.tcd.bc): \
+Output/%.tcd.bc: Output/%.opt.bc $(LOPT) $(ASSIST_SO)
+ -$(RUNOPT) -load $(ASSIST_SO) -typechecks -disable-ptr-type-checks -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)
@@ -89,6 +94,9 @@
$(PROGRAMS_TO_TEST:%=Output/%.tc.s): \
Output/%.tc.s: Output/%.tc.bc $(LLC)
-$(LLC) $< -o $@
+$(PROGRAMS_TO_TEST:%=Output/%.tcd.s): \
+Output/%.tcd.s: Output/%.tcd.bc $(LLC)
+ -$(LLC) $< -o $@
$(PROGRAMS_TO_TEST:%=Output/%.tco.s): \
Output/%.tco.s: Output/%.tco.bc $(LLC)
-$(LLC) $< -o $@
@@ -102,6 +110,9 @@
$(PROGRAMS_TO_TEST:%=Output/%.tc): \
Output/%.tc: Output/%.tc.s $(TYPE_RT_O)
-$(CC) $(CFLAGS) $< $(LLCLIBS) $(TYPE_RT_O) $(LDFLAGS) -o $@
+$(PROGRAMS_TO_TEST:%=Output/%.tcd): \
+Output/%.tcd: Output/%.tcd.s $(TYPE_RT_O)
+ -$(CC) $(CFLAGS) $< $(LLCLIBS) $(TYPE_RT_O) $(LDFLAGS) -o $@
$(PROGRAMS_TO_TEST:%=Output/%.tco): \
Output/%.tco: Output/%.tco.s $(TYPE_RT_O)
-$(CC) $(CFLAGS) $< $(LLCLIBS) $(TYPE_RT_O) $(LDFLAGS) -o $@
@@ -137,6 +148,9 @@
$(PROGRAMS_TO_TEST:%=Output/%.out-tc): \
Output/%.out-tc: Output/%.tc
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
+$(PROGRAMS_TO_TEST:%=Output/%.out-tcd): \
+Output/%.out-tcd: Output/%.tcd
+ -$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
$(PROGRAMS_TO_TEST:%=Output/%.out-tco): \
Output/%.out-tco: Output/%.tco
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
@@ -166,6 +180,13 @@
../../$< $(RUN_OPTIONS)
-(cd Output/tc-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
-cp Output/tc-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
+$(PROGRAMS_TO_TEST:%=Output/%.out-tcd): \
+Output/%.out-tcd: Output/%.tcd
+ -$(SPEC_SANDBOX) tcd-$(RUN_TYPE) $@ $(REF_IN_DIR) \
+ $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
+ ../../$< $(RUN_OPTIONS)
+ -(cd Output/tcd-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
+ -cp Output/tcd-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
$(PROGRAMS_TO_TEST:%=Output/%.out-tco): \
Output/%.out-tco: Output/%.tco
-$(SPEC_SANDBOX) tco-$(RUN_TYPE) $@ $(REF_IN_DIR) \
@@ -207,6 +228,10 @@
Output/%.diff-tc: Output/%.out-nat Output/%.out-tc
-$(DIFFPROG) tc $* $(HIDEDIFF)
+$(PROGRAMS_TO_TEST:%=Output/%.diff-tcd): \
+Output/%.diff-tcd: Output/%.out-nat Output/%.out-tcd
+ -$(DIFFPROG) tcd $* $(HIDEDIFF)
+
$(PROGRAMS_TO_TEST:%=Output/%.diff-tco): \
Output/%.diff-tco: Output/%.out-nat Output/%.out-tco
-$(DIFFPROG) tco $* $(HIDEDIFF)
@@ -229,7 +254,7 @@
$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
-Output/%.$(TEST).report.txt: Output/%.opt.bc Output/%.LOC.txt $(LOPT) Output/%.out-nat Output/%.diff-llvm1 Output/%.diff-opt Output/%.diff-tc Output/%.diff-tco Output/%.diff-tcoo Output/%.diff-count Output/%.diff-count1
+Output/%.$(TEST).report.txt: Output/%.opt.bc Output/%.LOC.txt $(LOPT) Output/%.out-nat Output/%.diff-llvm1 Output/%.diff-opt Output/%.diff-tc Output/%.diff-tcd Output/%.diff-tco Output/%.diff-tcoo Output/%.diff-count Output/%.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
@@ -331,6 +356,10 @@
printf "TC-RUN_TIME: " >> $@;\
grep 'program' Output/$*.out-tc.time >> $@;\
fi
+ @-if test -f Output/$*.diff-tcd; then \
+ printf "TCD-RUN_TIME: " >> $@;\
+ grep 'program' Output/$*.out-tcd.time >> $@;\
+ fi
@-if test -f Output/$*.diff-tco; then \
printf "TCO-RUN_TIME: " >> $@;\
grep 'program' Output/$*.out-tco.time >> $@;\
Modified: poolalloc/trunk/test/TEST.types.report
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.types.report?rev=132384&r1=132383&r2=132384&view=diff
==============================================================================
--- poolalloc/trunk/test/TEST.types.report (original)
+++ poolalloc/trunk/test/TEST.types.report Tue May 31 22:16:52 2011
@@ -143,11 +143,11 @@
[],
["TypeSafeO", "ACCESSES TYPED_O: *([0-9]+)"],
["NonTypeO", "ACCESSES UNTYPED_O: *([0-9]+)"],
- ["TSO %" , sub { return TypeSafeRatio(@_); }],
+ ["TSO%" , sub { return TypeSafeRatio(@_); }],
[],
["TypeSafe", "ACCESSES TYPED: *([0-9]+)"],
["NonType", "ACCESSES UNTYPED: *([0-9]+)"],
- ["TS %" , sub { return TypeSafeRatio(@_); }],
+ ["TS%" , sub { return TypeSafeRatio(@_); }],
[],
["Ign", "IGN: *([0-9]+)"],
["GEP-Ign", "GEPI: *([0-9]+)"],
@@ -177,17 +177,18 @@
[],
["DTotal", "DTOTAL: *([0-9]+)"],
["DSafe", "DSAFE: *([0-9]+)"],
- ["DTS %" , sub { return Ratio(@_); }],
+ ["DTS%" , sub { return Ratio(@_); }],
[],
["DTotalO", "DTOTALO: *([0-9]+)"],
["DSafeO", "DSAFEO: *([0-9]+)"],
- ["DTS %" , sub { return Ratio(@_); }],
+ ["DTS%" , sub { return Ratio(@_); }],
#[],
#["LoadChk", "LCHK: *([0-9]+)"],
#["StoreChk", "SCHK: *([0-9]+)"],
[],
["OptTime", "OPT-RUN_TIME: program *([.0-9]+)"],
["TcTime", "TC-RUN_TIME: program *([.0-9]+)"],
+ ["TcdTime", "TCD-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