test: restore verific handling, nicer naming

Makefile

@@ -842,80 +842,69 @@ else
 ABCOPT=""
 endif
 
+# Tests that generate .mk with tests/gen-tests-makefile.sh
+MK_TEST_DIRS =
+MK_TEST_DIRS += tests/arch/anlogic
+MK_TEST_DIRS += tests/arch/ecp5
+MK_TEST_DIRS += tests/arch/efinix
+MK_TEST_DIRS += tests/arch/gatemate
+MK_TEST_DIRS += tests/arch/gowin
+MK_TEST_DIRS += tests/arch/ice40
+MK_TEST_DIRS += tests/arch/intel_alm
+MK_TEST_DIRS += tests/arch/machxo2
+MK_TEST_DIRS += tests/arch/microchip
+MK_TEST_DIRS += tests/arch/nanoxplore
+MK_TEST_DIRS += tests/arch/nexus
+MK_TEST_DIRS += tests/arch/quicklogic/pp3
+MK_TEST_DIRS += tests/arch/quicklogic/qlf_k6n10f
+MK_TEST_DIRS += tests/arch/xilinx
+MK_TEST_DIRS += tests/opt
+MK_TEST_DIRS += tests/sat
+MK_TEST_DIRS += tests/sim
+MK_TEST_DIRS += tests/svtypes
+MK_TEST_DIRS += tests/techmap
+MK_TEST_DIRS += tests/various
+ifeq ($(ENABLE_VERIFIC),1)
+ifneq ($(YOSYS_NOVERIFIC),1)
+MK_TEST_DIRS += tests/verific
+endif
+endif
+MK_TEST_DIRS += tests/verilog
 
-###########################
-# TESTS THAT GENERATE .MK #
-###########################
-PARALLEL_TEST_DIRS =
-PARALLEL_TEST_DIRS += tests/arch/anlogic
-PARALLEL_TEST_DIRS += tests/arch/ecp5
-PARALLEL_TEST_DIRS += tests/arch/efinix
-PARALLEL_TEST_DIRS += tests/arch/gatemate
-PARALLEL_TEST_DIRS += tests/arch/gowin
-PARALLEL_TEST_DIRS += tests/arch/ice40
-PARALLEL_TEST_DIRS += tests/arch/intel_alm
-PARALLEL_TEST_DIRS += tests/arch/machxo2
-PARALLEL_TEST_DIRS += tests/arch/microchip
-PARALLEL_TEST_DIRS += tests/arch/nanoxplore
-PARALLEL_TEST_DIRS += tests/arch/nexus
-PARALLEL_TEST_DIRS += tests/arch/quicklogic/pp3
-PARALLEL_TEST_DIRS += tests/arch/quicklogic/qlf_k6n10f
-PARALLEL_TEST_DIRS += tests/arch/xilinx
-PARALLEL_TEST_DIRS += tests/opt
-PARALLEL_TEST_DIRS += tests/sat
-PARALLEL_TEST_DIRS += tests/sim
-PARALLEL_TEST_DIRS += tests/svtypes
-PARALLEL_TEST_DIRS += tests/techmap
-PARALLEL_TEST_DIRS += tests/various
-PARALLEL_TEST_DIRS += tests/verific
-PARALLEL_TEST_DIRS += tests/verilog
-# FIXME: Removed YOSYS_NOVERIFIC - temporarily?
-# PARALLEL_TEST_DIRS += verific/extensions/tests/passing
-
-##################################
-# TESTS THAT DO NOT GENERATE .MK #
-##################################
-SEED_TEST_DIRS =
-SEED_TEST_DIRS += tests/simple
-SEED_TEST_DIRS += tests/simple_abc9
-SEED_TEST_DIRS += tests/hana
-SEED_TEST_DIRS += tests/asicworld
-# TODO dig up why is this commented out
-# SEED_TEST_DIRS += tests/realmath
-SEED_TEST_DIRS += tests/share
-SEED_TEST_DIRS += tests/opt_share
-SEED_TEST_DIRS += tests/fsm
-SEED_TEST_DIRS += tests/memlib
-SEED_TEST_DIRS += tests/bram
-SEED_TEST_DIRS += tests/svinterfaces
-SEED_TEST_DIRS += tests/xprop
-SEED_TEST_DIRS += tests/select
-SEED_TEST_DIRS += tests/proc
-SEED_TEST_DIRS += tests/blif
-SEED_TEST_DIRS += tests/arch
-SEED_TEST_DIRS += tests/rpc
-SEED_TEST_DIRS += tests/memfile
-SEED_TEST_DIRS += tests/fmt
-SEED_TEST_DIRS += tests/cxxrtl
+# Tests that don't generate .mk
+SH_TEST_DIRS =
+SH_TEST_DIRS += tests/simple
+SH_TEST_DIRS += tests/simple_abc9
+SH_TEST_DIRS += tests/hana
+SH_TEST_DIRS += tests/asicworld
+# SH_TEST_DIRS += tests/realmath
+SH_TEST_DIRS += tests/share
+SH_TEST_DIRS += tests/opt_share
+SH_TEST_DIRS += tests/fsm
+SH_TEST_DIRS += tests/memlib
+SH_TEST_DIRS += tests/bram
+SH_TEST_DIRS += tests/svinterfaces
+SH_TEST_DIRS += tests/xprop
+SH_TEST_DIRS += tests/select
+SH_TEST_DIRS += tests/proc
+SH_TEST_DIRS += tests/blif
+SH_TEST_DIRS += tests/arch
+SH_TEST_DIRS += tests/rpc
+SH_TEST_DIRS += tests/memfile
+SH_TEST_DIRS += tests/fmt
+SH_TEST_DIRS += tests/cxxrtl
 ifeq ($(ENABLE_FUNCTIONAL_TESTS),1)
