Merge pull request f4pga#673 from litghost/newline_in_required_features

Output required_features as a list rather than a string with newlines.
mithro · Feb 21, 2019 · 8fde4e2 · 8fde4e2
2 parents a2d3718 + 2a114a9
commit 8fde4e2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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)