Renamed opt_share to opt_merge
authorClifford Wolf <clifford@clifford.at>
Thu, 31 Mar 2016 06:52:49 +0000 (08:52 +0200)
committerClifford Wolf <clifford@clifford.at>
Thu, 31 Mar 2016 06:52:49 +0000 (08:52 +0200)
manual/CHAPTER_Optimize.tex
manual/CHAPTER_Overview.tex
manual/PRESENTATION_ExSyn.tex
passes/memory/memory_share.cc
passes/opt/Makefile.inc
passes/opt/opt.cc
passes/opt/opt_merge.cc [new file with mode: 0644]
passes/opt/opt_share.cc [deleted file]
techlibs/ice40/ice40_opt.cc

index 07f5a26e6f7853e30e2ab09f18f8750abba4a126..4b09c22319e1e40935aab4efcd3a0b70d79e31c2 100644 (file)
@@ -16,13 +16,13 @@ passes that each perform a simple optimization:
 \item Once at the beginning of {\tt opt}:
 \begin{itemize}
 \item {\tt opt\_expr}
-\item {\tt opt\_share -nomux}
+\item {\tt opt\_merge -nomux}
 \end{itemize}
 \item Repeat until result is stable:
 \begin{itemize}
 \item {\tt opt\_muxtree}
 \item {\tt opt\_reduce}
-\item {\tt opt\_share}
+\item {\tt opt\_merge}
 \item {\tt opt\_rmdff}
 \item {\tt opt\_clean}
 \item {\tt opt\_expr}
@@ -130,7 +130,7 @@ This pass identifies unused signals and cells and removes them from the design.
 creates an \B{unused\_bits} attribute on wires with unused bits. This attribute can be
 used for debugging or by other optimization passes.
 
-\subsection{The opt\_share pass}
+\subsection{The opt\_merge pass}
 
 This pass performs trivial resource sharing. This means that this pass identifies cells
 with identical inputs and replaces them with a single instance of the cell.
index 4ce31482583570b7c5914fcc673bcfac2b0382b6..964875d571a2d5e92506f4f69cad5e41a0b6bfb9 100644 (file)
@@ -489,7 +489,7 @@ select.cc}, {\tt show.cc}, \dots) and a couple of other small utility libraries.
 This directory contains a subdirectory for each pass or group of passes. For example as
 of this writing the directory {\tt passes/opt/} contains the code for seven
 passes: {\tt opt}, {\tt opt\_expr}, {\tt opt\_muxtree}, {\tt opt\_reduce},
-{\tt opt\_rmdff}, {\tt opt\_rmunused} and {\tt opt\_share}.
+{\tt opt\_rmdff}, {\tt opt\_rmunused} and {\tt opt\_merge}.
 
 \item {\tt techlibs/} \\
 This directory contains simulation models and standard implementations for the
@@ -513,7 +513,7 @@ Yosys. So it is not needed to add additional commands to a central list of comma
 \end{sloppypar}
 
 Good starting points for reading example source code to learn how to write passes
-are {\tt passes/opt/opt\_rmdff.cc} and {\tt passes/opt/opt\_share.cc}.
+are {\tt passes/opt/opt\_rmdff.cc} and {\tt passes/opt/opt\_merge.cc}.
 
 See the top-level README file for a quick {\it Getting Started} guide and build
 instructions. The Yosys build is based solely on Makefiles.
index b57063c9c9affa5d8a7f36a6e5ab027d7252c857..655720ebc6482331f8b0e8460382be679bd4e32d 100644 (file)
@@ -145,12 +145,12 @@ is a macro command that calls other commands:
 
 \begin{lstlisting}[xleftmargin=0.5cm, basicstyle=\ttfamily\fontsize{8pt}{10pt}\selectfont, language=ys]
 opt_expr                # const folding and simple expression rewriting
-opt_share -nomux        # merging identical cells
+opt_merge -nomux        # merging identical cells
 
 do
     opt_muxtree         # remove never-active branches from multiplexer tree
     opt_reduce          # consolidate trees of boolean ops to reduce functions
-    opt_share           # merging identical cells
+    opt_merge           # merging identical cells
     opt_rmdff           # remove/simplify registers with constant inputs
     opt_clean           # remove unused objects (cells, wires) from design
     opt_expr            # const folding and simple expression rewriting