-SEED_TEST_DIRS += tests/functional
+SH_TEST_DIRS += tests/functional
 endif
 
-################################
-# TESTS THAT NEED SPECIAL ARGS #
-################################
-
-ABC_TEST_DIRS =
-ABC_TEST_DIRS += tests/memories
-ABC_TEST_DIRS += tests/aiger
-
-############
-# THE GUTS #
-############
+# Tests that don't generate .mk and need special args
+SH_ABC_TEST_DIRS =
+SH_ABC_TEST_DIRS += tests/memories
+SH_ABC_TEST_DIRS += tests/aiger
 
 # seed-tests/ is a dummy string, not a directory
 .PHONY: seed-tests
-seed-tests: $(SEED_TEST_DIRS:%=seed-tests/%)
+seed-tests: $(SH_TEST_DIRS:%=seed-tests/%)
 .PHONY: seed-tests/%
 seed-tests/%: %/run-test.sh $(TARGETS) $(EXTRA_TARGETS)
 	+cd $* && bash run-test.sh $(SEEDOPT)
@@ -923,14 +912,14 @@ seed-tests/%: %/run-test.sh $(TARGETS) $(EXTRA_TARGETS)
 
 # abcopt-tests/ is a dummy string, not a directory
 .PHONY: abcopt-tests
-abcopt-tests: $(ABC_TEST_DIRS:%=abcopt-tests/%)
+abcopt-tests: $(SH_ABC_TEST_DIRS:%=abcopt-tests/%)
 abcopt-tests/%: %/run-test.sh $(TARGETS) $(EXTRA_TARGETS)
 	+cd $* && bash run-test.sh $(ABCOPT) $(SEEDOPT)
 	+@echo "...passed tests in $*"
 
 # makefile-tests/ is a dummy string, not a directory
 .PHONY: makefile-tests
-makefile-tests: $(PARALLEL_TEST_DIRS:%=makefile-tests/%)
+makefile-tests: $(MK_TEST_DIRS:%=makefile-tests/%)
 # this target actually emits .mk files
 %.mk:
 	+cd $(dir $*) && bash run-test.sh
