diff options
author | gatecat <gatecat@ds0.me> | 2021-02-19 10:39:57 +0000 |
---|---|---|
committer | gatecat <gatecat@ds0.me> | 2021-02-19 11:31:33 +0000 |
commit | 7922b3bfc4ef93b8f67194c05e1a236b4c83c3da (patch) | |
tree | b2b21259e030edd0adc7cc944322e3e9186d3a71 /ice40/arch.h | |
parent | 8376db94a7519406444988be3628a4dadfb8d742 (diff) | |
download | nextpnr-7922b3bfc4ef93b8f67194c05e1a236b4c83c3da.tar.gz nextpnr-7922b3bfc4ef93b8f67194c05e1a236b4c83c3da.tar.bz2 nextpnr-7922b3bfc4ef93b8f67194c05e1a236b4c83c3da.zip |
Replace DelayInfo with DelayPair/DelayQuad
This replaces the arch-specific DelayInfo structure with new DelayPair
(min/max only) and DelayQuad (min/max for both rise and fall) structures
that form part of common code.
This further reduces the amount of arch-specific code; and also provides
useful data structures for timing analysis which will need to delay
with pairs/quads of delays as it is improved.
While there may be a small performance cost to arches that didn't
separate the rise/fall cases (arches that aren't currently separating
the min/max cases just need to be fixed...) in DelayInfo, my expectation
is that inlining will mean this doesn't make much difference.
Signed-off-by: gatecat <gatecat@ds0.me>
Diffstat (limited to 'ice40/arch.h')
-rw-r--r-- | ice40/arch.h | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/ice40/arch.h b/ice40/arch.h index 7280d2fe..4bac3d7a 100644 --- a/ice40/arch.h +++ b/ice40/arch.h @@ -578,15 +578,13 @@ struct Arch : BaseArch<ArchRanges> return wire_to_net[wire.index]; } - DelayInfo getWireDelay(WireId wire) const override + DelayQuad getWireDelay(WireId wire) const override { - DelayInfo delay; NPNR_ASSERT(wire != WireId()); if (fast_part) - delay.delay = chip_info->wire_data[wire.index].fast_delay; + return DelayQuad(chip_info->wire_data[wire.index].fast_delay); else - delay.delay = chip_info->wire_data[wire.index].slow_delay; - return delay; + return DelayQuad(chip_info->wire_data[wire.index].slow_delay); } BelPinRange getWireBelPins(WireId wire) const override @@ -739,15 +737,13 @@ struct Arch : BaseArch<ArchRanges> return wire; } - DelayInfo getPipDelay(PipId pip) const override + DelayQuad getPipDelay(PipId pip) const override { - DelayInfo delay; NPNR_ASSERT(pip != PipId()); if (fast_part) - delay.delay = chip_info->pip_data[pip.index].fast_delay; + return DelayQuad(chip_info->pip_data[pip.index].fast_delay); else - delay.delay = chip_info->pip_data[pip.index].slow_delay; - return delay; + return DelayQuad(chip_info->pip_data[pip.index].slow_delay); } PipRange getPipsDownhill(WireId wire) const override @@ -788,12 +784,7 @@ struct Arch : BaseArch<ArchRanges> delay_t getDelayEpsilon() const override { return 20; } delay_t getRipupDelayPenalty() const override { return 200; } float getDelayNS(delay_t v) const override { return v * 0.001; } - DelayInfo getDelayFromNS(float ns) const override - { - DelayInfo del; - del.delay = delay_t(ns * 1000); - return del; - } + delay_t getDelayFromNS(float ns) const override { return delay_t(ns * 1000); } uint32_t getDelayChecksum(delay_t v) const override { return v; } bool getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t &budget) const override; @@ -818,10 +809,10 @@ struct Arch : BaseArch<ArchRanges> // Get the delay through a cell from one port to another, returning false // if no path exists. This only considers combinational delays, as required by the Arch API - bool getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort, DelayInfo &delay) const override; + bool getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort, DelayQuad &delay) const override; // get_cell_delay_internal is similar to the above, but without false path checks and including clock to out delays // for internal arch use only - bool get_cell_delay_internal(const CellInfo *cell, IdString fromPort, IdString toPort, DelayInfo &delay) const; + bool get_cell_delay_internal(const CellInfo *cell, IdString fromPort, IdString toPort, DelayQuad &delay) const; // Get the port class, also setting clockInfoCount to the number of TimingClockingInfos associated with a port TimingPortClass getPortTimingClass(const CellInfo *cell, IdString port, int &clockInfoCount) const override; // Get the TimingClockingInfo of a port |