From 407b98cd2fc5541179ed336611f9b3f0d485f210 Mon Sep 17 00:00:00 2001 From: Alain Dargelas Date: Thu, 9 Nov 2023 10:47:46 -0800 Subject: [PATCH 01/12] Try stable_rs branch --- .github/workflows/yosys-plugin.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/yosys-plugin.yml b/.github/workflows/yosys-plugin.yml index 28d7bbebab..9736e8d9cb 100644 --- a/.github/workflows/yosys-plugin.yml +++ b/.github/workflows/yosys-plugin.yml @@ -41,8 +41,9 @@ jobs: # Make sure we always use https:// instead of git:// git config --global url.https://github.com/.insteadOf git://github.com/ # Use current main of the plugin repository... - git clone https://github.com/chipsalliance/systemverilog-plugin.git - cd systemverilog-plugin + git clone https://github.com/chipsalliance/synlig.git + cd synlig + git checkout stable_rs git submodule update --depth 1 --init --recursive --checkout \ third_party/yosys \ third_party/yosys_f4pga_plugins \ From dd17c472ae070882ae626612e149fed83057a3bf Mon Sep 17 00:00:00 2001 From: Alain Dargelas Date: Thu, 9 Nov 2023 10:57:10 -0800 Subject: [PATCH 02/12] Try stable_rs branch --- .github/workflows/yosys-plugin.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/yosys-plugin.yml b/.github/workflows/yosys-plugin.yml index 9736e8d9cb..4a8716c85d 100644 --- a/.github/workflows/yosys-plugin.yml +++ b/.github/workflows/yosys-plugin.yml @@ -41,8 +41,7 @@ jobs: # Make sure we always use https:// instead of git:// git config --global url.https://github.com/.insteadOf git://github.com/ # Use current main of the plugin repository... - git clone https://github.com/chipsalliance/synlig.git - cd synlig + git clone https://github.com/alaindargelas/synlig.git git checkout stable_rs git submodule update --depth 1 --init --recursive --checkout \ third_party/yosys \ @@ -55,7 +54,7 @@ jobs: with: submodules: recursive fetch-depth: 0 - path: 'systemverilog-plugin/third_party/surelog' + path: 'synlig/third_party/surelog' - name: Create Cache Timestamp id: cache_timestamp @@ -72,21 +71,21 @@ jobs: - name: Build binaries run: | - cd systemverilog-plugin + cd synlig make -rR -j $(nproc) -Oline -f build_binaries.mk SYSTEMVERILOG_PLUGIN_ONLY:=0 \ install-surelog install-yosys install-plugins - name: Build & Test Ibex run: | pip install virtualenv - cd systemverilog-plugin/tests + cd synlig/tests make -j 1 env TEST=ibex make -j $(nproc) uhdm/yosys/synth-ibex-f4pga TEST=ibex ENABLE_READLINE=0 PRETTY=0 - uses: actions/upload-artifact@v2 with: name: top_artya7.bit - path: ./systemverilog-plugin/tests/build/lowrisc_ibex_top_artya7_surelog_0.1/synth-symbiflow/top_artya7.bit + path: ./synlig/tests/build/lowrisc_ibex_top_artya7_surelog_0.1/synth-symbiflow/top_artya7.bit - name: Upload load graphs uses: actions/upload-artifact@v2 From 9130f982c4e20e570d6df63b1c39bf47c8492c0a Mon Sep 17 00:00:00 2001 From: Alain Dargelas Date: Thu, 9 Nov 2023 11:56:14 -0800 Subject: [PATCH 03/12] Try stable_rs branch --- .github/workflows/yosys-plugin.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/yosys-plugin.yml b/.github/workflows/yosys-plugin.yml index 4a8716c85d..92093e2623 100644 --- a/.github/workflows/yosys-plugin.yml +++ b/.github/workflows/yosys-plugin.yml @@ -43,11 +43,10 @@ jobs: # Use current main of the plugin repository... git clone https://github.com/alaindargelas/synlig.git git checkout stable_rs - git submodule update --depth 1 --init --recursive --checkout \ - third_party/yosys \ - third_party/yosys_f4pga_plugins \ - third_party/make_env \ - third_party/ibex \ + git submodule sync + git submodule update --depth 3 --init --recursive --checkout \ + ./third_party/{surelog,yosys} \ + ; - name: Setup Surelog uses: actions/checkout@v2 From 1c371bfe29169d47c3aef6e1fef5b1eb6c90aa4f Mon Sep 17 00:00:00 2001 From: Alain Dargelas Date: Thu, 9 Nov 2023 18:12:20 -0800 Subject: [PATCH 04/12] trial --- .github/workflows/yosys-plugin.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/yosys-plugin.yml b/.github/workflows/yosys-plugin.yml index 92093e2623..169ec5137b 100644 --- a/.github/workflows/yosys-plugin.yml +++ b/.github/workflows/yosys-plugin.yml @@ -39,7 +39,7 @@ jobs: run: | # Github dropped support for unauthorized git: https://github.blog/2021-09-01-improving-git-protocol-security-github/ # Make sure we always use https:// instead of git:// - git config --global url.https://github.com/.insteadOf git://github.com/ + #git config --global url.https://github.com/.insteadOf git://github.com/ # Use current main of the plugin repository... git clone https://github.com/alaindargelas/synlig.git git checkout stable_rs @@ -48,13 +48,6 @@ jobs: ./third_party/{surelog,yosys} \ ; - - name: Setup Surelog - uses: actions/checkout@v2 - with: - submodules: recursive - fetch-depth: 0 - path: 'synlig/third_party/surelog' - - name: Create Cache Timestamp id: cache_timestamp uses: nanzm/get-time-action@v1.1 From 4852483391efa74c7460fa13137079bc37fff568 Mon Sep 17 00:00:00 2001 From: Alain Dargelas Date: Thu, 9 Nov 2023 18:23:20 -0800 Subject: [PATCH 05/12] trial --- .github/workflows/yosys-plugin.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/yosys-plugin.yml b/.github/workflows/yosys-plugin.yml index 169ec5137b..e96105a895 100644 --- a/.github/workflows/yosys-plugin.yml +++ b/.github/workflows/yosys-plugin.yml @@ -42,6 +42,7 @@ jobs: #git config --global url.https://github.com/.insteadOf git://github.com/ # Use current main of the plugin repository... git clone https://github.com/alaindargelas/synlig.git + cd synlig git checkout stable_rs git submodule sync git submodule update --depth 3 --init --recursive --checkout \ @@ -63,7 +64,7 @@ jobs: - name: Build binaries run: | - cd synlig + #cd synlig make -rR -j $(nproc) -Oline -f build_binaries.mk SYSTEMVERILOG_PLUGIN_ONLY:=0 \ install-surelog install-yosys install-plugins From f2d85250a7002cede49c6a5f1980be4091f051c1 Mon Sep 17 00:00:00 2001 From: Alain Dargelas Date: Thu, 9 Nov 2023 18:38:54 -0800 Subject: [PATCH 06/12] trial --- .github/workflows/yosys-plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/yosys-plugin.yml b/.github/workflows/yosys-plugin.yml index e96105a895..9db2537276 100644 --- a/.github/workflows/yosys-plugin.yml +++ b/.github/workflows/yosys-plugin.yml @@ -64,7 +64,7 @@ jobs: - name: Build binaries run: | - #cd synlig + cd synlig make -rR -j $(nproc) -Oline -f build_binaries.mk SYSTEMVERILOG_PLUGIN_ONLY:=0 \ install-surelog install-yosys install-plugins From 54bf4ff56ed23a808bf2ddc50adf22b9942cd6b6 Mon Sep 17 00:00:00 2001 From: Alain Dargelas Date: Thu, 9 Nov 2023 19:02:40 -0800 Subject: [PATCH 07/12] trial --- .github/workflows/yosys-plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/yosys-plugin.yml b/.github/workflows/yosys-plugin.yml index 9db2537276..3fae5ea73a 100644 --- a/.github/workflows/yosys-plugin.yml +++ b/.github/workflows/yosys-plugin.yml @@ -46,7 +46,7 @@ jobs: git checkout stable_rs git submodule sync git submodule update --depth 3 --init --recursive --checkout \ - ./third_party/{surelog,yosys} \ + ./third_party/{surelog,yosys,make_env} \ ; - name: Create Cache Timestamp From 5b9a954c1ae2a29abd9adf3afe5e611eae7b94a0 Mon Sep 17 00:00:00 2001 From: Alain Dargelas Date: Thu, 9 Nov 2023 20:24:31 -0800 Subject: [PATCH 08/12] trial --- .github/workflows/yosys-plugin.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/yosys-plugin.yml b/.github/workflows/yosys-plugin.yml index 3fae5ea73a..ebf33a7422 100644 --- a/.github/workflows/yosys-plugin.yml +++ b/.github/workflows/yosys-plugin.yml @@ -46,7 +46,7 @@ jobs: git checkout stable_rs git submodule sync git submodule update --depth 3 --init --recursive --checkout \ - ./third_party/{surelog,yosys,make_env} \ + ./third_party/{surelog,yosys,make_env,yosys_f4pga_plugins} \ ; - name: Create Cache Timestamp @@ -68,17 +68,15 @@ jobs: make -rR -j $(nproc) -Oline -f build_binaries.mk SYSTEMVERILOG_PLUGIN_ONLY:=0 \ install-surelog install-yosys install-plugins - - name: Build & Test Ibex + - name: Build & Test run: | - pip install virtualenv - cd synlig/tests - make -j 1 env TEST=ibex - make -j $(nproc) uhdm/yosys/synth-ibex-f4pga TEST=ibex ENABLE_READLINE=0 PRETTY=0 + make -C tests uhdm/yosys/synth-ibex-f4pga TEST=ibex \ + ENABLE_READLINE=0 PRETTY=0 -j $(nproc) - uses: actions/upload-artifact@v2 with: name: top_artya7.bit - path: ./synlig/tests/build/lowrisc_ibex_top_artya7_surelog_0.1/synth-symbiflow/top_artya7.bit + path: ./tests/build/lowrisc_ibex_top_artya7_surelog_0.1/synth-symbiflow/top_artya7.bit - name: Upload load graphs uses: actions/upload-artifact@v2 From 9d61a70132c67ab6fb9f26ae604c68e98135fd5b Mon Sep 17 00:00:00 2001 From: Alain Dargelas Date: Thu, 9 Nov 2023 20:29:40 -0800 Subject: [PATCH 09/12] trial --- .github/workflows/yosys-plugin.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/yosys-plugin.yml b/.github/workflows/yosys-plugin.yml index ebf33a7422..5609f21831 100644 --- a/.github/workflows/yosys-plugin.yml +++ b/.github/workflows/yosys-plugin.yml @@ -68,6 +68,13 @@ jobs: make -rR -j $(nproc) -Oline -f build_binaries.mk SYSTEMVERILOG_PLUGIN_ONLY:=0 \ install-surelog install-yosys install-plugins + - name: Setup build environment + run: | + # Environment creation has to be run with one job to avoid race conditions. + # See: https://github.com/SymbiFlow/make-env/pull/40 + # Even with the fix more jobs doesn't help with anything. + make -C ./tests env TEST=ibex -j1 + - name: Build & Test run: | make -C tests uhdm/yosys/synth-ibex-f4pga TEST=ibex \ From b03403693e3bb71b36317e99810493be238652f4 Mon Sep 17 00:00:00 2001 From: Alain Dargelas Date: Sun, 12 Nov 2023 20:19:26 -0800 Subject: [PATCH 10/12] trial --- .github/workflows/yosys-plugin.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/yosys-plugin.yml b/.github/workflows/yosys-plugin.yml index 5609f21831..efb8c9082f 100644 --- a/.github/workflows/yosys-plugin.yml +++ b/.github/workflows/yosys-plugin.yml @@ -73,10 +73,12 @@ jobs: # Environment creation has to be run with one job to avoid race conditions. # See: https://github.com/SymbiFlow/make-env/pull/40 # Even with the fix more jobs doesn't help with anything. + cd synlig make -C ./tests env TEST=ibex -j1 - name: Build & Test run: | + cd synlig make -C tests uhdm/yosys/synth-ibex-f4pga TEST=ibex \ ENABLE_READLINE=0 PRETTY=0 -j $(nproc) From 7fbe1a79aab0c8a4401b6a046aecfd8e7e3d1033 Mon Sep 17 00:00:00 2001 From: Alain Dargelas Date: Sun, 12 Nov 2023 21:13:06 -0800 Subject: [PATCH 11/12] trial --- .github/workflows/yosys-plugin.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/yosys-plugin.yml b/.github/workflows/yosys-plugin.yml index efb8c9082f..b694bbc518 100644 --- a/.github/workflows/yosys-plugin.yml +++ b/.github/workflows/yosys-plugin.yml @@ -73,11 +73,13 @@ jobs: # Environment creation has to be run with one job to avoid race conditions. # See: https://github.com/SymbiFlow/make-env/pull/40 # Even with the fix more jobs doesn't help with anything. + pip install virtualenv cd synlig make -C ./tests env TEST=ibex -j1 - name: Build & Test run: | + pip install virtualenv cd synlig make -C tests uhdm/yosys/synth-ibex-f4pga TEST=ibex \ ENABLE_READLINE=0 PRETTY=0 -j $(nproc) From 48f24df3eb6289a258e8db360b228ae8a901d432 Mon Sep 17 00:00:00 2001 From: Alain Dargelas Date: Sun, 12 Nov 2023 21:58:12 -0800 Subject: [PATCH 12/12] trial --- .github/workflows/yosys-plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/yosys-plugin.yml b/.github/workflows/yosys-plugin.yml index b694bbc518..32c93f2f96 100644 --- a/.github/workflows/yosys-plugin.yml +++ b/.github/workflows/yosys-plugin.yml @@ -46,7 +46,7 @@ jobs: git checkout stable_rs git submodule sync git submodule update --depth 3 --init --recursive --checkout \ - ./third_party/{surelog,yosys,make_env,yosys_f4pga_plugins} \ + ./third_party/{surelog,yosys,make_env,yosys_f4pga_plugins,ibex} \ ; - name: Create Cache Timestamp