[llvm-commits] [poolalloc] r133101 - in /poolalloc/trunk/test: TEST.types.Makefile TEST.types.report
Arushi Aggarwal
aggarwa4 at illinois.edu
Wed Jun 15 15:40:18 PDT 2011
Author: aggarwa4
Date: Wed Jun 15 17:40:18 2011
New Revision: 133101
URL: http://llvm.org/viewvc/llvm-project?rev=133101&view=rev
Log:
Add the new optimization also, and track its runtime too.
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=133101&r1=133100&r2=133101&view=diff
==============================================================================
--- poolalloc/trunk/test/TEST.types.Makefile (original)
+++ poolalloc/trunk/test/TEST.types.Makefile Wed Jun 15 17:40:18 2011
@@ -13,6 +13,8 @@
# Pathname to poolalloc object tree
PADIR := $(LLVM_OBJ_ROOT)/projects/poolalloc
+LLC := /localhome/aggarwa4/llvm29/llvm-obj/Debug+Asserts/bin/llc
+
# Pathame to the DSA pass dynamic library
DSA_SO := $(PADIR)/$(CONFIGURATION)/lib/libLLVMDataStructure$(SHLIBEXT)
ASSIST_SO := $(PADIR)/$(CONFIGURATION)/lib/libAssistDS$(SHLIBEXT)
@@ -67,18 +69,28 @@
-$(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
+ #-$(RUNOPT) -load $(ASSIST_SO) $(SAFE_OPTS) -typechecks-runtime-opt $@.ld.bc -o $@ -f
$(PROGRAMS_TO_TEST:%=Output/%.tco.bc): \
Output/%.tco.bc: Output/%.opt.bc $(LOPT) $(ASSIST_SO)
-$(RUNOPT) -load $(ASSIST_SO) -typechecks -typechecks-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
+ #-$(RUNOPT) -load $(ASSIST_SO) $(SAFE_OPTS) -typechecks-runtime-opt $@.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-inference-opts -dsa-stdlib-no-fold -typechecks-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
+ #-$(RUNOPT) -load $(ASSIST_SO) $(SAFE_OPTS) -typechecks-runtime-opt $@.ld.bc -o $@ -f
+
+$(PROGRAMS_TO_TEST:%=Output/%.tcoo1.bc): \
+Output/%.tcoo1.bc: Output/%.opt.bc $(LOPT) $(ASSIST_SO)
+ -$(RUNOPT) -load $(ASSIST_SO) -typechecks -enable-type-inference-opts -dsa-stdlib-no-fold -typechecks-opt -typechecks-cmp-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
+ #-$(RUNOPT) -load $(ASSIST_SO) $(SAFE_OPTS) -typechecks-runtime-opt $@.ld.bc -o $@ -f
$(PROGRAMS_TO_TEST:%=Output/%.count.s): \
Output/%.count.s: Output/%.count.bc $(LLC)
@@ -105,6 +117,10 @@
Output/%.tcoo.s: Output/%.tcoo.bc $(LLC)
-$(LLC) $< -o $@
+$(PROGRAMS_TO_TEST:%=Output/%.tcoo1.s): \
+Output/%.tcoo1.s: Output/%.tcoo1.bc $(LLC)
+ -$(LLC) $< -o $@
+
$(PROGRAMS_TO_TEST:%=Output/%.opt): \
Output/%.opt: Output/%.opt.s
-$(CC) $(CFLAGS) $< $(LLCLIBS) $(LDFLAGS) -o $@
@@ -120,6 +136,9 @@
$(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/%.tcoo1): \
+Output/%.tcoo1: Output/%.tcoo1.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 $@
@@ -158,6 +177,9 @@
$(PROGRAMS_TO_TEST:%=Output/%.out-tcoo): \
Output/%.out-tcoo: Output/%.tcoo
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
+$(PROGRAMS_TO_TEST:%=Output/%.out-tcoo1): \
+Output/%.out-tcoo1: Output/%.tcoo1
+ -$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
else
$(PROGRAMS_TO_TEST:%=Output/%.out-opt): \
@@ -202,6 +224,13 @@
../../$< $(RUN_OPTIONS)
-(cd Output/tcoo-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
-cp Output/tcoo-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
+$(PROGRAMS_TO_TEST:%=Output/%.out-tcoo1): \
+Output/%.out-tcoo1: Output/%.tcoo1
+ -$(SPEC_SANDBOX) tcoo1-$(RUN_TYPE) $@ $(REF_IN_DIR) \
+ $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
+ ../../$< $(RUN_OPTIONS)
+ -(cd Output/tcoo1-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
+ -cp Output/tcoo1-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
$(PROGRAMS_TO_TEST:%=Output/%.out-count): \
Output/%.out-count: Output/%.count
-$(SPEC_SANDBOX) count-$(RUN_TYPE) $@ $(REF_IN_DIR) \
@@ -241,6 +270,10 @@
Output/%.diff-tcoo: Output/%.out-nat Output/%.out-tcoo
-$(DIFFPROG) tcoo $* $(HIDEDIFF)
+$(PROGRAMS_TO_TEST:%=Output/%.diff-tcoo1): \
+Output/%.diff-tcoo1: Output/%.out-nat Output/%.out-tcoo1
+ -$(DIFFPROG) tcoo1 $* $(HIDEDIFF)
+
$(PROGRAMS_TO_TEST:%=Output/%.diff-llvm1): \
Output/%.diff-llvm1: Output/%.out-nat Output/%.out-llvm1
-$(DIFFPROG) llvm1 $* $(HIDEDIFF)
@@ -369,6 +402,10 @@
printf "TCOO-RUN_TIME: " >> $@;\
grep 'program' Output/$*.out-tcoo.time >> $@;\
fi
+ @-if test -f Output/$*.diff-tcoo1; then \
+ printf "TCOO1-RUN_TIME: " >> $@;\
+ grep 'program' Output/$*.out-tcoo1.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=133101&r1=133100&r2=133101&view=diff
==============================================================================
--- poolalloc/trunk/test/TEST.types.report (original)
+++ poolalloc/trunk/test/TEST.types.report Wed Jun 15 17:40:18 2011
@@ -191,4 +191,5 @@
["TcdTime", "TCD-RUN_TIME: program *([.0-9]+)"],
["TcoTime", "TCO-RUN_TIME: program *([.0-9]+)"],
["TcooTime", "TCOO-RUN_TIME: program *([.0-9]+)"],
+ ["Tcoo1Time", "TCOO1-RUN_TIME: program *([.0-9]+)"],
);
More information about the llvm-commits
mailing list