Merge pull request #1803 from ucb-bar/mergify/copy/main/pr-1794

Bump CIRCT to 1.66.0, use statically linked CIRCT
ucb-bar · Feb 27, 2024 · 0a2a16c · 0a2a16c
2 parents b7c20b6 + d06bdc2
commit 0a2a16c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -1,3 +1,3 @@
 {
-  "version": "firtool-1.61.0"
+  "version": "firtool-1.66.0"
 }
diff --git a/generators/mempress b/generators/mempress
diff --git a/generators/sha3 b/generators/sha3
diff --git a/generators/shuttle b/generators/shuttle
diff --git a/generators/testchipip b/generators/testchipip
diff --git 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 \