summaryrefslogtreecommitdiff
path: root/passes
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2013-11-24 23:31:14 +0100
committerClifford Wolf <clifford@clifford.at>2013-11-24 23:31:14 +0100
commit76f7c10cfc7450e6be8eb25fc26f5447e05759b0 (patch)
treeaa5002fe6070f4f3a4dca24911504304cdf56ba5 /passes
parent3ee33cbdaf7ae8ef85e595fb2266ad92a17cfaeb (diff)
Using simplemap mappers from techmap
Diffstat (limited to 'passes')
-rw-r--r--passes/techmap/simplemap.cc55
-rw-r--r--passes/techmap/techmap.cc37
2 files changed, 64 insertions, 28 deletions
diff --git a/passes/techmap/simplemap.cc b/passes/techmap/simplemap.cc
index 5f49fdce..fbd86d59 100644
--- a/passes/techmap/simplemap.cc
+++ b/passes/techmap/simplemap.cc
@@ -25,6 +25,8 @@
#include <stdio.h>
#include <string.h>
+extern void simplemap_get_mappers(std::map<std::string, void(*)(RTLIL::Module*, RTLIL::Cell*)> &mappers);
+
static void simplemap_not(RTLIL::Module *module, RTLIL::Cell *cell)
{
int width = cell->parameters.at("\\Y_WIDTH").as_int();
@@ -448,6 +450,30 @@ static void simplemap_dlatch(RTLIL::Module *module, RTLIL::Cell *cell)
}
}
+void simplemap_get_mappers(std::map<std::string, void(*)(RTLIL::Module*, RTLIL::Cell*)> &mappers)
+{
+ mappers["$not"] = simplemap_not;
+ mappers["$pos"] = simplemap_pos;
+ mappers["$and"] = simplemap_bitop;
+ mappers["$or"] = simplemap_bitop;
+ mappers["$xor"] = simplemap_bitop;
+ mappers["$xnor"] = simplemap_bitop;
+ mappers["$reduce_and"] = simplemap_reduce;
+ mappers["$reduce_or"] = simplemap_reduce;
+ mappers["$reduce_xor"] = simplemap_reduce;
+ mappers["$reduce_xnor"] = simplemap_reduce;
+ mappers["$reduce_bool"] = simplemap_reduce;
+ mappers["$logic_not"] = simplemap_lognot;
+ mappers["$logic_and"] = simplemap_logbin;
+ mappers["$logic_or"] = simplemap_logbin;
+ mappers["$mux"] = simplemap_mux;
+ mappers["$sr"] = simplemap_sr;
+ mappers["$dff"] = simplemap_dff;
+ mappers["$dffsr"] = simplemap_dffsr;
+ mappers["$adff"] = simplemap_adff;
+ mappers["$dlatch"] = simplemap_dlatch;
+}
+
struct SimplemapPass : public Pass {
SimplemapPass() : Pass("simplemap", "mapping simple coarse-grain cells") { }
virtual void help()
@@ -470,41 +496,20 @@ struct SimplemapPass : public Pass {
log_header("Executing SIMPLEMAP pass (map simple cells to gate primitives).\n");
extra_args(args, 1, design);
- std::map<std::string, void(*)(RTLIL::Module*, RTLIL::Cell*)> supported_cells;
-
- supported_cells["$not"] = simplemap_not;
- supported_cells["$pos"] = simplemap_pos;
- supported_cells["$and"] = simplemap_bitop;
- supported_cells["$or"] = simplemap_bitop;
- supported_cells["$xor"] = simplemap_bitop;
- supported_cells["$xnor"] = simplemap_bitop;
- supported_cells["$reduce_and"] = simplemap_reduce;
- supported_cells["$reduce_or"] = simplemap_reduce;
- supported_cells["$reduce_xor"] = simplemap_reduce;
- supported_cells["$reduce_xnor"] = simplemap_reduce;
- supported_cells["$reduce_bool"] = simplemap_reduce;
- supported_cells["$logic_not"] = simplemap_lognot;
- supported_cells["$logic_and"] = simplemap_logbin;
- supported_cells["$logic_or"] = simplemap_logbin;
- supported_cells["$mux"] = simplemap_mux;
- supported_cells["$sr"] = simplemap_sr;
- supported_cells["$dff"] = simplemap_dff;
- supported_cells["$dffsr"] = simplemap_dffsr;
- supported_cells["$adff"] = simplemap_adff;
- supported_cells["$dlatch"] = simplemap_dlatch;
+ std::map<std::string, void(*)(RTLIL::Module*, RTLIL::Cell*)> mappers;
+ simplemap_get_mappers(mappers);
for (auto &mod_it : design->modules) {
if (!design->selected(mod_it.second))
continue;
std::vector<RTLIL::Cell*> delete_cells;
for (auto &cell_it : mod_it.second->cells) {
- auto mapper = supported_cells[cell_it.second->type];
- if (mapper == NULL)
+ if (mappers.count(cell_it.second->type) == 0)
continue;
if (!design->selected(mod_it.second, cell_it.second))
continue;
log("Mapping %s.%s (%s).\n", RTLIL::id2cstr(mod_it.first), RTLIL::id2cstr(cell_it.first), RTLIL::id2cstr(cell_it.second->type));
- mapper(mod_it.second, cell_it.second);
+ mappers.at(cell_it.second->type)(mod_it.second, cell_it.second);
delete_cells.push_back(cell_it.second);
}
for (auto &it : delete_cells) {
diff --git a/passes/techmap/techmap.cc b/passes/techmap/techmap.cc
index bd3d223b..d56e465e 100644
--- a/passes/techmap/techmap.cc
+++ b/passes/techmap/techmap.cc
@@ -27,6 +27,9 @@
#include "passes/techmap/stdcells.inc"
+// see simplemap.cc
+extern void simplemap_get_mappers(std::map<std::string, void(*)(RTLIL::Module*, RTLIL::Cell*)> &mappers);
+
static void apply_prefix(std::string prefix, std::string &id)
{
if (id[0] == '\\')
@@ -47,6 +50,7 @@ static void apply_prefix(std::string prefix, RTLIL::SigSpec &sig, RTLIL::Module
}
}
+std::map<std::string, void(*)(RTLIL::Module*, RTLIL::Cell*)> simplemap_mappers;
std::map<std::pair<RTLIL::IdString, std::map<RTLIL::IdString, RTLIL::Const>>, RTLIL::Module*> techmap_cache;
std::map<RTLIL::Module*, bool> techmap_do_cache;
@@ -217,7 +221,20 @@ static bool techmap_module(RTLIL::Design *design, RTLIL::Module *module, RTLIL::
RTLIL::Module *tpl = map->modules[tpl_name];
std::map<RTLIL::IdString, RTLIL::Const> parameters = cell->parameters;
- if (!flatten_mode) {
+ if (!flatten_mode)
+ {
+ if (tpl->get_bool_attribute("\\techmap_simplemap")) {
+ log("Mapping %s.%s (%s) with simplemap.\n", RTLIL::id2cstr(module->name), RTLIL::id2cstr(cell->name), RTLIL::id2cstr(cell->type));
+ if (simplemap_mappers.count(cell->type) == 0)
+ log_error("No simplemap mapper for cell type %s found!\n", RTLIL::id2cstr(cell->type));
+ simplemap_mappers.at(cell->type)(module, cell);
+ module->cells.erase(cell->name);
+ delete cell;
+ cell = NULL;
+ did_something = true;
+ break;
+ }
+
for (auto conn : cell->connections) {
if (conn.first.substr(0, 1) == "$")
continue;
@@ -386,11 +403,15 @@ struct TechmapPass : public Pass {
log(" '-ignore_redef' option set.\n");
log("\n");
log("When a module in the map file has the 'techmap_celltype' attribute set, it will\n");
- log("match cells with a type that match the text value of this attribute.\n");
+ log("match cells with a type that match the text value of this attribute. Otherwise\n");
+ log("the module name will be used to match the cell.\n");
+ log("\n");
+ log("When a module in the map file has the 'techmap_simplemap' attribute set, techmap\n");
+ log("will use 'simplemap' (see 'help simplemap') to map cells matching the module.\n");
log("\n");
log("All wires in the modules from the map file matching the pattern _TECHMAP_*\n");
log("or *._TECHMAP_* are special wires that are used to pass instructions from\n");
- log("the mapping module to the techmap command. At the moment the following spoecial\n");
+ log("the mapping module to the techmap command. At the moment the following special\n");
log("wires are supported:\n");
log("\n");
log(" _TECHMAP_FAIL_\n");
@@ -412,6 +433,13 @@ struct TechmapPass : public Pass {
log(" wire to start out as non-constant and evaluate to a constant value\n");
log(" during processing of other _TECHMAP_DO_* commands.\n");
log("\n");
+ log("In addition to this special wires, techmap also supports special parameters in\n");
+ log("modules in the map file:\n");
+ log("\n");
+ log(" _TECHMAP_CELLTYPE_\n");
+ log(" When a parameter with this name exists, it will be set to the type name\n");
+ log(" of the cell that matches the module.\n");
+ log("\n");
log("When a module in the map file has a parameter where the according cell in the\n");
log("design has a port, the module from the map file is only used if the port in\n");
log("the design is connected to a constant value. The parameter is then set to the\n");
@@ -453,6 +481,8 @@ struct TechmapPass : public Pass {
}
extra_args(args, argidx, design);
+ simplemap_get_mappers(simplemap_mappers);
+
RTLIL::Design *map = new RTLIL::Design;
if (map_files.empty()) {
FILE *f = fmemopen(stdcells_code, strlen(stdcells_code), "rt");
@@ -500,6 +530,7 @@ struct TechmapPass : public Pass {
log("No more expansions possible.\n");
techmap_cache.clear();
techmap_do_cache.clear();
+ simplemap_mappers.clear();
delete map;
log_pop();
}