From 92ef719434e970561f7415e35e6cb66b93a39239 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 10 Mar 2026 09:41:39 +0100
Subject: [PATCH] Split vanilla-test to separate Makefile

---
 Makefile       | 108 +++----------------------------------------------
 tests/Makefile | 105 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+), 102 deletions(-)
 create mode 100644 tests/Makefile

diff --git a/Makefile b/Makefile
index 33ff74fa4..01b9fbdc4 100644
--- a/Makefile
+++ b/Makefile
@@ -918,110 +918,14 @@ else
 ABCOPT=""
 endif
 
-# Tests that generate .mk with tests/gen-tests-makefile.sh
-MK_TEST_DIRS =
-MK_TEST_DIRS += tests/arch/analogdevices
-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/bugpoint
-MK_TEST_DIRS += tests/opt
-MK_TEST_DIRS += tests/sat
-MK_TEST_DIRS += tests/sdc
-MK_TEST_DIRS += tests/sim
-MK_TEST_DIRS += tests/svtypes
-MK_TEST_DIRS += tests/techmap
-MK_TEST_DIRS += tests/various
-MK_TEST_DIRS += tests/rtlil
-ifeq ($(ENABLE_VERIFIC),1)
-ifneq ($(YOSYS_NOVERIFIC),1)
-MK_TEST_DIRS += tests/verific
-endif
-endif
-MK_TEST_DIRS += tests/verilog
-
-# 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/peepopt
-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
-SH_TEST_DIRS += tests/liberty
-ifeq ($(ENABLE_FUNCTIONAL_TESTS),1)
-SH_TEST_DIRS += tests/functional
-endif
-
-# 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
-SH_ABC_TEST_DIRS += tests/alumacc
-
-# seed-tests/ is a dummy string, not a directory
-.PHONY: 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)
-	+@echo "...passed tests in $*"
-
-# abcopt-tests/ is a dummy string, not a directory
-.PHONY: 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: $(MK_TEST_DIRS:%=makefile-tests/%)
-# this target actually emits .mk files
-%.mk:
-	+cd $(dir $*) && bash run-test.sh
-# this one spawns submake on each
-makefile-tests/%: %/run-test.mk $(TARGETS) $(EXTRA_TARGETS)
-	$(MAKE) -C $* -f run-test.mk
-	+@echo "...passed tests in $*"
-
 test: vanilla-test unit-test
 