@@ -942,6 +931,11 @@ makefile-tests/%: %/run-test.mk $(TARGETS) $(EXTRA_TARGETS)
 test: makefile-tests abcopt-tests seed-tests
 	@echo ""
 	@echo "  Passed \"make test\"."
+ifeq ($(ENABLE_VERIFIC),1)
+ifeq ($(YOSYS_NOVERIFIC),1)
+	@echo "  Ran tests without verific support due to YOSYS_NOVERIFIC=1."
+endif
+endif
 	@echo ""
 
 VALGRIND ?= valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes --errors-for-leak-kinds=all

tests/arch/anlogic/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../../gen-tests-makefile.sh
-run_tests --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"
+generate_mk --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"

tests/arch/ecp5/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../../gen-tests-makefile.sh
-run_tests --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"
+generate_mk --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"

tests/arch/efinix/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../../gen-tests-makefile.sh
-run_tests --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"
+generate_mk --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"

tests/arch/gatemate/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../../gen-tests-makefile.sh
-run_tests --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"
+generate_mk --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"

tests/arch/gowin/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../../gen-tests-makefile.sh
-run_tests --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"
+generate_mk --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"

tests/arch/ice40/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../../gen-tests-makefile.sh
-run_tests --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"
+generate_mk --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"

tests/arch/intel_alm/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../../gen-tests-makefile.sh
-run_tests --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"
+generate_mk --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"

tests/arch/machxo2/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../../gen-tests-makefile.sh
-run_tests --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"
+generate_mk --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"

tests/arch/microchip/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../../gen-tests-makefile.sh
-run_tests --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"
+generate_mk --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"

tests/arch/nanoxplore/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../../gen-tests-makefile.sh
-run_tests --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"
+generate_mk --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"

tests/arch/nexus/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../../gen-tests-makefile.sh
-run_tests --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"
+generate_mk --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"

tests/arch/quicklogic/pp3/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../../../gen-tests-makefile.sh
-run_tests --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"
+generate_mk --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"

tests/arch/quicklogic/qlf_k6n10f/run-test.sh

@@ -2,4 +2,4 @@
 set -eu
 python3 mem_gen.py
 source ../../../gen-tests-makefile.sh
-run_tests --yosys-scripts --bash
+generate_mk --yosys-scripts --bash

tests/arch/xilinx/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../../gen-tests-makefile.sh
-run_tests --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"
+generate_mk --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"

tests/gen-tests-makefile.sh

@@ -105,7 +105,6 @@ generate_tests() {
 	fi
 }
 
-run_tests() {
+generate_mk() {
 	generate_tests "$@" > run-test.mk
-	# exec ${MAKE:-make} -f run-test.mk
 }

tests/opt/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../gen-tests-makefile.sh
-run_tests --yosys-scripts
+generate_mk --yosys-scripts

tests/sat/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../gen-tests-makefile.sh
-run_tests --yosys-scripts
+generate_mk --yosys-scripts

tests/sim/run-test.sh

@@ -9,4 +9,4 @@ find tb/* -name tb*.v | while read name; do
     iverilog -o tb/$test_name.out $name $verilog_name
     ./tb/$test_name.out -fst
 done
-run_tests --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"
+generate_mk --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"

tests/svtypes/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../gen-tests-makefile.sh
-run_tests --yosys-scripts --prove-sv
+generate_mk --yosys-scripts --prove-sv

tests/techmap/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../gen-tests-makefile.sh
-run_tests --yosys-scripts --tcl-scripts --bash --yosys-args "-e 'select out of bounds'"
+generate_mk --yosys-scripts --tcl-scripts --bash --yosys-args "-e 'select out of bounds'"

tests/various/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../gen-tests-makefile.sh
-run_tests --yosys-scripts --bash
+generate_mk --yosys-scripts --bash

tests/verific/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../gen-tests-makefile.sh
-run_tests --yosys-scripts --bash
+generate_mk --yosys-scripts --bash

tests/verilog/run-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../gen-tests-makefile.sh
-run_tests --yosys-scripts --bash
+generate_mk --yosys-scripts --bash