From c0fa6f3e1a001c3cd68c4be3eac877e08fd19971 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Fri, 4 Oct 2019 13:05:16 +0200
Subject: [PATCH] Split mux tests per type

---
 tests/efinix/mux.v  | 35 -----------------------------------
 tests/efinix/mux.ys | 39 ++++++++++++++++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/tests/efinix/mux.v b/tests/efinix/mux.v
index 0814b733e..27bc0bf0b 100644
--- a/tests/efinix/mux.v
+++ b/tests/efinix/mux.v
@@ -63,38 +63,3 @@ module mux16 (D, S, Y);
 assign Y = D[S];
 
 endmodule
-
-
-module top (
-input [3:0] S,
-input [15:0] D,
-output M2,M4,M8,M16
-);
-
-mux2 u_mux2 (
-        .S (S[0]),
-        .A (D[0]),
-        .B (D[1]),
-        .Y (M2)
-    );
-
-
-mux4 u_mux4 (
-        .S (S[1:0]),
-        .D (D[3:0]),
-        .Y (M4)
-    );
-
-mux8 u_mux8 (
-        .S (S[2:0]),
-        .D (D[7:0]),
-        .Y (M8)
-    );
-
-mux16 u_mux16 (
-        .S (S[3:0]),
-        .D (D[15:0]),
-        .Y (M16)
-    );
-
-endmodule
diff --git a/tests/efinix/mux.ys b/tests/efinix/mux.ys
index a2d653568..efe27583d 100644
--- a/tests/efinix/mux.ys
+++ b/tests/efinix/mux.ys
@@ -1,8 +1,41 @@
 read_verilog mux.v
+design -save read
+
 proc
-flatten
+hierarchy -top mux2
 equiv_opt -assert -map +/efinix/cells_sim.v synth_efinix # equivalency check
 design -load postopt # load the post-opt design (otherwise equiv_opt loads the pre-opt design)
-cd top # Constrain all select calls below inside the top module
-select -assert-count 13 t:EFX_LUT4
+cd mux2 # Constrain all select calls below inside the top module
+select -assert-count 1 t:EFX_LUT4
+
+select -assert-none t:EFX_LUT4 %% t:* %D
+
+design -load read
+proc
+hierarchy -top mux4
+equiv_opt -assert -map +/efinix/cells_sim.v synth_efinix # equivalency check
+design -load postopt # load the post-opt design (otherwise equiv_opt loads the pre-opt design)
+cd mux4 # Constrain all select calls below inside the top module
+select -assert-count 2 t:EFX_LUT4
+
+select -assert-none t:EFX_LUT4 %% t:* %D
+
+design -load read
+proc
+hierarchy -top mux8
+equiv_opt -assert -map +/efinix/cells_sim.v synth_efinix # equivalency check
+design -load postopt # load the post-opt design (otherwise equiv_opt loads the pre-opt design)
+cd mux8 # Constrain all select calls below inside the top module
+select -assert-count 5 t:EFX_LUT4
+
+select -assert-none t:EFX_LUT4 %% t:* %D
+
+design -load read
+proc
+hierarchy -top mux16
+equiv_opt -assert -map +/efinix/cells_sim.v synth_efinix # equivalency check
+design -load postopt # load the post-opt design (otherwise equiv_opt loads the pre-opt design)
+cd mux16 # Constrain all select calls below inside the top module
+select -assert-count 12 t:EFX_LUT4
+
 select -assert-none t:EFX_LUT4 %% t:* %D
-- 
2.30.2