From: Eddie Hung <eddie@fpgeh.com>
Date: Wed, 21 Aug 2019 20:42:03 +0000 (-0700)
Subject: Respect \keep on cells or wires
X-Git-Tag: working-ls180~1085^2~84
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=52fea5b65829745988de00a5e15975026060e76c;p=yosys.git

Respect \keep on cells or wires
---

diff --git a/passes/pmgen/xilinx_srl.pmg b/passes/pmgen/xilinx_srl.pmg
index ae29ac6c9..cd7461052 100644
--- a/passes/pmgen/xilinx_srl.pmg
+++ b/passes/pmgen/xilinx_srl.pmg
@@ -10,6 +10,8 @@ endcode
 
 match first
 	select first->type.in($_DFF_N_, $_DFF_P_, $_DFFE_NN_, $_DFFE_NP_, $_DFFE_PN_, $_DFFE_PP_, \FDRE, \FDRE_1)
+	select !first->get_bool_attribute(\keep)
+	select !port(first, \Q).as_wire()->get_bool_attribute(\keep)
 	filter !non_first_cells.count(first)
 //generate
 //	SigSpec A = module->addWire(NEW_ID);
@@ -46,11 +48,15 @@ subpattern setup
 
 match first
 	select first->type.in($_DFF_N_, $_DFF_P_, $_DFFE_NN_, $_DFFE_NP_, $_DFFE_PN_, $_DFFE_PP_, \FDRE, \FDRE_1)
+	select !first->get_bool_attribute(\keep)
+	select !port(first, \Q).as_wire()->get_bool_attribute(\keep)
 endmatch
 
 match next
-	select nusers(port(next, \Q)) == 2
 	select next->type.in($_DFF_N_, $_DFF_P_, $_DFFE_NN_, $_DFFE_NP_, $_DFFE_PN_, $_DFFE_PP_, \FDRE, \FDRE_1)
+	select !next->get_bool_attribute(\keep)
+	select !port(next, \Q).as_wire()->get_bool_attribute(\keep)
+	select nusers(port(next, \Q)) == 2
 	index <IdString> next->type === first->type
 	index <SigSpec> port(next, \Q) === port(first, \D)
 endmatch
@@ -66,8 +72,10 @@ arg first
 
 match next
 	semioptional
-	select nusers(port(next, \Q)) == 2
 	select next->type.in($_DFF_N_, $_DFF_P_, $_DFFE_NN_, $_DFFE_NP_, $_DFFE_PN_, $_DFFE_PP_, \FDRE, \FDRE_1)
+	select !next->get_bool_attribute(\keep)
+	select !port(next, \Q).as_wire()->get_bool_attribute(\keep)
+	select nusers(port(next, \Q)) == 2
 	index <IdString> next->type === chain.back()->type
 	index <SigSpec> port(next, \Q) === port(chain.back(), \D)
 //generate 10