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

Merge pull request #1235 from litghost/update_timing_scripts 

Fix some bugs present timing analysis script.
This commit is contained in:
litghost 2020-02-14 09:45:38 -08:00 committed by GitHub
parent 541d88c999 b9302a09c6
commit 2339c0715e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 164 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
minitests/timing/Makefile
View File

@ -8,7 +8,7 @@ build/.touch:
touch build/.touch
%.json: %.json5
python3 clean_json5.py < $< > $@
python3 ${XRAY_UTILS_DIR}/clean_json5.py < $< > $@
CURDIR=$(shell pwd)
@ -18,14 +18,14 @@ define output_timing
# $(2) - DESIGN_NAME
# $(3) - VERILOGS
build/$(2)_$(1)/timing_$(2)_$(1).json5: build/.touch runme.tcl $(3)
build/$(2)_$(1)/timing_$(2)_$(1).json5: build/.touch runme.tcl ${XRAY_UTILS_DIR}/write_timing_info.tcl $(3)
rm -rf build/$(2)_$(1)
mkdir -p build/$(2)_$(1)
export ITER=$(1) DESIGN_NAME=$(2) VERILOGS="$(3)" && cd build/$(2)_$(1) && \
${XRAY_VIVADO} -mode batch -source ${CURDIR}/runme.tcl > design_$(2)_$(1)_vivado.log
build/timing_$(2)_$(1).xlsx: build/$(2)_$(1)/timing_$(2)_$(1).json create_timing_worksheet_db.py
python3 create_timing_worksheet_db.py \
build/timing_$(2)_$(1).xlsx: build/$(2)_$(1)/timing_$(2)_$(1).json ${XRAY_UTILS_DIR}/create_timing_worksheet_db.py
python3 ${XRAY_UTILS_DIR}/create_timing_worksheet_db.py \
--timing_json build/$(2)_$(1)/timing_$(2)_$(1).json \
--db_root ${XRAY_FAMILY_DIR} \
--part ${XRAY_PART} \

93
minitests/timing/runme.tcl
View File

