From e260ac33abdd175f38ea5d8367c52a154b486648 Mon Sep 17 00:00:00 2001 From: gatecat Date: Wed, 7 Dec 2022 10:00:53 +0100 Subject: refactor: ArcBounds -> BoundingBox Signed-off-by: gatecat --- generic/arch.cc | 4 ++-- generic/arch.h | 2 +- generic/viaduct_api.cc | 4 ++-- generic/viaduct_api.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'generic') diff --git a/generic/arch.cc b/generic/arch.cc index a1d98200..c60c7674 100644 --- a/generic/arch.cc +++ b/generic/arch.cc @@ -548,11 +548,11 @@ delay_t Arch::predictDelay(BelId src_bel, IdString src_pin, BelId dst_bel, IdStr bool Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t &budget) const { return false; } -ArcBounds Arch::getRouteBoundingBox(WireId src, WireId dst) const +BoundingBox Arch::getRouteBoundingBox(WireId src, WireId dst) const { if (uarch) return uarch->getRouteBoundingBox(src, dst); - ArcBounds bb; + BoundingBox bb; int src_x = wire_info(src).x; int src_y = wire_info(src).y; diff --git a/generic/arch.h b/generic/arch.h index 6b34c289..a27dc78e 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -325,7 +325,7 @@ struct Arch : BaseArch uint32_t getDelayChecksum(delay_t v) const override { return 0; } bool getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t &budget) const override; - ArcBounds getRouteBoundingBox(WireId src, WireId dst) const override; + BoundingBox getRouteBoundingBox(WireId src, WireId dst) const override; bool pack() override; bool place() override; diff --git a/generic/viaduct_api.cc b/generic/viaduct_api.cc index 8a7b6313..626150c2 100644 --- a/generic/viaduct_api.cc +++ b/generic/viaduct_api.cc @@ -61,9 +61,9 @@ delay_t ViaductAPI::predictDelay(BelId src_bel, IdString src_pin, BelId dst_bel, int dy = abs(sink_loc.y - driver_loc.y); return (dx + dy) * ctx->args.delayScale + ctx->args.delayOffset; } -ArcBounds ViaductAPI::getRouteBoundingBox(WireId src, WireId dst) const +BoundingBox ViaductAPI::getRouteBoundingBox(WireId src, WireId dst) const { - ArcBounds bb; + BoundingBox bb; int src_x = ctx->wire_info(src).x; int src_y = ctx->wire_info(src).y; int dst_x = ctx->wire_info(dst).x; diff --git a/generic/viaduct_api.h b/generic/viaduct_api.h index 6f8adb3e..6887f56c 100644 --- a/generic/viaduct_api.h +++ b/generic/viaduct_api.h @@ -82,7 +82,7 @@ struct ViaductAPI // --- Route lookahead --- virtual delay_t estimateDelay(WireId src, WireId dst) const; virtual delay_t predictDelay(BelId src_bel, IdString src_pin, BelId dst_bel, IdString dst_pin) const; - virtual ArcBounds getRouteBoundingBox(WireId src, WireId dst) const; + virtual BoundingBox getRouteBoundingBox(WireId src, WireId dst) const; // --- Flow hooks --- virtual void pack(){}; // replaces the pack function -- cgit v1.2.3