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

Assorted fixes. 

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2018-10-22 09:08:34 -07:00
parent e7370d6fdc
commit 7eadae4ded
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
minitests/roi_harness/runme.sh
View File

@ -57,8 +57,8 @@ 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
${XRAY_SEGPRINT} -zd design.bits >design.segp ${XRAY_SEGPRINT} -zd design.bits >design.segp
${XRAY_DIR}/tools/segprint2fasm.py design.segp design.fasm ${XRAY_DIR}/utils/bits2fasm.py --verbose design.bits > design.fasm
${XRAY_DIR}/tools/fasm2frame.py design.fasm design.frm ${XRAY_DIR}/utils/fasm2frames.py design.fasm design.frm
# Hack to get around weird clock error related to clk net not found # Hack to get around weird clock error related to clk net not found
# Remove following lines: # Remove following lines:
#set_property CLOCK_DEDICATED_ROUTE FALSE [get_nets clk_IBUF] #set_property CLOCK_DEDICATED_ROUTE FALSE [get_nets clk_IBUF]

4
prjxray/fasm_disassembler.py
View File

@ -108,7 +108,7 @@ class FasmDisassembler(object):
verbose=verbose): verbose=verbose):
yield fasm_line yield fasm_line
if len(bitdata[frame]) > 0 and verbose: if len(bitdata[frame][1]) > 0 and verbose:
# Some bits were not decoded, add warning and annotations to # Some bits were not decoded, add warning and annotations to
# FASM. # FASM.
yield fasm.FasmLine( yield fasm.FasmLine(
@ -117,7 +117,7 @@ class FasmDisassembler(object):
comment=" In frame 0x{:08x} {} bits were not converted.". comment=" In frame 0x{:08x} {} bits were not converted.".
format( format(
frame, frame,
len(bitdata[frame]), len(bitdata[frame][1]),
)) ))
for bit in bitdata[frame][1]: for bit in bitdata[frame][1]:

2
utils/bits2fasm.py
View File

@ -40,7 +40,7 @@ def main():
parser.add_argument('--db_root', help="Database root.", **db_root_kwargs) parser.add_argument('--db_root', help="Database root.", **db_root_kwargs)
parser.add_argument('bits_file', help='') parser.add_argument('bits_file', help='')
parser.add_argument( parser.add_argument(
'verbose', '--verbose',
help='Print lines for unknown tiles and bits', help='Print lines for unknown tiles and bits',
action='store_true') action='store_true')
parser.add_argument( parser.add_argument(

3
utils/segprint.py
View File

@ -236,6 +236,9 @@ def mksegment(tile_name, block_name):
def tile_segnames(grid): def tile_segnames(grid):
ret = [] ret = []
for tile_name, tile in grid['tiles'].items(): for tile_name, tile in grid['tiles'].items():
if 'bits' not in tile:
continue
for block_name in tile['bits'].keys(): for block_name in tile['bits'].keys():
ret.append(mksegment(tile_name, block_name)) ret.append(mksegment(tile_name, block_name))
return ret return ret