@ -1,95 +1,4 @@
proc write_timing_info {filename} {
set fp [open $filename w]
puts $fp "\["
set nets [get_nets]
foreach net $nets {
if { $net == "<const0>" || $net == "<const1>" } {
continue
}
if { [get_property ROUTE_STATUS [get_nets $net]] == "INTRASITE" } {
continue
}
if { [get_property ROUTE_STATUS [get_nets $net]] == "NOLOADS" } {
continue
}
puts $fp "{"
puts $fp "\"net\":\"$net\","
set route [get_property ROUTE $net]
puts $fp "\"route\":\"$route\","
set pips [get_pips -of_objects $net]
puts $fp "\"pips\":\["
foreach pip $pips {
puts $fp "{"
puts $fp "\"name\":\"$pip\","
puts $fp "\"src_wire\":\"[get_wires -uphill -of_objects $pip]\","
puts $fp "\"dst_wire\":\"[get_wires -downhill -of_objects $pip]\","
puts $fp "\"speed_index\":\"[get_property SPEED_INDEX $pip]\","
puts $fp "\"is_directional\":\"[get_property IS_DIRECTIONAL $pip]\","
puts $fp "},"
}
puts $fp "\],"
puts $fp "\"nodes\":\["
set nodes [get_nodes -of_objects $net]
foreach node $nodes {
puts $fp "{"
puts $fp "\"name\":\"$node\","
puts $fp "\"cost_code\":\"[get_property COST_CODE $node]\","
puts $fp "\"cost_code_name\":\"[get_property COST_CODE_NAME $node]\","
puts $fp "\"speed_class\":\"[get_property SPEED_CLASS $node]\","
puts $fp "\"wires\":\["
set wires [get_wires -of_objects $node]
foreach wire $wires {
puts $fp "{"
puts $fp "\"name\":\"$wire\","
puts $fp "\"cost_code\":\"[get_property COST_CODE $wire]\","
puts $fp "\"speed_index\":\"[get_property SPEED_INDEX $wire]\","
puts $fp "},"
}
puts $fp "\],"
puts $fp "},"
}
puts $fp "\],"
set opin [get_pins -leaf -of_objects [get_nets $net] -filter {DIRECTION == OUT}]
puts $fp "\"opin\": {"
puts $fp "\"name\":\"$opin\","
set opin_site_pin [get_site_pins -of_objects $opin]
puts $fp "\"site_pin\":\"$opin_site_pin\","
puts $fp "\"site_pin_speed_index\":\"[get_property SPEED_INDEX $opin_site_pin]\","
puts $fp "\"node\":\"[get_nodes -of_objects $opin_site_pin]\","
puts $fp "\"wire\":\"[get_wires -of_objects [get_nodes -of_objects $opin_site_pin]]\","
puts $fp "},"
set ipins [get_pins -of_objects [get_nets $net] -filter {DIRECTION == IN} -leaf]
puts $fp "\"ipins\":\["
foreach ipin $ipins {
puts $fp "{"
set delay [get_net_delays -interconnect_only -of_objects $net -to $ipin]
puts $fp "\"name\":\"$ipin\","
puts $fp "\"ic_delays\":{"
foreach prop {"FAST_MAX" "FAST_MIN" "SLOW_MAX" "SLOW_MIN"} {
puts $fp "\"$prop\":\"[get_property $prop $delay]\","
}
puts $fp "},"
set ipin_site_pin [get_site_pin -of_objects $ipin]
puts $fp "\"site_pin\":\"$ipin_site_pin\","
puts $fp "\"site_pin_speed_index\":\"[get_property SPEED_INDEX $ipin_site_pin]\","
puts $fp "\"node\":\"[get_nodes -of_objects $ipin_site_pin]\","
puts $fp "\"wire\":\"[get_wires -of_objects [get_nodes -of_objects $ipin_site_pin]]\","
puts $fp "},"
}
puts $fp "\],"
puts $fp "},"
}
puts $fp "\]"
close $fp
}
source $::env(XRAY_UTILS_DIR)/write_timing_info.tcl
proc create_design {design_name sig_mask verilogs} {
create_project -part $::env(XRAY_PART) -force design_$design_name \

1
requirements.txt
View File

@ -14,3 +14,4 @@ simplejson
sympy
textx
yapf==0.24.0
openpyxl

0
minitests/timing/clean_json5.py → utils/clean_json5.py
View File

57
minitests/timing/create_timing_worksheet_db.py → utils/create_timing_worksheet_db.py
View File

@ -1,3 +1,8 @@
""" This takes a JSON file generated with write_timing_info.tcl and generates
a spreadsheet with the prjxray timing model and compares it with the
interconnect timing output from Vivado.
"""
import argparse
import json
from openpyxl import Workbook, utils
@ -92,7 +97,8 @@ class Net(object):
self.models = {}
for ipin in net['ipins']:
self.ipin_nodes[ipin['node']] = ipin
for ipin_node in ipin['node'].strip().split(' '):
self.ipin_nodes[ipin_node] = ipin
# Map of wire name to parent node
self.wire_to_node = {}
@ -112,7 +118,7 @@ class Net(object):
dst_wire = pip['dst_wire'].split('/')[1]
self.pips[(src_node, dst_wire)] = pip
if not pip['is_directional']:
if not int(pip['is_directional']):
dst_node = self.wire_to_node[pip['dst_wire']]['name']
src_wire = pip['src_wire'].split('/')[1]
self.pips[(dst_node, src_wire)] = pip
@ -235,7 +241,10 @@ class Net(object):
self.row += 1
if current_node in self.ipin_nodes:
assert route[route_idx] == '}'
assert route[route_idx] in ['}', 'IOB_O_OUT0', 'IOB_T_OUT0'], (
route_idx,
route[route_idx],
)
route_idx += 1
node = self.node_name_to_node[current_node]
@ -251,7 +260,7 @@ class Net(object):
ws['A{}'.format(self.row)] = ipin['name']
ws['B{}'.format(self.row)] = 'Inpin'
site_pin = timing_lookup.find_site_pin(ipin['node'], node_idx=-1)
site_pin = timing_lookup.find_site_pin(current_node, node_idx=-1)
assert isinstance(site_pin.timing, InPinTiming)
cells = {}
@ -421,8 +430,9 @@ class Net(object):
def add_net(wb, net, timing_lookup):
replace_underscore = str.maketrans('[]\\:/', '_____')
ws = wb.create_sheet(
title="Net {}".format(net['net'].replace('[', '_').replace(']', '_')))
title="Net {}".format(net['net'].translate(replace_underscore)))
# Header
ws['A1'] = 'Name'
@ -440,6 +450,28 @@ def add_net(wb, net, timing_lookup):
yield from net_obj.walk_route(ws, timing_lookup)
def build_wire_filter(wire_filter):
wires_to_include = set()
with open(wire_filter) as f:
for l in f:
wire = l.strip()
if not wire:
continue
wires_to_include.add(wire)
def filter_net(net):
wires_in_net = set()
for node in net['nodes']:
for wire in node['wires']:
wires_in_net.add(wire['name'])
return len(wires_in_net & wires_to_include) > 0
return filter_net
def main():
parser = argparse.ArgumentParser(
description="Create timing worksheet for 7-series timing analysis.")
@ -448,6 +480,9 @@ def main():
util.part_arg(parser)
parser.add_argument('--timing_json', required=True)
parser.add_argument('--output_xlsx', required=True)
parser.add_argument(
'--wire_filter',
help='List of wires that must be present in a net to be output')
args = parser.parse_args()
@ -464,7 +499,7 @@ def main():
timing_lookup = TimingLookup(db, nodes)
wb = Workbook()
summary_ws = wb.get_sheet_by_name(wb.sheetnames[0])
summary_ws = wb[wb.sheetnames[0]]
summary_ws.title = 'Summary'
summary_ws['A1'] = 'Name'
@ -477,14 +512,22 @@ def main():
summary_ws['{}1'.format(cur_col)] = 'Computed ' + col
cur_col = chr(ord(cur_col) + 3)
if args.wire_filter:
wire_filter = build_wire_filter(args.wire_filter)
else:
wire_filter = lambda x: True
summary_row = 2
for net in timing:
timing = [net for net in timing if wire_filter(net)]
for idx, net in enumerate(timing):
if '<' in net['route']:
print(
"WARNING: Skipping net {} because it has complicated route description."
.format(net['net']))
continue
print('Process net {} ({} / {})'.format(net['net'], idx, len(timing)))
for summary_cells in add_net(wb, net, timing_lookup):
summary_ws['A{}'.format(summary_row)] = summary_cells['Name']

