From 91842a272ebe43fddf2b81bce55f83b25c17d4a5 Mon Sep 17 00:00:00 2001 From: bartender Date: Mon, 26 Feb 2024 04:33:37 +0000 Subject: [PATCH 1/7] [cd] Bump CIRCT from firtool-1.61.0 to firtool-1.66.0 This is an automated commit generated by the `circt/update-circt` GitHub Action. (cherry picked from commit dc02e4016e87c3539e52e8b4b5ea985dd20297db) --- conda-reqs/circt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-reqs/circt.json b/conda-reqs/circt.json index 3b5ca63a..1eb54a43 100644 --- a/conda-reqs/circt.json +++ b/conda-reqs/circt.json @@ -1,3 +1,3 @@ { - "version": "firtool-1.61.0" + "version": "firtool-1.66.0" } From 2827e6831f21265ece27fc043dd487aba6108409 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Mon, 26 Feb 2024 11:27:29 -0800 Subject: [PATCH 2/7] Bump FireMarshal --- software/firemarshal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/firemarshal b/software/firemarshal index b014183a..047e72a5 160000 --- a/software/firemarshal +++ b/software/firemarshal @@ -1 +1 @@ -Subproject commit b014183ac6afed7fe1aca89fa010be8d13ad4079 +Subproject commit 047e72a509c2f5ecfdc7481283fa7425a0cf541a From b42e02df37c3e1a625e1a91e3faa023b115f4dbb Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Mon, 26 Feb 2024 13:09:39 -0800 Subject: [PATCH 3/7] Bump FireMarshal --- software/firemarshal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/firemarshal b/software/firemarshal index 047e72a5..2a23a7bb 160000 --- a/software/firemarshal +++ b/software/firemarshal @@ -1 +1 @@ -Subproject commit 047e72a509c2f5ecfdc7481283fa7425a0cf541a +Subproject commit 2a23a7bba965c485f86bdfd85125b214d7fdf74f From cee0d0ff3d24c53b11235303d9d7ecfba3c9e213 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Mon, 26 Feb 2024 14:23:19 -0800 Subject: [PATCH 4/7] Bump Gemmini to dev --- generators/gemmini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/gemmini b/generators/gemmini index 8c8b38b9..c16f815a 160000 --- a/generators/gemmini +++ b/generators/gemmini @@ -1 +1 @@ -Subproject commit 8c8b38b9dea3e4d6ba9695346a883b2094bd7388 +Subproject commit c16f815a38ae18ab37d835d4d07e78ba27c5f7b8 From 38d7a7650172cacdd4dd8ee4dcb82db0936885b5 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Mon, 26 Feb 2024 14:47:09 -0800 Subject: [PATCH 5/7] Bump for CIRCT | Fix style --- common.mk | 2 +- generators/mempress | 2 +- generators/sha3 | 2 +- generators/shuttle | 2 +- generators/testchipip | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common.mk b/common.mk index a0acba03..34c08786 100644 --- a/common.mk +++ b/common.mk @@ -193,7 +193,7 @@ SFC_MFC_TARGETS = \ $(GEN_COLLATERAL_DIR) SFC_REPL_SEQ_MEM = --infer-rw --repl-seq-mem -c:$(MODEL):-o:$(SFC_SMEMS_CONF) -MFC_BASE_LOWERING_OPTIONS ?= emittedLineLength=2048,noAlwaysComb,disallowLocalVariables,verifLabels,locationInfoStyle=wrapInAtSquareBracket +MFC_BASE_LOWERING_OPTIONS ?= emittedLineLength=2048,noAlwaysComb,disallowLocalVariables,verifLabels,disallowPortDeclSharing,locationInfoStyle=wrapInAtSquareBracket # DOC include start: FirrtlCompiler # There are two possible cases for this step. In the first case, SFC diff --git a/generators/mempress b/generators/mempress index c3d4901a..415f55b5 160000 --- a/generators/mempress +++ b/generators/mempress @@ -1 +1 @@ -Subproject commit c3d4901ab0f3c28bfd4101ffd62f707a86fc377e +Subproject commit 415f55b583f3527500c5cf4e0a7b663982479098 diff --git a/generators/sha3 b/generators/sha3 index 5e49347f..2d38585d 160000 --- a/generators/sha3 +++ b/generators/sha3 @@ -1 +1 @@ -Subproject commit 5e49347f069c72eeb3bf23f1a09170b3cfd3eb2e +Subproject commit 2d38585d6410ca51ab19040fc23b1f6b3465270c diff --git a/generators/shuttle b/generators/shuttle index fd325d43..4bc2fa1e 160000 --- a/generators/shuttle +++ b/generators/shuttle @@ -1 +1 @@ -Subproject commit fd325d43a162378dc1984e87297e6d710167db79 +Subproject commit 4bc2fa1e36209beae7323218ec006762ab096ac2 diff --git a/generators/testchipip b/generators/testchipip index 003c9c1e..9c4b28a5 160000 --- a/generators/testchipip +++ b/generators/testchipip @@ -1 +1 @@ -Subproject commit 003c9c1e81c94c74f877d3883688c220dfe69d1b +Subproject commit 9c4b28a5b49aa1cd5b490c73efbb11d1e83d1f87 From 3d5b018ffdf0eb5e90318cb6979de38606db34c5 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Mon, 26 Feb 2024 14:48:28 -0800 Subject: [PATCH 6/7] Use statically linked CIRCT --- scripts/build-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-setup.sh b/scripts/build-setup.sh index ffcee96b..d8a08c1c 100755 --- a/scripts/build-setup.sh +++ b/scripts/build-setup.sh @@ -308,7 +308,7 @@ if run_step "10"; then git submodule update --init $CYDIR/tools/install-circt && $CYDIR/tools/install-circt/bin/download-release-or-nightly-circt.sh \ - -f circt-full-shared-linux-x64.tar.gz \ + -f circt-full-static-linux-x64.tar.gz \ -i $PREFIX \ -v version-file \ -x $CYDIR/conda-reqs/circt.json \ From 76a2f01a84b68272ad9b3dfad3994427d9bac3b0 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Tue, 27 Feb 2024 09:33:24 -0800 Subject: [PATCH 7/7] Bump FireMarshal --- software/firemarshal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/firemarshal b/software/firemarshal index 2a23a7bb..95cf53a6 160000 --- a/software/firemarshal +++ b/software/firemarshal @@ -1 +1 @@ -Subproject commit 2a23a7bba965c485f86bdfd85125b214d7fdf74f +Subproject commit 95cf53a6f5bf800fcbb2fab2061f9b27df74d5dd