From ba6f8930582a9322d2aafdc58f01ac09343fb1fa Mon Sep 17 00:00:00 2001
From: Aki Van Ness <aki@lethalbit.net>
Date: Sun, 16 Jun 2024 12:08:43 -0700
Subject: [PATCH] squishy: actions: Added a new option `--aggressive-mapping`
 to the `SquishySynthAction` `run_synth` to allow for more intense mapping
 using ABC9 to hopefully improve performance

---
 squishy/actions/__init__.py | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/squishy/actions/__init__.py b/squishy/actions/__init__.py
index 735d4abc..b66076a8 100644
--- a/squishy/actions/__init__.py
+++ b/squishy/actions/__init__.py
@@ -176,6 +176,8 @@ def run_synth(
 
 		synth_opts: list[str] = []
 		pnr_opts: list[str] = []
+		script_pre_synth = ''
+		script_post_synth = ''
 
 		build_dir = Path(args.build_dir)
 
@@ -194,6 +196,11 @@ def run_synth(
 		# Synthesis Options
 		if not args.no_abc9:
 			synth_opts.append('-abc9')
+		if args.aggressive_mapping:
+			if args.no_abc9:
+				log.error('Can not spcify `--aggressive-mapping` with ABC9 disabled, remove `--no-abc9`')
+			else:
+				script_pre_synth += 'scratchpad -copy abc9.script.flow3 abc9.script\n'
 
 		# Place and Route Options
 		if args.use_router2:
@@ -230,16 +237,18 @@ def run_synth(
 		) as progress:
 			name, prod = plat.build(
 				elab,
-				name          = elab_name,
-				build_dir     = build_dir,
-				do_build      = True,
-				do_program    = False,
-				synth_opts    = synth_opts,
-				nextpnr_opts  = pnr_opts,
-				verbose       = args.loud,
-				skip_cache    = skip_cache,
-				progress      = progress,
-				debug_verilog = cacheable and not skip_cache
+				name               = elab_name,
+				build_dir          = build_dir,
+				do_build           = True,
+				do_program         = False,
+				synth_opts         = synth_opts,
+				nextpnr_opts       = pnr_opts,
+				verbose            = args.loud,
+				skip_cache         = skip_cache,
+				progress           = progress,
+				debug_verilog      = cacheable and not skip_cache,
+				script_after_read  = script_pre_synth,
+				script_after_synth = script_post_synth
 			)
 
 			return (name, prod)
@@ -294,6 +303,12 @@ def register_synth_args(self, parser: ArgumentParser, cacheable: bool = False) -
 			help   = 'Disable use of Yosys\' ABC9'
 		)
 
+		synth_options.add_argument(
+			'--aggressive-mapping',
+			action = 'store_true',
+			help   = 'Run multiple ABC9 mapping more than once to improve performance in exchange for longer synth time'
+		)
+
 		# Place and Route Options
 		pnr_options.add_argument(
 			'--use-router2',