diff options
| author | Eddie Hung <eddieh@ece.ubc.ca> | 2018-08-10 19:51:35 -0700 |
|---|---|---|
| committer | Eddie Hung <eddieh@ece.ubc.ca> | 2018-08-10 19:51:35 -0700 |
| commit | fc0496ec718546366a47e60db090caa6a7059277 (patch) | |
| tree | d1366190553de2147aae4ab71a1179bb712b91d7 /generic/arch.h | |
| parent | a41500a015afe7fec5f7d122a37ccd1031f9fb51 (diff) | |
| parent | 8b04a646291bec7fb65b3580a08c266268acf010 (diff) | |
| download | nextpnr-fc0496ec718546366a47e60db090caa6a7059277.tar.gz nextpnr-fc0496ec718546366a47e60db090caa6a7059277.tar.bz2 nextpnr-fc0496ec718546366a47e60db090caa6a7059277.zip | |
Merge remote-tracking branch 'origin/master' into placer_speedup
Diffstat (limited to 'generic/arch.h')
| -rw-r--r-- | generic/arch.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/generic/arch.h b/generic/arch.h index ee7d0403..7549a75b 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -36,6 +36,7 @@ struct PipInfo WireId srcWire, dstWire; DelayInfo delay; DecalXY decalxy; + Loc loc; }; struct WireInfo @@ -94,12 +95,13 @@ struct Arch : BaseCtx std::unordered_map<DecalId, std::vector<GraphicElement>> decal_graphics; int gridDimX, gridDimY; - std::vector<std::vector<int>> tileDimZ; + std::vector<std::vector<int>> tileBelDimZ; + std::vector<std::vector<int>> tilePipDimZ; float grid_distance_to_delay; void addWire(IdString name, IdString type, int x, int y); - void addPip(IdString name, IdString type, IdString srcWire, IdString dstWire, DelayInfo delay); + void addPip(IdString name, IdString type, IdString srcWire, IdString dstWire, DelayInfo delay, Loc loc); void addAlias(IdString name, IdString type, IdString srcWire, IdString dstWire, DelayInfo delay); void addBel(IdString name, IdString type, Loc loc, bool gb); @@ -132,7 +134,8 @@ struct Arch : BaseCtx int getGridDimX() const { return gridDimX; } int getGridDimY() const { return gridDimY; } - int getTileDimZ(int x, int y) const { return tileDimZ[x][y]; } + int getTileBelDimZ(int x, int y) const { return tileBelDimZ[x][y]; } + int getTilePipDimZ(int x, int y) const { return tilePipDimZ[x][y]; } BelId getBelByName(IdString name) const; IdString getBelName(BelId bel) const; @@ -175,6 +178,7 @@ struct Arch : BaseCtx NetInfo *getBoundPipNet(PipId pip) const; NetInfo *getConflictingPipNet(PipId pip) const; const std::vector<PipId> &getPips() const; + Loc getPipLocation(PipId pip) const; WireId getPipSrcWire(PipId pip) const; WireId getPipDstWire(PipId pip) const; DelayInfo getPipDelay(PipId pip) const; |