From 7123209324c93297efab6c2b2fc92286196be3fb Mon Sep 17 00:00:00 2001 From: David Shah Date: Mon, 3 Feb 2020 11:54:38 +0000 Subject: Allow selection of router algorithm Signed-off-by: David Shah --- generic/arch.cc | 18 ++++++++++++++++-- generic/arch.h | 2 ++ 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'generic') diff --git a/generic/arch.cc b/generic/arch.cc index c1c01d26..e4227c74 100644 --- a/generic/arch.cc +++ b/generic/arch.cc @@ -23,6 +23,7 @@ #include "placer1.h" #include "placer_heap.h" #include "router1.h" +#include "router2.h" #include "util.h" NEXTPNR_NAMESPACE_BEGIN @@ -553,10 +554,19 @@ bool Arch::place() bool Arch::route() { - bool retVal = router1(getCtx(), Router1Cfg(getCtx())); + std::string router = str_or_default(settings, id("router"), defaultRouter); + bool result; + if (router == "router1") { + result = router1(getCtx(), Router1Cfg(getCtx())); + } else if (router == "router2") { + router2(getCtx(), Router2Cfg(getCtx())); + result = router1(getCtx(), Router1Cfg(getCtx())); + } else { + log_error("iCE40 architecture does not support router '%s'\n", router.c_str()); + } getCtx()->settings[getCtx()->id("route")] = 1; archInfoToAttributes(); - return retVal; + return result; } // --------------------------------------------------------------- @@ -653,6 +663,10 @@ const std::vector Arch::availablePlacers = {"sa", "heap" #endif }; + +const std::string Arch::defaultRouter = "router1"; +const std::vector Arch::availableRouters = {"router1", "router2"}; + void Arch::assignArchInfo() { for (auto &cell : getCtx()->cells) { diff --git a/generic/arch.h b/generic/arch.h index 444d2636..21e78e9a 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -288,6 +288,8 @@ struct Arch : BaseCtx static const std::string defaultPlacer; static const std::vector availablePlacers; + static const std::string defaultRouter; + static const std::vector availableRouters; // --------------------------------------------------------------- // Internal usage -- cgit v1.2.3 From 2248e07b662bb99bbe053e485c5c4d8d10cf234b Mon Sep 17 00:00:00 2001 From: David Shah Date: Mon, 3 Feb 2020 13:46:05 +0000 Subject: router2: Improve flow and log output Signed-off-by: David Shah --- generic/arch.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'generic') diff --git a/generic/arch.cc b/generic/arch.cc index e4227c74..5d60d9c6 100644 --- a/generic/arch.cc +++ b/generic/arch.cc @@ -560,7 +560,7 @@ bool Arch::route() result = router1(getCtx(), Router1Cfg(getCtx())); } else if (router == "router2") { router2(getCtx(), Router2Cfg(getCtx())); - result = router1(getCtx(), Router1Cfg(getCtx())); + result = true; } else { log_error("iCE40 architecture does not support router '%s'\n", router.c_str()); } -- cgit v1.2.3 From a1c902dadc3165fe9abab7c96a75b5f4808836cd Mon Sep 17 00:00:00 2001 From: David Shah Date: Mon, 3 Feb 2020 13:48:51 +0000 Subject: generic: Implement getRouteBoundingBox Signed-off-by: David Shah --- generic/arch.cc | 24 ++++++++++++++++++++++++ generic/arch.h | 2 ++ 2 files changed, 26 insertions(+) (limited to 'generic') diff --git a/generic/arch.cc b/generic/arch.cc index 5d60d9c6..6979673a 100644 --- a/generic/arch.cc +++ b/generic/arch.cc @@ -515,6 +515,30 @@ delay_t Arch::predictDelay(const NetInfo *net_info, const PortRef &sink) const bool Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t &budget) const { return false; } +ArcBounds Arch::getRouteBoundingBox(WireId src, WireId dst) const +{ + ArcBounds bb; + + int src_x = wires.at(src).x; + int src_y = wires.at(src).y; + int dst_x = wires.at(dst).x; + int dst_y = wires.at(dst).y; + + bb.x0 = src_x; + bb.y0 = src_y; + bb.x1 = src_x; + bb.y1 = src_y; + + auto extend = [&](int x, int y) { + bb.x0 = std::min(bb.x0, x); + bb.x1 = std::max(bb.x1, x); + bb.y0 = std::min(bb.y0, y); + bb.y1 = std::max(bb.y1, y); + }; + extend(dst_x, dst_y); + return bb; +} + // --------------------------------------------------------------- bool Arch::place() diff --git a/generic/arch.h b/generic/arch.h index 21e78e9a..cbfb943d 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -267,6 +267,8 @@ struct Arch : BaseCtx uint32_t getDelayChecksum(delay_t v) const { return 0; } bool getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t &budget) const; + ArcBounds getRouteBoundingBox(WireId src, WireId dst) const; + bool pack(); bool place(); bool route(); -- cgit v1.2.3