index 3a6fd0b44d99c4046eaaf5c10db5fb26441244cf..ab9edb6e7d56cbd7fecc0d1d1f7865238fb53977 100644 (file)
@@ -746,7 +746,7 @@ struct MemorySharePass : public Pass {
                log("\n");
                log("Note that in addition to the algorithms implemented in this pass, the $memrd\n");
                log("and $memwr cells are also subject to generic resource sharing passes (and other\n");
-               log("optimizations) such as opt_share.\n");
+               log("optimizations) such as \"share\" and \"opt_merge\".\n");
                log("\n");
        }
        virtual void execute(std::vector<std::string> args, RTLIL::Design *design) {
index dd9088a66b768d88d531326e20ff2d282b71ee1d..a8b1537bb6aa3bdedc93ed910f380c73ac2012ee 100644 (file)
@@ -1,6 +1,6 @@
 
 OBJS += passes/opt/opt.o
-OBJS += passes/opt/opt_share.o
+OBJS += passes/opt/opt_merge.o
 OBJS += passes/opt/opt_muxtree.o
 OBJS += passes/opt/opt_reduce.o
 OBJS += passes/opt/opt_rmdff.o
index db35a177589220d62216b12eda9a113e97457d4a..c25adac97786f9b50044b8ce47541a978c94f015 100644 (file)
@@ -38,12 +38,12 @@ struct OptPass : public Pass {
                log("passes in the following order:\n");
                log("\n");
                log("    opt_expr [-mux_undef] [-mux_bool] [-undriven] [-clkinv] [-fine] [-full] [-keepdc]\n");
-               log("    opt_share [-share_all] -nomux\n");
+               log("    opt_merge [-share_all] -nomux\n");
                log("\n");
                log("    do\n");
                log("        opt_muxtree\n");
                log("        opt_reduce [-fine] [-full]\n");
-               log("        opt_share [-share_all]\n");
+               log("        opt_merge [-share_all]\n");
                log("        opt_rmdff\n");
                log("        opt_clean [-purge]\n");
                log("        opt_expr [-mux_undef] [-mux_bool] [-undriven] [-clkinv] [-fine] [-full] [-keepdc]\n");
@@ -53,7 +53,7 @@ struct OptPass : public Pass {
                log("\n");
                log("    do\n");
                log("        opt_expr [-mux_undef] [-mux_bool] [-undriven] [-clkinv] [-fine] [-full] [-keepdc]\n");
-               log("        opt_share [-share_all]\n");
+               log("        opt_merge [-share_all]\n");
                log("        opt_rmdff\n");
                log("        opt_clean [-purge]\n");
                log("    while <changed design in opt_rmdff>\n");
@@ -68,7 +68,7 @@ struct OptPass : public Pass {
                std::string opt_clean_args;
                std::string opt_expr_args;
                std::string opt_reduce_args;
-               std::string opt_share_args;
+               std::string opt_merge_args;
                bool fast_mode = false;
 
                log_header("Executing OPT pass (performing simple optimizations).\n");
@@ -111,7 +111,7 @@ struct OptPass : public Pass {
                                continue;
                        }
                        if (args[argidx] == "-share_all") {
-                               opt_share_args += " -share_all";
+                               opt_merge_args += " -share_all";
                                continue;
                        }
                        if (args[argidx] == "-fast") {
@@ -126,7 +126,7 @@ struct OptPass : public Pass {
                {
                        while (1) {
                                Pass::call(design, "opt_expr" + opt_expr_args);
-                               Pass::call(design, "opt_share" + opt_share_args);
+                               Pass::call(design, "opt_merge" + opt_merge_args);
                                design->scratchpad_unset("opt.did_something");
                                Pass::call(design, "opt_rmdff");
                                if (design->scratchpad_get_bool("opt.did_something") == false)
@@ -139,12 +139,12 @@ struct OptPass : public Pass {
                else
                {
                        Pass::call(design, "opt_expr" + opt_expr_args);
-                       Pass::call(design, "opt_share -nomux" + opt_share_args);
+                       Pass::call(design, "opt_merge -nomux" + opt_merge_args);
                        while (1) {
                                design->scratchpad_unset("opt.did_something");
                                Pass::call(design, "opt_muxtree");
                                Pass::call(design, "opt_reduce" + opt_reduce_args);
-                               Pass::call(design, "opt_share" + opt_share_args);
+                               Pass::call(design, "opt_merge" + opt_merge_args);
                                Pass::call(design, "opt_rmdff");
                                Pass::call(design, "opt_clean" + opt_clean_args);
                                Pass::call(design, "opt_expr" + opt_expr_args);
diff --git a/passes/opt/opt_merge.cc b/passes/opt/opt_merge.cc
new file mode 100644 (file)
index 0000000..fe1ad68
--- /dev/null
@@ -0,0 +1,341 @@
+/*
+ *  yosys -- Yosys Open SYnthesis Suite
+ *
+ *  Copyright (C) 2012  Clifford Wolf <clifford@clifford.at>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include "kernel/register.h"
+#include "kernel/sigtools.h"
+#include "kernel/log.h"
+#include "kernel/celltypes.h"
+#include "libs/sha1/sha1.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <set>
+
+#define USE_CELL_HASH_CACHE
+
+USING_YOSYS_NAMESPACE
+PRIVATE_NAMESPACE_BEGIN
+
+struct OptMergeWorker
+{
+       RTLIL::Design *design;
+       RTLIL::Module *module;
+       SigMap assign_map;
+       SigMap dff_init_map;
+       bool mode_share_all;
+
+       CellTypes ct;
+       int total_count;
+#ifdef USE_CELL_HASH_CACHE
+       dict<const RTLIL::Cell*, std::string> cell_hash_cache;
+#endif
+
+#ifdef USE_CELL_HASH_CACHE
+       std::string int_to_hash_string(unsigned int v)
+       {
+               if (v == 0)
+                       return "0";
+               std::string str = "";
+               while (v > 0) {
+                       str += 'a' + (v & 15);
+                       v = v >> 4;
+               }
+               return str;
+       }
+
+       std::string hash_cell_parameters_and_connections(const RTLIL::Cell *cell)
+       {
+               if (cell_hash_cache.count(cell) > 0)
+                       return cell_hash_cache[cell];
+
+               std::string hash_string = cell->type.str() + "\n";
+
+               for (auto &it : cell->parameters)
+                       hash_string += "P " + it.first.str() + "=" + it.second.as_string() + "\n";
+
+               const dict<RTLIL::IdString, RTLIL::SigSpec> *conn = &cell->connections();
+               dict<RTLIL::IdString, RTLIL::SigSpec> alt_conn;
+
+               if (cell->type == "$and" || cell->type == "$or" || cell->type == "$xor" || cell->type == "$xnor" || cell->type == "$add" || cell->type == "$mul" ||
+                               cell->type == "$logic_and" || cell->type == "$logic_or" || cell->type == "$_AND_" || cell->type == "$_OR_" || cell->type == "$_XOR_") {
+                       alt_conn = *conn;
+                       if (assign_map(alt_conn.at("\\A")) < assign_map(alt_conn.at("\\B"))) {
+                               alt_conn["\\A"] = conn->at("\\B");
+                               alt_conn["\\B"] = conn->at("\\A");
+                       }
+                       conn = &alt_conn;
+               } else
+               if (cell->type == "$reduce_xor" || cell->type == "$reduce_xnor") {
+                       alt_conn = *conn;
+                       assign_map.apply(alt_conn.at("\\A"));
+                       alt_conn.at("\\A").sort();
+                       conn = &alt_conn;
+               } else
+               if (cell->type == "$reduce_and" || cell->type == "$reduce_or" || cell->type == "$reduce_bool") {
+                       alt_conn = *conn;
+                       assign_map.apply(alt_conn.at("\\A"));
+                       alt_conn.at("\\A").sort_and_unify();
+                       conn = &alt_conn;
+               }
+
+               for (auto &it : *conn) {
+                       if (cell->output(it.first))
+                               continue;
+                       RTLIL::SigSpec sig = it.second;
+                       assign_map.apply(sig);
+                       hash_string += "C " + it.first.str() + "=";
+                       for (auto &chunk : sig.chunks()) {
+                               if (chunk.wire)
+                                       hash_string += "{" + chunk.wire->name.str() + " " +
+                                                       int_to_hash_string(chunk.offset) + " " +
+                                                       int_to_hash_string(chunk.width) + "}";
+                               else
+                                       hash_string += RTLIL::Const(chunk.data).as_string();
+                       }
+                       hash_string += "\n";
+               }
+
+               cell_hash_cache[cell] = sha1(hash_string);
+               return cell_hash_cache[cell];
+       }
+#endif
+
+       bool compare_cell_parameters_and_connections(const RTLIL::Cell *cell1, const RTLIL::Cell *cell2, bool &lt)
+       {
+#ifdef USE_CELL_HASH_CACHE
+               std::string hash1 = hash_cell_parameters_and_connections(cell1);
+               std::string hash2 = hash_cell_parameters_and_connections(cell2);
+
+               if (hash1 != hash2) {
+                       lt = hash1 < hash2;
+                       return true;
+               }
+#endif
+
+               if (cell1->parameters != cell2->parameters) {
+                       std::map<RTLIL::IdString, RTLIL::Const> p1(cell1->parameters.begin(), cell1->parameters.end());
+                       std::map<RTLIL::IdString, RTLIL::Const> p2(cell2->parameters.begin(), cell2->parameters.end());
+                       lt = p1 < p2;
+                       return true;
+               }
+
+               dict<RTLIL::IdString, RTLIL::SigSpec> conn1 = cell1->connections();
+               dict<RTLIL::IdString, RTLIL::SigSpec> conn2 = cell2->connections();
+
+               for (auto &it : conn1) {
+                       if (cell1->output(it.first))
+                               it.second = RTLIL::SigSpec();
+                       else
+                               assign_map.apply(it.second);
+               }
+
+               for (auto &it : conn2) {
+                       if (cell2->output(it.first))
+                               it.second = RTLIL::SigSpec();
+                       else
+                               assign_map.apply(it.second);
+               }
+
+               if (cell1->type == "$and" || cell1->type == "$or" || cell1->type == "$xor" || cell1->type == "$xnor" || cell1->type == "$add" || cell1->type == "$mul" ||
+                               cell1->type == "$logic_and" || cell1->type == "$logic_or" || cell1->type == "$_AND_" || cell1->type == "$_OR_" || cell1->type == "$_XOR_") {
+                       if (conn1.at("\\A") < conn1.at("\\B")) {
+                               RTLIL::SigSpec tmp = conn1["\\A"];
+                               conn1["\\A"] = conn1["\\B"];
+                               conn1["\\B"] = tmp;
+                       }
+                       if (conn2.at("\\A") < conn2.at("\\B")) {
+                               RTLIL::SigSpec tmp = conn2["\\A"];
+                               conn2["\\A"] = conn2["\\B"];
+                               conn2["\\B"] = tmp;
+                       }
+               } else
+               if (cell1->type == "$reduce_xor" || cell1->type == "$reduce_xnor") {
+                       conn1["\\A"].sort();
+                       conn2["\\A"].sort();
+               } else
+               if (cell1->type == "$reduce_and" || cell1->type == "$reduce_or" || cell1->type == "$reduce_bool") {
+                       conn1["\\A"].sort_and_unify();
+                       conn2["\\A"].sort_and_unify();
+               }
+
+               if (conn1 != conn2) {
+                       std::map<RTLIL::IdString, RTLIL::SigSpec> c1(conn1.begin(), conn1.end());
+                       std::map<RTLIL::IdString, RTLIL::SigSpec> c2(conn2.begin(), conn2.end());
+                       lt = c1 < c2;
+                       return true;
+               }
+
+               if (cell1->type.substr(0, 1) == "$" && conn1.count("\\Q") != 0) {
+                       std::vector<RTLIL::SigBit> q1 = dff_init_map(cell1->getPort("\\Q")).to_sigbit_vector();
+                       std::vector<RTLIL::SigBit> q2 = dff_init_map(cell2->getPort("\\Q")).to_sigbit_vector();
+                       for (size_t i = 0; i < q1.size(); i++)
+                               if ((q1.at(i).wire == NULL || q2.at(i).wire == NULL) && q1.at(i) != q2.at(i)) {
+                                       lt = q1.at(i) < q2.at(i);
+                                       return true;
+                               }
+               }
+
+               return false;
+       }
+
+       bool compare_cells(const RTLIL::Cell *cell1, const RTLIL::Cell *cell2)
+       {
+               if (cell1->type != cell2->type)
+                       return cell1->type < cell2->type;
+
+               if ((!mode_share_all && !ct.cell_known(cell1->type)) || !cell1->known())
+                       return cell1 < cell2;
+
+               if (cell1->has_keep_attr() || cell2->has_keep_attr())
+                       return cell1 < cell2;
+
+               bool lt;
+               if (compare_cell_parameters_and_connections(cell1, cell2, lt))
+                       return lt;
+
+               return false;
+       }
+
+       struct CompareCells {
+               OptMergeWorker *that;
+               CompareCells(OptMergeWorker *that) : that(that) {}
+               bool operator()(const RTLIL::Cell *cell1, const RTLIL::Cell *cell2) const {
+                       return that->compare_cells(cell1, cell2);
+               }
+       };
+
+       OptMergeWorker(RTLIL::Design *design, RTLIL::Module *module, bool mode_nomux, bool mode_share_all) :
+               design(design), module(module), assign_map(module), mode_share_all(mode_share_all)
+       {
+               total_count = 0;
+               ct.setup_internals();
+               ct.setup_internals_mem();
+               ct.setup_stdcells();
+               ct.setup_stdcells_mem();
+
+               if (mode_nomux) {
+                       ct.cell_types.erase("$mux");
+                       ct.cell_types.erase("$pmux");
+               }
+
+               log("Finding identical cells in module `%s'.\n", module->name.c_str());
+               assign_map.set(module);
+
+               dff_init_map.set(module);
+               for (auto &it : module->wires_)
+                       if (it.second->attributes.count("\\init") != 0)
+                               dff_init_map.add(it.second, it.second->attributes.at("\\init"));
+
+               bool did_something = true;
+               while (did_something)
+               {
+#ifdef USE_CELL_HASH_CACHE
+                       cell_hash_cache.clear();
+#endif
+                       std::vector<RTLIL::Cell*> cells;
+                       cells.reserve(module->cells_.size());
+                       for (auto &it : module->cells_) {
+                               if (!design->selected(module, it.second))
+                                       continue;
+                               if (ct.cell_known(it.second->type) || (mode_share_all && it.second->known()))
+                                       cells.push_back(it.second);
+                       }
+
+                       did_something = false;
+                       std::map<RTLIL::Cell*, RTLIL::Cell*, CompareCells> sharemap(CompareCells(this));
+                       for (auto cell : cells)
+                       {
+                               if (sharemap.count(cell) > 0) {
+                                       did_something = true;
+                                       log("  Cell `%s' is identical to cell `%s'.\n", cell->name.c_str(), sharemap[cell]->name.c_str());
+                                       for (auto &it : cell->connections()) {
+                                               if (cell->output(it.first)) {
+                                                       RTLIL::SigSpec other_sig = sharemap[cell]->getPort(it.first);
+                                                       log("    Redirecting output %s: %s = %s\n", it.first.c_str(),
+                                                                       log_signal(it.second), log_signal(other_sig));
+                                                       module->connect(RTLIL::SigSig(it.second, other_sig));
+                                                       assign_map.add(it.second, other_sig);
+                                               }
+                                       }
+                                       log("    Removing %s cell `%s' from module `%s'.\n", cell->type.c_str(), cell->name.c_str(), module->name.c_str());
+#ifdef USE_CELL_HASH_CACHE
+                                       cell_hash_cache.erase(cell);
+#endif
+                                       module->remove(cell);
+                                       total_count++;
+                               } else {
+                                       sharemap[cell] = cell;
+                               }
+                       }
+               }
+       }
+};
+
+struct OptMergePass : public Pass {
+       OptMergePass() : Pass("opt_merge", "consolidate identical cells") { }
+       virtual void help()
+       {
+               //   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
+               log("\n");
+               log("    opt_merge [options] [selection]\n");
+               log("\n");
+               log("This pass identifies cells with identical type and input signals. Such cells\n");
+               log("are then merged to one cell.\n");
+               log("\n");
+               log("    -nomux\n");
+               log("        Do not merge MUX cells.\n");
+               log("\n");
+               log("    -share_all\n");
+               log("        Operate on all cell types, not just built-in types.\n");
+               log("\n");
+       }
+       virtual void execute(std::vector<std::string> args, RTLIL::Design *design)
+       {
+               log_header("Executing OPT_SHARE pass (detect identical cells).\n");
+
+               bool mode_nomux = false;
+               bool mode_share_all = false;
+
+               size_t argidx;
+               for (argidx = 1; argidx < args.size(); argidx++) {
+                       std::string arg = args[argidx];
+                       if (arg == "-nomux") {
+                               mode_nomux = true;
+                               continue;
+                       }
+                       if (arg == "-share_all") {
+                               mode_share_all = true;
+                               continue;
+                       }
+                       break;
+               }
+               extra_args(args, argidx, design);
+
+               int total_count = 0;
+               for (auto module : design->selected_modules()) {
+                       OptMergeWorker worker(design, module, mode_nomux, mode_share_all);
+                       total_count += worker.total_count;
+               }
+
+               if (total_count)
+                       design->scratchpad_set_bool("opt.did_something", true);
+               log("Removed a total of %d cells.\n", total_count);
+       }
+} OptMergePass;
+
+PRIVATE_NAMESPACE_END
diff --git a/passes/opt/opt_share.cc b/passes/opt/opt_share.cc
deleted file mode 100644 (file)
index 46752e4..0000000
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- *  yosys -- Yosys Open SYnthesis Suite
- *
- *  Copyright (C) 2012  Clifford Wolf <clifford@clifford.at>
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "kernel/register.h"
-#include "kernel/sigtools.h"
-#include "kernel/log.h"
-#include "kernel/celltypes.h"
-#include "libs/sha1/sha1.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <set>
-
-#define USE_CELL_HASH_CACHE
-
-USING_YOSYS_NAMESPACE
-PRIVATE_NAMESPACE_BEGIN
-
-struct OptShareWorker
-{
-       RTLIL::Design *design;
-       RTLIL::Module *module;
-       SigMap assign_map;
-       SigMap dff_init_map;
-       bool mode_share_all;
-
-       CellTypes ct;
-       int total_count;
-#ifdef USE_CELL_HASH_CACHE
-       dict<const RTLIL::Cell*, std::string> cell_hash_cache;
-#endif
-
-#ifdef USE_CELL_HASH_CACHE
-       std::string int_to_hash_string(unsigned int v)
-       {
-               if (v == 0)
-                       return "0";
-               std::string str = "";
-               while (v > 0) {
-                       str += 'a' + (v & 15);
-                       v = v >> 4;
-               }
-               return str;
-       }
-
-       std::string hash_cell_parameters_and_connections(const RTLIL::Cell *cell)
-       {
-               if (cell_hash_cache.count(cell) > 0)
-                       return cell_hash_cache[cell];
-
-               std::string hash_string = cell->type.str() + "\n";
-
-               for (auto &it : cell->parameters)
-                       hash_string += "P " + it.first.str() + "=" + it.second.as_string() + "\n";
-
-               const dict<RTLIL::IdString, RTLIL::SigSpec> *conn = &cell->connections();
-               dict<RTLIL::IdString, RTLIL::SigSpec> alt_conn;
-
-               if (cell->type == "$and" || cell->type == "$or" || cell->type == "$xor" || cell->type == "$xnor" || cell->type == "$add" || cell->type == "$mul" ||
-                               cell->type == "$logic_and" || cell->type == "$logic_or" || cell->type == "$_AND_" || cell->type == "$_OR_" || cell->type == "$_XOR_") {
-                       alt_conn = *conn;
-                       if (assign_map(alt_conn.at("\\A")) < assign_map(alt_conn.at("\\B"))) {
-                               alt_conn["\\A"] = conn->at("\\B");
-                               alt_conn["\\B"] = conn->at("\\A");
-                       }
-                       conn = &alt_conn;
-               } else
-               if (cell->type == "$reduce_xor" || cell->type == "$reduce_xnor") {
-                       alt_conn = *conn;
-                       assign_map.apply(alt_conn.at("\\A"));
-                       alt_conn.at("\\A").sort();
-                       conn = &alt_conn;
-               } else
-               if (cell->type == "$reduce_and" || cell->type == "$reduce_or" || cell->type == "$reduce_bool") {
-                       alt_conn = *conn;
-                       assign_map.apply(alt_conn.at("\\A"));
-                       alt_conn.at("\\A").sort_and_unify();
-                       conn = &alt_conn;
-               }
-
-               for (auto &it : *conn) {
-                       if (cell->output(it.first))
-                               continue;
-                       RTLIL::SigSpec sig = it.second;
-                       assign_map.apply(sig);
-                       hash_string += "C " + it.first.str() + "=";
-                       for (auto &chunk : sig.chunks()) {
-                               if (chunk.wire)
-                                       hash_string += "{" + chunk.wire->name.str() + " " +
-                                                       int_to_hash_string(chunk.offset) + " " +
-                                                       int_to_hash_string(chunk.width) + "}";
-                               else
-                                       hash_string += RTLIL::Const(chunk.data).as_string();
-                       }
-                       hash_string += "\n";
-               }
-
-               cell_hash_cache[cell] = sha1(hash_string);
-               return cell_hash_cache[cell];
-       }
-#endif
-
-       bool compare_cell_parameters_and_connections(const RTLIL::Cell *cell1, const RTLIL::Cell *cell2, bool &lt)
-       {
-#ifdef USE_CELL_HASH_CACHE
-               std::string hash1 = hash_cell_parameters_and_connections(cell1);
-               std::string hash2 = hash_cell_parameters_and_connections(cell2);
-
-               if (hash1 != hash2) {
-                       lt = hash1 < hash2;
-                       return true;
-               }
-#endif
-
-               if (cell1->parameters != cell2->parameters) {
-                       std::map<RTLIL::IdString, RTLIL::Const> p1(cell1->parameters.begin(), cell1->parameters.end());
-                       std::map<RTLIL::IdString, RTLIL::Const> p2(cell2->parameters.begin(), cell2->parameters.end());
-                       lt = p1 < p2;
-                       return true;
-               }
-
-               dict<RTLIL::IdString, RTLIL::SigSpec> conn1 = cell1->connections();
-               dict<RTLIL::IdString, RTLIL::SigSpec> conn2 = cell2->connections();
-
-               for (auto &it : conn1) {
-                       if (cell1->output(it.first))
-                               it.second = RTLIL::SigSpec();
-                       else
-                               assign_map.apply(it.second);
-               }
-
-               for (auto &it : conn2) {
-                       if (cell2->output(it.first))
-                               it.second = RTLIL::SigSpec();
-                       else
-                               assign_map.apply(it.second);
-               }
-
-               if (cell1->type == "$and" || cell1->type == "$or" || cell1->type == "$xor" || cell1->type == "$xnor" || cell1->type == "$add" || cell1->type == "$mul" ||
-                               cell1->type == "$logic_and" || cell1->type == "$logic_or" || cell1->type == "$_AND_" || cell1->type == "$_OR_" || cell1->type == "$_XOR_") {
-                       if (conn1.at("\\A") < conn1.at("\\B")) {
-                               RTLIL::SigSpec tmp = conn1["\\A"];
-                               conn1["\\A"] = conn1["\\B"];
-                               conn1["\\B"] = tmp;
-                       }
-                       if (conn2.at("\\A") < conn2.at("\\B")) {
-                               RTLIL::SigSpec tmp = conn2["\\A"];
-                               conn2["\\A"] = conn2["\\B"];
-                               conn2["\\B"] = tmp;
-                       }
-               } else
-               if (cell1->type == "$reduce_xor" || cell1->type == "$reduce_xnor") {
-                       conn1["\\A"].sort();
-                       conn2["\\A"].sort();
-               } else
-               if (cell1->type == "$reduce_and" || cell1->type == "$reduce_or" || cell1->type == "$reduce_bool") {
-                       conn1["\\A"].sort_and_unify();
-                       conn2["\\A"].sort_and_unify();
-               }
-
-               if (conn1 != conn2) {
-                       std::map<RTLIL::IdString, RTLIL::SigSpec> c1(conn1.begin(), conn1.end());
-                       std::map<RTLIL::IdString, RTLIL::SigSpec> c2(conn2.begin(), conn2.end());
-                       lt = c1 < c2;
-                       return true;
-               }
-
-               if (cell1->type.substr(0, 1) == "$" && conn1.count("\\Q") != 0) {
-                       std::vector<RTLIL::SigBit> q1 = dff_init_map(cell1->getPort("\\Q")).to_sigbit_vector();
-                       std::vector<RTLIL::SigBit> q2 = dff_init_map(cell2->getPort("\\Q")).to_sigbit_vector();
-                       for (size_t i = 0; i < q1.size(); i++)
-                               if ((q1.at(i).wire == NULL || q2.at(i).wire == NULL) && q1.at(i) != q2.at(i)) {
-                                       lt = q1.at(i) < q2.at(i);
-                                       return true;
-                               }
-               }
-
-               return false;
-       }
-
-       bool compare_cells(const RTLIL::Cell *cell1, const RTLIL::Cell *cell2)
-       {
-               if (cell1->type != cell2->type)
-                       return cell1->type < cell2->type;
-
-               if ((!mode_share_all && !ct.cell_known(cell1->type)) || !cell1->known())
-                       return cell1 < cell2;
-
-               if (cell1->has_keep_attr() || cell2->has_keep_attr())
-                       return cell1 < cell2;
-
-               bool lt;
-               if (compare_cell_parameters_and_connections(cell1, cell2, lt))
-                       return lt;
-
-               return false;
-       }
-
-       struct CompareCells {
-               OptShareWorker *that;
-               CompareCells(OptShareWorker *that) : that(that) {}
-               bool operator()(const RTLIL::Cell *cell1, const RTLIL::Cell *cell2) const {
-                       return that->compare_cells(cell1, cell2);
-               }
-       };
-
-       OptShareWorker(RTLIL::Design *design, RTLIL::Module *module, bool mode_nomux, bool mode_share_all) :
-               design(design), module(module), assign_map(module), mode_share_all(mode_share_all)
-       {
-               total_count = 0;
-               ct.setup_internals();
-               ct.setup_internals_mem();
-               ct.setup_stdcells();
-               ct.setup_stdcells_mem();
-
-               if (mode_nomux) {
-                       ct.cell_types.erase("$mux");
-                       ct.cell_types.erase("$pmux");
-               }
-
-               log("Finding identical cells in module `%s'.\n", module->name.c_str());
-               assign_map.set(module);
-
-               dff_init_map.set(module);
-               for (auto &it : module->wires_)
-                       if (it.second->attributes.count("\\init") != 0)
-                               dff_init_map.add(it.second, it.second->attributes.at("\\init"));
-
-               bool did_something = true;
-               while (did_something)
-               {
-#ifdef USE_CELL_HASH_CACHE
-                       cell_hash_cache.clear();
-#endif
-                       std::vector<RTLIL::Cell*> cells;
-                       cells.reserve(module->cells_.size());
-                       for (auto &it : module->cells_) {
-                               if (!design->selected(module, it.second))
-                                       continue;
-                               if (ct.cell_known(it.second->type) || (mode_share_all && it.second->known()))
-                                       cells.push_back(it.second);
-                       }
-
-                       did_something = false;
-                       std::map<RTLIL::Cell*, RTLIL::Cell*, CompareCells> sharemap(CompareCells(this));
-                       for (auto cell : cells)
-                       {
-                               if (sharemap.count(cell) > 0) {
-                                       did_something = true;
-                                       log("  Cell `%s' is identical to cell `%s'.\n", cell->name.c_str(), sharemap[cell]->name.c_str());
-                                       for (auto &it : cell->connections()) {
-                                               if (cell->output(it.first)) {
-                                                       RTLIL::SigSpec other_sig = sharemap[cell]->getPort(it.first);
-                                                       log("    Redirecting output %s: %s = %s\n", it.first.c_str(),
-                                                                       log_signal(it.second), log_signal(other_sig));
-                                                       module->connect(RTLIL::SigSig(it.second, other_sig));
-                                                       assign_map.add(it.second, other_sig);
-                                               }
-                                       }
-                                       log("    Removing %s cell `%s' from module `%s'.\n", cell->type.c_str(), cell->name.c_str(), module->name.c_str());
-#ifdef USE_CELL_HASH_CACHE
-                                       cell_hash_cache.erase(cell);
-#endif
-                                       module->remove(cell);
-                                       total_count++;
-                               } else {
-                                       sharemap[cell] = cell;
-                               }
-                       }
-               }
-       }
-};
-
-struct OptSharePass : public Pass {
-       OptSharePass() : Pass("opt_share", "consolidate identical cells") { }
-       virtual void help()
-       {
-               //   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
-               log("\n");
-               log("    opt_share [options] [selection]\n");
-               log("\n");
-               log("This pass identifies cells with identical type and input signals. Such cells\n");
-               log("are then merged to one cell.\n");
-               log("\n");
-               log("    -nomux\n");
-               log("        Do not merge MUX cells.\n");
-               log("\n");
-               log("    -share_all\n");
-               log("        Operate on all cell types, not just built-in types.\n");
-               log("\n");
-       }
-       virtual void execute(std::vector<std::string> args, RTLIL::Design *design)
-       {
-               log_header("Executing OPT_SHARE pass (detect identical cells).\n");
-
-               bool mode_nomux = false;
-               bool mode_share_all = false;
-
-               size_t argidx;
-               for (argidx = 1; argidx < args.size(); argidx++) {
-                       std::string arg = args[argidx];
-                       if (arg == "-nomux") {
-                               mode_nomux = true;
-                               continue;
-                       }
-                       if (arg == "-share_all") {
-                               mode_share_all = true;
-                               continue;
-                       }
-                       break;
-               }
-               extra_args(args, argidx, design);
-
-               int total_count = 0;
-               for (auto module : design->selected_modules()) {
-                       OptShareWorker worker(design, module, mode_nomux, mode_share_all);
-                       total_count += worker.total_count;
-               }
-
-               if (total_count)
-                       design->scratchpad_set_bool("opt.did_something", true);
-               log("Removed a total of %d cells.\n", total_count);
-       }
-} OptSharePass;
-
-PRIVATE_NAMESPACE_END
index 69c22280806f97c3ad6b87f1b9e7666285d246ea..5730847ced7cf03c77a8e12e63b0c995e1b7b7b7 100644 (file)
@@ -128,7 +128,7 @@ struct Ice40OptPass : public Pass {
                log("    do\n");
                log("        <ice40 specific optimizations>\n");
                log("        opt_expr -mux_undef -undriven [-full]\n");
-               log("        opt_share\n");
+               log("        opt_merge\n");
                log("        opt_rmdff\n");
                log("        opt_clean\n");
                log("    while <changed design>\n");
@@ -159,7 +159,7 @@ struct Ice40OptPass : public Pass {
                                run_ice40_opts(module);
 
                        Pass::call(design, "opt_expr " + opt_expr_args);
-                       Pass::call(design, "opt_share");
+                       Pass::call(design, "opt_merge");
                        Pass::call(design, "opt_rmdff");
                        Pass::call(design, "opt_clean");