[llvm-commits] CVS: poolalloc/test/Makefile TEST.perf.Makefile TEST.perf.report
John Criswell
criswell at cs.uiuc.edu
Mon Nov 8 19:34:00 PST 2004
Changes in directory poolalloc/test:
Makefile updated: 1.24 -> 1.25
TEST.perf.Makefile updated: 1.11 -> 1.12
TEST.perf.report updated: 1.1 -> 1.2
---
Log message:
Update the list of automatic tests to match what Chris is using for the
current paper.
Add runtimes to the list of stuff reported by the perf targets.
Create CSV files for cache statistics; it seems getting it to work properly
for poolalloc runtimes needs a little bit more work yet.
---
Diffs of the changes: (+45 -29)
Index: poolalloc/test/Makefile
diff -u poolalloc/test/Makefile:1.24 poolalloc/test/Makefile:1.25
--- poolalloc/test/Makefile:1.24 Sat Nov 6 16:33:14 2004
+++ poolalloc/test/Makefile Mon Nov 8 21:33:49 2004
@@ -12,17 +12,21 @@
include $(LEVEL)/Makefile.common
LARGE_PROBLEM_SIZE_DIRS := \
- MultiSource/Benchmarks/Olden \
- MultiSource/Benchmarks/FreeBench/analyzer \
- MultiSource/Benchmarks/llubenchmark
+ MultiSource/Benchmarks/llubenchmark \
+ MultiSource/Benchmarks/FreeBench \
+ MultiSource/Benchmarks/Ptrdist \
+ MultiSource/Benchmarks/MallocBench/cfrac \
+ SingleSource/Benchmarks/McGill
LARGE_PROBLEM_SIZE_DIRS := \
$(addprefix $(LLVM_OBJ_ROOT)/projects/llvm-test/,$(LARGE_PROBLEM_SIZE_DIRS))
NORMAL_PROBLEM_SIZE_DIRS := \
- MultiSource/Benchmarks/Ptrdist \
+ MultiSource/Benchmarks/SciMark2-C/scimark2 \
+ External/Povray \
+ External/FPGrowth \
+ External/Namd \
External/SPEC/CINT2000
- #MultiSource/Benchmarks/MallocBench/cfrac
NORMAL_PROBLEM_SIZE_DIRS := \
$(addprefix $(LLVM_OBJ_ROOT)/projects/llvm-test/,$(NORMAL_PROBLEM_SIZE_DIRS))
@@ -58,22 +62,22 @@
for dir in $(LARGE_PROBLEM_SIZE_DIRS); do \
(cd $$dir; \
PROJECT_DIR=$(BUILD_OBJ_ROOT) $(MAKE) -j1 TEST=perf \
- LARGE_PROBLEM_SIZE=1 report.html) \
+ LARGE_PROBLEM_SIZE=1 report.html report.csv) \
done
for dir in $(NORMAL_PROBLEM_SIZE_DIRS); do \
(cd $$dir; \
PROJECT_DIR=$(BUILD_OBJ_ROOT) $(MAKE) -j1 TEST=perf \
- report.html) \
+ report.html report.csv) \
done
@for dir in $(LARGE_PROBLEM_SIZE_DIRS); do \
(cd $$dir; \
PROJECT_DIR=$(BUILD_OBJ_ROOT) $(MAKE) -s -j1 TEST=perf \
- LARGE_PROBLEM_SIZE=1 report) \
+ LARGE_PROBLEM_SIZE=1 report report.csv) \
done
@for dir in $(NORMAL_PROBLEM_SIZE_DIRS); do \
(cd $$dir; \
PROJECT_DIR=$(BUILD_OBJ_ROOT) $(MAKE) -s -j1 TEST=perf \
- report) \
+ report report.csv) \
done
@printf "\a"; sleep 1; printf "\a"; sleep 1; printf "\a"
@@ -81,22 +85,22 @@
for dir in $(LARGE_PROBLEM_SIZE_DIRS); do \
(cd $$dir; \
PROJECT_DIR=$(BUILD_OBJ_ROOT) $(MAKE) -j1 TEST=p4perf \
- LARGE_PROBLEM_SIZE=1 report.html) \
+ LARGE_PROBLEM_SIZE=1 report.html report.csv) \
done
for dir in $(NORMAL_PROBLEM_SIZE_DIRS); do \
(cd $$dir; \
PROJECT_DIR=$(BUILD_OBJ_ROOT) $(MAKE) -j1 TEST=p4perf \
- report.html) \
+ report.html report.csv) \
done
@for dir in $(LARGE_PROBLEM_SIZE_DIRS); do \
(cd $$dir; \
PROJECT_DIR=$(BUILD_OBJ_ROOT) $(MAKE) -s -j1 TEST=p4perf \
- LARGE_PROBLEM_SIZE=1 report) \
+ LARGE_PROBLEM_SIZE=1 report report.csv) \
done
@for dir in $(NORMAL_PROBLEM_SIZE_DIRS); do \
(cd $$dir; \
PROJECT_DIR=$(BUILD_OBJ_ROOT) $(MAKE) -s -j1 TEST=p4perf \
- report) \
+ report report.csv) \
done
@printf "\a"; sleep 1; printf "\a"; sleep 1; printf "\a"
@@ -104,22 +108,22 @@
for dir in $(LARGE_PROBLEM_SIZE_DIRS); do \
(cd $$dir; \
PROJECT_DIR=$(BUILD_OBJ_ROOT) $(MAKE) -j1 TEST=cputrack \
- LARGE_PROBLEM_SIZE=1 report.html) \
+ LARGE_PROBLEM_SIZE=1 report.html report.csv) \
done
for dir in $(NORMAL_PROBLEM_SIZE_DIRS); do \
(cd $$dir; \
PROJECT_DIR=$(BUILD_OBJ_ROOT) $(MAKE) -j1 TEST=cputrack \
- report.html) \
+ report.html report.csv) \
done
@for dir in $(LARGE_PROBLEM_SIZE_DIRS); do \
(cd $$dir; \
PROJECT_DIR=$(BUILD_OBJ_ROOT) $(MAKE) -s -j1 TEST=cputrack \
- LARGE_PROBLEM_SIZE=1 report) \
+ LARGE_PROBLEM_SIZE=1 report report.csv) \
done
@for dir in $(NORMAL_PROBLEM_SIZE_DIRS); do \
(cd $$dir; \
PROJECT_DIR=$(BUILD_OBJ_ROOT) $(MAKE) -s -j1 TEST=cputrack \
- report) \
+ report report.csv) \
done
@printf "\a"; sleep 1; printf "\a"; sleep 1; printf "\a"
@@ -139,19 +143,19 @@
vtl::
(cd $(LLVM_OBJ_ROOT)/projects/llvm-test/$(SUBDIR); \
PROJECT_DIR=$(BUILD_OBJ_ROOT) $(MAKE) -j1 TEST=pavtl \
- test report)
+ test report report.csv)
@printf "\a"; sleep 1; printf "\a"; sleep 1; printf "\a"
perf::
(cd $(LLVM_OBJ_ROOT)/projects/llvm-test/$(SUBDIR); \
PROJECT_DIR=$(BUILD_OBJ_ROOT) $(MAKE) -j1 TEST=perf \
- test report)
+ test report report.csv)
@printf "\a"; sleep 1; printf "\a"; sleep 1; printf "\a"
p4perf::
(cd $(LLVM_OBJ_ROOT)/projects/llvm-test/$(SUBDIR); \
PROJECT_DIR=$(BUILD_OBJ_ROOT) $(MAKE) -j1 TEST=p4perf \
- test report)
+ test report report.csv)
@printf "\a"; sleep 1; printf "\a"; sleep 1; printf "\a"
strace::
@@ -163,6 +167,6 @@
cputrack::
(cd $(LLVM_OBJ_ROOT)/projects/llvm-test/$(SUBDIR); \
PROJECT_DIR=$(BUILD_OBJ_ROOT) $(MAKE) -j1 TEST=cputrack \
- report)
+ report report.csv)
@printf "\a"; sleep 1; printf "\a"; sleep 1; printf "\a"
Index: poolalloc/test/TEST.perf.Makefile
diff -u poolalloc/test/TEST.perf.Makefile:1.11 poolalloc/test/TEST.perf.Makefile:1.12
--- poolalloc/test/TEST.perf.Makefile:1.11 Fri Nov 5 12:08:50 2004
+++ poolalloc/test/TEST.perf.Makefile Mon Nov 8 21:33:50 2004
@@ -167,6 +167,14 @@
@printf "CBE-L1-Cache-Misses: %lld\n" `cat Output/$(TEST).L1Misses.$*` >> $@
@printf "CBE-PA-L2-Cache-Misses: %lld\n" `cat Output/$(TEST).L2Misses.pa.$*` >> $@
@printf "CBE-L2-Cache-Misses: %lld\n" `cat Output/$(TEST).L2Misses.$*` >> $@
+ @printf "CBE-RUN-TIME-NORMAL-USER: " >> $@
+ @grep "^user" Output/$*.nonpa.out-cbe.time >> $@
+ @printf "CBE-RUN-TIME-NORMAL-SYS: " >> $@
+ @grep "^sys" Output/$*.nonpa.out-cbe.time >> $@
+ @printf "CBE-RUN-TIME-POOLALLOC-USER: " >> $@
+ @grep "^user" Output/$*.poolalloc.out-cbe.time >> $@
+ @printf "CBE-RUN-TIME-POOLALLOC-SYS: " >> $@
+ @grep "^sys" Output/$*.poolalloc.out-cbe.time >> $@
endif
ifeq ($(EVENTS),$(P4_EVENTS))
Index: poolalloc/test/TEST.perf.report
diff -u poolalloc/test/TEST.perf.report:1.1 poolalloc/test/TEST.perf.report:1.2
--- poolalloc/test/TEST.perf.report:1.1 Thu Mar 4 17:16:18 2004
+++ poolalloc/test/TEST.perf.report Mon Nov 8 21:33:50 2004
@@ -78,15 +78,19 @@
["Name:" , '\'([^\']+)\' Program'],
[],
# Times
- ["NormalCacheAccess", 'CBE-Cache-Accesses: ([0-9]+)'],
- ["NormalCacheMisses", 'CBE-Cache-Misses: ([0-9]+)'],
- ["NormalRefillFromL2", 'CBE-L1-Cache-Misses: ([0-9]+)'],
- ["NormalRefillFromSystem", 'CBE-L2-Cache-Misses: ([.0-9]+)'],
+ ["NormUserTime", 'CBE-RUN-TIME-NORMAL-USER: user\s*([.0-9m:]+)', \&FormatTime],
+ ["NormSysTime", 'CBE-RUN-TIME-NORMAL-SYS: sys\s*([.0-9m:]+)', \&FormatTime],
+ ["NormCacheAccess", 'CBE-Cache-Accesses: ([0-9]+)'],
+ ["NormCacheMisses", 'CBE-Cache-Misses: ([0-9]+)'],
+ ["NormRefillFromL2", 'CBE-L1-Cache-Misses: ([0-9]+)'],
+ ["NormRefillFromSys", 'CBE-L2-Cache-Misses: ([.0-9]+)'],
- ["PoolAllocCacheAccess", 'CBE-PA-Cache-Accesses: ([0-9]+)'],
- ["PoolAllocCacheMisses", 'CBE-PA-Cache-Misses: ([0-9]+)'],
- ["PoolAllocRefillFromL2", 'CBE-PA-L1-Cache-Misses: ([0-9]+)'],
- ["PoolAllocRefillFromSystem", 'CBE-PA-L2-Cache-Misses: ([.0-9]+)'],
+ ["PAUserTime", 'CBE-RUN-TIME-POOLALLOC-USER: user\s*([.0-9m:]+)', \&FormatTime],
+ ["PASysTime", 'CBE-RUN-TIME-POOLALLOC-SYS: sys\s*([.0-9m:]+)', \&FormatTime],
+ ["PACacheAccess", 'CBE-PA-Cache-Accesses: ([0-9]+)'],
+ ["PACacheMisses", 'CBE-PA-Cache-Misses: ([0-9]+)'],
+ ["PARefillFromL2", 'CBE-PA-L1-Cache-Misses: ([0-9]+)'],
+ ["PARefillFromSys", 'CBE-PA-L2-Cache-Misses: ([.0-9]+)'],
[]
);
More information about the llvm-commits
mailing list