From 12d6ac720481621588cd8f7294f3462710d183cf Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 26 May 2026 15:55:00 +0200 Subject: [PATCH] Docs cleanup --- docs/Makefile | 20 +++++++++----------- docs/common.mk | 4 ++++ docs/source/code_examples/stubnets/Makefile | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 6f86fb8c4..3fe4f1867 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -257,25 +257,23 @@ images: .PHONY: extract extract: @mkdir -p source/generated - @$(BUILD_CMD)yosys -q -p 'help -dump-cmds-json source/generated/cmds.json' - @$(BUILD_CMD)yosys -q -p 'help -dump-cells-json source/generated/cells.json' + @$(YOSYS) -q -p 'help -dump-cmds-json source/generated/cmds.json' + @$(YOSYS) -q -p 'help -dump-cells-json source/generated/cells.json' @cp ../passes/cmds/chformal.cc source/generated/ - @$(BUILD_CMD)yosys -qQT -h 'chformal' -l source/generated/chformal.log + @$(YOSYS) -qQT -h 'chformal' -l source/generated/chformal.log @mkdir -p source/generated/functional @cp ../backends/functional/smtlib.cc source/generated/functional/ -@cd .. && diff -U 20 backends/functional/smtlib.cc backends/functional/smtlib_rosette.cc \ > docs/source/generated/functional/rosette.diff || true - @$(BUILD_CMD)yosys --help >source/generated/yosys - @$(BUILD_CMD)yosys-smtbmc --help >source/generated/yosys-smtbmc - @$(BUILD_CMD)yosys-witness --help >source/generated/yosys-witness - @$(BUILD_CMD)yosys-config --help >source/generated/yosys-config - -@$(BUILD_CMD)yosys-filterlib --help 2>source/generated/yosys-filterlib || true -ifeq ($(ABCEXTERNAL),) - -@$(BUILD_CMD)yosys-abc --help 2>source/generated/yosys-abc > /dev/null || true -endif + @$(YOSYS) --help >source/generated/yosys + @$(YOSYS_SMTBMC) --help >source/generated/yosys-smtbmc + @$(YOSYS_WITNESS) --help >source/generated/yosys-witness + @$(YOSYS_CONFIG) --help >source/generated/yosys-config + -@$(YOSYS_FILTERLIB) --help 2>source/generated/yosys-filterlib || true + -@$(ABC) --help 2>source/generated/yosys-abc > /dev/null || true .PHONY: gen gen: diff --git a/docs/common.mk b/docs/common.mk index fb0815cb6..70baead77 100644 --- a/docs/common.mk +++ b/docs/common.mk @@ -3,7 +3,11 @@ BUILD_DIR ?= $(ROOT_DIR)/../build BUILD_CMD := $(BUILD_DIR)/$(PROGRAM_PREFIX) YOSYS ?= $(BUILD_CMD)yosys +ABC ?= $(BUILD_CMD)yosys-abc +YOSYS_FILTERLIB ?= $(BUILD_CMD)yosys-filterlib +YOSYS_WITNESS ?= @$(BUILD_CMD)yosys-witness YOSYS_CONFIG ?= $(BUILD_CMD)yosys-config +YOSYS_SMTBMC ?= $(BUILD_CMD)yosys-smtbmc export YOSYS export YOSYS_CONFIG diff --git a/docs/source/code_examples/stubnets/Makefile b/docs/source/code_examples/stubnets/Makefile index 17ade23df..324fdff6b 100644 --- a/docs/source/code_examples/stubnets/Makefile +++ b/docs/source/code_examples/stubnets/Makefile @@ -13,7 +13,7 @@ test: stubnets.so @tail test1.log test2.log test3.log stubnets.so: stubnets.cc - @$(YOSYS)-config --exec --cxx --cxxflags --ldflags -o $@ -shared $^ --ldlibs >/dev/null 2>&1 + @$(YOSYS_CONFIG) --exec --cxx --cxxflags --ldflags -o $@ -shared $^ --ldlibs >/dev/null 2>&1 .PHONY: clean clean: