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

Remove xjson from 074. 

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2020-02-12 07:36:31 -08:00
parent 18cd6aff1c
commit 7dfd4adaa8
5 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuzzers/074-dump_all/cleanup_site_pins.py
View File

@ -15,8 +15,6 @@ import re
import sys import sys
import copy import copy
from utils import xjson
# All site names appear to follow the pattern <type>_X<abs coord>Y<abs coord>. # All site names appear to follow the pattern <type>_X<abs coord>Y<abs coord>.
# Generally speaking, only the tile relatively coordinates are required to # Generally speaking, only the tile relatively coordinates are required to
# assemble arch defs, so we re-origin the coordinates to be relative to the tile # assemble arch defs, so we re-origin the coordinates to be relative to the tile
@ -115,7 +113,7 @@ def main():
site_pin['name'] = site_pin['name'][len(orig_site_name) + 1:] site_pin['name'] = site_pin['name'][len(orig_site_name) + 1:]
xjson.pprint(sys.stdout, output_site_pins) json.dumps(output_site_pins, indent=2, sort_keys=True)
if __name__ == "__main__": if __name__ == "__main__":

5
fuzzers/074-dump_all/create_node_tree.py
View File

@ -5,8 +5,7 @@ import os.path
import prjxray.lib import prjxray.lib
import pickle import pickle
import collections import collections
import json
from utils import xjson
def build_node_index(fname): def build_node_index(fname):
@ -273,7 +272,7 @@ def main():
print('{} Writing node tree'.format(datetime.datetime.now())) print('{} Writing node tree'.format(datetime.datetime.now()))
with open(os.path.join(args.output_dir, 'node_tree.json'), 'w') as f: with open(os.path.join(args.output_dir, 'node_tree.json'), 'w') as f:
xjson.pprint(f, nodes) json.dump(nodes, f, indent=2, sort_keys=True)
if __name__ == '__main__': if __name__ == '__main__':

5
fuzzers/074-dump_all/generate_grid.py
View File

@ -11,7 +11,6 @@ import datetime
import pickle import pickle
import sys import sys
from utils import xjson
from prjxray import util, lib from prjxray import util, lib
@ -608,7 +607,7 @@ def main():
print('{} Writing tileconn'.format(datetime.datetime.now())) print('{} Writing tileconn'.format(datetime.datetime.now()))
with open(tileconn_file, 'w') as f: with open(tileconn_file, 'w') as f:
xjson.pprint(f, tileconn) json.dump(tileconn, f, indent=2, sort_keys=True)
else: else:
with open(wire_map_file, 'rb') as f: with open(wire_map_file, 'rb') as f:
wire_map = pickle.load(f) wire_map = pickle.load(f)
@ -653,7 +652,7 @@ def main():
if len(error_nodes) > 0: if len(error_nodes) > 0:
error_nodes_file = os.path.join(args.output_dir, 'error_nodes.json') error_nodes_file = os.path.join(args.output_dir, 'error_nodes.json')
with open(error_nodes_file, 'w') as f: with open(error_nodes_file, 'w') as f:
xjson.pprint(f, error_nodes) json.dump(error_nodes, f, indent=2, sort_keys=True)
ignored_wires = [] ignored_wires = []
ignored_wires_file = args.ignored_wires ignored_wires_file = args.ignored_wires

4
fuzzers/074-dump_all/reduce_site_types.py
View File

@ -13,8 +13,6 @@ import os.path
import re import re
import json import json
from utils import xjson
def main(): def main():
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
@ -57,7 +55,7 @@ def main():
with open(os.path.join(args.output_dir, with open(os.path.join(args.output_dir,
'site_type_{}.json'.format(site_type)), 'site_type_{}.json'.format(site_type)),
'w') as f: 'w') as f:
xjson.pprint(f, proto_site_type) json.dump(proto_site_type, f)
if __name__ == '__main__': if __name__ == '__main__':

7
fuzzers/074-dump_all/reduce_tile_types.py
View File

@ -17,8 +17,7 @@ import progressbar
import multiprocessing import multiprocessing
import os import os
import functools import functools
import json
from utils import xjson
def check_and_strip_prefix(name, prefix): def check_and_strip_prefix(name, prefix):
@ -364,10 +363,10 @@ def main():
with open(os.path.join( with open(os.path.join(
args.output_dir, 'tile_type_{}_site_type_{}.json'.format( args.output_dir, 'tile_type_{}_site_type_{}.json'.format(
tile_type, site_types[site_type]['type'])), 'w') as f: tile_type, site_types[site_type]['type'])), 'w') as f:
xjson.pprint(f, site_types[site_type]) json.dump(site_types[site_type], f, indent=2, sort_keys=True)
with open(tile_type_file, 'w') as f: with open(tile_type_file, 'w') as f:
xjson.pprint(f, reduced_tile) json.dump(reduced_tile, f, indent=2, sort_keys=True)
if __name__ == '__main__': if __name__ == '__main__':