Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/11257 )
Change subject: systemc: Add a filter-file option.
..
systemc: Add a filter-file option.
The --filter option is very useful, but can get to be long and complex
and a bit too cumbersome to use from the command line. This change
adds a --filter-file option which is mutually exclusive with --filter
and which reads the filter expression from a file instead of accepting
it on the command line.
Change-Id: I381c92ddf0d9fe62acd20432fa4868e2121405b8
Reviewed-on: https://gem5-review.googlesource.com/11257
Reviewed-by: Gabe Black
Maintainer: Gabe Black
---
M src/systemc/tests/verify.py
1 file changed, 23 insertions(+), 12 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
diff --git a/src/systemc/tests/verify.py b/src/systemc/tests/verify.py
index d46e3cc..9cf3443 100755
--- a/src/systemc/tests/verify.py
+++ b/src/systemc/tests/verify.py
@@ -158,9 +158,13 @@
parser.add_argument('--list', action='store_true',
help='List the available tests')
-parser.add_argument('--filter', default='True',
-help='Python expression which filters tests based on '
-'their properties')
+filter_opts = parser.add_mutually_exclusive_group()
+filter_opts.add_argument('--filter', default='True',
+ help='Python expression which filters tests
based '
+ 'on their properties')
+filter_opts.add_argument('--filter-file', default=None,
+ type=argparse.FileType('r'),
+ help='Same as --filter, but read from a file')
def collect_phases(args):
phase_groups = [list(g) for k, g in
@@ -196,20 +200,27 @@
with open(json_path) as f:
test_data = json.load(f)
+if main_args.filter_file:
+f = main_args.filter_file
+filt = compile(f.read(), f.name, 'eval')
+else:
+filt = compile(main_args.filter, '', 'eval')
+
+filtered_tests = {
+target: props for (target, props) in
+test_data.iteritems() if eval(filt, dict(props))
+}
+
if main_args.list:
-for target, props in test_data.iteritems():
-if not eval(main_args.filter, dict(props)):
-continue
+for target, props in sorted(filtered_tests.iteritems()):
print('%s.%s' % (target, main_args.flavor))
for key, val in props.iteritems():
print('%s: %s' % (key, val))
else:
-tests_to_run = []
-for target, props in test_data.iteritems():
-if not eval(main_args.filter, props):
-continue
-tests_to_run.append(Test(target, main_args.flavor,
- main_args.build_dir, props))
+tests_to_run = list([
+Test(target, main_args.flavor, main_args.build_dir, props) for
+target, props in sorted(filtered_tests.iteritems())
+])
for phase in phases:
phase.run(tests_to_run)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/11257
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I381c92ddf0d9fe62acd20432fa4868e2121405b8
Gerrit-Change-Number: 11257
Gerrit-PatchSet: 6
Gerrit-Owner: Gabe Black
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Giacomo Travaglini
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Matthias Jung
Gerrit-MessageType: merged
___
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
