|
|
@@ -315,8 +315,8 @@ def compile(bench_paths, **args):
|
|
|
for i, defines in enumerate(case.permutations):
|
|
|
for k, v in sorted(defines.items()):
|
|
|
if v not in define_cbs:
|
|
|
- name = ('__bench__%s__%s__%s__%d'
|
|
|
- % (suite.name, case.name, k, i))
|
|
|
+ name = ('__bench__%s__%s__%d'
|
|
|
+ % (case.name, k, i))
|
|
|
define_cbs[v] = name
|
|
|
f.writeln('intmax_t %s('
|
|
|
'__attribute__((unused)) '
|
|
|
@@ -325,9 +325,9 @@ def compile(bench_paths, **args):
|
|
|
f.writeln('}')
|
|
|
f.writeln()
|
|
|
f.writeln('const bench_define_t '
|
|
|
- '__bench__%s__%s__defines[]['
|
|
|
+ '__bench__%s__defines[]['
|
|
|
'BENCH_IMPLICIT_DEFINE_COUNT+%d] = {'
|
|
|
- % (suite.name, case.name, len(suite.defines)))
|
|
|
+ % (case.name, len(suite.defines)))
|
|
|
for defines in case.permutations:
|
|
|
f.writeln(4*' '+'{')
|
|
|
for k, v in sorted(defines.items()):
|
|
|
@@ -339,8 +339,8 @@ def compile(bench_paths, **args):
|
|
|
|
|
|
# create case filter function
|
|
|
if suite.if_ is not None or case.if_ is not None:
|
|
|
- f.writeln('bool __bench__%s__%s__filter(void) {'
|
|
|
- % (suite.name, case.name))
|
|
|
+ f.writeln('bool __bench__%s__filter(void) {'
|
|
|
+ % (case.name))
|
|
|
f.writeln(4*' '+'return %s;'
|
|
|
% ' && '.join('(%s)' % if_
|
|
|
for if_ in [suite.if_, case.if_]
|
|
|
@@ -349,9 +349,9 @@ def compile(bench_paths, **args):
|
|
|
f.writeln()
|
|
|
|
|
|
# create case run function
|
|
|
- f.writeln('void __bench__%s__%s__run('
|
|
|
+ f.writeln('void __bench__%s__run('
|
|
|
'__attribute__((unused)) struct lfs_config *cfg) {'
|
|
|
- % (suite.name, case.name))
|
|
|
+ % (case.name))
|
|
|
f.writeln(4*' '+'// bench case %s' % case.name)
|
|
|
if case.code_lineno is not None:
|
|
|
f.writeln(4*' '+'#line %d "%s"'
|
|
|
@@ -391,16 +391,16 @@ def compile(bench_paths, **args):
|
|
|
else:
|
|
|
if case.defines:
|
|
|
f.writeln('extern const bench_define_t '
|
|
|
- '__bench__%s__%s__defines[]['
|
|
|
+ '__bench__%s__defines[]['
|
|
|
'BENCH_IMPLICIT_DEFINE_COUNT+%d];'
|
|
|
- % (suite.name, case.name, len(suite.defines)))
|
|
|
+ % (case.name, len(suite.defines)))
|
|
|
if suite.if_ is not None or case.if_ is not None:
|
|
|
- f.writeln('extern bool __bench__%s__%s__filter('
|
|
|
+ f.writeln('extern bool __bench__%s__filter('
|
|
|
'void);'
|
|
|
- % (suite.name, case.name))
|
|
|
- f.writeln('extern void __bench__%s__%s__run('
|
|
|
+ % (case.name))
|
|
|
+ f.writeln('extern void __bench__%s__run('
|
|
|
'struct lfs_config *cfg);'
|
|
|
- % (suite.name, case.name))
|
|
|
+ % (case.name))
|
|
|
f.writeln()
|
|
|
|
|
|
# create suite struct
|
|
|
@@ -436,13 +436,13 @@ def compile(bench_paths, **args):
|
|
|
% len(case.permutations))
|
|
|
if case.defines:
|
|
|
f.writeln(12*' '+'.defines '
|
|
|
- '= (const bench_define_t*)__bench__%s__%s__defines,'
|
|
|
- % (suite.name, case.name))
|
|
|
+ '= (const bench_define_t*)__bench__%s__defines,'
|
|
|
+ % (case.name))
|
|
|
if suite.if_ is not None or case.if_ is not None:
|
|
|
- f.writeln(12*' '+'.filter = __bench__%s__%s__filter,'
|
|
|
- % (suite.name, case.name))
|
|
|
- f.writeln(12*' '+'.run = __bench__%s__%s__run,'
|
|
|
- % (suite.name, case.name))
|
|
|
+ f.writeln(12*' '+'.filter = __bench__%s__filter,'
|
|
|
+ % (case.name))
|
|
|
+ f.writeln(12*' '+'.run = __bench__%s__run,'
|
|
|
+ % (case.name))
|
|
|
f.writeln(8*' '+'},')
|
|
|
f.writeln(4*' '+'},')
|
|
|
f.writeln(4*' '+'.case_count = %d,' % len(suite.cases))
|
|
|
@@ -1040,7 +1040,8 @@ def run(runner, bench_ids=[], **args):
|
|
|
proged = 0
|
|
|
erased = 0
|
|
|
failures = []
|
|
|
- for by in (expected_case_perms.keys() if args.get('by_cases')
|
|
|
+ for by in (bench_ids if bench_ids
|
|
|
+ else expected_case_perms.keys() if args.get('by_cases')
|
|
|
else expected_suite_perms.keys() if args.get('by_suites')
|
|
|
else [None]):
|
|
|
# spawn jobs for stage
|
|
|
@@ -1053,7 +1054,7 @@ def run(runner, bench_ids=[], **args):
|
|
|
killed) = run_stage(
|
|
|
by or 'benches',
|
|
|
runner_,
|
|
|
- [by] if by is not None else bench_ids,
|
|
|
+ [by] if by is not None else [],
|
|
|
stdout,
|
|
|
trace,
|
|
|
output,
|