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/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" } 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 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 696de30c..be9c416d 160000 --- a/generators/testchipip +++ b/generators/testchipip @@ -1 +1 @@ -Subproject commit 696de30c59d935cb34d2b45b9505dd15fc363086 +Subproject commit be9c416d6a64462a28433a3eee808cf6cfacdd25 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 \ diff --git a/software/firemarshal b/software/firemarshal index b014183a..95cf53a6 160000 --- a/software/firemarshal +++ b/software/firemarshal @@ -1 +1 @@ -Subproject commit b014183ac6afed7fe1aca89fa010be8d13ad4079 +Subproject commit 95cf53a6f5bf800fcbb2fab2061f9b27df74d5dd