Add some CARRY4 related tests to "simple" experiment

Signed-off-by: Clifford Wolf <clifford@clifford.at>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
This commit is contained in:
Clifford Wolf 2017-10-13 22:00:49 +02:00
parent e91686fdd7
commit 916cae0ccd
6 changed files with 125 additions and 44 deletions

3
simple/.gitignore vendored
View File

@ -10,6 +10,7 @@
/hd_visual/
/vivado[_.]*
/usage_statistics_webtalk.*
/lutlist.txt
/lutdata.txt
/carrydata.txt
/segdata.txt
/database.txt

View File

@ -1,25 +0,0 @@
# set carry_cell [lindex [get_cells -hierarchical -filter {REF_NAME == CARRY4}] 0]
proc get_carry_cyinit_mux_cfg {carry_cell} {
set cyinit_pin [get_pins -of_objects $carry_cell -filter {REF_PIN_NAME == CYINIT}]
set cyinit_net [get_nets -quiet -of_objects $cyinit_pin]
if {[string last "<const0>" $cyinit_net] > 0} { return "zero" }
if {[string last "<const1>" $cyinit_net] > 0} { return "one" }
set cin_pin [get_site_pins -of_objects [get_sites -of_objects $carry_cell] */CIN]
set cin_net [get_nets -quiet -of_objects $cin_pin]
if {"$cyinit_net" == "$cin_net"} { return "cin" }
set ax_pin [get_site_pins -of_objects [get_sites -of_objects $carry_cell] */AX]
set ax_net [get_nets -quiet -of_objects $ax_pin]
if {"$cyinit_net" == "$ax_net"} { return "ax" }
return "unknown"
}
proc list_carry_cyinit_mux_cfg {} {
foreach carry_cell [get_cells -hierarchical -filter {REF_NAME == CARRY4}] {
puts "[get_bels -of_objects $carry_cell] [get_carry_cyinit_mux_cfg $carry_cell]"
}
}

View File

