Supercell creation for $div/$mod worked all along, fixed test benches

diff --git a/passes/sat/share.cc b/passes/sat/share.cc
index 27b21207e12b20b1b968cd04012eed0b7d78ba1d..0654967103ae9c7cb36cd30a58650b7bd88079a4 100644 (file)
--- a/passes/sat/share.cc
+++ b/passes/sat/share.cc
@@ -134,10 +134,6 @@ struct ShareWorker
                not_a_muxed_cell:
                                continue;
 
-                       // FIXME: Creation of super cells is broken for this cell types
-                       if (cell->type == "$div" || cell->type == "$mod")
-                               continue;
-
                        if (config.opt_force) {
                                shareable_cells.insert(cell);
                                continue;

diff --git a/tests/share/generate.py b/tests/share/generate.py
index fa17080f9c52219873d3c5abcb1bc76d29e2804e..9e5bef7ae6f9e3353df93c4fab0404589a296e61 100644 (file)
--- a/tests/share/generate.py
+++ b/tests/share/generate.py
@@ -46,5 +46,5 @@ for idx in range(100):
         print('rename uut_%05d gate' % idx)
         print('share -aggressive gate')
         print('miter -equiv -flatten -ignore_gold_x -make_outputs -make_outcmp gold gate miter')
-        print('sat -verify -prove trigger 0 -show-inputs -show-outputs miter')
+        print('sat -set-def-inputs -verify -prove trigger 0 -show-inputs -show-outputs miter')
  

diff --git a/tests/vloghtb/test_share.sh b/tests/vloghtb/test_share.sh
index 52b5a1428954bae3846e3a120ac901864fce3ef9..88e0428172fcc0ffd8d160cbd234f586b79f5f64 100644 (file)
--- a/tests/vloghtb/test_share.sh
+++ b/tests/vloghtb/test_share.sh
@@ -21,9 +21,8 @@ if ! ../../yosys -q -l log_test_share/$n.out - 2> /dev/null <<- EOT
        share -aggressive
        cd ..
 
-       miter -equiv -ignore_gold_x -make_outputs -make_outcmp gold work miter
-       flatten miter
-       sat -verify -prove trigger 0 -show-inputs -show-outputs miter
+       miter -equiv -flatten -ignore_gold_x -make_outputs -make_outcmp gold work miter
+       sat -set-def-inputs -verify -prove trigger 0 -show-inputs -show-outputs miter
 EOT
 then
        log_fail test_share $n