From 794d22969dae1a31af36719574351cf75e4fe033 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Mon, 27 Apr 2015 10:16:07 +0200
Subject: [PATCH] Added simplemap $lut support
---
passes/techmap/simplemap.cc | 24 ++++++++++++++++++++++++
passes/techmap/simplemap.h | 1 +
techlibs/common/techmap.v | 10 ++--------
3 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/passes/techmap/simplemap.cc b/passes/techmap/simplemap.cc
index 170b7b04f..6cd1c5864 100644
--- a/passes/techmap/simplemap.cc
+++ b/passes/techmap/simplemap.cc
@@ -283,6 +283,29 @@ void simplemap_mux(RTLIL::Module *module, RTLIL::Cell *cell)
}
}
+void simplemap_lut(RTLIL::Module *module, RTLIL::Cell *cell)
+{
+ SigSpec lut_ctrl = cell->getPort("\\A");
+ SigSpec lut_data = cell->getParam("\\LUT");
+ lut_data.extend_u0(1 << cell->getParam("\\WIDTH").as_int());
+
+ for (int idx = 0; GetSize(lut_data) > 1; idx++) {
+ SigSpec sig_s = lut_ctrl[idx];
+ SigSpec new_lut_data = module->addWire(NEW_ID, GetSize(lut_data)/2);
+ for (int i = 0; i < GetSize(lut_data); i += 2) {
+ RTLIL::Cell *gate = module->addCell(NEW_ID, "$_MUX_");
+ gate->add_strpool_attribute("\\src", cell->get_strpool_attribute("\\src"));
+ gate->setPort("\\A", lut_data[i]);
+ gate->setPort("\\B", lut_data[i+1]);
+ gate->setPort("\\S", lut_ctrl[idx]);
+ gate->setPort("\\Y", new_lut_data[i/2]);
+ }
+ lut_data = new_lut_data;
+ }
+
+ module->connect(cell->getPort("\\Y"), lut_data);
+}
+
void simplemap_slice(RTLIL::Module *module, RTLIL::Cell *cell)
{
int offset = cell->parameters.at("\\OFFSET").as_int();
@@ -458,6 +481,7 @@ void simplemap_get_mappers(std::map<RTLIL::IdString, void(*)(RTLIL::Module*, RTL
mappers["$ne"] = simplemap_eqne;
mappers["$nex"] = simplemap_eqne;
mappers["$mux"] = simplemap_mux;
+ mappers["$lut"] = simplemap_lut;
mappers["$slice"] = simplemap_slice;
mappers["$concat"] = simplemap_concat;
mappers["$sr"] = simplemap_sr;
diff --git a/passes/techmap/simplemap.h b/passes/techmap/simplemap.h
index dc2a395d3..67be4efef 100644
--- a/passes/techmap/simplemap.h
+++ b/passes/techmap/simplemap.h
@@ -31,6 +31,7 @@ extern void simplemap_reduce(RTLIL::Module *module, RTLIL::Cell *cell);
extern void simplemap_lognot(RTLIL::Module *module, RTLIL::Cell *cell);
extern void simplemap_logbin(RTLIL::Module *module, RTLIL::Cell *cell);
extern void simplemap_mux(RTLIL::Module *module, RTLIL::Cell *cell);
+extern void simplemap_lut(RTLIL::Module *module, RTLIL::Cell *cell);
extern void simplemap_slice(RTLIL::Module *module, RTLIL::Cell *cell);
extern void simplemap_concat(RTLIL::Module *module, RTLIL::Cell *cell);
extern void simplemap_sr(RTLIL::Module *module, RTLIL::Cell *cell);
diff --git a/techlibs/common/techmap.v b/techlibs/common/techmap.v
index e0ecf0c48..f67e36584 100644
--- a/techlibs/common/techmap.v
+++ b/techlibs/common/techmap.v
@@ -451,15 +451,9 @@ endmodule
// --------------------------------------------------------
`ifndef NOLUT
+(* techmap_simplemap *)
(* techmap_celltype = "$lut" *)
-module _90_lut (A, Y);
- parameter WIDTH = 1;
- parameter LUT = 0;
-
- input [WIDTH-1:0] A;
- output Y;
-
- assign Y = LUT[A];
+module _90_lut;
endmodule
`endif