From 353344350edeeb09cbd042f5798b0c28193ea7f5 Mon Sep 17 00:00:00 2001 From: Robert Szczepanski Date: Thu, 28 Sep 2023 17:00:36 +0200 Subject: [PATCH 1/2] Fix BlackParrot synthesis in Synlig --- tools/runners/SynligYosys.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/tools/runners/SynligYosys.py b/tools/runners/SynligYosys.py index b2db91bae3037..0e4b4629e87c3 100644 --- a/tools/runners/SynligYosys.py +++ b/tools/runners/SynligYosys.py @@ -53,8 +53,25 @@ def prepare_run_cb(self, tmp_dir, params): for d in params["defines"]: f.write(f" -D{d}") + mem_path = None for fn in params["files"]: - f.write(f" {fn}") + # Remove unsynthesizable memory modules + if not fn.endswith("bsg_mem_1rw_sync_mask_write_bit_synth.v") \ + and not fn.endswith("bsg_mem_1rw_sync_mask_write_bit.v"): + f.write(f" {fn}") + else: + mem_path = fn.split("/") + + # Replace removed modules with synthesizable memory + if mem_path != None: + mem_path = mem_path[:-2] + str_mem_path = "/" + + for p in mem_path: + str_mem_path = os.path.join(str_mem_path, p) + str_mem_path += "/hard/ultrascale_plus/bsg_mem/bsg_mem_1rw_sync_mask_write_bit.v" + + f.write(f" {str_mem_path}") f.write("\n") From f19d9b52cd55e3ca542d439be26411441f1ed7da Mon Sep 17 00:00:00 2001 From: Robert Szczepanski Date: Fri, 29 Sep 2023 13:37:44 +0200 Subject: [PATCH 2/2] Save test logs --- .github/workflows/sv-tests-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/sv-tests-ci.yml b/.github/workflows/sv-tests-ci.yml index 6e78e303471d8..9560b107e1d30 100644 --- a/.github/workflows/sv-tests-ci.yml +++ b/.github/workflows/sv-tests-ci.yml @@ -256,6 +256,8 @@ jobs: name: tests_summary path: | ./tests_summary/ + ./out/report_yosys-synlig/logs/SynligYosys/generated/black-parrot/ + ./out/report_yosys-synlig/out/logs/SynligYosys/generated/black-parrot/ - name: Find artifacts that are no longer needed id: get-artifacts-to-delete if: github.event_name == 'pull_request'