From: Clifford Wolf Date: Sun, 20 Aug 2017 10:31:50 +0000 (+0200) Subject: Rename "singleton" pass to "uniquify" X-Git-Tag: yosys-0.8~340 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ca53fba44a8f49fc96e8f2913eb55b622ec0638a;p=yosys.git Rename "singleton" pass to "uniquify" --- diff --git a/passes/hierarchy/Makefile.inc b/passes/hierarchy/Makefile.inc index 1fb669c11..b3f139b72 100644 --- a/passes/hierarchy/Makefile.inc +++ b/passes/hierarchy/Makefile.inc @@ -1,5 +1,5 @@ OBJS += passes/hierarchy/hierarchy.o -OBJS += passes/hierarchy/singleton.o +OBJS += passes/hierarchy/uniquify.o OBJS += passes/hierarchy/submod.o diff --git a/passes/hierarchy/singleton.cc b/passes/hierarchy/singleton.cc deleted file mode 100644 index 03c365fb5..000000000 --- a/passes/hierarchy/singleton.cc +++ /dev/null @@ -1,101 +0,0 @@ -/* - * yosys -- Yosys Open SYnthesis Suite - * - * Copyright (C) 2012 Clifford Wolf - * - * 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/yosys.h" - -USING_YOSYS_NAMESPACE -PRIVATE_NAMESPACE_BEGIN - -struct SingletonPass : public Pass { - SingletonPass() : Pass("singleton", "create singleton modules") { } - virtual void help() - { - // |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---| - log("\n"); - log(" singleton [selection]\n"); - log("\n"); - log("By default, a module that is instantiated by several other modules is only\n"); - log("kept once in the design. This preserves the original modularity of the design\n"); - log("and reduces the overall size of the design in memory. But it prevents certain\n"); - log("optimizations and other operations on the design. This pass creates singleton\n"); - log("modules for all selected cells. The created modules are marked with the\n"); - log("'singleton' attribute.\n"); - log("\n"); - log("This commands only operates on modules that by themself have the 'singleton'\n"); - log("attribute set (the 'top' module is a singleton implicitly).\n"); - log("\n"); - } - virtual void execute(std::vector args, RTLIL::Design *design) - { - log_header(design, "Executing SINGLETON pass (creating singleton modules).\n"); - - size_t argidx; - for (argidx = 1; argidx < args.size(); argidx++) - { - // if (args[argidx] == "-check") { - // flag_check = true; - // continue; - // } - } - extra_args(args, argidx, design); - - bool did_something = true; - int singleton_cnt = 0; - - while (did_something) - { - did_something = false; - - for (auto module : design->selected_modules()) - { - if (!module->get_bool_attribute("\\singleton") && !module->get_bool_attribute("\\top")) - continue; - - for (auto cell : module->selected_cells()) - { - auto tmod = design->module(cell->type); - - if (tmod == nullptr) - continue; - - if (tmod->get_bool_attribute("\\blackbox")) - continue; - - if (tmod->get_bool_attribute("\\singleton")) - continue; - - cell->type = module->name.str() + "." + log_id(cell->name); - log("Creating singleton '%s'.\n", log_id(cell->type)); - - auto smod = tmod->clone(); - smod->name = cell->type; - smod->set_bool_attribute("\\singleton"); - design->add(smod); - - did_something = true; - singleton_cnt++; - } - } - } - - log("Created %d singleton modules.\n", singleton_cnt); - } -} SingletonPass; - -PRIVATE_NAMESPACE_END diff --git a/passes/hierarchy/uniquify.cc b/passes/hierarchy/uniquify.cc new file mode 100644 index 000000000..1da0870f6 --- /dev/null +++ b/passes/hierarchy/uniquify.cc @@ -0,0 +1,102 @@ +/* + * yosys -- Yosys Open SYnthesis Suite + * + * Copyright (C) 2012 Clifford Wolf + * + * 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/yosys.h" + +USING_YOSYS_NAMESPACE +PRIVATE_NAMESPACE_BEGIN + +struct UniquifyPass : public Pass { + UniquifyPass() : Pass("uniquify", "create unique copies of modules") { } + virtual void help() + { + // |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---| + log("\n"); + log(" uniquify [selection]\n"); + log("\n"); + log("By default, a module that is instantiated by several other modules is only\n"); + log("kept once in the design. This preserves the original modularity of the design\n"); + log("and reduces the overall size of the design in memory. But it prevents certain\n"); + log("optimizations and other operations on the design. This pass creates unique\n"); + log("modules for all selected cells. The created modules are marked with the\n"); + log("'unique' attribute.\n"); + log("\n"); + log("This commands only operates on modules that by themself have the 'unique'\n"); + log("attribute set (the 'top' module is unique implicitly).\n"); + log("\n"); + } + virtual void execute(std::vector args, RTLIL::Design *design) + { + log_header(design, "Executing UNIQUIFY pass (creating unique copies of modules).\n"); + + size_t argidx; + for (argidx = 1; argidx < args.size(); argidx++) + { + // if (args[argidx] == "-check") { + // flag_check = true; + // continue; + // } + } + extra_args(args, argidx, design); + + bool did_something = true; + int count = 0; + + while (did_something) + { + did_something = false; + + for (auto module : design->selected_modules()) + { + if (!module->get_bool_attribute("\\unique") && !module->get_bool_attribute("\\top")) + continue; + + for (auto cell : module->selected_cells()) + { + Module *tmod = design->module(cell->type); + IdString newname = module->name.str() + "." + log_id(cell->name); + + if (tmod == nullptr) + continue; + + if (tmod->get_bool_attribute("\\blackbox")) + continue; + + if (tmod->get_bool_attribute("\\unique") && newname == tmod->name) + continue; + + log("Creating module %s from %s.\n", log_id(newname), log_id(tmod)); + + auto smod = tmod->clone(); + smod->name = newname; + cell->type = newname; + smod->set_bool_attribute("\\unique"); + design->add(smod); + + did_something = true; + count++; + } + } + } + + log("Created %d unique modules.\n", count); + } +} UniquifyPass; + +PRIVATE_NAMESPACE_END diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc index 966510776..b49c12529 100644 --- a/passes/sat/sim.cc +++ b/passes/sat/sim.cc @@ -526,7 +526,7 @@ struct SimInstance void writeback(pool &wbmods) { if (wbmods.count(module)) - log_error("Instance %s of module %s is not unique: Writeback not possible. (Fix by running 'singleton'.)\n", hiername().c_str(), log_id(module)); + log_error("Instance %s of module %s is not unique: Writeback not possible. (Fix by running 'uniquify'.)\n", hiername().c_str(), log_id(module)); wbmods.insert(module);