[llvm-commits] [poolalloc] r57097 - in /poolalloc/trunk: lib/DSA/Local.cpp test/TEST.poolalloc.Makefile
Andrew Lenharth
alenhar2 at cs.uiuc.edu
Sat Oct 4 21:56:12 PDT 2008
Author: alenhar2
Date: Sat Oct 4 23:56:11 2008
New Revision: 57097
URL: http://llvm.org/viewvc/llvm-project?rev=57097&view=rev
Log:
atomic types
Modified:
poolalloc/trunk/lib/DSA/Local.cpp
poolalloc/trunk/test/TEST.poolalloc.Makefile
Modified: poolalloc/trunk/lib/DSA/Local.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Local.cpp?rev=57097&r1=57096&r2=57097&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/Local.cpp (original)
+++ poolalloc/trunk/lib/DSA/Local.cpp Sat Oct 4 23:56:11 2008
@@ -576,6 +576,37 @@
return true;
}
+ case Intrinsic::atomic_cmp_swap: {
+ DSNodeHandle Ptr = getValueDest(**CS.arg_begin());
+ Ptr.getNode()->setReadMarker();
+ Ptr.getNode()->setModifiedMarker();
+ if (isa<PointerType>(F->getReturnType())) {
+ setDestTo(*(CS.getInstruction()), getValueDest(**(CS.arg_begin() + 1)));
+ getValueDest(**(CS.arg_begin() + 1))
+ .mergeWith(getValueDest(**(CS.arg_begin() + 2)));
+ }
+ }
+ case Intrinsic::atomic_swap:
+ case Intrinsic::atomic_load_add:
+ case Intrinsic::atomic_load_sub:
+ case Intrinsic::atomic_load_and:
+ case Intrinsic::atomic_load_nand:
+ case Intrinsic::atomic_load_or:
+ case Intrinsic::atomic_load_xor:
+ case Intrinsic::atomic_load_max:
+ case Intrinsic::atomic_load_min:
+ case Intrinsic::atomic_load_umax:
+ case Intrinsic::atomic_load_umin:
+ {
+ DSNodeHandle Ptr = getValueDest(**CS.arg_begin());
+ Ptr.getNode()->setReadMarker();
+ Ptr.getNode()->setModifiedMarker();
+ if (isa<PointerType>(F->getReturnType()))
+ setDestTo(*(CS.getInstruction()), getValueDest(**(CS.arg_begin() + 1)));
+ }
+
+
+
case Intrinsic::eh_selector_i32:
case Intrinsic::eh_selector_i64:
case Intrinsic::eh_typeid_for_i32:
@@ -594,7 +625,7 @@
return true;
}
- DOUT << "[dsa:local] Unhandled intrinsic: " << F->getName() << "\n";
+ cerr << "[dsa:local] Unhandled intrinsic: " << F->getName() << "\n";
assert(0 && "Unhandled intrinsic");
return false;
}
@@ -606,7 +637,7 @@
// Special case handling of certain libc allocation functions here.
if (Function *F = dyn_cast<Function>(Callee))
- if (F->isDeclaration())
+ if (F->isDeclaration()) {
if (F->isIntrinsic() && visitIntrinsic(CS, F))
return;
else {
@@ -628,6 +659,7 @@
return;
}
}
+ }
// Set up the return value...
DSNodeHandle RetVal;
Modified: poolalloc/trunk/test/TEST.poolalloc.Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.poolalloc.Makefile?rev=57097&r1=57096&r2=57097&view=diff
==============================================================================
--- poolalloc/trunk/test/TEST.poolalloc.Makefile (original)
+++ poolalloc/trunk/test/TEST.poolalloc.Makefile Sat Oct 4 23:56:11 2008
@@ -17,13 +17,13 @@
CURDIR := $(shell cd .; pwd)
-PROGDIR := $(shell cd $(LLVM_SRC_ROOT)/projects/llvm-test; pwd)/
+PROGDIR := $(shell cd $(LLVM_SRC_ROOT)/projects/test-suite; pwd)/
RELDIR := $(subst $(PROGDIR),,$(CURDIR))
-PADIR := /home/andrewl/Research/llvm.orig/projects/llvm-poolalloc
+PADIR := /home/andrewl/Research/llvm/projects/poolalloc
# Pool allocator pass shared object
-PA_SO := $(PADIR)/Debug/lib/poolalloc$(SHLIBEXT)
-DSA_SO := $(PADIR)/Debug/lib/LLVMDataStructure$(SHLIBEXT)
+PA_SO := $(PADIR)/Debug/lib/libpoolalloc$(SHLIBEXT)
+DSA_SO := $(PADIR)/Debug/lib/libLLVMDataStructure$(SHLIBEXT)
# Pool allocator runtime library
#PA_RT := $(PADIR)/Debug/lib/libpoolalloc_fl_rt.bc
@@ -43,24 +43,24 @@
# This rule runs the pool allocator on the .llvm.bc file to produce a new .bc
# file
-$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).poolalloc.bc): \
-Output/%.$(TEST).poolalloc.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
+$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.bc): \
+Output/%.poolalloc.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
- at rm -f $(CURDIR)/$@.info
-$(OPT_PA_STATS) -poolalloc $(EXTRA_PA_FLAGS) $(OPTZN_PASSES) -pooloptimize $< -o $@ -f 2>&1 > $@.out
-$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).basepa.bc): \
-Output/%.$(TEST).basepa.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
+$(PROGRAMS_TO_TEST:%=Output/%.basepa.bc): \
+Output/%.basepa.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
- at rm -f $(CURDIR)/$@.info
-$(OPT_PA_STATS) -poolalloc -poolalloc-disable-alignopt -poolalloc-force-all-poolfrees -poolalloc-heuristic=AllNodes $(OPTZN_PASSES) $< -o $@ -f 2>&1 > $@.out
-$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).mallocrepl.bc): \
-Output/%.$(TEST).mallocrepl.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
+$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.bc): \
+Output/%.mallocrepl.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
- at rm -f $(CURDIR)/$@.info
-$(OPT_PA_STATS) -poolalloc -poolalloc-heuristic=AllInOneGlobalPool $(OPTZN_PASSES) $< -o $@ -f 2>&1 > $@.out
-$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).onlyoverhead.bc): \
-Output/%.$(TEST).onlyoverhead.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
+$(PROGRAMS_TO_TEST:%=Output/%.onlyoverhead.bc): \
+Output/%.onlyoverhead.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
- at rm -f $(CURDIR)/$@.info
-$(OPT_PA_STATS) -poolalloc -poolalloc-heuristic=OnlyOverhead $(OPTZN_PASSES) $< -o $@ -f 2>&1 > $@.out
@@ -69,47 +69,47 @@
- at rm -f $(CURDIR)/$@.info
-$(LOPT) $(OPTZN_PASSES) $< -o $@ -f 2>&1 > $@.out
-# This rule compiles the new .bc file into a .c file using CBE
-$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.cbe.c): \
-Output/%.poolalloc.cbe.c: Output/%.$(TEST).poolalloc.bc $(LLC)
- -$(LLC) -march=c -f $< -o $@
+# This rule compiles the new .bc file into a .s file
+$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.s): \
+Output/%.poolalloc.s: Output/%.poolalloc.bc $(LLC)
+ -$(LLC) -f $< -o $@
-$(PROGRAMS_TO_TEST:%=Output/%.basepa.cbe.c): \
-Output/%.basepa.cbe.c: Output/%.$(TEST).basepa.bc $(LLC)
- -$(LLC) -march=c -f $< -o $@
+$(PROGRAMS_TO_TEST:%=Output/%.basepa.s): \
+Output/%.basepa.s: Output/%.basepa.bc $(LLC)
+ -$(LLC) -f $< -o $@
-$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.cbe.c): \
-Output/%.mallocrepl.cbe.c: Output/%.$(TEST).mallocrepl.bc $(LLC)
- -$(LLC) -march=c -f $< -o $@
+$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.s): \
+Output/%.mallocrepl.s: Output/%.mallocrepl.bc $(LLC)
+ -$(LLC) -f $< -o $@
-$(PROGRAMS_TO_TEST:%=Output/%.onlyoverhead.cbe.c): \
-Output/%.onlyoverhead.cbe.c: Output/%.$(TEST).onlyoverhead.bc $(LLC)
- -$(LLC) -march=c -f $< -o $@
+$(PROGRAMS_TO_TEST:%=Output/%.onlyoverhead.s): \
+Output/%.onlyoverhead.s: Output/%.onlyoverhead.bc $(LLC)
+ -$(LLC) -f $< -o $@
-$(PROGRAMS_TO_TEST:%=Output/%.nonpa.cbe.c): \
-Output/%.nonpa.cbe.c: Output/%.nonpa.bc $(LLC)
- -$(LLC) -march=c -f $< -o $@
+$(PROGRAMS_TO_TEST:%=Output/%.nonpa.s): \
+Output/%.nonpa.s: Output/%.nonpa.bc $(LLC)
+ -$(LLC) -f $< -o $@
-$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.cbe): \
-Output/%.poolalloc.cbe: Output/%.poolalloc.cbe.c $(PA_RT_O)
+$(PROGRAMS_TO_TEST:%=Output/%.poolalloc): \
+Output/%.poolalloc: Output/%.poolalloc.s $(PA_RT_O)
-$(CC) $(CFLAGS) $< $(PA_RT_O) $(LLCLIBS) $(LDFLAGS) -o $@
-$(PROGRAMS_TO_TEST:%=Output/%.basepa.cbe): \
-Output/%.basepa.cbe: Output/%.basepa.cbe.c $(PA_RT_O)
+$(PROGRAMS_TO_TEST:%=Output/%.basepa): \
+Output/%.basepa: Output/%.basepa.s $(PA_RT_O)
-$(CC) $(CFLAGS) $< $(PA_RT_O) $(LLCLIBS) $(LDFLAGS) -o $@
-$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.cbe): \
-Output/%.mallocrepl.cbe: Output/%.mallocrepl.cbe.c $(PA_RT_O)
+$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl): \
+Output/%.mallocrepl: Output/%.mallocrepl.s $(PA_RT_O)
-$(CC) $(CFLAGS) $< $(PA_RT_O) $(LLCLIBS) $(LDFLAGS) -o $@
-$(PROGRAMS_TO_TEST:%=Output/%.onlyoverhead.cbe): \
-Output/%.onlyoverhead.cbe: Output/%.onlyoverhead.cbe.c $(PA_RT_O)
+$(PROGRAMS_TO_TEST:%=Output/%.onlyoverhead): \
+Output/%.onlyoverhead: Output/%.onlyoverhead.s $(PA_RT_O)
-$(CC) $(CFLAGS) $< $(PA_RT_O) $(LLCLIBS) $(LDFLAGS) -o $@
-$(PROGRAMS_TO_TEST:%=Output/%.nonpa.cbe): \
-Output/%.nonpa.cbe: Output/%.nonpa.cbe.c $(PA_RT_O)
+$(PROGRAMS_TO_TEST:%=Output/%.nonpa): \
+Output/%.nonpa: Output/%.nonpa.s $(PA_RT_O)
-$(CC) $(CFLAGS) $< $(PA_RT_O) $(LLCLIBS) $(LDFLAGS) -o $@
@@ -118,138 +118,138 @@
# This rule runs the generated executable, generating timing information, for
# normal test programs
-$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.out-cbe): \
-Output/%.poolalloc.out-cbe: Output/%.poolalloc.cbe
+$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.out): \
+Output/%.poolalloc.out: Output/%.poolalloc
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
-$(PROGRAMS_TO_TEST:%=Output/%.basepa.out-cbe): \
-Output/%.basepa.out-cbe: Output/%.basepa.cbe
+$(PROGRAMS_TO_TEST:%=Output/%.basepa.out): \
+Output/%.basepa.out: Output/%.basepa
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
-$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.out-cbe): \
-Output/%.mallocrepl.out-cbe: Output/%.mallocrepl.cbe
+$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.out): \
+Output/%.mallocrepl.out: Output/%.mallocrepl
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
-$(PROGRAMS_TO_TEST:%=Output/%.onlyoverhead.out-cbe): \
-Output/%.onlyoverhead.out-cbe: Output/%.onlyoverhead.cbe
+$(PROGRAMS_TO_TEST:%=Output/%.onlyoverhead.out): \
+Output/%.onlyoverhead.out: Output/%.onlyoverhead
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
-$(PROGRAMS_TO_TEST:%=Output/%.nonpa.out-cbe): \
-Output/%.nonpa.out-cbe: Output/%.nonpa.cbe
+$(PROGRAMS_TO_TEST:%=Output/%.nonpa.out): \
+Output/%.nonpa.out: Output/%.nonpa
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
else
# This rule runs the generated executable, generating timing information, for
# SPEC
-$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.out-cbe): \
-Output/%.poolalloc.out-cbe: Output/%.poolalloc.cbe
- -$(SPEC_SANDBOX) poolalloccbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \
+$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.out): \
+Output/%.poolalloc.out: Output/%.poolalloc
+ -$(SPEC_SANDBOX) poolalloc-$(RUN_TYPE) $@ $(REF_IN_DIR) \
$(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
../../$< $(RUN_OPTIONS)
- -(cd Output/poolalloccbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
- -cp Output/poolalloccbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
+ -(cd Output/poolalloc-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
+ -cp Output/poolalloc-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
-$(PROGRAMS_TO_TEST:%=Output/%.basepa.out-cbe): \
-Output/%.basepa.out-cbe: Output/%.basepa.cbe
- -$(SPEC_SANDBOX) basepacbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \
+$(PROGRAMS_TO_TEST:%=Output/%.basepa.out): \
+Output/%.basepa.out: Output/%.basepa
+ -$(SPEC_SANDBOX) basepa-$(RUN_TYPE) $@ $(REF_IN_DIR) \
$(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
../../$< $(RUN_OPTIONS)
- -(cd Output/basepacbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
- -cp Output/basepacbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
+ -(cd Output/basepa-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
+ -cp Output/basepa-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
-$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.out-cbe): \
-Output/%.mallocrepl.out-cbe: Output/%.mallocrepl.cbe
- -$(SPEC_SANDBOX) mallocreplcbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \
+$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.out): \
+Output/%.mallocrepl.out: Output/%.mallocrepl
+ -$(SPEC_SANDBOX) mallocrepl-$(RUN_TYPE) $@ $(REF_IN_DIR) \
$(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
../../$< $(RUN_OPTIONS)
- -(cd Output/mallocreplcbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
- -cp Output/mallocreplcbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
+ -(cd Output/mallocrepl-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
+ -cp Output/mallocrepl-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
-$(PROGRAMS_TO_TEST:%=Output/%.onlyoverhead.out-cbe): \
-Output/%.onlyoverhead.out-cbe: Output/%.onlyoverhead.cbe
- -$(SPEC_SANDBOX) onlyoverheadcbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \
+$(PROGRAMS_TO_TEST:%=Output/%.onlyoverhead.out): \
+Output/%.onlyoverhead.out: Output/%.onlyoverhead
+ -$(SPEC_SANDBOX) onlyoverhead-$(RUN_TYPE) $@ $(REF_IN_DIR) \
$(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
../../$< $(RUN_OPTIONS)
- -(cd Output/onlyoverheadcbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
- -cp Output/onlyoverheadcbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
+ -(cd Output/onlyoverhead-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
+ -cp Output/onlyoverhead-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
-$(PROGRAMS_TO_TEST:%=Output/%.nonpa.out-cbe): \
-Output/%.nonpa.out-cbe: Output/%.nonpa.cbe
- -$(SPEC_SANDBOX) nonpacbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \
+$(PROGRAMS_TO_TEST:%=Output/%.nonpa.out): \
+Output/%.nonpa.out: Output/%.nonpa
+ -$(SPEC_SANDBOX) nonpa-$(RUN_TYPE) $@ $(REF_IN_DIR) \
$(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
../../$< $(RUN_OPTIONS)
- -(cd Output/nonpacbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
- -cp Output/nonpacbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
+ -(cd Output/nonpa-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
+ -cp Output/nonpa-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
endif
# This rule diffs the post-poolallocated version to make sure we didn't break
# the program!
-$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.diff-cbe): \
-Output/%.poolalloc.diff-cbe: Output/%.out-nat Output/%.poolalloc.out-cbe
+$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.diff): \
+Output/%.poolalloc.diff: Output/%.out-nat Output/%.poolalloc.out
@cp Output/$*.out-nat Output/$*.poolalloc.out-nat
- -$(DIFFPROG) cbe $*.poolalloc $(HIDEDIFF)
+ -$(DIFFPROG) nat $*.poolalloc $(HIDEDIFF)
-$(PROGRAMS_TO_TEST:%=Output/%.basepa.diff-cbe): \
-Output/%.basepa.diff-cbe: Output/%.out-nat Output/%.basepa.out-cbe
+$(PROGRAMS_TO_TEST:%=Output/%.basepa.diff): \
+Output/%.basepa.diff: Output/%.out-nat Output/%.basepa.out
@cp Output/$*.out-nat Output/$*.basepa.out-nat
- -$(DIFFPROG) cbe $*.basepa $(HIDEDIFF)
+ -$(DIFFPROG) nat $*.basepa $(HIDEDIFF)
-$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.diff-cbe): \
-Output/%.mallocrepl.diff-cbe: Output/%.out-nat Output/%.mallocrepl.out-cbe
+$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.diff): \
+Output/%.mallocrepl.diff: Output/%.out-nat Output/%.mallocrepl.out
@cp Output/$*.out-nat Output/$*.mallocrepl.out-nat
- -$(DIFFPROG) cbe $*.mallocrepl $(HIDEDIFF)
+ -$(DIFFPROG) nat $*.mallocrepl $(HIDEDIFF)
-$(PROGRAMS_TO_TEST:%=Output/%.onlyoverhead.diff-cbe): \
-Output/%.onlyoverhead.diff-cbe: Output/%.out-nat Output/%.onlyoverhead.out-cbe
+$(PROGRAMS_TO_TEST:%=Output/%.onlyoverhead.diff): \
+Output/%.onlyoverhead.diff: Output/%.out-nat Output/%.onlyoverhead.out
@cp Output/$*.out-nat Output/$*.onlyoverhead.out-nat
- -$(DIFFPROG) cbe $*.onlyoverhead $(HIDEDIFF)
+ -$(DIFFPROG) nat $*.onlyoverhead $(HIDEDIFF)
-$(PROGRAMS_TO_TEST:%=Output/%.nonpa.diff-cbe): \
-Output/%.nonpa.diff-cbe: Output/%.out-nat Output/%.nonpa.out-cbe
+$(PROGRAMS_TO_TEST:%=Output/%.nonpa.diff): \
+Output/%.nonpa.diff: Output/%.out-nat Output/%.nonpa.out
@cp Output/$*.out-nat Output/$*.nonpa.out-nat
- -$(DIFFPROG) cbe $*.nonpa $(HIDEDIFF)
+ -$(DIFFPROG) nat $*.nonpa $(HIDEDIFF)
# This rule wraps everything together to build the actual output the report is
# generated from.
$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
Output/%.$(TEST).report.txt: Output/%.out-nat \
- Output/%.nonpa.diff-cbe \
- Output/%.poolalloc.diff-cbe \
- Output/%.basepa.diff-cbe \
- Output/%.mallocrepl.diff-cbe \
- Output/%.onlyoverhead.diff-cbe \
+ Output/%.nonpa.diff \
+ Output/%.poolalloc.diff \
+ Output/%.basepa.diff \
+ Output/%.mallocrepl.diff \
+ Output/%.onlyoverhead.diff \
Output/%.LOC.txt
@echo > $@
- @-if test -f Output/$*.nonpa.diff-cbe; then \
+ @-if test -f Output/$*.nonpa.diff; then \
printf "GCC-RUN-TIME: " >> $@;\
grep "^program" Output/$*.out-nat.time >> $@;\
fi
- @-if test -f Output/$*.nonpa.diff-cbe; then \
- printf "CBE-RUN-TIME-NORMAL: " >> $@;\
- grep "^program" Output/$*.nonpa.out-cbe.time >> $@;\
+ @-if test -f Output/$*.nonpa.diff; then \
+ printf "RUN-TIME-NORMAL: " >> $@;\
+ grep "^program" Output/$*.nonpa.out.time >> $@;\
fi
- @-if test -f Output/$*.mallocrepl.diff-cbe; then \
- printf "CBE-RUN-TIME-MALLOCREPL: " >> $@;\
- grep "^program" Output/$*.mallocrepl.out-cbe.time >> $@;\
+ @-if test -f Output/$*.mallocrepl.diff; then \
+ printf "RUN-TIME-MALLOCREPL: " >> $@;\
+ grep "^program" Output/$*.mallocrepl.out.time >> $@;\
fi
- @-if test -f Output/$*.onlyoverhead.diff-cbe; then \
- printf "CBE-RUN-TIME-ONLYOVERHEAD: " >> $@;\
- grep "^program" Output/$*.onlyoverhead.out-cbe.time >> $@;\
+ @-if test -f Output/$*.onlyoverhead.diff; then \
+ printf "RUN-TIME-ONLYOVERHEAD: " >> $@;\
+ grep "^program" Output/$*.onlyoverhead.out.time >> $@;\
fi
- @-if test -f Output/$*.basepa.diff-cbe; then \
- printf "CBE-RUN-TIME-BASEPA: " >> $@;\
- grep "^program" Output/$*.basepa.out-cbe.time >> $@;\
+ @-if test -f Output/$*.basepa.diff; then \
+ printf "RUN-TIME-BASEPA: " >> $@;\
+ grep "^program" Output/$*.basepa.out.time >> $@;\
fi
- @-if test -f Output/$*.poolalloc.diff-cbe; then \
- printf "CBE-RUN-TIME-POOLALLOC: " >> $@;\
- grep "^program" Output/$*.poolalloc.out-cbe.time >> $@;\
+ @-if test -f Output/$*.poolalloc.diff; then \
+ printf "RUN-TIME-POOLALLOC: " >> $@;\
+ grep "^program" Output/$*.poolalloc.out.time >> $@;\
fi
printf "LOC: " >> $@
cat Output/$*.LOC.txt >> $@
- @cat Output/$*.$(TEST).poolalloc.bc.info >> $@
+ @cat Output/$*.$(TEST).bc.info >> $@
@#cat Output/$*.$(TEST).basepa.bc.out >> $@
More information about the llvm-commits
mailing list