From e9506bb2da9640cebc325e33a678d352d36a909e Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sun, 20 Jul 2014 18:54:06 +0200 Subject: [PATCH] Supercell creation for $div/$mod worked all along, fixed test benches --- passes/sat/share.cc | 4 ---- tests/share/generate.py | 2 +- tests/vloghtb/test_share.sh | 5 ++--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/passes/sat/share.cc b/passes/sat/share.cc index 27b21207e..065496710 100644 --- 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 fa17080f9..9e5bef7ae 100644 --- 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 52b5a1428..88e042817 100644 --- 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 -- 2.30.2