From 9fe86c3f96cf9f8eed89afec9a1c5afa24ef0173 Mon Sep 17 00:00:00 2001 From: Sebastian Ullrich Date: Fri, 31 May 2019 10:48:50 +0200 Subject: [PATCH] chore(tests/bench): further tweak Swift support --- tests/bench/Makefile | 4 ++-- tests/bench/report.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/bench/Makefile b/tests/bench/Makefile index 90874369a7..82d4b34776 100644 --- a/tests/bench/Makefile +++ b/tests/bench/Makefile @@ -5,7 +5,7 @@ CROSS_BENCHES = binarytrees deriv const_fold qsort rbmap rbmap_10 rbmap_1 LEAN_CATS = .lean .no_reuse.lean .no_borrow.lean .no_st.lean CROSS_CATS = .lean .gc.lean .lean.perf .hs .gc.hs .hs.perf .ml .gc.ml .ml.perf .mlton .gc.mlton .mlton.perf .mlkit .gc.mlkit .mlkit.perf .swift .gc.swift .swift.perf -CROSS_TIME_CATS = .lean .hs .ml .mlton .mlkit +CROSS_TIME_CATS = .lean .hs .ml .mlton .mlkit .swift RETIRED_CATS = .gcc.lean .llvm.hs .flambda.ml LEAN_FLAGS = @@ -142,7 +142,7 @@ bench/%gc.mlkit.bench: %gc.mlkit.out | bench bench/%gc.swift.bench: %swift.out | bench ulimit -s unlimited && $(TEMCI) short exec $(TEMCI_FLAGS)\ - -d $< "perf record -o $@.tmp ./$< $(BENCH_PARAMS) >/dev/null && perf report -i $@.tmp -t ';' --stdio | grep -E 'retain|release|free' | ./lean-gc.py"\ + -d $< "perf record -o $@.tmp ./$< $(BENCH_PARAMS) >/dev/null && perf report -i $@.tmp -t ';' --stdio | grep -E 'retain|release|dealloc|free' | ./lean-gc.py"\ --runner output --out $@ bench/%.perf.bench: %.out | bench diff --git a/tests/bench/report.py b/tests/bench/report.py index aa07d27bff..e16e02948d 100755 --- a/tests/bench/report.py +++ b/tests/bench/report.py @@ -64,6 +64,9 @@ CATBAG = { '.mlkit': ("MLKit", "etime"), '.gc.mlkit': ("GC", "gc"), '.mlkit.perf': ("CM", "cache-misses"), + '.swift': ("Swift", "etime"), + '.gc.swift': ("GC", "gc"), + '.swift.perf': ("CM", "cache-misses"), } benches = os.environ['BENCHES'].split(':')