From: Eddie Hung <eddie@fpgeh.com>
Date: Fri, 24 Apr 2020 18:16:25 +0000 (-0700)
Subject: tests: opt_expr update xnor/xor tests
X-Git-Tag: working-ls180~553^2~7
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ebd6fa945d4f0afa9a7507e791d13653571c8a63;p=yosys.git

tests: opt_expr update xnor/xor tests
---

diff --git a/tests/opt/opt_expr_xnor.ys b/tests/opt/opt_expr_xnor.ys
index eadd3ce56..0f9463379 100644
--- a/tests/opt/opt_expr_xnor.ys
+++ b/tests/opt/opt_expr_xnor.ys
@@ -56,7 +56,7 @@ copy gold fine_keepdc
 
 cd coarse
 opt_expr -fine
-select -assert-count 1 t:$xnor # FIXME: Should be zero
+select -assert-none t:$xnor
 
 cd fine
 simplemap
@@ -71,12 +71,12 @@ sat -verify -prove-asserts -show-ports -enable_undef miter2
 
 cd coarse_keepdc
 opt_expr -keepdc -fine
-select -assert-count 2 t:$xnor $ FIXME: Should be one
+select -assert-count 1 t:$xnor
 
 cd fine_keepdc
 simplemap
 opt_expr -keepdc
-select -assert-count t c:$_XOR_
+select -assert-count 0 c:$_XOR_
 
 cd
 miter -equiv -flatten -make_assert -make_outputs gold coarse_keepdc miter3
diff --git a/tests/opt/opt_expr_xor.ys b/tests/opt/opt_expr_xor.ys
index 411bc396c..a879f3ec9 100644
--- a/tests/opt/opt_expr_xor.ys
+++ b/tests/opt/opt_expr_xor.ys
@@ -111,7 +111,7 @@ copy gold fine_keepdc
 
 cd coarse
 opt_expr -fine
-select -assert-count 1 t:$xor # FIXME: Should be zero
+select -assert-count 0 t:$xor
 
 cd fine
 simplemap
@@ -126,13 +126,12 @@ sat -verify -prove-asserts -show-ports -enable_undef miter2
 
 cd coarse_keepdc
 opt_expr -keepdc -fine
-dump
-select -assert-count 2 t:$xor $ FIXME: Should be one
+select -assert-count 1 t:$xor
 
 cd fine_keepdc
 simplemap
 opt_expr -keepdc
-select -assert-count t c:$_XOR_
+select -assert-count 3 t:$_XOR_
 
 cd
 miter -equiv -flatten -make_assert -make_outputs gold coarse_keepdc miter3