tests: rework Kogge-Stone test consistently with Han-Carlson

widlarizer · widlarizer · commit 3f078d9afa46 · 2024-11-28T15:33:21.000+01:00
diff --git a/tests/techmap/han-carlson.tcl b/tests/techmap/han-carlson.tcl
@@ -8,7 +8,7 @@ for {set i 1} {$i <= 16} {incr i} {
     design -load init
     chparam -set WIDTH $i
     yosys proc
-    equiv_make -blacklist han-carlson.nomatch lcu _85_lcu_han_carlson equiv
+    equiv_make -blacklist ppa.nomatch lcu _85_lcu_han_carlson equiv
     equiv_simple equiv
     equiv_status -assert equiv
 }
diff --git a/tests/techmap/kogge-stone.tcl b/tests/techmap/kogge-stone.tcl
@@ -0,0 +1,14 @@
+yosys -import
+
+read_verilog +/choices/kogge-stone.v
+read_verilog lcu_refined.v
+design -save init
+
+for {set i 1} {$i <= 16} {incr i} {
+    design -load init
+    chparam -set WIDTH $i
+    yosys proc
+    equiv_make -blacklist ppa.nomatch lcu _80_lcu_kogge_stone equiv
+    equiv_simple equiv
+    equiv_status -assert equiv
+}
diff --git a/tests/techmap/kogge-stone.ys b/tests/techmap/kogge-stone.ys
diff --git a/tests/techmap/ppa.nomatch b/tests/techmap/ppa.nomatch
@@ -1,2 +1,2 @@
 i
-j
+j

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ for {set i 1} {$i <= 16} {incr i} {`
`8`	`8`	`design -load init`
`9`	`9`	`chparam -set WIDTH $i`
`10`	`10`	`yosys proc`
`11`		`- equiv_make -blacklist han-carlson.nomatch lcu _85_lcu_han_carlson equiv`
	`11`	`+ equiv_make -blacklist ppa.nomatch lcu _85_lcu_han_carlson equiv`
`12`	`12`	`equiv_simple equiv`
`13`	`13`	`equiv_status -assert equiv`
`14`	`14`	`}`