-vanilla-test: makefile-tests abcopt-tests seed-tests
-	@echo ""
-	@echo "  Passed \"make vanilla-test\"."
-ifeq ($(ENABLE_VERIFIC),1)
-ifeq ($(YOSYS_NOVERIFIC),1)
-	@echo "  Ran tests without verific support due to YOSYS_NOVERIFIC=1."
-endif
-endif
-	@echo ""
+.PHONY: vanilla-test
+
+vanilla-test:
+	@$(MAKE) -C tests vanilla-test \
+	$(if $(ENABLE_VERIFIC),ENABLE_VERIFIC=$(ENABLE_VERIFIC)) \
+	$(if $(YOSYS_NOVERIFIC),YOSYS_NOVERIFIC=$(YOSYS_NOVERIFIC))
 
 VALGRIND ?= valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes --errors-for-leak-kinds=all
 
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644
index 000000000..3ec125e48
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,105 @@
+# Tests that generate .mk with ./gen-tests-makefile.sh
+MK_TEST_DIRS =
+MK_TEST_DIRS += ./arch/analogdevices
+MK_TEST_DIRS += ./arch/anlogic
+MK_TEST_DIRS += ./arch/ecp5
+MK_TEST_DIRS += ./arch/efinix
+MK_TEST_DIRS += ./arch/gatemate
+MK_TEST_DIRS += ./arch/gowin
+MK_TEST_DIRS += ./arch/ice40
+MK_TEST_DIRS += ./arch/intel_alm
+MK_TEST_DIRS += ./arch/machxo2
+MK_TEST_DIRS += ./arch/microchip
+MK_TEST_DIRS += ./arch/nanoxplore
+MK_TEST_DIRS += ./arch/nexus
+MK_TEST_DIRS += ./arch/quicklogic/pp3
+MK_TEST_DIRS += ./arch/quicklogic/qlf_k6n10f
+MK_TEST_DIRS += ./arch/xilinx
+MK_TEST_DIRS += ./bugpoint
+MK_TEST_DIRS += ./opt
+MK_TEST_DIRS += ./sat
+MK_TEST_DIRS += ./sdc
+MK_TEST_DIRS += ./sim
+MK_TEST_DIRS += ./svtypes
+MK_TEST_DIRS += ./techmap
+MK_TEST_DIRS += ./various
+MK_TEST_DIRS += ./rtlil
+ifeq ($(ENABLE_VERIFIC),1)
+ifneq ($(YOSYS_NOVERIFIC),1)
+MK_TEST_DIRS += ./verific
+endif
+endif
+MK_TEST_DIRS += ./verilog
+
+# Tests that don't generate .mk
+SH_TEST_DIRS =
+SH_TEST_DIRS += ./simple
+SH_TEST_DIRS += ./simple_abc9
+SH_TEST_DIRS += ./hana
+SH_TEST_DIRS += ./asicworld
+# SH_TEST_DIRS += ./realmath
+SH_TEST_DIRS += ./share
+SH_TEST_DIRS += ./opt_share
+SH_TEST_DIRS += ./fsm
+SH_TEST_DIRS += ./memlib
+SH_TEST_DIRS += ./bram
+SH_TEST_DIRS += ./svinterfaces
+SH_TEST_DIRS += ./xprop
+SH_TEST_DIRS += ./select
+SH_TEST_DIRS += ./peepopt
+SH_TEST_DIRS += ./proc
+SH_TEST_DIRS += ./blif
+SH_TEST_DIRS += ./arch
+SH_TEST_DIRS += ./rpc
+SH_TEST_DIRS += ./memfile
+SH_TEST_DIRS += ./fmt
+SH_TEST_DIRS += ./cxxrtl
+SH_TEST_DIRS += ./liberty
+ifeq ($(ENABLE_FUNCTIONAL_TESTS),1)
+SH_TEST_DIRS += ./functional
+endif
+
+# Tests that don't generate .mk and need special args
+SH_ABC_TEST_DIRS =
+SH_ABC_TEST_DIRS += ./memories
+SH_ABC_TEST_DIRS += ./aiger
+SH_ABC_TEST_DIRS += ./alumacc
+
+all: vanilla-test
+
+# seed-./ is a dummy string, not a directory
+.PHONY: seed-tests
+seed-tests: $(SH_TEST_DIRS:%=seed-./%)
+.PHONY: seed-./%
+seed-./%: %/run-test.sh $(TARGETS) $(EXTRA_TARGETS)
+	+cd $* && bash run-test.sh $(SEEDOPT)
+	+@echo "...passed tests in $*"
+
+# abcopt-./ is a dummy string, not a directory
+.PHONY: abcopt-tests
+abcopt-tests: $(SH_ABC_TEST_DIRS:%=abcopt-./%)
+abcopt-./%: %/run-test.sh $(TARGETS) $(EXTRA_TARGETS)
+	+cd $* && bash run-test.sh $(ABCOPT) $(SEEDOPT)
+	+@echo "...passed tests in $*"
+
+# makefile-./ is a dummy string, not a directory
+.PHONY: makefile-tests
+makefile-tests: $(MK_TEST_DIRS:%=makefile-./%)
+# this target actually emits .mk files
+%.mk:
+	+cd $(dir $*) && bash run-test.sh
+# this one spawns submake on each
+makefile-./%: %/run-test.mk $(TARGETS) $(EXTRA_TARGETS)
+	$(MAKE) -C $* -f run-test.mk
+	+@echo "...passed tests in $*"
+
+vanilla-test: makefile-tests abcopt-tests seed-tests
+	@echo ""
+	@echo "  Passed \"make vanilla-test\"."
+ifeq ($(ENABLE_VERIFIC),1)
+ifeq ($(YOSYS_NOVERIFIC),1)
+	@echo "  Ran tests without verific support due to YOSYS_NOVERIFIC=1."
+endif
+endif
+	@echo ""
+