From 974ca143e80ac48b0e87054001a48b0d6597c6fa Mon Sep 17 00:00:00 2001 From: David Shah Date: Tue, 24 Jul 2018 16:09:29 +0200 Subject: Remove implementations of deprecated APIs Signed-off-by: David Shah --- generic/arch.h | 1 - 1 file changed, 1 deletion(-) (limited to 'generic/arch.h') diff --git a/generic/arch.h b/generic/arch.h index 61e6b033..3025bda0 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -191,7 +191,6 @@ struct Arch : BaseCtx const std::vector &getGroupPips(GroupId group) const; const std::vector &getGroupGroups(GroupId group) const; - void estimatePosition(BelId bel, int &x, int &y, bool &gb) const; delay_t estimateDelay(WireId src, WireId dst) const; delay_t getDelayEpsilon() const { return 0.01; } delay_t getRipupDelayPenalty() const { return 1.0; } -- cgit v1.2.3 From a82a8840d2c3995a1b746020a54315acd7fba7b8 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Tue, 24 Jul 2018 16:28:06 +0200 Subject: Add missing implementations of generic Arch methods Signed-off-by: Clifford Wolf --- generic/arch.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'generic/arch.h') diff --git a/generic/arch.h b/generic/arch.h index 3025bda0..97ed1ac2 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -141,7 +141,7 @@ struct Arch : BaseCtx IdString getBelName(BelId bel) const; Loc getBelLocation(BelId bel) const; BelId getBelByLocation(Loc loc) const; - std::vector getBelsByTile(int x, int y) const; + const std::vector &getBelsByTile(int x, int y) const; bool getBelGlobalBuf(BelId bel) const; uint32_t getBelChecksum(BelId bel) const; void bindBel(BelId bel, IdString cell, PlaceStrength strength); -- cgit v1.2.3 From 467e0926f920f23b7cb2241cf52dbcfe84646fed Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Thu, 26 Jul 2018 16:38:11 +0200 Subject: Add getWireType()/getPipType() API Signed-off-by: Clifford Wolf --- generic/arch.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'generic/arch.h') diff --git a/generic/arch.h b/generic/arch.h index 97ed1ac2..01a90ee1 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -31,7 +31,7 @@ struct WireInfo; struct PipInfo { - IdString name, bound_net; + IdString name, type, bound_net; WireId srcWire, dstWire; DelayInfo delay; DecalXY decalxy; @@ -39,7 +39,7 @@ struct PipInfo struct WireInfo { - IdString name, bound_net; + IdString name, type, bound_net; std::vector downhill, uphill, aliases; BelPin uphill_bel_pin; std::vector downhill_bel_pins; @@ -96,9 +96,9 @@ struct Arch : BaseCtx float grid_distance_to_delay; - void addWire(IdString name, int x, int y); - void addPip(IdString name, IdString srcWire, IdString dstWire, DelayInfo delay); - void addAlias(IdString name, IdString srcWire, IdString dstWire, DelayInfo delay); + void addWire(IdString name, IdString type, int x, int y); + void addPip(IdString name, IdString type, IdString srcWire, IdString dstWire, DelayInfo delay); + void addAlias(IdString name, IdString type, IdString srcWire, IdString dstWire, DelayInfo delay); void addBel(IdString name, IdString type, Loc loc, bool gb); void addBelInput(IdString bel, IdString name, IdString wire); @@ -157,6 +157,7 @@ struct Arch : BaseCtx WireId getWireByName(IdString name) const; IdString getWireName(WireId wire) const; + IdString getWireType(WireId wire) const; uint32_t getWireChecksum(WireId wire) const; void bindWire(WireId wire, IdString net, PlaceStrength strength); void unbindWire(WireId wire); @@ -169,6 +170,7 @@ struct Arch : BaseCtx PipId getPipByName(IdString name) const; IdString getPipName(PipId pip) const; + IdString getPipType(PipId pip) const; uint32_t getPipChecksum(PipId pip) const; void bindPip(PipId pip, IdString net, PlaceStrength strength); void unbindPip(PipId pip); -- cgit v1.2.3 From 97e546041e109fdade1099b056c7166578314846 Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Thu, 26 Jul 2018 21:37:19 -0700 Subject: Revert "Remove Arch::getBudgetOverride()" This reverts commit 749dae4ae5b2b719237af5db28e98ff671bae265. --- generic/arch.h | 1 + 1 file changed, 1 insertion(+) (limited to 'generic/arch.h') diff --git a/generic/arch.h b/generic/arch.h index 01a90ee1..df21fbe4 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -198,6 +198,7 @@ struct Arch : BaseCtx delay_t getRipupDelayPenalty() const { return 1.0; } float getDelayNS(delay_t v) const { return v; } uint32_t getDelayChecksum(delay_t v) const { return 0; } + delay_t getBudgetOverride(const PortRef &pr, delay_t v) const; bool pack() { return true; } bool place(); -- cgit v1.2.3 From d083451cd5918c676e0f6a15dd8595bb3c077a6b Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Thu, 26 Jul 2018 22:31:16 -0700 Subject: Update getBudgetOverride() for other arches --- generic/arch.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'generic/arch.h') diff --git a/generic/arch.h b/generic/arch.h index df21fbe4..b6892c85 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -198,7 +198,7 @@ struct Arch : BaseCtx delay_t getRipupDelayPenalty() const { return 1.0; } float getDelayNS(delay_t v) const { return v; } uint32_t getDelayChecksum(delay_t v) const { return 0; } - delay_t getBudgetOverride(const PortRef &pr, delay_t v) const; + delay_t getBudgetOverride(NetInfo *net_info, int user_idx, delay_t budget) const; bool pack() { return true; } bool place(); -- cgit v1.2.3