diff --git a/fuzzers/007-timing/projects/project.tcl b/fuzzers/007-timing/projects/project.tcl index 38ba25ed..7e80e20e 100644 --- a/fuzzers/007-timing/projects/project.tcl +++ b/fuzzers/007-timing/projects/project.tcl @@ -38,8 +38,8 @@ proc list_format {l delim} { return $ret } -proc line_net_external {fp net src_site src_site_type src_site_pin src_bel src_bel_pin dst_site dst_site_type dst_site_pin dst_bel dst_bel_pin ico fast_max fast_min slow_max slow_min pips_out nodes_out wires_out} { - puts $fp "NET,$net,$src_site,$src_site_type,$src_site_pin,$src_bel,$src_bel_pin,$dst_site,$dst_site_type,$dst_site_pin,$dst_bel,$dst_bel_pin,$ico,$fast_max,$fast_min,$slow_max,$slow_min,$pips_out,$nodes_out,$wires_out" +proc line_net_external {fp net src_site src_site_type src_site_pin src_bel src_bel_pin dst_site dst_site_type dst_site_pin dst_bel dst_bel_pin ico fast_max fast_min slow_max slow_min pips_out wires_out} { + puts $fp "NET,$net,$src_site,$src_site_type,$src_site_pin,$src_bel,$src_bel_pin,$dst_site,$dst_site_type,$dst_site_pin,$dst_bel,$dst_bel_pin,$ico,$fast_max,$fast_min,$slow_max,$slow_min,$pips_out,$wires_out" } proc line_net_internal {fp net site site_type src_bel src_bel_pin dst_bel dst_bel_pin ico fast_max fast_min slow_max slow_min} { @@ -52,17 +52,16 @@ proc line_net_internal {fp net site site_type src_bel src_bel_pin dst_bel dst_be set dst_site_pin "" set pips_out "" - set nodes_out "" set wires_out "" - puts $fp "NET,$net,$src_site,$src_site_type,$src_site_pin,$src_bel,$src_bel_pin,$dst_site,$dst_site_type,$dst_site_pin,$dst_bel,$dst_bel_pin,$ico,$fast_max,$fast_min,$slow_max,$slow_min,$pips_out,$nodes_out,$wires_out" + puts $fp "NET,$net,$src_site,$src_site_type,$src_site_pin,$src_bel,$src_bel_pin,$dst_site,$dst_site_type,$dst_site_pin,$dst_bel,$dst_bel_pin,$ico,$fast_max,$fast_min,$slow_max,$slow_min,$pips_out,$wires_out" } proc write_info4 {} { set outdir "." set fp [open "$outdir/timing4.txt" w] # bel as site/bel, so don't bother with site - puts $fp "linetype,net,src_site,src_site_type,src_site_pin,src_bel,src_bel_pin,dst_site,dst_site_type,dst_site_pin,dst_bel,dst_bel_pin,ico,fast_max,fast_min,slow_max,slow_min,pips,inodes,wires" + puts $fp "linetype,net,src_site,src_site_type,src_site_pin,src_bel,src_bel_pin,dst_site,dst_site_type,dst_site_pin,dst_bel,dst_bel_pin,ico,fast_max,fast_min,slow_max,slow_min,pips,wires" set TIME_start [clock clicks -milliseconds] set equations 0 @@ -184,19 +183,11 @@ proc write_info4 {} { } set pips_out [list_format "$pips_out" "|"] - # Write nodes - # XXX: remove? don't think I care about these - # most for debugging at this point set nodes [get_nodes -of_objects $net -from $src_site_pin -to $dst_site_pin] if {$nodes eq ""} { puts "ERROR: no nodes" return } - foreach node $nodes { - set nwires [llength [get_wires -of_objects $node]] - lappend nodes_out "$node:$nwires" - } - set nodes_out [list_format "$nodes_out" "|"] set wires [get_wires -of_objects $nodes] # Write wires @@ -207,7 +198,7 @@ proc write_info4 {} { set wires_out [list_format "$wires_out" "|"] incr lines_some_int - line_net_external $fp $net $src_site $src_site_type $src_site_pin $src_bel $src_bel_pin $dst_site $dst_site_type $dst_site_pin $dst_bel $dst_bel_pin $ico $fast_max $fast_min $slow_max $slow_min $pips_out $nodes_out $wires_out + line_net_external $fp $net $src_site $src_site_type $src_site_pin $src_bel $src_bel_pin $dst_site $dst_site_type $dst_site_pin $dst_bel $dst_bel_pin $ico $fast_max $fast_min $slow_max $slow_min $pips_out $wires_out } } } diff --git a/fuzzers/007-timing/timing_txt2json.py b/fuzzers/007-timing/timing_txt2json.py index b064b99b..c20c8c9f 100644 --- a/fuzzers/007-timing/timing_txt2json.py +++ b/fuzzers/007-timing/timing_txt2json.py @@ -29,17 +29,6 @@ def parse_pips(pips, speed_i2s): return [parse_pip(pip, speed_i2s) for pip in pips.split('|')] -def parse_node(s): - node, nwires = s.split(':') - return node, int(nwires) - - -def parse_nodes(nodes): - if not nodes: - return [] - return [parse_node(node) for node in nodes.split('|')] - - def parse_wire(s, speed_i2s): # CLBLM_R_X3Y80/CLBLM_M_D6:952 wirestr, speed_index = s.split(':') @@ -55,7 +44,7 @@ def parse_wires(wires, speed_i2s): def gen_timing4(fn, speed_i2s): f = open(fn, 'r') - header_want = "linetype,net,src_site,src_site_type,src_site_pin,src_bel,src_bel_pin,dst_site,dst_site_type,dst_site_pin,dst_bel,dst_bel_pin,ico,fast_max,fast_min,slow_max,slow_min,pips,inodes,wires" + header_want = "linetype,net,src_site,src_site_type,src_site_pin,src_bel,src_bel_pin,dst_site,dst_site_type,dst_site_pin,dst_bel,dst_bel_pin,ico,fast_max,fast_min,slow_max,slow_min,pips,wires" ncols = len(header_want.split(',')) # src_bel dst_bel ico fast_max fast_min slow_max slow_min pips @@ -78,7 +67,7 @@ def gen_timing4(fn, speed_i2s): def net_line(): assert len(parts) == ncols, "Expected %u parts, got %u" % ( ncols, len(parts)) - _lintype, net, src_site, src_site_type, src_site_pin, src_bel, src_bel_pin, dst_site, dst_site_type, dst_site_pin, dst_bel, dst_bel_pin, ico, fast_max, fast_min, slow_max, slow_min, pips, nodes, wires = parts + _lintype, net, src_site, src_site_type, src_site_pin, src_bel, src_bel_pin, dst_site, dst_site_type, dst_site_pin, dst_bel, dst_bel_pin, ico, fast_max, fast_min, slow_max, slow_min, pips, wires = parts return { 'net': net, 'src': { @@ -104,7 +93,6 @@ def gen_timing4(fn, speed_i2s): }, 'ico': int(ico), 'pips': parse_pips(pips, speed_i2s), - 'nodes': parse_nodes(nodes), 'wires': parse_wires(wires, speed_i2s), 'line': l, }