diff --git a/perf.py b/perf.py --- a/perf.py +++ b/perf.py @@ -2265,11 +2265,16 @@ BENCH_GROUPS = {"default": ["2to3", "dja "template" : ["slowspitfire", "django_v2", "mako_v2"], "logging": ["silent_logging", "simple_logging", "formatted_logging"], + # These are removed from the "all" group + "deprecated": ["iterative_count", "threaded_count"], } # Calculate set of 2-and-3 compatible benchmarks. group2n3 = BENCH_GROUPS["2n3"] = [] +group_deprecated = set(BENCH_GROUPS["deprecated"]) for bm, func in BENCH_FUNCS.items(): + if bm in group_deprecated: + continue minver, maxver = getattr(func, '_range', ('2.0', '4.0')) if minver <= '2.7' and '3.2' <= maxver: group2n3.append(bm) @@ -2401,8 +2406,8 @@ def ParseOutputStyle(option, opt_str, va def CreateBenchGroups(bench_funcs=BENCH_FUNCS, bench_groups=BENCH_GROUPS): bench_groups = bench_groups.copy() - all_benchmarks = bench_funcs.keys() - bench_groups["all"] = all_benchmarks + deprecated = bench_groups['deprecated'] + bench_groups["all"] = sorted(b for b in bench_funcs if b not in deprecated) return bench_groups