From 2a114a9726c80c4998afe791592c48456eb19639 Mon Sep 17 00:00:00 2001 From: Keith Rothman <537074+litghost@users.noreply.github.com> Date: Thu, 21 Feb 2019 15:40:07 -0800 Subject: [PATCH] Output required_features as a list rather than a string with newlines. Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com> --- fuzzers/025-bram-config/generate.py | 3 ++- minitests/roi_harness/create_design_json.py | 2 +- utils/fasm2frames.py | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fuzzers/025-bram-config/generate.py b/fuzzers/025-bram-config/generate.py index 737f1bd1..75a0c98b 100644 --- a/fuzzers/025-bram-config/generate.py +++ b/fuzzers/025-bram-config/generate.py @@ -65,7 +65,8 @@ def bus_tags(segmk, ps, site): # Magic bit positions from experimentation # we could just only solve when parity, but this check documents the fine points a bit better if hasparity or i not in (1, 9): - segmk.add_site_tag(site, '%s[%u]' % (tagname, i), 1 ^ bitstr[i]) + segmk.add_site_tag( + site, '%s[%u]' % (tagname, i), 1 ^ bitstr[i]) def rw_width_tags(segmk, ps, site): diff --git a/minitests/roi_harness/create_design_json.py b/minitests/roi_harness/create_design_json.py index 549ad7ac..fb37c7b1 100644 --- a/minitests/roi_harness/create_design_json.py +++ b/minitests/roi_harness/create_design_json.py @@ -110,7 +110,7 @@ def main(): required_features.append(fasm_line) design_json['required_features'] = fasm.fasm_tuple_to_string( - required_features, canonical=True) + required_features, canonical=True).split('\n') xjson.pprint(sys.stdout, design_json) diff --git a/utils/fasm2frames.py b/utils/fasm2frames.py index a30da868..f94060f1 100755 --- a/utils/fasm2frames.py +++ b/utils/fasm2frames.py @@ -70,7 +70,8 @@ def run(db_root, filename_in, f_out, sparse=False, roi=None, debug=False): assembler.mark_roi_frames(Roi(db=db, x1=x1, x2=x2, y1=y1, y2=y2)) if 'required_features' in roi_j: - extra_features = fasm.parse_fasm_string(roi_j['required_features']) + extra_features = fasm.parse_fasm_string( + '\n'.join(roi_j['required_features'])) assembler.parse_fasm_filename(filename_in, extra_features=extra_features) frames = assembler.get_frames(sparse=sparse)