diff options
author | Eddie Hung <eddie.hung+gitlab@gmail.com> | 2018-07-21 19:04:14 +0000 |
---|---|---|
committer | Eddie Hung <eddie.hung+gitlab@gmail.com> | 2018-07-21 19:04:14 +0000 |
commit | dfdeb21690181044a95c2b2d64c197c999507b0c (patch) | |
tree | a7c74ddc6c085830880ceffdb9f15d8c84afc3fe /ecp5 | |
parent | 6e7ba2a2be87bb1e0f323128283a87f59af596b7 (diff) | |
parent | f438fc615b829170679971110b5d1bb57fba6a86 (diff) | |
download | nextpnr-dfdeb21690181044a95c2b2d64c197c999507b0c.tar.gz nextpnr-dfdeb21690181044a95c2b2d64c197c999507b0c.tar.bz2 nextpnr-dfdeb21690181044a95c2b2d64c197c999507b0c.zip |
Merge branch 'master' into 'master'
Master
See merge request eddiehung/nextpnr!6
Diffstat (limited to 'ecp5')
-rw-r--r-- | ecp5/arch.h | 6 | ||||
-rw-r--r-- | ecp5/archdefs.h | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/ecp5/arch.h b/ecp5/arch.h index 944aedea..bf36ef2f 100644 --- a/ecp5/arch.h +++ b/ecp5/arch.h @@ -578,6 +578,12 @@ struct Arch : BaseCtx return wire_to_net.at(wire); } + DelayInfo getWireDelay(WireId wire) const + { + DelayInfo delay; + return delay; + } + WireRange getWires() const { WireRange range; diff --git a/ecp5/archdefs.h b/ecp5/archdefs.h index 941607ba..40442e1b 100644 --- a/ecp5/archdefs.h +++ b/ecp5/archdefs.h @@ -32,9 +32,14 @@ struct DelayInfo { delay_t delay = 0; - delay_t raiseDelay() const { return delay; } - delay_t fallDelay() const { return delay; } - delay_t avgDelay() const { return delay; } + 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 { |