diff options
| author | gatecat <gatecat@ds0.me> | 2021-02-20 10:51:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-20 10:51:57 +0000 |
| commit | 6672f17d0a546054412c3ecad29a5414ffdcd971 (patch) | |
| tree | e0976dd397edf50fe89b5108751c5fb3a7ace896 /machxo2 | |
| parent | 130c5cc76882c2f07836b97040e6bc1d93e4efe9 (diff) | |
| parent | e571c707b50a601787590b9752205336ee1c3f6d (diff) | |
| download | nextpnr-6672f17d0a546054412c3ecad29a5414ffdcd971.tar.gz nextpnr-6672f17d0a546054412c3ecad29a5414ffdcd971.tar.bz2 nextpnr-6672f17d0a546054412c3ecad29a5414ffdcd971.zip | |
Merge pull request #592 from YosysHQ/gatecat/rework-delay
Replace DelayInfo with DelayPair and DelayQuad
Diffstat (limited to 'machxo2')
| -rw-r--r-- | machxo2/arch.h | 18 | ||||
| -rw-r--r-- | machxo2/archdefs.h | 21 |
2 files changed, 3 insertions, 36 deletions
diff --git a/machxo2/arch.h b/machxo2/arch.h index adc6e25c..7a22dd91 100644 --- a/machxo2/arch.h +++ b/machxo2/arch.h @@ -509,7 +509,7 @@ struct Arch : BaseArch<ArchRanges> return IdStringList(ids); } - DelayInfo getWireDelay(WireId wire) const override { return DelayInfo(); } + DelayQuad getWireDelay(WireId wire) const override { return DelayQuad(0); } WireRange getWires() const override { @@ -582,14 +582,7 @@ struct Arch : BaseArch<ArchRanges> return wire; } - DelayInfo getPipDelay(PipId pip) const override - { - DelayInfo delay; - - delay.delay = 0.01; - - return delay; - } + DelayQuad getPipDelay(PipId pip) const override { return DelayQuad(0); } PipRange getPipsDownhill(WireId wire) const override { @@ -633,12 +626,7 @@ struct Arch : BaseArch<ArchRanges> delay_t getRipupDelayPenalty() const override { return 0.015; } float getDelayNS(delay_t v) const override { return v; } - DelayInfo getDelayFromNS(float ns) const override - { - DelayInfo del; - del.delay = ns; - return del; - } + delay_t getDelayFromNS(float ns) const override { return ns; } uint32_t getDelayChecksum(delay_t v) const override { return v; } diff --git a/machxo2/archdefs.h b/machxo2/archdefs.h index 844a87b6..f822b907 100644 --- a/machxo2/archdefs.h +++ b/machxo2/archdefs.h @@ -26,27 +26,6 @@ NEXTPNR_NAMESPACE_BEGIN typedef float delay_t; -struct DelayInfo -{ - delay_t delay = 0; - - delay_t minRaiseDelay() const { return delay; } - delay_t maxRaiseDelay() const { return delay; } - - delay_t minFallDelay() const { return delay; } - delay_t maxFallDelay() const { return delay; } - - delay_t minDelay() const { return delay; } - delay_t maxDelay() const { return delay; } - - DelayInfo operator+(const DelayInfo &other) const - { - DelayInfo ret; - ret.delay = this->delay + other.delay; - return ret; - } -}; - enum ConstIds { ID_NONE |