Cleanup

passes/cmds/Makefile.inc

@@ -6,7 +6,6 @@ OBJS += passes/cmds/add.o
 OBJS += passes/cmds/delete.o
 OBJS += passes/cmds/design.o
 OBJS += passes/cmds/select.o
-OBJS += passes/cmds/selectconst.o
 OBJS += passes/cmds/show.o
 OBJS += passes/cmds/viz.o
 OBJS += passes/cmds/rename.o
@@ -16,7 +15,6 @@ OBJS += passes/cmds/scatter.o
 OBJS += passes/cmds/setundef.o
 OBJS += passes/cmds/splitnets.o
 OBJS += passes/cmds/splitcells.o
-OBJS += passes/cmds/splitfanout.o
 OBJS += passes/cmds/stat.o
 OBJS += passes/cmds/internal_stats.o
 OBJS += passes/cmds/setattr.o
@@ -53,10 +51,5 @@ OBJS += passes/cmds/future.o
 OBJS += passes/cmds/box_derive.o
 OBJS += passes/cmds/example_dt.o
 OBJS += passes/cmds/portarcs.o
-
-OBJS += passes/cmds/activity.o
-OBJS += passes/cmds/splitnetlist.o
-OBJS += passes/cmds/bus_rebuild.o
-
 OBJS += passes/cmds/wrapcell.o
 OBJS += passes/cmds/setenv.o

passes/opt/Makefile.inc

@@ -12,16 +12,14 @@ OBJS += passes/opt/opt_share.o
 OBJS += passes/opt/opt_clean.o
 OBJS += passes/opt/opt_expr.o
 
-OBJS += passes/opt/opt_balance_tree.o
-OBJS += passes/opt/muxpack.o
-OBJS += passes/opt/wreduce.o
-OBJS += passes/opt/pmux2shiftx.o
-
 ifneq ($(SMALL),1)
 OBJS += passes/opt/share.o
+OBJS += passes/opt/wreduce.o
 OBJS += passes/opt/opt_demorgan.o
 OBJS += passes/opt/rmports.o
 OBJS += passes/opt/opt_lut.o
 OBJS += passes/opt/opt_lut_ins.o
 OBJS += passes/opt/opt_ffinv.o
+OBJS += passes/opt/pmux2shiftx.o
+OBJS += passes/opt/muxpack.o
 endif

passes/silimate/Makefile.inc

@@ -0,0 +1,11 @@
+
+OBJS += passes/silimate/activity.o
+OBJS += passes/silimate/annotate_cell_fanout.o
+OBJS += passes/silimate/annotate_logic_depth.o
+OBJS += passes/silimate/breaksop.o
+OBJS += passes/silimate/bus_rebuild.o
+OBJS += passes/silimate/longloop_select.o
+OBJS += passes/silimate/opt_balance_tree.o
+OBJS += passes/silimate/selectconst.o
+OBJS += passes/silimate/splitfanout.o
+OBJS += passes/silimate/splitnetlist.o

passes/techmap/Makefile.inc

@@ -7,15 +7,6 @@ OBJS += passes/techmap/maccmap.o
 OBJS += passes/techmap/booth.o
 OBJS += passes/techmap/libparse.o
 
-OBJS += passes/techmap/bmuxmap.o
-OBJS += passes/techmap/demuxmap.o
-OBJS += passes/techmap/pmuxtree.o
-OBJS += passes/techmap/alumacc.o
-OBJS += passes/techmap/extract.o
-OBJS += passes/techmap/extract_reduce.o
-OBJS += passes/techmap/aigmap.o
-OBJS += passes/techmap/breaksop.o
-
 ifeq ($(ENABLE_ABC),1)
 OBJS += passes/techmap/abc.o
 OBJS += passes/techmap/abc9.o
@@ -34,11 +25,18 @@ ifneq ($(SMALL),1)
 OBJS += passes/techmap/iopadmap.o
 OBJS += passes/techmap/clkbufmap.o
 OBJS += passes/techmap/hilomap.o
+OBJS += passes/techmap/extract.o
 OBJS += passes/techmap/extract_fa.o
 OBJS += passes/techmap/extract_counter.o
+OBJS += passes/techmap/extract_reduce.o
+OBJS += passes/techmap/alumacc.o
 OBJS += passes/techmap/dffinit.o
+OBJS += passes/techmap/pmuxtree.o
+OBJS += passes/techmap/bmuxmap.o
+OBJS += passes/techmap/demuxmap.o
 OBJS += passes/techmap/bwmuxmap.o
 OBJS += passes/techmap/muxcover.o
+OBJS += passes/techmap/aigmap.o
 OBJS += passes/techmap/tribuf.o
 OBJS += passes/techmap/lut2mux.o
 OBJS += passes/techmap/nlutmap.o

passes/techmap/bufnorm.cc

@@ -391,7 +391,7 @@ struct BufnormPass : public Pass {
 					}
 
 					if (w->name.isPublic())
-						log_debug("  directly driven by cell %s port %s: %s\n",
+						log("  directly driven by cell %s port %s: %s\n",
 								log_id(cell), log_id(conn.first), log_id(w));
 
 					for (auto bit : SigSpec(w))

passes/techmap/libparse.cc

@@ -389,12 +389,9 @@ LibertyAst *LibertyParser::parse()
 			if (tok == 'v') {
     				tok = lexer(str);
 			}
-			while (tok == '(' || tok == ')' || tok == '+' || tok == '-' || tok == '*' || tok == '/' || tok == '!') { // SILIMATE: added parentheses
+			while (tok == '+' || tok == '-' || tok == '*' || tok == '/' || tok == '!') {
 				ast->value += tok;
-				if (tok == ')') { // SILIMATE: semicolon may follow close parenthesis
-					tok = lexer(str);
-					if (tok == ';') break;
-				} else tok = lexer(str);
+				tok = lexer(str);
 				if (tok != 'v')
 					error();
 				ast->value += str;
@@ -407,13 +404,6 @@ LibertyAst *LibertyParser::parse()
 			// instead of the ';' too..
 			if ((tok == ';') || (tok == 'n'))
 				break;
-			else if (tok == '[') {
-				while (tok != ']') {
-					tok = lexer(str);
-				}
-				ast->value += '[' + str + ']';
-				continue;
-			}
 			else
 				error();
 			continue;
@@ -475,16 +465,12 @@ LibertyAst *LibertyParser::parse()
 					{
 					case 'n':
 					  continue;
-					case ':': // SILIMATE HACK: eat up the ':' and the next thing too
-						tok = lexer(arg);
-						if (tok != 'v')
-							error("Expecting string after ':'.");
-						break;
 					case '[':
 					case ']':
 					case '}':
 					case '{':
 					case '\"':
+					case ':':
 						eReport = "Unexpected '";
 						eReport += static_cast<char>(tok);
 						eReport += "'.";