diff options
author | Clifford Wolf <clifford@clifford.at> | 2018-06-13 12:37:23 +0200 |
---|---|---|
committer | Clifford Wolf <clifford@clifford.at> | 2018-06-13 12:37:23 +0200 |
commit | 4d7f18dd98a7ef9540a279a8e27cb9dbef355af7 (patch) | |
tree | 28a147e3435cec7ff9cd22950b6b349260d1ec11 /ice40 | |
parent | 301136db033e6696b7d606f9833474fdd5e77aac (diff) | |
download | nextpnr-4d7f18dd98a7ef9540a279a8e27cb9dbef355af7.tar.gz nextpnr-4d7f18dd98a7ef9540a279a8e27cb9dbef355af7.tar.bz2 nextpnr-4d7f18dd98a7ef9540a279a8e27cb9dbef355af7.zip |
Redesign PosInfo API
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Diffstat (limited to 'ice40')
-rw-r--r-- | ice40/chip.cc | 32 | ||||
-rw-r--r-- | ice40/chip.h | 14 |
2 files changed, 34 insertions, 12 deletions
diff --git a/ice40/chip.cc b/ice40/chip.cc index 918a7fb4..de33b020 100644 --- a/ice40/chip.cc +++ b/ice40/chip.cc @@ -17,6 +17,7 @@ * */ +#include <math.h> #include "log.h" #include "nextpnr.h" @@ -230,27 +231,40 @@ PipId Chip::getPipByName(IdString name) const // ----------------------------------------------------------------------- -void Chip::getBelPosition(BelId bel, float &x, float &y) const +PosInfo Chip::getBelPosition(BelId bel) const { + PosInfo pos; assert(bel != BelId()); - x = chip_info.bel_data[bel.index].x; - y = chip_info.bel_data[bel.index].y; + pos.x = chip_info.bel_data[bel.index].x; + pos.y = chip_info.bel_data[bel.index].y; + return pos; } -void Chip::getWirePosition(WireId wire, float &x, float &y) const +PosInfo Chip::getWirePosition(WireId wire) const { + PosInfo pos; assert(wire != WireId()); - x = chip_info.wire_data[wire.index].x; - y = chip_info.wire_data[wire.index].y; + pos.x = chip_info.wire_data[wire.index].x; + pos.y = chip_info.wire_data[wire.index].y; + return pos; } -void Chip::getPipPosition(PipId pip, float &x, float &y) const +PosInfo Chip::getPipPosition(PipId pip) const { + PosInfo pos; assert(pip != PipId()); - x = chip_info.pip_data[pip.index].x; - y = chip_info.pip_data[pip.index].y; + pos.x = chip_info.pip_data[pip.index].x; + pos.y = chip_info.pip_data[pip.index].y; + return pos; } +float Chip::estimateDelay(PosInfo src, PosInfo dst) const +{ + return fabsf(src.x - dst.x) + fabsf(src.x - dst.x); +} + +// ----------------------------------------------------------------------- + std::vector<GraphicElement> Chip::getBelGraphics(BelId bel) const { std::vector<GraphicElement> ret; diff --git a/ice40/chip.h b/ice40/chip.h index f8946610..2c95bf4e 100644 --- a/ice40/chip.h +++ b/ice40/chip.h @@ -42,6 +42,11 @@ struct DelayInfo } }; +struct PosInfo +{ + float x = 0, y = 0; +}; + // ----------------------------------------------------------------------- enum BelType @@ -679,9 +684,12 @@ struct Chip // ------------------------------------------------- - void getBelPosition(BelId bel, float &x, float &y) const; - void getWirePosition(WireId wire, float &x, float &y) const; - void getPipPosition(PipId pip, float &x, float &y) const; + PosInfo getBelPosition(BelId bel) const; + PosInfo getWirePosition(WireId wire) const; + PosInfo getPipPosition(PipId pip) const; + float estimateDelay(PosInfo src, PosInfo dst) const; + + // ------------------------------------------------- std::vector<GraphicElement> getBelGraphics(BelId bel) const; std::vector<GraphicElement> getWireGraphics(WireId wire) const; |