From c32b9186815d0f129d923749a3c668c32f343c53 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 5 Jun 2013 07:07:31 +0200 Subject: [PATCH] Renamed opt_rmunused to opt_clean --- passes/fsm/fsm.cc | 10 +++++----- passes/fsm/fsm_extract.cc | 2 +- passes/fsm/fsm_opt.cc | 2 +- passes/opt/Makefile.inc | 2 +- passes/opt/opt.cc | 4 ++-- passes/opt/{opt_rmunused.cc => opt_clean.cc} | 10 +++++----- passes/submod/submod.cc | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) rename passes/opt/{opt_rmunused.cc => opt_clean.cc} (96%) diff --git a/passes/fsm/fsm.cc b/passes/fsm/fsm.cc index 1feeaf8b3..13e90910b 100644 --- a/passes/fsm/fsm.cc +++ b/passes/fsm/fsm.cc @@ -31,17 +31,17 @@ struct FsmPass : public Pass { log(" fsm [options] [selection]\n"); log("\n"); log("This pass calls all the other fsm_* passes in a useful order. This performs\n"); - log("FSM extraction and optimiziation. It also calls opt_rmunused as needed:\n"); + log("FSM extraction and optimiziation. It also calls opt_clean as needed:\n"); log("\n"); log(" fsm_detect unless got option -nodetect\n"); log(" fsm_extract\n"); log("\n"); log(" fsm_opt\n"); - log(" opt_rmunused\n"); + log(" opt_clean\n"); log(" fsm_opt\n"); log("\n"); log(" fsm_expand if got option -expand\n"); - log(" opt_rmunused if got option -expand\n"); + log(" opt_clean if got option -expand\n"); log(" fsm_opt if got option -expand\n"); log("\n"); log(" fsm_recode unless got option -norecode\n"); @@ -114,12 +114,12 @@ struct FsmPass : public Pass { Pass::call(design, "fsm_extract"); Pass::call(design, "fsm_opt"); - Pass::call(design, "opt_rmunused"); + Pass::call(design, "opt_clean"); Pass::call(design, "fsm_opt"); if (flag_expand) { Pass::call(design, "fsm_expand"); - Pass::call(design, "opt_rmunused"); + Pass::call(design, "opt_clean"); Pass::call(design, "fsm_opt"); } diff --git a/passes/fsm/fsm_extract.cc b/passes/fsm/fsm_extract.cc index 103093165..6fb65de07 100644 --- a/passes/fsm/fsm_extract.cc +++ b/passes/fsm/fsm_extract.cc @@ -329,7 +329,7 @@ struct FsmExtractPass : public Pass { log("\n"); log("The generated FSM cell still generates the original state signal with its\n"); log("original encoding. The 'fsm_opt' pass can be used in combination with the\n"); - log("'opt_rmunused' pass to eliminate this signal.\n"); + log("'opt_clean' pass to eliminate this signal.\n"); log("\n"); } virtual void execute(std::vector args, RTLIL::Design *design) diff --git a/passes/fsm/fsm_opt.cc b/passes/fsm/fsm_opt.cc index ae764eaa5..ad8f3ff3b 100644 --- a/passes/fsm/fsm_opt.cc +++ b/passes/fsm/fsm_opt.cc @@ -278,7 +278,7 @@ struct FsmOptPass : public Pass { log("\n"); log("This pass optimizes FSM cells. It detects which output signals are actually\n"); log("not used and removes them from the FSM. This pass is usually used in\n"); - log("combination with the 'opt_rmunused' pass (see also 'help fsm').\n"); + log("combination with the 'opt_clean' pass (see also 'help fsm').\n"); log("\n"); } virtual void execute(std::vector args, RTLIL::Design *design) diff --git a/passes/opt/Makefile.inc b/passes/opt/Makefile.inc index 3602b96bd..9dfb32c87 100644 --- a/passes/opt/Makefile.inc +++ b/passes/opt/Makefile.inc @@ -4,6 +4,6 @@ OBJS += passes/opt/opt_share.o OBJS += passes/opt/opt_muxtree.o OBJS += passes/opt/opt_reduce.o OBJS += passes/opt/opt_rmdff.o -OBJS += passes/opt/opt_rmunused.o +OBJS += passes/opt/opt_clean.o OBJS += passes/opt/opt_const.o diff --git a/passes/opt/opt.cc b/passes/opt/opt.cc index ea1c95705..467baf235 100644 --- a/passes/opt/opt.cc +++ b/passes/opt/opt.cc @@ -45,7 +45,7 @@ struct OptPass : public Pass { log(" opt_reduce\n"); log(" opt_share\n"); log(" opt_rmdff\n"); - log(" opt_rmunused\n"); + log(" opt_clean\n"); log(" opt_const\n"); log(" while [changed design]\n"); log("\n"); @@ -68,7 +68,7 @@ struct OptPass : public Pass { Pass::call(design, "opt_reduce"); Pass::call(design, "opt_share"); Pass::call(design, "opt_rmdff"); - Pass::call(design, "opt_rmunused"); + Pass::call(design, "opt_clean"); Pass::call(design, "opt_const"); if (OPT_DID_SOMETHING == false) break; diff --git a/passes/opt/opt_rmunused.cc b/passes/opt/opt_clean.cc similarity index 96% rename from passes/opt/opt_rmunused.cc rename to passes/opt/opt_clean.cc index 3d6d755af..0b4defdf4 100644 --- a/passes/opt/opt_rmunused.cc +++ b/passes/opt/opt_clean.cc @@ -240,13 +240,13 @@ static void rmunused_module(RTLIL::Module *module) rmunused_module_signals(module); } -struct OptRmUnusedPass : public Pass { - OptRmUnusedPass() : Pass("opt_rmunused", "remove unused cells and wires") { } +struct OptCleanPass : public Pass { + OptCleanPass() : Pass("opt_clean", "remove unused cells and wires") { } virtual void help() { // |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---| log("\n"); - log(" opt_rmunused [selection]\n"); + log(" opt_clean [selection]\n"); log("\n"); log("This pass identifies wires and cells that are unused and removes them. Other\n"); log("passes often remove cells but leave the wires in the design or reconnect the\n"); @@ -258,7 +258,7 @@ struct OptRmUnusedPass : public Pass { } virtual void execute(std::vector args, RTLIL::Design *design) { - log_header("Executing OPT_RMUNUSED pass (remove unused cells and wires).\n"); + log_header("Executing OPT_CLEAN pass (remove unused cells and wires).\n"); log_push(); extra_args(args, 1, design); @@ -284,5 +284,5 @@ struct OptRmUnusedPass : public Pass { ct.clear(); log_pop(); } -} OptRmUnusedPass; +} OptCleanPass; diff --git a/passes/submod/submod.cc b/passes/submod/submod.cc index 98854da23..a92189142 100644 --- a/passes/submod/submod.cc +++ b/passes/submod/submod.cc @@ -302,7 +302,7 @@ struct SubmodPass : public Pass { if (opt_name.empty()) { - Pass::call(design, "opt_rmunused"); + Pass::call(design, "opt_clean"); log_header("Continuing SUBMOD pass.\n"); std::set handled_modules; @@ -322,7 +322,7 @@ struct SubmodPass : public Pass { } } - Pass::call(design, "opt_rmunused"); + Pass::call(design, "opt_clean"); } else { -- 2.30.2