108
utils/write_timing_info.tcl Normal file
View File

@ -0,0 +1,108 @@
# Writes a JSON5 to filename containing timing for current design.
# This can be used with create_timing_worksheet_db.py to compare prjxray model
# with Vivado timing model outputs.
proc write_timing_info {filename} {
set fp [open $filename w]
puts $fp "\["
set nets [get_nets]
set idx 0
foreach net $nets {
puts "net: $net ($idx / [llength $nets])"
incr idx
if { $net == "<const0>" || $net == "<const1>" } {
continue
}
if { [get_property TYPE [get_nets $net]] == "GROUND" } {
continue
}
if { [get_property TYPE [get_nets $net]] == "POWER" } {
continue
}
if { [get_property ROUTE_STATUS [get_nets $net]] == "INTRASITE" } {
continue
}
if { [get_property ROUTE_STATUS [get_nets $net]] == "NOLOADS" } {
continue
}
puts $fp "{"
puts $fp "\"net\":\"$net\","
set route [get_property ROUTE $net]
puts $fp "\"route\":\"$route\","
set pips [get_pips -of_objects $net]
puts $fp "\"pips\":\["
foreach pip $pips {
puts $fp "{"
puts $fp "\"name\":\"$pip\","
puts $fp "\"src_wire\":\"[get_wires -uphill -of_objects $pip]\","
puts $fp "\"dst_wire\":\"[get_wires -downhill -of_objects $pip]\","
puts $fp "\"speed_index\":\"[get_property SPEED_INDEX $pip]\","
puts $fp "\"is_directional\":\"[get_property IS_DIRECTIONAL $pip]\","
puts $fp "},"
}
puts $fp "\],"
puts $fp "\"nodes\":\["
set nodes [get_nodes -of_objects $net]
foreach node $nodes {
puts $fp "{"
puts $fp "\"name\":\"$node\","
puts $fp "\"cost_code\":\"[get_property COST_CODE $node]\","
puts $fp "\"cost_code_name\":\"[get_property COST_CODE_NAME $node]\","
puts $fp "\"speed_class\":\"[get_property SPEED_CLASS $node]\","
puts $fp "\"wires\":\["
set wires [get_wires -of_objects $node]
foreach wire $wires {
puts $fp "{"
puts $fp "\"name\":\"$wire\","
puts $fp "\"cost_code\":\"[get_property COST_CODE $wire]\","
puts $fp "\"speed_index\":\"[get_property SPEED_INDEX $wire]\","
puts $fp "},"
}
puts $fp "\],"
puts $fp "},"
}
puts $fp "\],"
set opin [get_pins -leaf -of_objects [get_nets $net] -filter {DIRECTION == OUT}]
puts $fp "\"opin\": {"
puts $fp "\"name\":\"$opin\","
set opin_site_pin [get_site_pins -of_objects $opin]
puts $fp "\"site_pin\":\"$opin_site_pin\","
puts $fp "\"site_pin_speed_index\":\"[get_property SPEED_INDEX $opin_site_pin]\","
puts $fp "\"node\":\"[get_nodes -of_objects $opin_site_pin]\","
puts $fp "\"wire\":\"[get_wires -of_objects [get_nodes -of_objects $opin_site_pin]]\","
puts $fp "},"
set ipins [get_pins -of_objects [get_nets $net] -filter {DIRECTION == IN} -leaf]
puts $fp "\"ipins\":\["
foreach ipin $ipins {
set ipin_site_pin [get_site_pins -of_objects $ipin -quiet]
if { $ipin_site_pin == "" } {
# This connection is internal!
continue
}
puts $fp "{"
set delay [get_net_delays -interconnect_only -of_objects $net -to $ipin]
puts $fp "\"name\":\"$ipin\","
puts $fp "\"ic_delays\":{"
foreach prop {"FAST_MAX" "FAST_MIN" "SLOW_MAX" "SLOW_MIN"} {
puts $fp "\"$prop\":\"[get_property $prop $delay]\","
}
puts $fp "},"
puts $fp "\"site_pin\":\"$ipin_site_pin\","
puts $fp "\"site_pin_speed_index\":\"[get_property SPEED_INDEX $ipin_site_pin]\","
puts $fp "\"node\":\"[get_nodes -of_objects $ipin_site_pin]\","
puts $fp "\"wire\":\"[get_wires -of_objects [get_nodes -of_objects $ipin_site_pin]]\","
puts $fp "},"
}
puts $fp "\],"
puts $fp "},"
}
puts $fp "\]"
close $fp
}