@ -28,6 +28,7 @@ set_property CLOCK_DEDICATED_ROUTE FALSE [get_nets clk_IBUF]
EOT
cat > design.tcl << EOT
source "utilities.tcl"
create_project -force -part $XRAY_PART design design
read_xdc design.xdc
@ -41,16 +42,28 @@ route_design
write_checkpoint -force design.dcp
write_bitstream -force design.bit
puts "Writing lutlist.txt."
set fp [open "lutlist.txt" w]
set luts [get_cells -hierarchical -filter {REF_NAME == LUT6}]
foreach lut \$luts {
set bel [get_property BEL \$lut]
set loc [get_property LOC \$lut]
set init [get_property INIT \$lut]
puts "Writing lutdata.txt."
set fp [open "lutdata.txt" w]
foreach cell [get_cells -hierarchical -filter {REF_NAME == LUT6}] {
set bel [get_property BEL \$cell]
set loc [get_property LOC \$cell]
set init [get_property INIT \$cell]
puts \$fp "\$loc \$bel \$init"
}
close \$fp
puts "Writing carrydata.txt."
set fp [open "carrydata.txt" w]
foreach cell [get_cells -hierarchical -filter {REF_NAME == CARRY4}] {
set loc [get_property LOC \$cell]
set cyinit_mux [get_carry_cyinit_mux_cfg \$cell]
set di0_mux [get_carry_di0_mux_cfg \$cell]
set di1_mux [get_carry_di1_mux_cfg \$cell]
set di2_mux [get_carry_di2_mux_cfg \$cell]
set di3_mux [get_carry_di3_mux_cfg \$cell]
puts \$fp "\$loc \$cyinit_mux \$di0_mux \$di1_mux \$di2_mux \$di3_mux"
}
close \$fp
EOT
rm -rf design design.log

View File

@ -8,6 +8,7 @@ import os, json, re
grid = None
bits = dict()
luts = dict()
carry = dict()
print("Loading grid.")
with open("../gridinfo/grid-%s-db.json" % os.getenv("XRAY_PART"), "r") as f:
@ -30,8 +31,8 @@ with open("design.bits", "r") as f:
bits[base_frame][bit_wordidx].add((bit_frame, bit_wordidx, bit_bitidx))
print("Loading luts.")
with open("lutlist.txt", "r") as f:
print("Loading lut data.")
with open("lutdata.txt", "r") as f:
for line in f:
line = line.split()
site = line[0]
@ -45,6 +46,17 @@ with open("lutlist.txt", "r") as f:
bitname = "%s.INIT[%02d]" % (bel, i)
luts[site][bitname] = ((init >> i) & 1) != 0
print("Loading carry data.")
with open("carrydata.txt", "r") as f:
for line in f:
line = line.split()
assert line[0] not in carry
carry[line[0]] = dict()
for i, n in enumerate("CYINIT:ZRO:ONE:AX:CIN DI0:AX:O5 DI1:AX:O5 DI2:AX:O5 DI3:AX:O5".split()):
n = n.split(":")
for k in n[1:]:
carry[line[0]]["CARRY_%s_MUX_%s" % (n[0], k)] = line[1+i].upper() == k
#################################################
# Group per Segment
@ -68,7 +80,7 @@ for tilename, tiledata in grid["tiles"].items():
segments[segname] = { "bits": list(), "tags": dict() }
for site in tiledata["sites"]:
if site not in luts:
if site not in luts and site not in carry:
continue
if re.match(r"SLICE_X[0-9]*[02468]Y", site):
@ -78,14 +90,20 @@ for tilename, tiledata in grid["tiles"].items():
else:
assert 0
for name, value in luts[site].items():
tile_type = tiledata["props"]["TYPE"]
if site in luts:
for name, value in luts[site].items():
tile_type = tiledata["props"]["TYPE"]
# LUT init bits are in the same position for all CLBL[LM]_[LR] tiles
if re.match("^CLBL[LM]_[LR]", tile_type) and "LUT.INIT" in name:
tile_type = "CLBLX_X"
# LUT init bits are in the same position for all CLBL[LM]_[LR] tiles
if re.match("^CLBL[LM]_[LR]", tile_type) and "LUT.INIT" in name:
tile_type = "CLBLX_X"
segments[segname]["tags"]["%s.%s.%s" % (tile_type, sitekey, name)] = value
segments[segname]["tags"]["%s.%s.%s" % (tile_type, sitekey, name)] = value
if site in carry:
for name, value in carry[site].items():
tile_type = tiledata["props"]["TYPE"]
segments[segname]["tags"]["%s.%s.%s" % (tile_type, sitekey, name)] = value
base_frame = int(tiledata["cfgcol"]["BASE_FRAMEID"][2:], 16)
for wordidx in tiledata["cfgcol"]["WORDS"]:

76
simple/utilities.tcl Normal file
View File

@ -0,0 +1,76 @@
proc puts_list {l} {
foreach e $l {puts $e}
}
proc get_carry_cyinit_mux_cfg {carry_cell} {
set cyinit_pin [get_pins -of_objects $carry_cell -filter {REF_PIN_NAME == CYINIT}]
set cyinit_net [get_nets -quiet -of_objects $cyinit_pin]
if {[string last "<const0>" $cyinit_net] > 0} { return "zro" }
if {[string last "<const1>" $cyinit_net] > 0} { return "one" }
set ax_pin [get_site_pins -of_objects [get_sites -of_objects $carry_cell] */AX]
set ax_net [get_nets -quiet -of_objects $ax_pin]
if {"$cyinit_net" == "$ax_net"} { return "ax " }
set cin_pin [get_site_pins -of_objects [get_sites -of_objects $carry_cell] */CIN]
set cin_net [get_nets -quiet -of_objects $cin_pin]
if {"$cyinit_net" == "$cin_net"} { return "cin" }
return "???"
}
proc get_carry_di0_mux_cfg {carry_cell} {
set di0_pin [get_pins -of_objects $carry_cell -filter {REF_PIN_NAME == DI[0]}]
set di0_net [get_nets -quiet -of_objects $di0_pin]
set ax_pin [get_site_pins -of_objects [get_sites -of_objects $carry_cell] */AX]
set ax_net [get_nets -quiet -of_objects $ax_pin]
if {"$di0_net" == "$ax_net"} { return "ax " }
return "o5 "
}
proc get_carry_di1_mux_cfg {carry_cell} {
set di1_pin [get_pins -of_objects $carry_cell -filter {REF_PIN_NAME == DI[1]}]
set di1_net [get_nets -quiet -of_objects $di1_pin]
set bx_pin [get_site_pins -of_objects [get_sites -of_objects $carry_cell] */BX]
set bx_net [get_nets -quiet -of_objects $bx_pin]
if {"$di1_net" == "$bx_net"} { return "bx " }
return "o5 "
}
proc get_carry_di2_mux_cfg {carry_cell} {
set di2_pin [get_pins -of_objects $carry_cell -filter {REF_PIN_NAME == DI[2]}]
set di2_net [get_nets -quiet -of_objects $di2_pin]
set cx_pin [get_site_pins -of_objects [get_sites -of_objects $carry_cell] */CX]
set cx_net [get_nets -quiet -of_objects $cx_pin]
if {"$di2_net" == "$cx_net"} { return "cx " }
return "o5 "
}
proc get_carry_di3_mux_cfg {carry_cell} {
set di3_pin [get_pins -of_objects $carry_cell -filter {REF_PIN_NAME == DI[3]}]
set di3_net [get_nets -quiet -of_objects $di3_pin]
set dx_pin [get_site_pins -of_objects [get_sites -of_objects $carry_cell] */DX]
set dx_net [get_nets -quiet -of_objects $dx_pin]
if {"$di3_net" == "$dx_net"} { return "dx " }
return "o5 "
}
proc list_carry_cfg {} {
foreach carry_cell [get_cells -hierarchical -filter {REF_NAME == CARRY4}] {
set cyinit_mux_cfg [get_carry_cyinit_mux_cfg $carry_cell]
set di0_mux_cfg [get_carry_di0_mux_cfg $carry_cell]
set di1_mux_cfg [get_carry_di1_mux_cfg $carry_cell]
set di2_mux_cfg [get_carry_di2_mux_cfg $carry_cell]
set di3_mux_cfg [get_carry_di3_mux_cfg $carry_cell]
puts "[get_bels -of_objects $carry_cell] $cyinit_mux_cfg $di0_mux_cfg $di1_mux_cfg $di2_mux_cfg $di3_mux_cfg"
}
}

View File

@ -194,8 +194,6 @@ help:
} else {
printf(" <%d candidates>\n", num_candidates);
}
assert(num_candidates != 0);
}
return 0;