From 65fc97c17e3a8d41557b9e7bfcd8717e95e80115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Harboe?= Date: Mon, 7 Jul 2025 17:23:29 +0200 Subject: [PATCH] synth: more consistent naming MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I'm not keen on changing 1_1_yosys stem as I don't know what tools that rely on that name, like metrics, but canonicalization happens before 1_1_yosys, so the compromise is to create 1_0_yosys_canonicalize stem. Signed-off-by: Øyvind Harboe --- flow/Makefile | 6 +++--- flow/scripts/synth.tcl | 2 +- flow/scripts/synth_canonicalize.tcl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flow/Makefile b/flow/Makefile index c96bf8f3c6..5339b2570c 100644 --- a/flow/Makefile +++ b/flow/Makefile @@ -286,12 +286,12 @@ do-yosys: $(DONT_USE_SC_LIB) .PHONY: do-yosys-canonicalize do-yosys-canonicalize: yosys-dependencies $(DONT_USE_SC_LIB) - $(SCRIPTS_DIR)/synth.sh $(SCRIPTS_DIR)/synth_canonicalize.tcl $(LOG_DIR)/1_1_yosys_canonicalize.log + $(SCRIPTS_DIR)/synth.sh $(SCRIPTS_DIR)/synth_canonicalize.tcl $(LOG_DIR)/1_0_yosys_canonicalize.log -$(RESULTS_DIR)/1_synth.rtlil: $(YOSYS_DEPENDENCIES) +$(RESULTS_DIR)/1_0_yosys_canonicalize.rtlil: $(YOSYS_DEPENDENCIES) $(UNSET_AND_MAKE) do-yosys-canonicalize -$(RESULTS_DIR)/1_1_yosys.v: $(RESULTS_DIR)/1_synth.rtlil +$(RESULTS_DIR)/1_1_yosys.v: $(RESULTS_DIR)/1_0_yosys_canonicalize.rtlil $(UNSET_AND_MAKE) do-yosys .PHONY: do-synth diff --git a/flow/scripts/synth.tcl b/flow/scripts/synth.tcl index 9a6b75d0be..16686af62c 100644 --- a/flow/scripts/synth.tcl +++ b/flow/scripts/synth.tcl @@ -1,5 +1,5 @@ source $::env(SCRIPTS_DIR)/synth_preamble.tcl -read_checkpoint $::env(RESULTS_DIR)/1_synth.rtlil +read_checkpoint $::env(RESULTS_DIR)/1_0_yosys_canonicalize.rtlil hierarchy -check -top $::env(DESIGN_NAME) diff --git a/flow/scripts/synth_canonicalize.tcl b/flow/scripts/synth_canonicalize.tcl index f53ca13219..f62fcbe6a5 100644 --- a/flow/scripts/synth_canonicalize.tcl +++ b/flow/scripts/synth_canonicalize.tcl @@ -10,4 +10,4 @@ hierarchy -check -top $::env(DESIGN_NAME) # Get rid of unused modules opt_clean -purge # The hash of this file will not change if files not part of synthesis do not change -write_rtlil $::env(RESULTS_DIR)/1_synth.rtlil +write_rtlil $::env(RESULTS_DIR)/1_0_yosys_canonicalize.rtlil