luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #670 from litghost/format_harness_json 

Format harness JSON file.
This commit is contained in:
litghost 2019-02-21 15:36:00 -08:00 committed by GitHub
parent 9832078689 1b4b2152db
commit ca041e78a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
minitests/roi_harness/create_design_json.py
View File

@ -1,4 +1,4 @@
import json import xjson
import csv import csv
import argparse import argparse
import sys import sys
@ -112,7 +112,7 @@ def main():
design_json['required_features'] = fasm.fasm_tuple_to_string( design_json['required_features'] = fasm.fasm_tuple_to_string(
required_features, canonical=True) required_features, canonical=True)
json.dump(design_json, sys.stdout, indent=2, sort_keys=True) xjson.pprint(sys.stdout, design_json)
if __name__ == '__main__': if __name__ == '__main__':

2
minitests/roi_harness/runme.sh
View File

@ -62,7 +62,7 @@ test -z "$(fgrep CRITICAL vivado.log)"
${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o design.bits -z -y design.bit ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o design.bits -z -y design.bit
python3 ${XRAY_DIR}/utils/bit2fasm.py --verbose design.bit > design.fasm python3 ${XRAY_DIR}/utils/bit2fasm.py --verbose design.bit > design.fasm
python3 ${XRAY_DIR}/utils/fasm2frames.py design.fasm design.frm python3 ${XRAY_DIR}/utils/fasm2frames.py design.fasm design.frm
python3 ../create_design_json.py \ PYTHONPATH=$PYTHONPATH:$XRAY_DIR/utils python3 ../create_design_json.py \
--design_info_txt design_info.txt \ --design_info_txt design_info.txt \
--design_txt design.txt \ --design_txt design.txt \
--pad_wires design_pad_wires.txt \ --pad_wires design_pad_wires.txt \