From: Eddie Hung <eddie@fpgeh.com>
Date: Mon, 9 Dec 2019 22:28:54 +0000 (-0800)
Subject: ice40_wrapcarry -unwrap to preserve 'src' attribute
X-Git-Tag: working-ls180~931^2~1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=36a88be609b942f9bc1a5e44ecdbe432a3fa56e8;p=yosys.git

ice40_wrapcarry -unwrap to preserve 'src' attribute
---

diff --git a/passes/pmgen/ice40_wrapcarry.cc b/passes/pmgen/ice40_wrapcarry.cc
index 4bddece30..6e154147f 100644
--- a/passes/pmgen/ice40_wrapcarry.cc
+++ b/passes/pmgen/ice40_wrapcarry.cc
@@ -121,16 +121,24 @@ struct Ice40WrapCarryPass : public Pass {
 					lut->setPort(ID(A), {cell->getPort(ID(I0)), cell->getPort(ID(A)), cell->getPort(ID(B)), cell->getPort(ID(I3)) });
 					lut->setPort(ID(Y), cell->getPort(ID(O)));
 
+					Const src;
 					for (const auto &a : cell->attributes)
 						if (a.first.begins_with("\\SB_CARRY.\\"))
 							carry->attributes[a.first.c_str() + strlen("\\SB_CARRY.")] = a.second;
 						else if (a.first.begins_with("\\SB_LUT4.\\"))
 							lut->attributes[a.first.c_str() + strlen("\\SB_LUT4.")] = a.second;
-						else if (a.first.in(ID(SB_LUT4.name), ID::keep, ID(module_not_derived), ID(src)))
+						else if (a.first == ID(src))
+							src = a.second;
+						else if (a.first.in(ID(SB_LUT4.name), ID::keep, ID(module_not_derived)))
 							continue;
 						else
 							log_abort();
 
+					if (!src.empty()) {
+						carry->attributes.insert(std::make_pair(ID(src), src));
+						lut->attributes.insert(std::make_pair(ID(src), src));
+					}
+
 					module->remove(cell);
 				}
 			}