Merge remote-tracking branch 'origin/misc-fixes' into vlog-as-top

.github/actions/repo-setup-aws/action.yml

@@ -4,7 +4,7 @@ description: "Runs all baseline setup to interact with a AWS-hosted manager inst
 runs:
   using: "composite"
   steps:
-      - uses: aws-actions/configure-aws-credentials@v1-node16
+      - uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-access-key-id: ${{ env.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ env.AWS_SECRET_ACCESS_KEY }}

.github/workflows/firesim-publish-scala-doc.yml

@@ -57,7 +57,7 @@ jobs:
       image: firesim/firesim-ci:v1.3
       options: --entrypoint /bin/bash
       env:
-        JVM_MEMORY: 3500M # Default JVM maximum heap limit
+        JAVA_HEAP_SIZE: 3500M # Default JVM maximum heap limit
     steps:
       - run: |
           sudo yum -y remove git git224 git224-core ius-release.noarch # remove any older git versions and collateral first from docker image

conda-reqs/ci-shared.yaml

@@ -18,6 +18,8 @@ dependencies:
     - mypy_boto3_ec2
     - botocore-stubs
 
+    - cryptography<41
+
     - pytz
     - types-pytz
 

conda-reqs/firesim.yaml

@@ -25,7 +25,7 @@ dependencies:
 
     - gcc
     - gxx
-    - sysroot_linux-64>=2.17 # needed to match pre-built CI XRT glibc version
+    - sysroot_linux-64==2.17 # needed to match pre-built CI XRT glibc version
     - conda-gcc-specs
     - binutils
 
@@ -83,11 +83,11 @@ dependencies:
     - graphviz
     - expect
     - dtc
-    - verilator==5.006
+    - verilator==5.008
     - screen
     - elfutils
     - libdwarf-dev==0.0.0.20190110_28_ga81397fc4 # from ucb-bar channel - using mainline libdwarf-feedstock
-    - conda-lock>=1
+    - conda-lock=1
 
     # clang-format for driver coding style enforcement.
     - clang-format

scripts/machine-launch-script.sh

@@ -224,19 +224,21 @@ set -o pipefail
         vim \
         git \
         screen \
-        argcomplete==1.12.3 \
-        "conda-lock>=1" \
+        argcomplete \
+        "conda-lock=1" \
         expect \
-        python \
-        boto3==1.20.21 \
+        "python>=3.8" \
+        boto3 \
         pytz \
-        mypy-boto3-s3==1.21.0 \
-        azure-mgmt-resource==18.0.0 \
-        azure-identity==1.5.0 \
+        mypy-boto3-s3 \
+        mypy_boto3_ec2 \
+        "azure-mgmt-resource>=18" \
+        azure-identity \
         azure-mgmt-compute \
         azure-mgmt-network \
         fsspec \
-        s3fs \
+        "s3fs==0.4.2" \
+        "cryptography<41" \
     )
 
     if [[ "$CONDA_ENV_NAME" == "base" ]]; then
@@ -267,8 +269,7 @@ set -o pipefail
     # prefer creating the environment with a single invocation of
     # conda
     PIP_PKGS=( \
-        fab-classic==1.19.1 \
-        mypy-boto3-ec2==1.21.9 \
+        "fab-classic>=1.19.2" \
         azure-mgmt-resourcegraph \
     )
     if [[ -n "$PIP_PKGS[*]" ]]; then

sim/make/chipyard.mk

@@ -7,12 +7,11 @@ chipyard_dir := $(abspath ..)/target-design/chipyard
 rocketchip_dir := $(chipyard_dir)/generators/rocket-chip
 
 # Scala invocation options
-JVM_MEMORY ?= 16G
-SCALA_VERSION ?= 2.13.10
+JAVA_HEAP_SIZE ?= 16G
 # Disable the SBT supershell as interacts poorly with scalatest output and breaks
 # the runtime config generator.
-export JAVA_TOOL_OPTIONS ?= -Xmx$(JVM_MEMORY) -Xss8M -Dsbt.supershell=false -Djava.io.tmpdir=$(base_dir)/.java_tmp
-export SBT_OPTS ?= -Dsbt.ivy.home=$(base_dir)/.ivy2 -Dsbt.global.base=$(base_dir)/.sbt -Dsbt.boot.directory=$(base_dir)/.sbt/boot/
+export JAVA_TOOL_OPTIONS ?= -Xmx$(JAVA_HEAP_SIZE) -Xss8M -Djava.io.tmpdir=$(base_dir)/.java_tmp
+export SBT_OPTS ?= -Dsbt.ivy.home=$(base_dir)/.ivy2 -Dsbt.global.base=$(base_dir)/.sbt -Dsbt.boot.directory=$(base_dir)/.sbt/boot/ -Dsbt.color=always -Dsbt.supershell=false -Dsbt.server.forcestart=true
 
 sbt_sources = $(shell find -L $(base_dir) -name target -prune -o -iname "*.sbt" -print 2> /dev/null)
 SCALA_BUILDTOOL_DEPS ?= $(sbt_sources)

sim/make/scala-build.mk

@@ -77,8 +77,6 @@ $(FIRESIM_MAIN_CP): $(SCALA_BUILDTOOL_DEPS) $(firesim_main_srcs) $(firesim_test_
 	@mkdir -p $(@D)
 	$(call run_sbt_assembly,$(FIRESIM_SBT_PROJECT),$(FIRESIM_MAIN_CP))
 
-# If the target project is the main FireSim project, provide the test classpath
-# as it defines the target configs and parameters for designs to elaborate.
 ifneq ($(FIRESIM_SBT_PROJECT),$(TARGET_SBT_PROJECT))
 
 target_srcs = $(foreach dir,$(TARGET_SOURCE_DIRS), \
@@ -93,7 +91,7 @@ $(TARGET_CP): $(target_srcs) | $(FIRESIM_MAIN_CP)
 
 else
 
-TARGET_CP :=
+TARGET_CP := $(FIRESIM_MAIN_CP)
 
 endif