caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ice40: Use real cell timings

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-08-02 16:02:43 +02:00
parent c0aaac8dfa
commit a7269a685e
3 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ice40/arch.cc
View File

@ -834,28 +834,23 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort, DelayInfo &delay) const bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort, DelayInfo &delay) const
{ {
if (cell->type == id_icestorm_lc) { BelType type = belTypeFromId(cell->type);
if ((fromPort == id_i0 || fromPort == id_i1 || fromPort == id_i2 || fromPort == id_i3) && for (int i = 0; i < chip_info->num_timing_cells; i++) {
(toPort == id_o || toPort == id_lo)) { const auto &tc = chip_info->cell_timing[i];
delay.delay = 450; if (tc.type == type) {
return true; PortPin fromPin = portPinFromId(fromPort);
} else if (fromPort == id_cin && toPort == id_cout) { PortPin toPin = portPinFromId(toPort);
delay.delay = 120; for (int j = 0; j < tc.num_paths; j++) {
return true; const auto &path = tc.path_delays[j];
} else if (fromPort == id_i1 && toPort == id_cout) { if (path.from_port == fromPin && path.to_port == toPin) {
delay.delay = 260; if (fast_part)
return true; delay.delay = path.fast_delay;
} else if (fromPort == id_i2 && toPort == id_cout) { else
delay.delay = 230; delay.delay = path.slow_delay;
return true;
} else if (fromPort == id_clk && toPort == id_o) {
delay.delay = 540;
return true; return true;
} }
} else if (cell->type == id_icestorm_ram) { }
if (fromPort == id_rclk) { break;
delay.delay = 2140;
return true;
} }
} }
return false; return false;

2
ice40/arch.h
View File

@ -180,7 +180,7 @@ NPNR_PACKED_STRUCT(struct CellPathDelayPOD {
}); });
NPNR_PACKED_STRUCT(struct CellTimingPOD { NPNR_PACKED_STRUCT(struct CellTimingPOD {
BelType type; int32_t type;
int32_t num_paths; int32_t num_paths;
RelPtr<CellPathDelayPOD> path_delays; RelPtr<CellPathDelayPOD> path_delays;
}); });

9
ice40/chipdb.py
View File

@ -666,14 +666,14 @@ def add_bel_ec(ec):
cell_timings = {} cell_timings = {}
tmport_to_portpin = { tmport_to_portpin = {
"posedge:clk": "CLK", "posedge:clk": "CLK",
"ce": "CE", "ce": "CEN",
"sr": "SR", "sr": "SR",
"in0": "I0", "in0": "I0",
"in1": "I1", "in1": "I1",
"in2": "I2", "in2": "I2",
"in3": "I3", "in3": "I3",
"carryin": "CIN", "carryin": "CIN",
"carrout": "COUT", "carryout": "COUT",
"lcout": "O", "lcout": "O",
"ltout": "LO", "ltout": "LO",
"posedge:RCLK": "RCLK", "posedge:RCLK": "RCLK",
@ -711,8 +711,8 @@ def add_cell_timingdata(bel_type, timing_cell, fast_db, slow_db):
cell_timings[bel_type] = timing_entries cell_timings[bel_type] = timing_entries
add_cell_timingdata("ICESTORM_LC", "LogicCell40", fast_timings, slow_timings) add_cell_timingdata("ICESTORM_LC", "LogicCell40", fast_timings, slow_timings)
if dev_name != "384":
add_cell_timingdata("ICESTORM_RAM", "SB_RAM40_4K", fast_timings, slow_timings) add_cell_timingdata("ICESTORM_RAM", "SB_RAM40_4K", fast_timings, slow_timings)
if dev_name == "5k": if dev_name == "5k":
add_cell_timingdata("SPRAM", "SB_SPRAM256KA", fast_timings, slow_timings) add_cell_timingdata("SPRAM", "SB_SPRAM256KA", fast_timings, slow_timings)
@ -1154,6 +1154,7 @@ bba.u32(len(pipinfo), "num_pips")
bba.u32(len(switchinfo), "num_switches") bba.u32(len(switchinfo), "num_switches")
bba.u32(len(extra_cell_config), "num_belcfgs") bba.u32(len(extra_cell_config), "num_belcfgs")
bba.u32(len(packageinfo), "num_packages") bba.u32(len(packageinfo), "num_packages")
bba.u32(len(cell_timings), "num_timing_cells")
bba.r("bel_data_%s" % dev_name, "bel_data") bba.r("bel_data_%s" % dev_name, "bel_data")
bba.r("wire_data_%s" % dev_name, "wire_data") bba.r("wire_data_%s" % dev_name, "wire_data")
bba.r("pip_data_%s" % dev_name, "pip_data") bba.r("pip_data_%s" % dev_name, "pip_data")
@ -1161,6 +1162,6 @@ bba.r("tile_grid_%s" % dev_name, "tile_grid")
bba.r("bits_info_%s" % dev_name, "bits_info") bba.r("bits_info_%s" % dev_name, "bits_info")
bba.r("bel_config_%s" % dev_name if len(extra_cell_config) > 0 else None, "bel_config") bba.r("bel_config_%s" % dev_name if len(extra_cell_config) > 0 else None, "bel_config")
bba.r("package_info_%s" % dev_name, "packages_data") bba.r("package_info_%s" % dev_name, "packages_data")
bba.r("cell_timing_%s" % dev_name, "cell_timing") bba.r("cell_timings_%s" % dev_name, "cell_timing")
bba.pop() bba.pop()