From aeaa0552ba0373fb1edaed263b6edb4e8e82d7ea Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Fri, 9 Nov 2018 17:00:45 +0100 Subject: Essentially a rewrite router1 Signed-off-by: Clifford Wolf --- common/router1.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'common/router1.h') diff --git a/common/router1.h b/common/router1.h index a184cbe7..0c7699bc 100644 --- a/common/router1.h +++ b/common/router1.h @@ -33,6 +33,11 @@ struct Router1Cfg : Settings bool cleanupReroute; bool fullCleanupReroute; bool useEstimate; + delay_t wireRipupPenalty; + delay_t pipRipupPenalty; + delay_t wireReusePenalty; + delay_t pipReusePenalty; + delay_t estimatePrecision; }; extern bool router1(Context *ctx, const Router1Cfg &cfg); -- cgit v1.2.3 From f0a3a272ca52b2235b6609b61ba6ff56d6a9af8b Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Fri, 9 Nov 2018 22:39:39 +0100 Subject: Fixes and improvements in new router Signed-off-by: Clifford Wolf --- common/router1.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/router1.h') diff --git a/common/router1.h b/common/router1.h index 0c7699bc..120bf30e 100644 --- a/common/router1.h +++ b/common/router1.h @@ -35,8 +35,8 @@ struct Router1Cfg : Settings bool useEstimate; delay_t wireRipupPenalty; delay_t pipRipupPenalty; - delay_t wireReusePenalty; - delay_t pipReusePenalty; + delay_t wireReuseBonus; + delay_t pipReuseBonus; delay_t estimatePrecision; }; -- cgit v1.2.3 From d2bdb670c0be9e18722f79c170fc99d7f41768f1 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sun, 11 Nov 2018 11:34:38 +0100 Subject: Add getConflictingPipWire() arch API, router1 improvements Signed-off-by: Clifford Wolf --- common/router1.h | 1 + 1 file changed, 1 insertion(+) (limited to 'common/router1.h') diff --git a/common/router1.h b/common/router1.h index 120bf30e..65975d53 100644 --- a/common/router1.h +++ b/common/router1.h @@ -35,6 +35,7 @@ struct Router1Cfg : Settings bool useEstimate; delay_t wireRipupPenalty; delay_t pipRipupPenalty; + delay_t netRipupPenalty; delay_t wireReuseBonus; delay_t pipReuseBonus; delay_t estimatePrecision; -- cgit v1.2.3 From f93129634b479ba54d8e33186eb79f412eaeb4a9 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sun, 11 Nov 2018 17:28:41 +0100 Subject: Add getConflictingWireWire() arch API, streamline getConflictingXY semantic Signed-off-by: Clifford Wolf --- common/router1.h | 1 - 1 file changed, 1 deletion(-) (limited to 'common/router1.h') diff --git a/common/router1.h b/common/router1.h index 65975d53..d6113441 100644 --- a/common/router1.h +++ b/common/router1.h @@ -34,7 +34,6 @@ struct Router1Cfg : Settings bool fullCleanupReroute; bool useEstimate; delay_t wireRipupPenalty; - delay_t pipRipupPenalty; delay_t netRipupPenalty; delay_t wireReuseBonus; delay_t pipReuseBonus; -- cgit v1.2.3 From f9a512633840a88d8c846f1387681c62161ea6a7 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sun, 11 Nov 2018 17:50:42 +0100 Subject: Another router1 bugfix Signed-off-by: Clifford Wolf --- common/router1.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'common/router1.h') diff --git a/common/router1.h b/common/router1.h index d6113441..80d7aa96 100644 --- a/common/router1.h +++ b/common/router1.h @@ -35,8 +35,7 @@ struct Router1Cfg : Settings bool useEstimate; delay_t wireRipupPenalty; delay_t netRipupPenalty; - delay_t wireReuseBonus; - delay_t pipReuseBonus; + delay_t reuseBonus; delay_t estimatePrecision; }; -- cgit v1.2.3