Added $lut support in test_cell, techmap, satgen

2 files changed, 57 insertions, 4 deletions

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 72eced91..403bb6d2 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -1768,8 +1768,7 @@ void RTLIL::Cell::fixup_parameters(bool set_a_signed, bool set_b_signed)
 			type.substr(0, 9) == "$verific$" || type.substr(0, 7) == "$array:" || type.substr(0, 8) == "$extern:")
 		return;
 
-	if (type == "$mux" || type == "$pmux")
-	{
+	if (type == "$mux" || type == "$pmux") {
 		parameters["\\WIDTH"] = SIZE(connections_["\\Y"]);
 		if (type == "$pmux")
 			parameters["\\S_WIDTH"] = SIZE(connections_["\\S"]);
@@ -1777,7 +1776,12 @@ void RTLIL::Cell::fixup_parameters(bool set_a_signed, bool set_b_signed)
 		return;
 	}
 
-	bool signedness_ab = type != "$slice" && type != "$concat";
+	if (type == "$lut") {
+		parameters["\\WIDTH"] = SIZE(connections_["\\A"]);
+		return;
+	}
+
+	bool signedness_ab = !type.in("$slice", "$concat");
 
 	if (connections_.count("\\A")) {
 		if (signedness_ab) {
diff --git a/kernel/satgen.h b/kernel/satgen.h
index c02900a6..5d1c11c9 100644
--- a/kernel/satgen.h
+++ b/kernel/satgen.h
@@ -841,6 +841,56 @@ struct SatGen
 			return true;
 		}
 
+		if (cell->type == "$lut")
+		{
+			std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+			std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
+
+			std::vector<int> lut;
+			for (auto bit : cell->getParam("\\LUT").bits)
+				lut.push_back(bit == RTLIL::S1 ? ez->TRUE : ez->FALSE);
+			while (SIZE(lut) < (1 << SIZE(a)))
+				lut.push_back(ez->FALSE);
+			lut.resize(1 << SIZE(a));
+
+			if (model_undef)
+			{
+				std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+				std::vector<int> t(lut), u(SIZE(t), ez->FALSE);
+
+				for (int i = SIZE(a)-1; i >= 0; i--)
+				{
+					std::vector<int> t0(t.begin(), t.begin() + SIZE(t)/2);
+					std::vector<int> t1(t.begin() + SIZE(t)/2, t.end());
+
+					std::vector<int> u0(u.begin(), u.begin() + SIZE(u)/2);
+					std::vector<int> u1(u.begin() + SIZE(u)/2, u.end());
+
+					t = ez->vec_ite(a[i], t1, t0);
+					u = ez->vec_ite(undef_a[i], ez->vec_or(ez->vec_xor(t0, t1), ez->vec_or(u0, u1)), ez->vec_ite(a[i], u1, u0));
+				}
+
+				log_assert(SIZE(t) == 1);
+				log_assert(SIZE(u) == 1);
+				undefGating(y, t, u);
+				ez->assume(ez->vec_eq(importUndefSigSpec(cell->getPort("\\Y"), timestep), u));
+			}
+			else
+			{
+				std::vector<int> t = lut;
+				for (int i = SIZE(a)-1; i >= 0; i--)
+				{
+					std::vector<int> t0(t.begin(), t.begin() + SIZE(t)/2);
+					std::vector<int> t1(t.begin() + SIZE(t)/2, t.end());
+					t = ez->vec_ite(a[i], t1, t0);
+				}
+
+				log_assert(SIZE(t) == 1);
+				ez->assume(ez->vec_eq(y, t));
+			}
+			return true;
+		}
+
 		if (cell->type == "$slice")
 		{
 			RTLIL::SigSpec a = cell->getPort("\\A");
@@ -903,4 +953,3 @@ struct SatGen
 };
 
 #endif
-