diff --git a/.github/scripts/defaults.sh b/.github/scripts/defaults.sh index 2d471e9e..85e4cc1b 100755 --- a/.github/scripts/defaults.sh +++ b/.github/scripts/defaults.sh @@ -33,7 +33,7 @@ grouping["group-peripherals"]="chipyard-dmirocket chipyard-dmiboom chipyard-spif grouping["group-accels"]="chipyard-mempress chipyard-sha3 chipyard-hwacha chipyard-gemmini chipyard-manymmioaccels" grouping["group-constellation"]="chipyard-constellation" grouping["group-tracegen"]="tracegen tracegen-boom" -grouping["group-other"]="icenet testchipip constellation" +grouping["group-other"]="icenet testchipip constellation rocketchip-amba rocketchip-tlsimple rocketchip-tlwidth rocketchip-tlxbar" grouping["group-fpga"]="arty vcu118 vc707" # key value store to get the build strings @@ -70,6 +70,10 @@ mapping["firesim"]="SCALA_TEST=firesim.firesim.RocketNICF1Tests" mapping["fireboom"]="SCALA_TEST=firesim.firesim.BoomF1Tests" mapping["icenet"]="SUB_PROJECT=icenet" mapping["testchipip"]="SUB_PROJECT=testchipip" +mapping["rocketchip-amba"]="SUB_PROJECT=rocketchip CONFIG=AMBAUnitTestConfig" +mapping["rocketchip-tlsimple"]="SUB_PROJECT=rocketchip CONFIG=TLSimpleUnitTestConfig" +mapping["rocketchip-tlwidth"]="SUB_PROJECT=rocketchip CONFIG=TLWidthUnitTestConfig" +mapping["rocketchip-tlxbar"]="SUB_PROJECT=rocketchip CONFIG=TLXbarUnitTestConfig" mapping["arty"]="SUB_PROJECT=arty verilog" mapping["vcu118"]="SUB_PROJECT=vcu118 verilog" diff --git a/.github/scripts/run-tests.sh b/.github/scripts/run-tests.sh index 2c3a6af7..89859eb7 100755 --- a/.github/scripts/run-tests.sh +++ b/.github/scripts/run-tests.sh @@ -139,6 +139,18 @@ case $1 in constellation) run_binary BINARY=none ;; + rocketchip-amba) + run_binary BINARY=none + ;; + rocketchip-tlsimple) + run_binary BINARY=none + ;; + rocketchip-tlwidth) + run_binary BINARY=none + ;; + rocketchip-tlxbar) + run_binary BINARY=none + ;; *) echo "No set of tests for $1. Did you spell it right?" exit 1 diff --git a/.github/workflows/chipyard-full-flow.yml b/.github/workflows/chipyard-full-flow.yml index 5179be0f..50e219e3 100644 --- a/.github/workflows/chipyard-full-flow.yml +++ b/.github/workflows/chipyard-full-flow.yml @@ -80,7 +80,7 @@ jobs: eval "$(conda shell.bash hook)" mkdir ${{ env.JAVA_TMP_DIR }} export MAKEFLAGS="-j32" - ./build-setup.sh -f + ./build-setup.sh -f -v run-cfg-finder: name: run-cfg-finder @@ -115,7 +115,7 @@ jobs: cd vlsi - # NOTE: most conda installs are in separate conda envs because they mess up + # NOTE: most conda installs are in separate conda envs because they mess up # each other's versions (for no apparent reason) and we need the latest versions conda config --add channels defaults conda config --add channels litex-hub @@ -166,7 +166,7 @@ jobs: name: cleanup needs: [run-tutorial] runs-on: ferry - if: ${{ always() && contains(join(needs.*.result, ','), 'success') }} + if: ${{ always() }} steps: - name: Delete repo copy and conda env run: | diff --git a/.github/workflows/chipyard-run-tests.yml b/.github/workflows/chipyard-run-tests.yml index f8ca8e11..72d6f654 100644 --- a/.github/workflows/chipyard-run-tests.yml +++ b/.github/workflows/chipyard-run-tests.yml @@ -880,6 +880,45 @@ jobs: group-key: "group-other" project-key: "testchipip" + rocketchip-run-tests: + name: rocketchip-run-tests + needs: prepare-chipyard-other + runs-on: self-hosted + steps: + - name: Delete old checkout + run: | + ls -alh . + rm -rf ${{ github.workspace }}/* || true + rm -rf ${{ github.workspace }}/.* || true + ls -alh . + - name: Checkout + uses: actions/checkout@v3 + - name: Git workaround + uses: ./.github/actions/git-workaround + - name: Create conda env + uses: ./.github/actions/create-conda-env + - name: Run amba tests + uses: ./.github/actions/run-tests + with: + group-key: "group-other" + project-key: "rocketchip-amba" + # Below tests segfault with verilator, work fine in VCS + # - name: Run tlsimple tests + # uses: ./.github/actions/run-tests + # with: + # group-key: "group-other" + # project-key: "rocketchip-tlsimple" + # - name: Run tlwidth tests + # uses: ./.github/actions/run-tests + # with: + # group-key: "group-other" + # project-key: "rocketchip-tlwidth" + # - name: Run tlxbar tests + # uses: ./.github/actions/run-tests + # with: + # group-key: "group-other" + # project-key: "rocketchip-tlxbar" + constellation-run-tests: name: constellation-run-tests needs: prepare-chipyard-other @@ -1004,6 +1043,7 @@ jobs: tracegen-run-tests, icenet-run-tests, testchipip-run-tests, + rocketchip-run-tests, constellation-run-tests, prepare-chipyard-fpga, # firesim-run-tests, fireboom-run-tests] diff --git a/.gitignore b/.gitignore index 9c73c6e1..ac8e84d0 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ project/metals.sbt project/project/ .ivy2 .sbt +.classpath_cache/ diff --git a/build.sbt b/build.sbt index 8160a4f9..6f72940a 100644 --- a/build.sbt +++ b/build.sbt @@ -4,14 +4,34 @@ import Tests._ // implicit one lazy val chipyardRoot = Project("chipyardRoot", file(".")) +// keep chisel/firrtl specific class files, rename other conflicts +val chiselFirrtlMergeStrategy = CustomMergeStrategy.rename { dep => + import sbtassembly.Assembly.{Project, Library} + val nm = dep match { + case p: Project => p.name + case l: Library => l.moduleCoord.name + } + if (Seq("firrtl", "chisel3").contains(nm.split("_")(0))) { // split by _ to avoid checking on major/minor version + dep.target + } else { + "renamed/" + dep.target + } +} + lazy val commonSettings = Seq( organization := "edu.berkeley.cs", version := "1.6", scalaVersion := "2.13.10", assembly / test := {}, - assembly / assemblyMergeStrategy := { _ match { - case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard - case _ => MergeStrategy.first}}, + assembly / assemblyMergeStrategy := { + case PathList("chisel3", "stage", xs @ _*) => chiselFirrtlMergeStrategy + case PathList("firrtl", "stage", xs @ _*) => chiselFirrtlMergeStrategy + // should be safe in JDK11: https://stackoverflow.com/questions/54834125/sbt-assembly-deduplicate-module-info-class + case x if x.endsWith("module-info.class") => MergeStrategy.discard + case x => + val oldStrategy = (assembly / assemblyMergeStrategy).value + oldStrategy(x) + }, scalacOptions ++= Seq( "-deprecation", "-unchecked", @@ -86,8 +106,6 @@ lazy val hardfloat = (project in rocketChipDir / "hardfloat") .settings(commonSettings) .settings( libraryDependencies ++= Seq( - "org.scala-lang" % "scala-reflect" % scalaVersion.value, - "org.json4s" %% "json4s-jackson" % "3.6.6", "org.scalatest" %% "scalatest" % "3.2.0" % "test" ) ) @@ -97,8 +115,6 @@ lazy val rocketMacros = (project in rocketChipDir / "macros") .settings( libraryDependencies ++= Seq( "org.scala-lang" % "scala-reflect" % scalaVersion.value, - "org.json4s" %% "json4s-jackson" % "3.6.6", - "org.scalatest" %% "scalatest" % "3.2.0" % "test" ) ) @@ -225,7 +241,6 @@ lazy val iocell = Project(id = "iocell", base = file("./tools/barstools/") / "sr lazy val tapeout = (project in file("./tools/barstools/")) .settings(chiselSettings) .settings(chiselTestSettings) - .enablePlugins(sbtassembly.AssemblyPlugin) .settings(commonSettings) lazy val dsptools = freshProject("dsptools", file("./tools/dsptools")) diff --git a/common.mk b/common.mk index 4501c20a..54f81cf6 100644 --- a/common.mk +++ b/common.mk @@ -16,7 +16,6 @@ HELP_COMPILATION_VARIABLES += \ " EXTRA_SIM_LDFLAGS = additional LDFLAGS for building simulators" \ " EXTRA_SIM_SOURCES = additional simulation sources needed for simulator" \ " EXTRA_SIM_REQS = additional make requirements to build the simulator" \ -" ENABLE_SBT_THIN_CLIENT = if set, use sbt's experimental thin client (works best when overridding SBT_BIN with the mainline sbt script)" \ " ENABLE_CUSTOM_FIRRTL_PASS = if set, enable custom firrtl passes (SFC lowers to LowFIRRTL & MFC converts to Verilog)" \ " ENABLE_YOSYS_FLOW = if set, add compilation flags to enable the vlsi flow for yosys(tutorial flow)" \ " EXTRA_CHISEL_OPTIONS = additional options to pass to the Chisel compiler" \ @@ -52,7 +51,6 @@ HELP_COMMANDS += \ " firrtl = generate intermediate firrtl files from chisel elaboration" \ " run-tests = run all assembly and benchmark tests" \ " launch-sbt = start sbt terminal" \ -" {shutdown,start}-sbt-server = shutdown or start sbt server if using ENABLE_SBT_THIN_CLIENT" \ " find-config-fragments = list all config. fragments" ######################################################################################### @@ -105,12 +103,24 @@ $(BOOTROM_TARGETS): $(build_dir)/bootrom.%.img: $(TESTCHIP_RSRCS_DIR)/testchipip cp -f $< $@ ######################################################################################### -# create firrtl file rule and variables +# compile scala jars +######################################################################################### +$(CHIPYARD_CLASSPATH_TARGETS) &: $(SCALA_SOURCES) $(SCALA_BUILDTOOL_DEPS) + mkdir -p $(dir $@) + $(call run_sbt_assembly,$(SBT_PROJECT),$(CHIPYARD_CLASSPATH)) + +# order only dependency between sbt runs needed to avoid concurrent sbt runs +$(TAPEOUT_CLASSPATH_TARGETS) &: $(SCALA_SOURCES) $(SCALA_BUILDTOOL_DEPS) | $(CHIPYARD_CLASSPATH_TARGETS) + mkdir -p $(dir $@) + $(call run_sbt_assembly,tapeout,$(TAPEOUT_CLASSPATH)) + +######################################################################################### +# verilog generation pipeline ######################################################################################### # AG: must re-elaborate if cva6 sources have changed... otherwise just run firrtl compile -$(FIRRTL_FILE) $(ANNO_FILE) $(CHISEL_LOG_FILE) &: $(SCALA_SOURCES) $(SCALA_BUILDTOOL_DEPS) $(EXTRA_GENERATOR_REQS) +$(FIRRTL_FILE) $(ANNO_FILE) $(CHISEL_LOG_FILE) &: $(CHIPYARD_CLASSPATH_TARGETS) $(EXTRA_GENERATOR_REQS) mkdir -p $(build_dir) - (set -o pipefail && $(call run_scala_main,$(SBT_PROJECT),$(GENERATOR_PACKAGE).Generator,\ + (set -o pipefail && $(call run_jar_scala_main,$(CHIPYARD_CLASSPATH),$(GENERATOR_PACKAGE).Generator,\ --target-dir $(build_dir) \ --name $(long_name) \ --top-module $(MODEL_PACKAGE).$(MODEL) \ @@ -195,9 +205,9 @@ endif if [ $(SFC_LEVEL) = none ]; then cat $(EXTRA_ANNO_FILE) > $(FINAL_ANNO_FILE); fi $(SFC_MFC_TARGETS) &: private TMP_DIR := $(shell mktemp -d -t cy-XXXXXXXX) -$(SFC_MFC_TARGETS) &: $(FIRRTL_FILE) $(FINAL_ANNO_FILE) $(SFC_LEVEL) $(EXTRA_FIRRTL_OPTIONS) +$(SFC_MFC_TARGETS) &: $(TAPEOUT_CLASSPATH_TARGETS) $(FIRRTL_FILE) $(FINAL_ANNO_FILE) $(SFC_LEVEL) $(EXTRA_FIRRTL_OPTIONS) rm -rf $(GEN_COLLATERAL_DIR) - $(call run_scala_main,tapeout,barstools.tapeout.transforms.GenerateModelStageMain,\ + $(call run_jar_scala_main,$(TAPEOUT_CLASSPATH),barstools.tapeout.transforms.GenerateModelStageMain,\ --no-dedup \ --output-file $(SFC_FIRRTL_BASENAME) \ --output-annotation-file $(SFC_ANNO_FILE) \ @@ -263,12 +273,12 @@ $(TOP_SMEMS_CONF) $(MODEL_SMEMS_CONF) &: $(MFC_SMEMS_CONF) $(MFC_MODEL_HRCHY_JS # This file is for simulation only. VLSI flows should replace this file with one containing hard SRAMs TOP_MACROCOMPILER_MODE ?= --mode synflops -$(TOP_SMEMS_FILE) $(TOP_SMEMS_FIR) &: $(TOP_SMEMS_CONF) - $(call run_scala_main,tapeout,barstools.macros.MacroCompiler,-n $(TOP_SMEMS_CONF) -v $(TOP_SMEMS_FILE) -f $(TOP_SMEMS_FIR) $(TOP_MACROCOMPILER_MODE)) +$(TOP_SMEMS_FILE) $(TOP_SMEMS_FIR) &: $(TAPEOUT_CLASSPATH_TARGETS) $(TOP_SMEMS_CONF) + $(call run_jar_scala_main,$(TAPEOUT_CLASSPATH),barstools.macros.MacroCompiler,-n $(TOP_SMEMS_CONF) -v $(TOP_SMEMS_FILE) -f $(TOP_SMEMS_FIR) $(TOP_MACROCOMPILER_MODE)) MODEL_MACROCOMPILER_MODE = --mode synflops -$(MODEL_SMEMS_FILE) $(MODEL_SMEMS_FIR) &: $(MODEL_SMEMS_CONF) | $(TOP_SMEMS_FILE) - $(call run_scala_main,tapeout,barstools.macros.MacroCompiler, -n $(MODEL_SMEMS_CONF) -v $(MODEL_SMEMS_FILE) -f $(MODEL_SMEMS_FIR) $(MODEL_MACROCOMPILER_MODE)) +$(MODEL_SMEMS_FILE) $(MODEL_SMEMS_FIR) &: $(TAPEOUT_CLASSPATH_TARGETS) $(MODEL_SMEMS_CONF) | $(TOP_SMEMS_FILE) + $(call run_jar_scala_main,$(TAPEOUT_CLASSPATH),barstools.macros.MacroCompiler, -n $(MODEL_SMEMS_CONF) -v $(MODEL_SMEMS_FILE) -f $(MODEL_SMEMS_FIR) $(MODEL_MACROCOMPILER_MODE)) ######################################################################################## # remove duplicate files and headers in list of simulation file inputs @@ -391,7 +401,6 @@ endif ####################################### # Rules for building DRAMSim2 library ####################################### - dramsim_dir = $(base_dir)/tools/DRAMSim2 dramsim_lib = $(dramsim_dir)/libdramsim.a @@ -399,27 +408,12 @@ $(dramsim_lib): $(MAKE) -C $(dramsim_dir) $(notdir $@) ################################################ -# Helper to run SBT or manage the SBT server +# Helper to run SBT ################################################ - SBT_COMMAND ?= shell .PHONY: launch-sbt launch-sbt: - cd $(base_dir) && $(SBT_NON_THIN) "$(SBT_COMMAND)" - -.PHONY: check-thin-client -check-thin-client: -ifeq (,$(ENABLE_SBT_THIN_CLIENT)) - $(error ENABLE_SBT_THIN_CLIENT not set.) -endif - -.PHONY: shutdown-sbt-server -shutdown-sbt-server: check-thin-client - cd $(base_dir) && $(SBT) "shutdown" - -.PHONY: start-sbt-server -start-sbt-server: check-thin-client - cd $(base_dir) && $(SBT) "exit" + cd $(base_dir) && $(SBT) "$(SBT_COMMAND)" ######################################################################################### # print help text (and other help) diff --git a/conda-reqs/chipyard.yaml b/conda-reqs/chipyard.yaml index d1d9eab9..d67f3452 100644 --- a/conda-reqs/chipyard.yaml +++ b/conda-reqs/chipyard.yaml @@ -93,7 +93,7 @@ dependencies: - 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 diff --git a/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml b/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml index 4899b455..d35ed064 100644 --- a/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml +++ b/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml @@ -7,9 +7,9 @@ # Install this environment as "YOURENV" with: # conda-lock install -n YOURENV --file conda-requirements-esp-tools-linux-64.conda-lock.yml # To update a single package to the latest version compatible with the version constraints in the source: -# conda-lock lock --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml --update PACKAGE +# conda-lock lock --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml --update PACKAGE # To re-solve the entire environment, e.g. after changing a version constraint in the source file: -# conda-lock -f /scratch/abejgonza/cy/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy/conda-reqs/esp-tools.yaml --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml +# conda-lock -f /scratch/abejgonza/cy/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy/conda-reqs/esp-tools.yaml -f /scratch/abejgonza/cy-check/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy-check/conda-reqs/esp-tools.yaml --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml metadata: channels: - url: ucb-bar @@ -21,12 +21,14 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: 86382a6fa6e58883c85e482f6c209ab347df1461d7c5706f28b95813412dfe94 + linux-64: 9600a29dfc36e0d5f74716881b8020b4deb08672489e89923b0036ca29e44589 platforms: - linux-64 sources: - /scratch/abejgonza/cy/conda-reqs/chipyard.yaml - /scratch/abejgonza/cy/conda-reqs/esp-tools.yaml + - /scratch/abejgonza/cy-check/conda-reqs/chipyard.yaml + - /scratch/abejgonza/cy-check/conda-reqs/esp-tools.yaml package: - category: main dependencies: {} @@ -234,14 +236,14 @@ package: dependencies: _sysroot_linux-64_curr_repodata_hack: 3.* hash: - md5: 523bc836a954faf0cca94831971bb85a - sha256: 67a3caa56e2a59f407f3d290437b865aaf996873006e2fcfca6295d0f0be8db9 + md5: 540e9f635ce30eb7fbf4488cfcf656bf + sha256: b0a77e609081d5a03327fd718c713fe83671043fdcd97f5983a1e956fe4d3052 manager: conda name: kernel-headers_linux-64 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/kernel-headers_linux-64-3.10.0-h4a8ded7_13.tar.bz2 - version: 3.10.0 + url: https://conda.anaconda.org/conda-forge/noarch/kernel-headers_linux-64-4.18.0-he073ed8_0.conda + version: 4.18.0 - category: main dependencies: libgfortran5: 12.2.0 h337968e_19 @@ -294,16 +296,16 @@ package: - category: main dependencies: _sysroot_linux-64_curr_repodata_hack: 3.* - kernel-headers_linux-64: 3.10.0 h4a8ded7_13 + kernel-headers_linux-64: 4.18.0 he073ed8_0 hash: - md5: 57e5a5191ffe999b9f4dfdbcd0ddcba4 - sha256: f09f2fea4b571dcd225f1e35bd3c851e809cd4c2f5f151438133969ab28478e5 + md5: f55932f8af2630b906d746c374028226 + sha256: cbcaffe5c8df0e0e3e3110582b666b154482a1517233836b3ec2b2aa122dd7fb manager: conda name: sysroot_linux-64 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/sysroot_linux-64-2.17-h4a8ded7_13.tar.bz2 - version: '2.17' + url: https://conda.anaconda.org/conda-forge/noarch/sysroot_linux-64-2.28-he073ed8_0.conda + version: '2.28' - category: main dependencies: ld_impl_linux-64: 2.40 h41732ed_0 @@ -334,14 +336,14 @@ package: dependencies: libgcc-ng: '>=12' hash: - md5: be733e69048951df1e4b4b7bb8c7666f - sha256: 2c0a618d0fa695e4e01a30e7ff31094be540c52e9085cbd724edb132c65cf9cd + md5: a0c6f0e7e1a467f5678f94dea18c8aa7 + sha256: f177627acdfcead15a28f4a07fcda6a1e26b83f053eaa1efa7cce01c0a3b09a8 manager: conda name: alsa-lib optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/alsa-lib-1.2.8-h166bdaf_0.tar.bz2 - version: 1.2.8 + url: https://conda.anaconda.org/conda-forge/linux-64/alsa-lib-1.2.9-hd590300_0.conda + version: 1.2.9 - category: main dependencies: libgcc-ng: '>=9.4.0' @@ -380,16 +382,16 @@ package: version: 1.0.8 - category: main dependencies: - libgcc-ng: '>=9.4.0' + libgcc-ng: '>=12' hash: - md5: f26ef8098fab1f719c91eb760d63381a - sha256: ee735e60d2cf68e5635df17847e97b505a752985d10581d2438203e7c0f44c15 + md5: e8c18d865be43e2fb3f7a145b6adf1f5 + sha256: c4276b1a0e8f18ab08018b1881666656742b325e0fcf2354f714e924d28683b6 manager: conda name: c-ares optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.18.1-h7f98852_0.tar.bz2 - version: 1.18.1 + url: https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.19.1-hd590300_0.conda + version: 1.19.1 - category: main dependencies: libgcc-ng: '>=12' @@ -420,6 +422,7 @@ package: libstdcxx-ng: '>=12' hash: md5: 6bfb79319763a11c7423c9d0e0ee00b7 + sha256: null manager: conda name: dromajo optional: false @@ -551,6 +554,19 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/lerc-4.0.0-h27087fc_0.tar.bz2 version: 4.0.0 +- category: main + dependencies: + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' + hash: + md5: f67106643beadfc737b94ca0bfd6d8e3 + sha256: 1778dc86603df24aaf6865f7f3e1ffc5c793a0f1fc4570add2a6ccb4c0a62785 + manager: conda + name: libabseil + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libabseil-20230125.2-cxx17_h59595ed_2.conda + version: '20230125.2' - category: main dependencies: libgcc-ng: '>=12' @@ -871,14 +887,14 @@ package: ca-certificates: '' libgcc-ng: '>=12' hash: - md5: 8f24d371ed9efb3f0b0de383fb81d51c - sha256: 24bf6cf8f741c28a8d10f51c917f378694d4a98a38ab4372629932cd6c94e9e8 + md5: 92c4e93948f2d7ba3e82ded3f6cbff31 + sha256: bf74edd02d7b17ac73c3055c974ca9039290e4a669a75d3bd50ce0a8a06cd557 manager: conda name: openssl optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.0-hd590300_3.conda - version: 3.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.1-hd590300_0.conda + version: 3.1.1 - category: main dependencies: libgcc-ng: '>=9.3.0' @@ -1001,16 +1017,16 @@ package: version: 1.0.10 - category: main dependencies: - libgcc-ng: '>=9.3.0' + libgcc-ng: '>=12' hash: - md5: bf6f803a544f26ebbdc3bfff272eb179 - sha256: 9e9b70c24527289ac7ae31925d1eb3b0c1e9a78cb7b8f58a3110cc8bbfe51c26 + md5: 2c80dc38fface310c9bd81b17037fee5 + sha256: 309751371d525ce50af7c87811b435c176915239fc9e132b99a25d5e1703f2d4 manager: conda name: xorg-libxau optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libxau-1.0.9-h7f98852_0.tar.bz2 - version: 1.0.9 + url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libxau-1.0.11-hd590300_0.conda + version: 1.0.11 - category: main dependencies: libgcc-ng: '>=9.3.0' @@ -1112,14 +1128,14 @@ package: libgcc-ng: '>=12' libiconv: '>=1.17,<2.0a0' hash: - md5: 3a04f6b950cc884a43c2b737a38da9bd - sha256: 43a2b08d6eed3263be63805edd720133eda2189e8c673238c37e407fa2b84f2e + md5: 1db01b49235f4ba44b9258798d42668d + sha256: b98495d98abe2a6b3023591a25974aab8c3dba43abf300dfc75f9c03c6a1c951 manager: conda name: diffutils optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/diffutils-3.9-h6c2ea63_0.conda - version: '3.9' + url: https://conda.anaconda.org/conda-forge/linux-64/diffutils-3.10-hf18258e_0.conda + version: '3.10' - category: main dependencies: libfdt: '>=1.6.1,<1.7.0a0' @@ -1329,31 +1345,32 @@ package: version: 1.6.39 - category: main dependencies: + libabseil: '>=20230125.2,<20230126.0a0' libgcc-ng: '>=12' libstdcxx-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: 4b36c68184c6c85d88c6e595a32a1ede - sha256: 760118d7879b5524e118db1c75cc2a5dfceb2c4940dcae94751a94786c8cf12b + md5: c98e8a14701ebb97b4b19f4cc4d07dee + sha256: 9950ff4734fc5f89818883f3861da9e1e0a2fdd215d679f3abca259471cab9e6 manager: conda name: libprotobuf optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libprotobuf-3.21.12-h3eb15da_0.conda - version: 3.21.12 + url: https://conda.anaconda.org/conda-forge/linux-64/libprotobuf-4.23.2-hd1fb520_1.conda + version: 4.23.2 - category: main dependencies: libgcc-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: 1d002bf709048f8021c32abfd0e0d395 - sha256: bb2a8ddb26e74f2cedc36825fc6f95d45f19e1912a1a6c75847952d92fc16215 + md5: fdaae20a1cf7cd62130a0973190a31b7 + sha256: 72e958870f49174ebc0ddcd4129e9a9f48de815f20aa3b553f136b514f29bb3a manager: conda name: libsqlite optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.41.2-h2797004_1.conda - version: 3.41.2 + url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.42.0-h2797004_0.conda + version: 3.42.0 - category: main dependencies: libgcc-ng: '>=12' @@ -1370,19 +1387,19 @@ package: version: 1.10.0 - category: main dependencies: - libgcc-ng: '>=9.4.0' + libgcc-ng: '>=12' pthread-stubs: '' xorg-libxau: '' xorg-libxdmcp: '' hash: - md5: b3653fdc58d03face9724f602218a904 - sha256: 8d5d24cbeda9282dd707edd3156e5fde2e3f3fe86c802fa7ce08c8f1e803bfd9 + md5: 33277193f5b92bad9fdd230eb700929c + sha256: a670902f0a3173a466c058d2ac22ca1dd0df0453d3a80e0212815c20a16b0485 manager: conda name: libxcb optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.13-h7f98852_1004.tar.bz2 - version: '1.13' + url: https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.15-h0b41bf4_0.conda + version: '1.15' - category: main dependencies: icu: '>=72.1,<73.0a0' @@ -1615,17 +1632,17 @@ package: - category: main dependencies: flex: '' - libgcc-ng: '>=9.4.0' - libstdcxx-ng: '>=9.4.0' + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' hash: - md5: c12b9a7d2289bce118c8322762836c97 - sha256: 4c593dccc8e53717225547c8961c5d0671d738c26702b91a228b43d44ff4e387 + md5: ac931227dce83e3303cfe3e606e87fa8 + sha256: d45803ee7834f71eb0656d74a58644390ef13365ff67f7716cc660309e46cfbd manager: conda name: bison optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/bison-3.8-h9c3ff4c_0.tar.bz2 - version: '3.8' + url: https://conda.anaconda.org/conda-forge/linux-64/bison-3.8.2-h59595ed_0.conda + version: 3.8.2 - category: main dependencies: libbrotlidec: 1.0.9 h166bdaf_8 @@ -1794,14 +1811,14 @@ package: libzlib: '>=1.2.13,<1.3.0a0' pcre2: '>=10.40,<10.41.0a0' hash: - md5: db1d4a1dfc04f3eab50d97551850759a - sha256: e0d54ffe98b7471cfc95f043bf3921412843c05ba5f1f10ceeac5edb328ac928 + md5: a64f11b244b2c112cd3fa1cbe9493999 + sha256: 6a34c6b123f06fcee7e28e981ec0daad09bce35616ad8e9e61ef84be7fad4d92 manager: conda name: libglib optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libglib-2.76.2-hebfc3b9_0.conda - version: 2.76.2 + url: https://conda.anaconda.org/conda-forge/linux-64/libglib-2.76.3-hebfc3b9_0.conda + version: 2.76.3 - category: main dependencies: libblas: 3.9.0 16_linux64_openblas @@ -1853,20 +1870,20 @@ package: - category: main dependencies: libgcc-ng: '>=12' - libprotobuf: '>=3.21.9,<3.22.0a0' + libprotobuf: '>=4.23.2,<4.23.3.0a0' libstdcxx-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' ncurses: '>=6.3,<7.0a0' - openssl: '>=3.0.7,<4.0a0' + openssl: '>=3.1.0,<4.0a0' perl: '>=5.32.1,<5.33.0a0 *_perl5' hash: - md5: c660c643ea8a05e4bce078d6486d04fd - sha256: c1d3f6053f3983229ffd362ef6192f148f80ccac0d287429756017a98deaac01 + md5: 2cf0c4f7a0a46c75e27735d16fab1501 + sha256: 412157ab852270658e1b96e6f66e00f8ca7039ea8d4ae24090b1d3f726fadfac manager: conda name: mosh optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/mosh-1.4.0-pl5321h9ed9655_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/mosh-1.4.0-pl5321h4605741_1.conda version: 1.4.0 - category: main dependencies: @@ -1929,19 +1946,19 @@ package: - category: main dependencies: libgcc-ng: '>=12' - libsqlite: 3.41.2 h2797004_1 + libsqlite: 3.42.0 h2797004_0 libzlib: '>=1.2.13,<1.3.0a0' ncurses: '>=6.3,<7.0a0' readline: '>=8.2,<9.0a0' hash: - md5: c8771266cc289756099c04e597209862 - sha256: 2674e5b0888799ad055bdbc79e2257d67f52b0c11f4c174d4deff4b69874cf45 + md5: 1192f6ec654a5bc4ee1d64bdc4a3e5cc + sha256: 9cf59fa9891248e0e3a86a41041156cec367653d423e5d8a09b4c8ab98441a27 manager: conda name: sqlite optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.41.2-h2c6b66d_1.conda - version: 3.41.2 + url: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.42.0-h2c6b66d_0.conda + version: 3.42.0 - category: main dependencies: libgcc-ng: '>=9.4.0' @@ -1961,18 +1978,18 @@ package: - category: main dependencies: libgcc-ng: '>=12' - libxcb: '>=1.13,<1.14.0a0' + libxcb: '>=1.15,<1.16.0a0' xorg-kbproto: '' xorg-xextproto: '>=7.3.0,<8.0a0' xorg-xproto: '' hash: - md5: ea8fbfeb976ac49cbeb594e985393514 - sha256: 3c6862a01a39cdea3870b132706ad7256824299947a3a94ae361d863d402d704 + md5: 52d09ea80a42c0466214609ef0a2d62d + sha256: 26e5c72def9f1b191afea84aa2d09622d34b2f547a446eac201ecf894521e5ee manager: conda name: xorg-libx11 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.8.4-h0b41bf4_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.8.4-h8ee46fc_1.conda version: 1.8.4 - category: main dependencies: @@ -2222,6 +2239,7 @@ package: python_abi: 3.9.* *_cp39 hash: md5: ae197de48b202c65efd7a61135ac0ae5 + sha256: null manager: conda name: esp-tools optional: false @@ -2499,13 +2517,13 @@ package: libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: 205aca93c1bc4a0bc663dd787c224025 - sha256: 66e0e925088acbc1306c814ca8441e61dd2f2a2ff93ff752b914939b87864d24 + md5: e3a70b7bde225412a04c681f5aa094f5 + sha256: 925c2e940a74cdda141b350ee6f6d7dfe5783c1f7575bd95649117c1841908e2 manager: conda name: libclang-cpp16 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp16-16.0.3-default_h83cc7fd_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp16-16.0.3-default_h1cdf331_2.conda version: 16.0.3 - category: main dependencies: @@ -2513,13 +2531,13 @@ package: libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: e0f95087543b73c7bc2689f0aeb86a6d - sha256: 40c7a6ebfe181b3683fa4c0a378ff25eca1a77d68c35578b9c237dd58c4d458d + md5: 2dd726d3664b57ff32e4ef1965774c02 + sha256: b79181e5d1e3cd80ce5cbc0d0098621413e24c37437e8906b5bca1c398a5ce34 manager: conda name: libclang13 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libclang13-16.0.3-default_hd781213_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libclang13-16.0.3-default_h4d60ac6_2.conda version: 16.0.3 - category: main dependencies: @@ -3177,14 +3195,14 @@ package: python: '>=3.9,<3.10.0a0' python_abi: 3.9.* *_cp39 hash: - md5: c69c42faf110456735b6147190d5f12f - sha256: ef9b63cb061b8dcc2eb4b2f11440f91ca9330d09aa6914325b5160d22d968e1c + md5: da334eecb1ea2248e28294c49e6f6d89 + sha256: b824e8b396eedbb6e0dfe6311b37d43f62a5aaa8eeb6d2015e9e565c86f78874 manager: conda name: tornado optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/tornado-6.3-py39h72bdee0_0.conda - version: '6.3' + url: https://conda.anaconda.org/conda-forge/linux-64/tornado-6.3.2-py39hd1e30aa_0.conda + version: 6.3.2 - category: main dependencies: python: '>=3.6' @@ -3201,38 +3219,38 @@ package: dependencies: python: '>=3.6' hash: - md5: 0c0c5edec27d8284bf75023737f74823 - sha256: 10290d04934693214ea9a3caaefac35c3fdfc72094ffa8b0f063141bef469bbe + md5: 21ab63073cea60bc584a889ae8d765d8 + sha256: ee1fa0049b7c30507beb33b796df3bcd06f54b8f536cc1f69d5bec7088c200f4 manager: conda name: types-pyyaml optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-pyyaml-6.0.12.9-pyhd8ed1ab_0.conda - version: 6.0.12.9 + url: https://conda.anaconda.org/conda-forge/noarch/types-pyyaml-6.0.12.10-pyhd8ed1ab_0.conda + version: 6.0.12.10 - category: main dependencies: python: '>=3.6' hash: - md5: 8b7a7a28f8a274b98f0387c13c56c94c - sha256: e07d313a9c7aa2dfe425ca5a3bdc65cd015a8819cda8e576edb3b3a47535da1a + md5: 9a73576dfe2f764c431347b9dc35a3fc + sha256: 3e3ce73fc2575ab94a41232c8241ad20b564dbb6d0f832b9aa5df65799fc1361 manager: conda name: types-urllib3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-urllib3-1.26.25.12-pyhd8ed1ab_0.conda - version: 1.26.25.12 + url: https://conda.anaconda.org/conda-forge/noarch/types-urllib3-1.26.25.13-pyhd8ed1ab_0.conda + version: 1.26.25.13 - category: main dependencies: python: '>=3.7' hash: - md5: 43e7d9e50261fb11deb76e17d8431aac - sha256: f81eee64fcdfb379e27d01773b34041fbf7f9e86f33b157c9925d19e0a442452 + md5: 5a4a270e5a3f93846d6bade2f71fa440 + sha256: 8af96d7b665daabe3e60fa9c7457986237db1ad54469b01af3f4736bc18be284 manager: conda name: typing_extensions optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda - version: 4.5.0 + url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.6.2-pyha770c72_0.conda + version: 4.6.2 - category: main dependencies: libgcc-ng: '>=12' @@ -3282,14 +3300,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 2a914654b9ade742049dab13e29571c6 - sha256: 7a2c359d12a13e505b74cd82686f98379113c9b4be01f6685167ba137b286127 + md5: bfe7e7cd1476092f51efbcde15dfb110 + sha256: 85310b382c4220d7846fa8f046216fd722b88db07991f07bd7decdf2e5dc3446 manager: conda name: websocket-client optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.5.1-pyhd8ed1ab_0.conda - version: 1.5.1 + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.5.2-pyhd8ed1ab_0.conda + version: 1.5.2 - category: main dependencies: python: '>=3.7' @@ -3372,21 +3390,21 @@ package: version: 0.9.10 - category: main dependencies: - libgcc-ng: '>=9.3.0' + libgcc-ng: '>=12' xorg-kbproto: '' xorg-libice: 1.0.* xorg-libsm: 1.2.* - xorg-libx11: '>=1.7.0,<2.0a0' + xorg-libx11: '>=1.8.4,<2.0a0' xorg-xproto: '' hash: - md5: 60d6eec5273f1c9af096c10c268912e3 - sha256: 25bfc4d86df3498b88aac2f02ecf65e739bf99a687805c31a635df6f2e60a163 + md5: ab2044e8d87dda9f74652e8e084a5569 + sha256: fbceccea26f81d557ac93ca08afa95b3638f713c43deb468488013218be11fed manager: conda name: xorg-libxt optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libxt-1.2.1-h7f98852_2.tar.bz2 - version: 1.2.1 + url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libxt-1.3.0-hd590300_0.conda + version: 1.3.0 - category: main dependencies: python: '>=3.7' @@ -3432,9 +3450,9 @@ package: freetype: '>=2.12.1,<3.0a0' icu: '>=72.1,<73.0a0' libgcc-ng: '>=12' - libglib: '>=2.74.1,<3.0a0' + libglib: '>=2.76.2,<3.0a0' libpng: '>=1.6.39,<1.7.0a0' - libxcb: '>=1.13,<1.14.0a0' + libxcb: '>=1.15,<1.16.0a0' libzlib: '>=1.2.13,<1.3.0a0' pixman: '>=0.40.0,<1.0a0' xorg-libice: '' @@ -3444,13 +3462,13 @@ package: xorg-libxrender: '' zlib: '' hash: - md5: 0c944213e40c9e4aa32292776b9c6903 - sha256: 0be3064cb30e3e69a47370abae85b2780cd81fbca00cbd17076d40c0f6302fdb + md5: c1dd96500b9b1a75e9e511931f415cbc + sha256: 1fffecc684c26e0f1aed6d9857ad0f2abfe3a849977f718ad82366c68c7a9a36 manager: conda name: cairo optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-h35add3b_1015.conda + url: https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-hbbf8b49_1016.conda version: 1.16.0 - category: main dependencies: @@ -3475,13 +3493,13 @@ package: libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: 14a18f87f492a905cee3d833eae4e86b - sha256: 0896316dbdcd3dca118c61127b2d79cc0c0bdb08f869cff9f35fe2c5a4673555 + md5: 738a21e17b4d9d846cf96503810c9b45 + sha256: 2d0c4ecdf647bf0bf3602495f0a3b85aa1985d0027cc787aa43e0c810ebbc704 manager: conda name: clang-format-16 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-16-16.0.3-default_h83cc7fd_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-16-16.0.3-default_h1cdf331_2.conda version: 16.0.3 - category: main dependencies: @@ -3612,14 +3630,14 @@ package: python_abi: 3.9.* *_cp39 unicodedata2: '>=14.0.0' hash: - md5: 9232b3b2cc83a304c8210a092e8ba4a5 - sha256: 08b6feeebcdd6ccb61cdb794eec806be7765dc4d601d4ec051aea721fa439aa4 + md5: 80605b792f58cf5c78a5b7e20cef1e35 + sha256: a7e7256d309fa6561e28aedaaabafceb7b3c04a6261fa3fc9cd7aac4e89df823 manager: conda name: fonttools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.3-py39h72bdee0_0.conda - version: 4.39.3 + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.4-py39hd1e30aa_0.conda + version: 4.39.4 - category: main dependencies: python: '>=3.4' @@ -3787,27 +3805,27 @@ package: tomli: '>=1.1.0' typing_extensions: '>=3.10' hash: - md5: 340cfe1633c018c5abf0099d7c307ab4 - sha256: 682fd2b43cf9bb66813d44b70535684670c33ca4a44e6c0e76540c496cb632c5 + md5: 752593aa8094de1c8606411d13d003fb + sha256: 973ade2e49e9bc73b2364322506c5cc39320037ac416f45b133801bc2706446a manager: conda name: mypy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/mypy-1.2.0-py39h72bdee0_0.conda - version: 1.2.0 + url: https://conda.anaconda.org/conda-forge/linux-64/mypy-1.3.0-py39hd1e30aa_0.conda + version: 1.3.0 - category: main dependencies: python: 2.7|>=3.7 setuptools: '' hash: - md5: fbe1182f650c04513046d6894046cd6c - sha256: 8f5afb243a9dd4ba6961eacc7d3c3da104cdc30162de863164b09f8920493d46 + md5: 2a75b296096adabbabadd5e9782e5fcc + sha256: 1320306234552717149f36f825ddc7e27ea295f24829e9db4cc6ceaff0b032bd manager: conda name: nodeenv optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2 - version: 1.7.0 + url: https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.8.0-pyhd8ed1ab_0.conda + version: 1.8.0 - category: main dependencies: freetype: '>=2.12.1,<3.0a0' @@ -3816,20 +3834,20 @@ package: libjpeg-turbo: '>=2.1.5.1,<3.0a0' libtiff: '>=4.5.0,<4.6.0a0' libwebp-base: '>=1.3.0,<2.0a0' - libxcb: '>=1.13,<1.14.0a0' + libxcb: '>=1.15,<1.16.0a0' libzlib: '>=1.2.13,<1.3.0a0' openjpeg: '>=2.5.0,<3.0a0' python: '>=3.9,<3.10.0a0' python_abi: 3.9.* *_cp39 tk: '>=8.6.12,<8.7.0a0' hash: - md5: 7882f5dfc152b021e5cb98e2d01507f8 - sha256: 82a2926a9a39e72291e134778fb3da7371efcb67437897fd474aaad03d6db609 + md5: d7aa9b99ed6ade75fbab1e4cedcb3ce2 + sha256: 3cb87b24c89cd4fdb0c448982e6d37d6974332160f7576c1a99d0eb59f537444 manager: conda name: pillow optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pillow-9.5.0-py39h7207d5c_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pillow-9.5.0-py39haaeba84_1.conda version: 9.5.0 - category: main dependencies: @@ -3898,14 +3916,14 @@ package: ruamel.yaml.clib: '>=0.1.2' setuptools: '' hash: - md5: 522b3d9f069af18d947bd43b57817ba0 - sha256: f1deff6ee893729e4c1b1005a60fea55907bbdbca2d3c88263ac65ff3ea25c55 + md5: 99d3123139dac00986b67b7f1060069d + sha256: 4dcd786d84f2ab6bec1b7758c00628cedc754874d338c4fd2f5f0707700a3497 manager: conda name: ruamel.yaml optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml-0.17.25-py39hd1e30aa_0.conda - version: 0.17.25 + url: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml-0.17.30-py39hd1e30aa_0.conda + version: 0.17.30 - category: main dependencies: colorama: '' @@ -3924,26 +3942,26 @@ package: python: '>=3.6' types-urllib3: <1.27 hash: - md5: 1ab2e9a47f24fac257f88956828f1956 - sha256: 19d2affb4d3fab4d1d60eb3748b2d80b9ff2983c9b196e74aae7a0dc03fe74d8 + md5: d4edae6cf0af5332243c2d995f5e8745 + sha256: c417ed8470ad4f5b7189ba3496ce5b5973d7767e64723b5c3d4c7d436d64ced9 manager: conda name: types-requests optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-requests-2.30.0.0-pyhd8ed1ab_0.conda - version: 2.30.0.0 + url: https://conda.anaconda.org/conda-forge/noarch/types-requests-2.31.0.1-pyhd8ed1ab_0.conda + version: 2.31.0.1 - category: main dependencies: - typing_extensions: 4.5.0 pyha770c72_0 + typing_extensions: 4.6.2 pyha770c72_0 hash: - md5: b3c594fde1a80a1fc3eb9cc4a5dfe392 - sha256: 6da5e15fa533620ae2e7aca9a7d16013eed3a73ac64c47d7c3bf3deec39b63b9 + md5: f676553904bb8f7c1dfe71c9db0d9ba7 + sha256: 5c6dcf5ff0d6be8a15d6bf5297867d9cb0154b6b946e8c87f69becf8a356e71b manager: conda name: typing-extensions optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda - version: 4.5.0 + url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.6.2-hd8ed1ab_0.conda + version: 4.6.2 - category: main dependencies: gettext: '>=0.21.1,<1.0a0' @@ -4001,14 +4019,14 @@ package: python: '>=3.9,<3.10.0a0' python_abi: 3.9.* *_cp39 hash: - md5: 38cd0735b2002777c765fa5b7f4217b5 - sha256: d9e48f222156d21817588a853efa63e84d5f2c5dedfb00df73a53857ef12ec26 + md5: 453d1199297e5ac3f6b70bd92f0bb000 + sha256: 051f6c6e556ece9587342cf951ee64c2e605abf1d4753c2c1f4a84352727a0d0 manager: conda name: yarl optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/yarl-1.9.1-py39hd1e30aa_0.conda - version: 1.9.1 + url: https://conda.anaconda.org/conda-forge/linux-64/yarl-1.9.2-py39hd1e30aa_0.conda + version: 1.9.2 - category: main dependencies: python: '>=3.6' @@ -4056,36 +4074,36 @@ package: version: 0.7.0 - category: main dependencies: - clang-format-16: 16.0.3 default_h83cc7fd_0 + clang-format-16: 16.0.3 default_h1cdf331_2 libclang-cpp16: '>=16.0.3,<16.1.0a0' libgcc-ng: '>=12' libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: a1f13606e670bdaaee724536218f5c40 - sha256: 5eb61124b6f96015aee46217f081953cb4efee9f9d39ac7c98e76d734f384693 + md5: c15e6c12bbd093170f1dab9d1ee922a8 + sha256: fe8d04e73e28a844e3513b214ca83a218d6d7115b1a86d5dfe1eb4e80e4bd15a manager: conda name: clang-format optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-16.0.3-default_h83cc7fd_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-16.0.3-default_h1cdf331_2.conda version: 16.0.3 - category: main dependencies: cffi: '>=1.12' libgcc-ng: '>=12' - openssl: '>=3.1.0,<4.0a0' + openssl: '>=3.1.1,<4.0a0' python: '>=3.9,<3.10.0a0' python_abi: 3.9.* *_cp39 hash: - md5: ad5cb1777ae6847c4d60199fa90a674c - sha256: 379f168a099aa47dbe38261fbebca0dd39e422ac0666468dc81b5e32c326503e + md5: 705a4718d0f0f2dacf10416f7277f199 + sha256: a7725f6340162efacf5bb5b871e89723847af21dfe375a05122f5f7b05f2c3e4 manager: conda name: cryptography optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-40.0.2-py39h079d5ae_0.conda - version: 40.0.2 + url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-41.0.0-py39hd4f0224_0.conda + version: 41.0.0 - category: main dependencies: cloudpickle: '' @@ -4159,17 +4177,17 @@ package: graphite2: '' icu: '>=72.1,<73.0a0' libgcc-ng: '>=12' - libglib: '>=2.74.1,<3.0a0' + libglib: '>=2.76.2,<3.0a0' libstdcxx-ng: '>=12' hash: - md5: 73d2c2d25fdcec40c24929bab9f44831 - sha256: d4bf8a3e23478efefe39ac2d965f44b55cee4058277f2ad7478384e7973fc97f + md5: 765bc76c0dfaf24ff9d8a2935b2510df + sha256: 9d99416e9d4a01ea0915f65ea7fac71dee11916de115fbd0325c0cb82e0b63f8 manager: conda name: harfbuzz optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-6.0.0-h3ff4399_1.conda - version: 6.0.0 + url: https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-7.3.0-hdb3a94d_0.conda + version: 7.3.0 - category: main dependencies: importlib_resources: '>=5.12.0,<5.12.1.0a0' @@ -4219,6 +4237,7 @@ package: libzlib: '>=1.2.12,<1.3.0a0' hash: md5: 5b3ed39ee3809d63d347b649de0a45f8 + sha256: null manager: conda name: libdwarf optional: false @@ -4236,14 +4255,14 @@ package: python_abi: 3.9.* *_cp39 pytz: '>=2020.1' hash: - md5: 85bc4d45cd98f84af0c00435fff23f67 - sha256: 49c114195ed92a7e36244259f747c87a42382629548ce40e6d9ea5b3e5570840 + md5: de99b3f807c0b295a7df94623df0fb4c + sha256: 234e0474b55edc7159ddbdf03c99a9d9f53a0b32d9c505dc4be85698bab9bd6b manager: conda name: pandas optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.0.1-py39h40cae4c_1.conda - version: 2.0.1 + url: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.0.2-py39h40cae4c_0.conda + version: 2.0.2 - category: main dependencies: pip: '' @@ -4262,14 +4281,14 @@ package: python: '>=3.7' typing-extensions: '>=4.5' hash: - md5: 6c36f1c42dd0069b7f23acc74f19be46 - sha256: e6d247b9a645ac6a2e4909cbe9cfad5cf9ba1a2f4352fee7aac3acb640371a54 + md5: e2be672aece1f060adf7154f76531a35 + sha256: d7845c01a9ee5a224cc9242782befed7d12dc6aac1103650ec87917b20f3579e manager: conda name: platformdirs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.5.0-pyhd8ed1ab_0.conda - version: 3.5.0 + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.5.1-pyhd8ed1ab_0.conda + version: 3.5.1 - category: main dependencies: libgcc-ng: '>=12' @@ -4277,14 +4296,14 @@ package: python_abi: 3.9.* *_cp39 typing-extensions: '>=4.2.0' hash: - md5: d189943289498d75a39922d5b25bd77e - sha256: 401a02c0fcecd4ad2eaafa8f69eabef4873bec09963c277c0473596f8c3cae46 + md5: 0b010892a3a2515a50f5f166543faa60 + sha256: 0e914ff39c85afa91528900819f5fd9b39804db7518ee6297b59527e820e4090 manager: conda name: pydantic optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-1.10.7-py39h72bdee0_0.conda - version: 1.10.7 + url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-1.10.8-py39hd1e30aa_0.conda + version: 1.10.8 - category: main dependencies: cffi: '>=1.4.1' @@ -4326,14 +4345,14 @@ package: pip: '' python: '>=3.7,<4.0' hash: - md5: 8462b4f53fa7d7dc057a26d589ec71de - sha256: dc2928817ff89e3628f82f3cedd4369c84d7079d04493b33dc67e4288d1de35d + md5: 82e8ad8e403f7183c54806064eaad6f0 + sha256: 558698d3bf59058578c3b7919d8f92a678ece0da20332970b58fa29e666c4684 manager: conda name: types-awscrt optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.17-pyhd8ed1ab_0.conda - version: 0.16.17 + url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.18-pyhd8ed1ab_0.conda + version: 0.16.18 - category: main dependencies: cffi: '' @@ -4410,44 +4429,44 @@ package: types-awscrt: '' typing_extensions: '' hash: - md5: 01961f718d29cabd188e863a61d8fd81 - sha256: 1fc8f40eb33d7e38590d88d847fb39329628c31269c8a2e5aaab7d51cc5b501f + md5: 02c4d0596fd90242135cbd533368f723 + sha256: eaa094606d1dd54579fd78299d39b185e80d0c91c031915eeaeae963aa5d271c manager: conda name: botocore-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.129-pyhd8ed1ab_0.conda - version: 1.29.129 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.141-pyhd8ed1ab_0.conda + version: 1.29.141 - category: main dependencies: - clang-format: 16.0.3 default_h83cc7fd_0 + clang-format: 16.0.3 default_h1cdf331_2 libclang-cpp16: '>=16.0.3,<16.1.0a0' libclang13: '>=16.0.3' libgcc-ng: '>=12' libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: ceedc73b354682b0d63d61d654ebcd33 - sha256: b5ea9bef3e3316c34bfbde0a3a50cb53a2bf2db89221c9b145d37fc1e5c89576 + md5: 8910812419605001db20734aad191191 + sha256: 236cd870e4a155d323202961cbcf13b1de84a86dde4ef6bf160b7e05b699b9d8 manager: conda name: clang-tools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/clang-tools-16.0.3-default_h83cc7fd_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/clang-tools-16.0.3-default_h1cdf331_2.conda version: 16.0.3 - category: main dependencies: python: '>=3.7' zstandard: '>=0.15' hash: - md5: 1a2fa9e53cfbc2e4d9ab21990805a436 - sha256: 48cde99cc0abe5e50fb00713710851db9f76812a644892a9a2b5cbf9fe9707f5 + md5: ebe3230a4c1e135954eee4fb6ef8cded + sha256: a437007aa798f6d1c9f079f4dbb2a38685ac306d5a5ce3d1ee797c2de9f7d6e9 manager: conda name: conda-package-streaming optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/conda-package-streaming-0.7.0-pyhd8ed1ab_1.conda - version: 0.7.0 + url: https://conda.anaconda.org/conda-forge/noarch/conda-package-streaming-0.8.0-pyhd8ed1ab_0.conda + version: 0.8.0 - category: main dependencies: flask: '>=0.9' @@ -4496,6 +4515,7 @@ package: libzlib: '>=1.2.12,<1.3.0a0' hash: md5: 899c511688e6c41cb51c2921a8d25e63 + sha256: null manager: conda name: libdwarf-dev optional: false @@ -4545,12 +4565,12 @@ package: version: 0.2.3 - category: main dependencies: - alsa-lib: '>=1.2.8,<1.2.9.0a0' + alsa-lib: '>=1.2.9,<1.2.10.0a0' fontconfig: '>=2.14.2,<3.0a0' fonts-conda-ecosystem: '' freetype: '>=2.12.1,<3.0a0' giflib: '>=5.2.1,<5.3.0a0' - harfbuzz: '>=6.0.0,<7.0a0' + harfbuzz: '>=7.3.0,<8.0a0' lcms2: '>=2.15,<3.0a0' libcups: '>=2.3.3,<2.4.0a0' libgcc-ng: '>=12' @@ -4564,13 +4584,13 @@ package: xorg-libxrender: '' xorg-libxtst: '' hash: - md5: 33527b036cd6d369be12fd772cdd49e4 - sha256: 221de13214f051654177dd331c019a889ab1bbe3b2cf30d5cf17596378740359 + md5: 0e10da8ba3087130edd8a91fd2a7140f + sha256: 1b403f59ee32bbe3d38342559c35679d4fc29391d4d4ef17039f4c7f505e9fb1 manager: conda name: openjdk optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/openjdk-17.0.3-h4335b31_6.conda + url: https://conda.anaconda.org/conda-forge/linux-64/openjdk-17.0.3-h8e330f5_8.conda version: 17.0.3 - category: main dependencies: @@ -4579,18 +4599,18 @@ package: fonts-conda-ecosystem: '' freetype: '>=2.12.1,<3.0a0' fribidi: '>=1.0.10,<2.0a0' - harfbuzz: '>=6.0.0,<7.0a0' + harfbuzz: '>=7.1.0,<8.0a0' libgcc-ng: '>=12' - libglib: '>=2.74.1,<3.0a0' + libglib: '>=2.76.1,<3.0a0' libpng: '>=1.6.39,<1.7.0a0' hash: - md5: a8b9e35dd7be2c945b0de4fe19a7c3a9 - sha256: 80648fb4691839a81f83fe55f4353357d198cd75e61dbb61b815e39d577e87d2 + md5: cde553e0e32389e26595db4eacf859eb + sha256: 3bb7cf6e826fa6d867318ba4866470b02d2efcc1dcd6b8b6307afaa8ac21aff4 manager: conda name: pango optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pango-1.50.14-hd33c08f_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pango-1.50.14-heaa33ce_1.conda version: 1.50.14 - category: main dependencies: @@ -4599,27 +4619,28 @@ package: pynacl: '>=1.5' python: '>=3.6' hash: - md5: 748d328d93daa18c35220e251b610b25 - sha256: 35d35d9eea83058068d23213976d3d990a87692cd0fb52104c8cd7eedda5b555 + md5: f212c7eb95e909df4795297f73690993 + sha256: e425a03e5e2ef2ec5a78711686c59cfceeeeec3a98165fbc7d186bd6a5cb78de manager: conda name: paramiko optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/paramiko-3.1.0-pyhd8ed1ab_0.conda - version: 3.1.0 + url: https://conda.anaconda.org/conda-forge/noarch/paramiko-3.2.0-pyhd8ed1ab_0.conda + version: 3.2.0 - category: main dependencies: - cryptography: '>=38.0.0,<41' - python: '>=3.6' + cryptography: '>=3.3' + python: '>=2.7' + six: '>=1.5.2' hash: - md5: 0b34aa3ab7e7ccb1765a03dd9ed29938 - sha256: 458428cb867f70f2af2a4ed59d382291ea3eb3f10490196070a15d1d71d5432a + md5: 8c49efecb7dca466e18b06015e8c88ce + sha256: c9bb8059b6de4acfde65cc39e0d04127e82c496023223fe92c05d8b9a06f9cc8 manager: conda name: pyopenssl optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pyopenssl-23.1.1-pyhd8ed1ab_0.conda - version: 23.1.1 + url: https://conda.anaconda.org/conda-forge/noarch/pyopenssl-21.0.0-pyhd8ed1ab_0.tar.bz2 + version: 21.0.0 - category: main dependencies: pytest: '>=3.6.0' @@ -4827,14 +4848,14 @@ package: pyyaml: '>=5.1' virtualenv: '>=20.10.0' hash: - md5: c3ad8d291556452edb6c301c91f330ed - sha256: db90abf2c06c8bace41c491e2af445d06178fa8c9111e0e2ae4738866cb929ef + md5: dbb0111b18ea5c9983fb8db0aef6000b + sha256: a55d8a19bb00c2c5bf8a074c94d5ac1ffed8d63c53c9df4cee76f3764ad7a304 manager: conda name: pre-commit optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.3.1-pyha770c72_0.conda - version: 3.3.1 + url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.3.2-pyha770c72_0.conda + version: 3.3.2 - category: main dependencies: __unix: '' @@ -4873,14 +4894,14 @@ package: python-dateutil: '>=2.1,<3.0.0' urllib3: '>=1.25.4,<1.27' hash: - md5: 7da51e7dabbb80ebe3064e9343e8e818 - sha256: 1806dfc46c9f4b51ff56575025e7e5491ee630a6be5997dd1536009585da4c4c + md5: a5c15ea2e1c6558ac0f15429bb774084 + sha256: 1534363d9da1cf7ee28fcd9883b02ef9b548e7e325261e602d06cb43be773dd3 manager: conda name: botocore optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.131-pyhd8ed1ab_0.conda - version: 1.29.131 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.142-pyhd8ed1ab_0.conda + version: 1.29.142 - category: main dependencies: cairo: '>=1.16.0,<2.0a0' @@ -4917,16 +4938,16 @@ package: charset-normalizer: '>=2,<4' idna: '>=2.5,<4' python: '>=3.7' - urllib3: '>=1.21.1,<1.27' + urllib3: '>=1.21.1,<3' hash: - md5: 5fa992d972fbccfc069161805122cb8d - sha256: bd06a6603104050fc9c4fd9bf3de7b28bbb6b9ce4b33130519d8611488213f67 + md5: a30144e4156cdbb236f99ebb49828f8b + sha256: 9f629d6fd3c8ac5f2a198639fe7af87c4db2ac9235279164bfe0fcb49d8c4bad manager: conda name: requests optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/requests-2.29.0-pyhd8ed1ab_0.conda - version: 2.29.0 + url: https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda + version: 2.31.0 - category: main dependencies: botocore: '>=1.11.3' @@ -5112,7 +5133,7 @@ package: version: 5.1.1 - category: main dependencies: - botocore: 1.29.131 + botocore: 1.29.142 colorama: '>=0.2.5,<0.4.5' docutils: '>=0.10,<0.17' python: '>=3.9,<3.10.0a0' @@ -5121,29 +5142,29 @@ package: rsa: '>=3.1.2,<4.8' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: 06f90a852ccad1f28aefe0216299b50a - sha256: e26260e3439d5a1b350fe9b244230c0ed2356a4ee873ddbb59a1f2cfa839b627 + md5: 9dab1670819ad5d8e393e75f349bf523 + sha256: 49f4b45526276cf994af5186cec4eb02dd84a58bfa9c35451c30b6a7cbe22a69 manager: conda name: awscli optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.131-py39hf3d152e_0.conda - version: 1.27.131 + url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.142-py39hf3d152e_0.conda + version: 1.27.142 - category: main dependencies: - botocore: '>=1.29.131,<1.30.0' + botocore: '>=1.29.142,<1.30.0' jmespath: '>=0.7.1,<2.0.0' python: '>=3.7' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: f51fe6d09662dc8ec9672be8567b7430 - sha256: 888fa362ba6db8b881a200539c1cc4379379ec1937168e5e475245fa1a3544c7 + md5: 7183f27eb377ee481de34fbcfa40b67e + sha256: fd2fb41bcec9bd6b70d367d4d83c4fed054ee4c6853c422b67e55ea5cf233c86 manager: conda name: boto3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.131-pyhd8ed1ab_0.conda - version: 1.26.131 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.142-pyhd8ed1ab_0.conda + version: 1.26.142 - category: main dependencies: cachecontrol: 0.12.11 pyhd8ed1ab_1 @@ -5269,14 +5290,14 @@ package: python: '' typing_extensions: '' hash: - md5: da03042814034e36f0938058b7b218fb - sha256: d18385d39e4af117b99cbd931cb68cbd33582949a837ae4e6453964ecc64d80a + md5: e4035713762b745fe7521141eef9cbec + sha256: d0f14dcdaf50e693a5a3422945cf034587b9c19e0b41ef04a8525b3f5418e737 manager: conda name: boto3-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.130-pyhd8ed1ab_0.conda - version: 1.26.130 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.143-pyhd8ed1ab_0.conda + version: 1.26.143 - category: main dependencies: cachecontrol-with-filecache: '>=0.12.9' @@ -5331,14 +5352,14 @@ package: python: '>=3.6' typing-extensions: '' hash: - md5: 35a0dc87b7ff0abd9e3012bea164f439 - sha256: 706be4a8f070af47d29e18315c3053977315c1c58479ecfebb2443d3a72edf87 + md5: 2f58c5525f108a1525553e081c90f815 + sha256: 66d980a4aa02be974410c64d0631ea54d26e538f49300ac5e3b46d44a4acec78 manager: conda name: mypy_boto3_ec2 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.129-pyhd8ed1ab_0.conda - version: 1.26.129 + url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.136-pyhd8ed1ab_0.conda + version: 1.26.136 - category: main dependencies: boto3: '' @@ -5360,14 +5381,14 @@ package: sphinx: '>=1.6,<7' sphinxcontrib-jquery: '>=2.0.0,!=3.0.0' hash: - md5: 55f8f3f0fa3fd6b7522f4133fac8ee59 - sha256: 3774803e81091a64d2f3990246bb9310f1b9df13887914e1c77eab917bf102ec + md5: dd1ec3c6beac662d7bf9c996975f637f + sha256: 818659eb58b74da694e7ff6ecb907d417ae0de4db8231c42f0b0ba75f56ef3f4 manager: conda name: sphinx_rtd_theme optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/sphinx_rtd_theme-1.2.0-pyha770c72_0.conda - version: 1.2.0 + url: https://conda.anaconda.org/conda-forge/noarch/sphinx_rtd_theme-1.2.1-pyha770c72_0.conda + version: 1.2.1 - category: main dependencies: aws-sam-translator: '>=1.55.0' @@ -5417,14 +5438,14 @@ package: werkzeug: '>=0.5,!=2.2.0,!=2.2.1' xmltodict: '' hash: - md5: 89dfb6776dcc992a100cafd0c612b7fb - sha256: f5de61e07e99798c0f73947fae9f947a4eb7aeff7adc04e78b9a9a3ef2ddc780 + md5: 7f8865d0f6df238a407cab06d884c211 + sha256: c51cc65dac1b0b1f5139860c07030b9465417cebcb8529ffa97fcd8615aba606 manager: conda name: moto optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.9-pyhd8ed1ab_0.conda - version: 4.1.9 + url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.10-pyhd8ed1ab_0.conda + version: 4.1.10 - category: main dependencies: {} hash: @@ -5433,6 +5454,7 @@ package: name: mock optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/27/6f/fbb16f260a7107ee98871d83f6793d88c4311b7189b10ef239da0b2181db/mock-5.0.2-py3-none-any.whl version: 5.0.2 - dependencies: {} @@ -5441,6 +5463,7 @@ package: manager: pip name: pyyaml platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/12/fc/a4d5a7554e0067677823f7265cb3ae22aed8a238560b5133b58cda252dad/PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl version: '6.0' - category: main @@ -5452,6 +5475,7 @@ package: name: asttokens optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/f3/e1/64679d9d0759db5b182222c81ff322c2fe2c31e156a59afd6e9208c960e5/asttokens-2.2.1-py2.py3-none-any.whl version: 2.2.1 - category: main @@ -5463,6 +5487,7 @@ package: name: gdspy optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/1d/e4/97b8add92fbec2a9890ad4777272e9a9e4d7a0ceeac42b7e1febe94f0e86/gdspy-1.4.zip version: '1.4' - category: main @@ -5475,6 +5500,7 @@ package: name: paramiko-ng optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/9f/53/1ac75eab589149b1e02e38185ecebf09e1b805fc3fdeadbc16d1a2b7d208/paramiko_ng-2.8.10-py2.py3-none-any.whl version: 2.8.10 - category: main @@ -5486,6 +5512,7 @@ package: name: ruamel.yaml optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/23/33/dbc62343de0cf92e0f9c15bc0a287bdaea0953f1cadca0480c78d5ac6641/ruamel.yaml-0.17.26-py3-none-any.whl version: 0.17.26 - category: main @@ -5498,6 +5525,7 @@ package: name: sure optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/dd/ae/eb28ee3b6768e51cb938abcf521cb678217203f33385a2df54d3f23331c5/sure-2.0.1.tar.gz version: 2.0.1 - category: main @@ -5510,6 +5538,7 @@ package: name: fab-classic optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/6b/0f/efc537eebfd2a2c470250c0ac8bd8a05ffc13d95a7fb22021367890d7c46/fab_classic-1.19.2-py2.py3-none-any.whl version: 1.19.2 - category: main @@ -5525,6 +5554,7 @@ package: name: hammer-vlsi optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/0a/da/1897421311c6332655e2f73d02d8c914ecb724198a1988aacd8f4c61ae6e/hammer_vlsi-1.1.1-py3-none-any.whl version: 1.1.1 - category: main @@ -5537,6 +5567,7 @@ package: name: icontract optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/d8/91/9756e7cf0b155e80bf9a62beffdd1dec4afce43cc6ab7f432f2267c62762/icontract-2.6.2-py3-none-any.whl version: 2.6.2 - category: main @@ -5549,6 +5580,7 @@ package: name: pylddwrap optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/c9/12/4afd6542c43cd20271f0e53bf0211decc10079a76a41e53c0288025a7b85/pylddwrap-1.2.2.tar.gz version: 1.2.2 version: 1 diff --git a/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml b/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml index 22681575..6ccfa40f 100644 --- a/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml +++ b/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml @@ -7,9 +7,9 @@ # Install this environment as "YOURENV" with: # conda-lock install -n YOURENV --file conda-requirements-riscv-tools-linux-64.conda-lock.yml # To update a single package to the latest version compatible with the version constraints in the source: -# conda-lock lock --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml --update PACKAGE +# conda-lock lock --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml --update PACKAGE # To re-solve the entire environment, e.g. after changing a version constraint in the source file: -# conda-lock -f /scratch/abejgonza/cy/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy/conda-reqs/riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml +# conda-lock -f /scratch/abejgonza/cy/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy/conda-reqs/riscv-tools.yaml -f /scratch/abejgonza/cy-check/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy-check/conda-reqs/riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml metadata: channels: - url: ucb-bar @@ -21,12 +21,14 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: 92c3e7798f0b770b5c7c3ccb9bb821f7aca74819a9dba397e47d752af976b25f + linux-64: b0ec35c8fb9744ff1f54090428e86cb2c026ee4fb1441cf49d7492c212878158 platforms: - linux-64 sources: - /scratch/abejgonza/cy/conda-reqs/chipyard.yaml - /scratch/abejgonza/cy/conda-reqs/riscv-tools.yaml + - /scratch/abejgonza/cy-check/conda-reqs/chipyard.yaml + - /scratch/abejgonza/cy-check/conda-reqs/riscv-tools.yaml package: - category: main dependencies: {} @@ -234,14 +236,14 @@ package: dependencies: _sysroot_linux-64_curr_repodata_hack: 3.* hash: - md5: 523bc836a954faf0cca94831971bb85a - sha256: 67a3caa56e2a59f407f3d290437b865aaf996873006e2fcfca6295d0f0be8db9 + md5: 540e9f635ce30eb7fbf4488cfcf656bf + sha256: b0a77e609081d5a03327fd718c713fe83671043fdcd97f5983a1e956fe4d3052 manager: conda name: kernel-headers_linux-64 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/kernel-headers_linux-64-3.10.0-h4a8ded7_13.tar.bz2 - version: 3.10.0 + url: https://conda.anaconda.org/conda-forge/noarch/kernel-headers_linux-64-4.18.0-he073ed8_0.conda + version: 4.18.0 - category: main dependencies: libgfortran5: 12.2.0 h337968e_19 @@ -294,16 +296,16 @@ package: - category: main dependencies: _sysroot_linux-64_curr_repodata_hack: 3.* - kernel-headers_linux-64: 3.10.0 h4a8ded7_13 + kernel-headers_linux-64: 4.18.0 he073ed8_0 hash: - md5: 57e5a5191ffe999b9f4dfdbcd0ddcba4 - sha256: f09f2fea4b571dcd225f1e35bd3c851e809cd4c2f5f151438133969ab28478e5 + md5: f55932f8af2630b906d746c374028226 + sha256: cbcaffe5c8df0e0e3e3110582b666b154482a1517233836b3ec2b2aa122dd7fb manager: conda name: sysroot_linux-64 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/sysroot_linux-64-2.17-h4a8ded7_13.tar.bz2 - version: '2.17' + url: https://conda.anaconda.org/conda-forge/noarch/sysroot_linux-64-2.28-he073ed8_0.conda + version: '2.28' - category: main dependencies: ld_impl_linux-64: 2.40 h41732ed_0 @@ -334,14 +336,14 @@ package: dependencies: libgcc-ng: '>=12' hash: - md5: be733e69048951df1e4b4b7bb8c7666f - sha256: 2c0a618d0fa695e4e01a30e7ff31094be540c52e9085cbd724edb132c65cf9cd + md5: a0c6f0e7e1a467f5678f94dea18c8aa7 + sha256: f177627acdfcead15a28f4a07fcda6a1e26b83f053eaa1efa7cce01c0a3b09a8 manager: conda name: alsa-lib optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/alsa-lib-1.2.8-h166bdaf_0.tar.bz2 - version: 1.2.8 + url: https://conda.anaconda.org/conda-forge/linux-64/alsa-lib-1.2.9-hd590300_0.conda + version: 1.2.9 - category: main dependencies: libgcc-ng: '>=9.4.0' @@ -380,16 +382,16 @@ package: version: 1.0.8 - category: main dependencies: - libgcc-ng: '>=9.4.0' + libgcc-ng: '>=12' hash: - md5: f26ef8098fab1f719c91eb760d63381a - sha256: ee735e60d2cf68e5635df17847e97b505a752985d10581d2438203e7c0f44c15 + md5: e8c18d865be43e2fb3f7a145b6adf1f5 + sha256: c4276b1a0e8f18ab08018b1881666656742b325e0fcf2354f714e924d28683b6 manager: conda name: c-ares optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.18.1-h7f98852_0.tar.bz2 - version: 1.18.1 + url: https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.19.1-hd590300_0.conda + version: 1.19.1 - category: main dependencies: libgcc-ng: '>=12' @@ -420,6 +422,7 @@ package: libstdcxx-ng: '>=12' hash: md5: 6bfb79319763a11c7423c9d0e0ee00b7 + sha256: null manager: conda name: dromajo optional: false @@ -551,6 +554,19 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/lerc-4.0.0-h27087fc_0.tar.bz2 version: 4.0.0 +- category: main + dependencies: + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' + hash: + md5: f67106643beadfc737b94ca0bfd6d8e3 + sha256: 1778dc86603df24aaf6865f7f3e1ffc5c793a0f1fc4570add2a6ccb4c0a62785 + manager: conda + name: libabseil + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libabseil-20230125.2-cxx17_h59595ed_2.conda + version: '20230125.2' - category: main dependencies: libgcc-ng: '>=12' @@ -871,14 +887,14 @@ package: ca-certificates: '' libgcc-ng: '>=12' hash: - md5: 8f24d371ed9efb3f0b0de383fb81d51c - sha256: 24bf6cf8f741c28a8d10f51c917f378694d4a98a38ab4372629932cd6c94e9e8 + md5: 92c4e93948f2d7ba3e82ded3f6cbff31 + sha256: bf74edd02d7b17ac73c3055c974ca9039290e4a669a75d3bd50ce0a8a06cd557 manager: conda name: openssl optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.0-hd590300_3.conda - version: 3.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.1-hd590300_0.conda + version: 3.1.1 - category: main dependencies: libgcc-ng: '>=9.3.0' @@ -1001,16 +1017,16 @@ package: version: 1.0.10 - category: main dependencies: - libgcc-ng: '>=9.3.0' + libgcc-ng: '>=12' hash: - md5: bf6f803a544f26ebbdc3bfff272eb179 - sha256: 9e9b70c24527289ac7ae31925d1eb3b0c1e9a78cb7b8f58a3110cc8bbfe51c26 + md5: 2c80dc38fface310c9bd81b17037fee5 + sha256: 309751371d525ce50af7c87811b435c176915239fc9e132b99a25d5e1703f2d4 manager: conda name: xorg-libxau optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libxau-1.0.9-h7f98852_0.tar.bz2 - version: 1.0.9 + url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libxau-1.0.11-hd590300_0.conda + version: 1.0.11 - category: main dependencies: libgcc-ng: '>=9.3.0' @@ -1112,14 +1128,14 @@ package: libgcc-ng: '>=12' libiconv: '>=1.17,<2.0a0' hash: - md5: 3a04f6b950cc884a43c2b737a38da9bd - sha256: 43a2b08d6eed3263be63805edd720133eda2189e8c673238c37e407fa2b84f2e + md5: 1db01b49235f4ba44b9258798d42668d + sha256: b98495d98abe2a6b3023591a25974aab8c3dba43abf300dfc75f9c03c6a1c951 manager: conda name: diffutils optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/diffutils-3.9-h6c2ea63_0.conda - version: '3.9' + url: https://conda.anaconda.org/conda-forge/linux-64/diffutils-3.10-hf18258e_0.conda + version: '3.10' - category: main dependencies: libfdt: '>=1.6.1,<1.7.0a0' @@ -1329,31 +1345,32 @@ package: version: 1.6.39 - category: main dependencies: + libabseil: '>=20230125.2,<20230126.0a0' libgcc-ng: '>=12' libstdcxx-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: 4b36c68184c6c85d88c6e595a32a1ede - sha256: 760118d7879b5524e118db1c75cc2a5dfceb2c4940dcae94751a94786c8cf12b + md5: c98e8a14701ebb97b4b19f4cc4d07dee + sha256: 9950ff4734fc5f89818883f3861da9e1e0a2fdd215d679f3abca259471cab9e6 manager: conda name: libprotobuf optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libprotobuf-3.21.12-h3eb15da_0.conda - version: 3.21.12 + url: https://conda.anaconda.org/conda-forge/linux-64/libprotobuf-4.23.2-hd1fb520_1.conda + version: 4.23.2 - category: main dependencies: libgcc-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: 1d002bf709048f8021c32abfd0e0d395 - sha256: bb2a8ddb26e74f2cedc36825fc6f95d45f19e1912a1a6c75847952d92fc16215 + md5: fdaae20a1cf7cd62130a0973190a31b7 + sha256: 72e958870f49174ebc0ddcd4129e9a9f48de815f20aa3b553f136b514f29bb3a manager: conda name: libsqlite optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.41.2-h2797004_1.conda - version: 3.41.2 + url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.42.0-h2797004_0.conda + version: 3.42.0 - category: main dependencies: libgcc-ng: '>=12' @@ -1370,19 +1387,19 @@ package: version: 1.10.0 - category: main dependencies: - libgcc-ng: '>=9.4.0' + libgcc-ng: '>=12' pthread-stubs: '' xorg-libxau: '' xorg-libxdmcp: '' hash: - md5: b3653fdc58d03face9724f602218a904 - sha256: 8d5d24cbeda9282dd707edd3156e5fde2e3f3fe86c802fa7ce08c8f1e803bfd9 + md5: 33277193f5b92bad9fdd230eb700929c + sha256: a670902f0a3173a466c058d2ac22ca1dd0df0453d3a80e0212815c20a16b0485 manager: conda name: libxcb optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.13-h7f98852_1004.tar.bz2 - version: '1.13' + url: https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.15-h0b41bf4_0.conda + version: '1.15' - category: main dependencies: icu: '>=72.1,<73.0a0' @@ -1615,17 +1632,17 @@ package: - category: main dependencies: flex: '' - libgcc-ng: '>=9.4.0' - libstdcxx-ng: '>=9.4.0' + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' hash: - md5: c12b9a7d2289bce118c8322762836c97 - sha256: 4c593dccc8e53717225547c8961c5d0671d738c26702b91a228b43d44ff4e387 + md5: ac931227dce83e3303cfe3e606e87fa8 + sha256: d45803ee7834f71eb0656d74a58644390ef13365ff67f7716cc660309e46cfbd manager: conda name: bison optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/bison-3.8-h9c3ff4c_0.tar.bz2 - version: '3.8' + url: https://conda.anaconda.org/conda-forge/linux-64/bison-3.8.2-h59595ed_0.conda + version: 3.8.2 - category: main dependencies: libbrotlidec: 1.0.9 h166bdaf_8 @@ -1794,14 +1811,14 @@ package: libzlib: '>=1.2.13,<1.3.0a0' pcre2: '>=10.40,<10.41.0a0' hash: - md5: db1d4a1dfc04f3eab50d97551850759a - sha256: e0d54ffe98b7471cfc95f043bf3921412843c05ba5f1f10ceeac5edb328ac928 + md5: a64f11b244b2c112cd3fa1cbe9493999 + sha256: 6a34c6b123f06fcee7e28e981ec0daad09bce35616ad8e9e61ef84be7fad4d92 manager: conda name: libglib optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libglib-2.76.2-hebfc3b9_0.conda - version: 2.76.2 + url: https://conda.anaconda.org/conda-forge/linux-64/libglib-2.76.3-hebfc3b9_0.conda + version: 2.76.3 - category: main dependencies: libblas: 3.9.0 16_linux64_openblas @@ -1853,20 +1870,20 @@ package: - category: main dependencies: libgcc-ng: '>=12' - libprotobuf: '>=3.21.9,<3.22.0a0' + libprotobuf: '>=4.23.2,<4.23.3.0a0' libstdcxx-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' ncurses: '>=6.3,<7.0a0' - openssl: '>=3.0.7,<4.0a0' + openssl: '>=3.1.0,<4.0a0' perl: '>=5.32.1,<5.33.0a0 *_perl5' hash: - md5: c660c643ea8a05e4bce078d6486d04fd - sha256: c1d3f6053f3983229ffd362ef6192f148f80ccac0d287429756017a98deaac01 + md5: 2cf0c4f7a0a46c75e27735d16fab1501 + sha256: 412157ab852270658e1b96e6f66e00f8ca7039ea8d4ae24090b1d3f726fadfac manager: conda name: mosh optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/mosh-1.4.0-pl5321h9ed9655_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/mosh-1.4.0-pl5321h4605741_1.conda version: 1.4.0 - category: main dependencies: @@ -1889,8 +1906,8 @@ package: libffi: '>=3.4,<4.0a0' libgcc-ng: '>=12' libnsl: '>=2.0.0,<2.1.0a0' - libsqlite: '>=3.40.0,<4.0a0' - libuuid: '>=2.32.1,<3.0a0' + libsqlite: '>=3.41.2,<4.0a0' + libuuid: '>=2.38.1,<3.0a0' libzlib: '>=1.2.13,<1.3.0a0' ncurses: '>=6.3,<7.0a0' openssl: '>=3.1.0,<4.0a0' @@ -1899,14 +1916,14 @@ package: tzdata: '' xz: '>=5.2.6,<6.0a0' hash: - md5: de25afc7041c103c7f510c746bb63435 - sha256: 67748307da3fa057d17d4e991f3c60f87595a517b98f4b323a17b5f3dc287159 + md5: 7439c9d24378a82b73a7a53868dacdf1 + sha256: 6682c75caf3456796fb76313a25475738d85729b43f8c0e904407c0ed8362ede manager: conda name: python optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.10-he550d4f_0_cpython.conda - version: 3.10.10 + url: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.11-he550d4f_0_cpython.conda + version: 3.10.11 - category: main dependencies: libgcc-ng: '>=12' @@ -1929,19 +1946,19 @@ package: - category: main dependencies: libgcc-ng: '>=12' - libsqlite: 3.41.2 h2797004_1 + libsqlite: 3.42.0 h2797004_0 libzlib: '>=1.2.13,<1.3.0a0' ncurses: '>=6.3,<7.0a0' readline: '>=8.2,<9.0a0' hash: - md5: c8771266cc289756099c04e597209862 - sha256: 2674e5b0888799ad055bdbc79e2257d67f52b0c11f4c174d4deff4b69874cf45 + md5: 1192f6ec654a5bc4ee1d64bdc4a3e5cc + sha256: 9cf59fa9891248e0e3a86a41041156cec367653d423e5d8a09b4c8ab98441a27 manager: conda name: sqlite optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.41.2-h2c6b66d_1.conda - version: 3.41.2 + url: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.42.0-h2c6b66d_0.conda + version: 3.42.0 - category: main dependencies: libgcc-ng: '>=9.4.0' @@ -1961,18 +1978,18 @@ package: - category: main dependencies: libgcc-ng: '>=12' - libxcb: '>=1.13,<1.14.0a0' + libxcb: '>=1.15,<1.16.0a0' xorg-kbproto: '' xorg-xextproto: '>=7.3.0,<8.0a0' xorg-xproto: '' hash: - md5: ea8fbfeb976ac49cbeb594e985393514 - sha256: 3c6862a01a39cdea3870b132706ad7256824299947a3a94ae361d863d402d704 + md5: 52d09ea80a42c0466214609ef0a2d62d + sha256: 26e5c72def9f1b191afea84aa2d09622d34b2f547a446eac201ecf894521e5ee manager: conda name: xorg-libx11 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.8.4-h0b41bf4_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.8.4-h8ee46fc_1.conda version: 1.8.4 - category: main dependencies: @@ -2482,13 +2499,13 @@ package: libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: 205aca93c1bc4a0bc663dd787c224025 - sha256: 66e0e925088acbc1306c814ca8441e61dd2f2a2ff93ff752b914939b87864d24 + md5: e3a70b7bde225412a04c681f5aa094f5 + sha256: 925c2e940a74cdda141b350ee6f6d7dfe5783c1f7575bd95649117c1841908e2 manager: conda name: libclang-cpp16 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp16-16.0.3-default_h83cc7fd_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp16-16.0.3-default_h1cdf331_2.conda version: 16.0.3 - category: main dependencies: @@ -2496,13 +2513,13 @@ package: libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: e0f95087543b73c7bc2689f0aeb86a6d - sha256: 40c7a6ebfe181b3683fa4c0a378ff25eca1a77d68c35578b9c237dd58c4d458d + md5: 2dd726d3664b57ff32e4ef1965774c02 + sha256: b79181e5d1e3cd80ce5cbc0d0098621413e24c37437e8906b5bca1c398a5ce34 manager: conda name: libclang13 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libclang13-16.0.3-default_hd781213_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libclang13-16.0.3-default_h4d60ac6_2.conda version: 16.0.3 - category: main dependencies: @@ -3179,14 +3196,14 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* *_cp310 hash: - md5: 7c08afb0f02d5673de8e4f6f535663a8 - sha256: b9c3eec0f102b04d893911be6761f13f653d02b12f55fd5a108959903fbac8ab + md5: 1c510e74c87dc9b8fe1f7f9e8dbcef96 + sha256: 56bcfc59da0f6fc78afe79447b8b1327e9149a52c9dc6ee805ac73bf18ac22b6 manager: conda name: tornado optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/tornado-6.3-py310h1fa729e_0.conda - version: '6.3' + url: https://conda.anaconda.org/conda-forge/linux-64/tornado-6.3.2-py310h2372a71_0.conda + version: 6.3.2 - category: main dependencies: python: '>=3.6' @@ -3203,38 +3220,38 @@ package: dependencies: python: '>=3.6' hash: - md5: 0c0c5edec27d8284bf75023737f74823 - sha256: 10290d04934693214ea9a3caaefac35c3fdfc72094ffa8b0f063141bef469bbe + md5: 21ab63073cea60bc584a889ae8d765d8 + sha256: ee1fa0049b7c30507beb33b796df3bcd06f54b8f536cc1f69d5bec7088c200f4 manager: conda name: types-pyyaml optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-pyyaml-6.0.12.9-pyhd8ed1ab_0.conda - version: 6.0.12.9 + url: https://conda.anaconda.org/conda-forge/noarch/types-pyyaml-6.0.12.10-pyhd8ed1ab_0.conda + version: 6.0.12.10 - category: main dependencies: python: '>=3.6' hash: - md5: 8b7a7a28f8a274b98f0387c13c56c94c - sha256: e07d313a9c7aa2dfe425ca5a3bdc65cd015a8819cda8e576edb3b3a47535da1a + md5: 9a73576dfe2f764c431347b9dc35a3fc + sha256: 3e3ce73fc2575ab94a41232c8241ad20b564dbb6d0f832b9aa5df65799fc1361 manager: conda name: types-urllib3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-urllib3-1.26.25.12-pyhd8ed1ab_0.conda - version: 1.26.25.12 + url: https://conda.anaconda.org/conda-forge/noarch/types-urllib3-1.26.25.13-pyhd8ed1ab_0.conda + version: 1.26.25.13 - category: main dependencies: python: '>=3.7' hash: - md5: 43e7d9e50261fb11deb76e17d8431aac - sha256: f81eee64fcdfb379e27d01773b34041fbf7f9e86f33b157c9925d19e0a442452 + md5: 5a4a270e5a3f93846d6bade2f71fa440 + sha256: 8af96d7b665daabe3e60fa9c7457986237db1ad54469b01af3f4736bc18be284 manager: conda name: typing_extensions optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda - version: 4.5.0 + url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.6.2-pyha770c72_0.conda + version: 4.6.2 - category: main dependencies: libgcc-ng: '>=12' @@ -3284,14 +3301,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 2a914654b9ade742049dab13e29571c6 - sha256: 7a2c359d12a13e505b74cd82686f98379113c9b4be01f6685167ba137b286127 + md5: bfe7e7cd1476092f51efbcde15dfb110 + sha256: 85310b382c4220d7846fa8f046216fd722b88db07991f07bd7decdf2e5dc3446 manager: conda name: websocket-client optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.5.1-pyhd8ed1ab_0.conda - version: 1.5.1 + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.5.2-pyhd8ed1ab_0.conda + version: 1.5.2 - category: main dependencies: python: '>=3.7' @@ -3374,21 +3391,21 @@ package: version: 0.9.10 - category: main dependencies: - libgcc-ng: '>=9.3.0' + libgcc-ng: '>=12' xorg-kbproto: '' xorg-libice: 1.0.* xorg-libsm: 1.2.* - xorg-libx11: '>=1.7.0,<2.0a0' + xorg-libx11: '>=1.8.4,<2.0a0' xorg-xproto: '' hash: - md5: 60d6eec5273f1c9af096c10c268912e3 - sha256: 25bfc4d86df3498b88aac2f02ecf65e739bf99a687805c31a635df6f2e60a163 + md5: ab2044e8d87dda9f74652e8e084a5569 + sha256: fbceccea26f81d557ac93ca08afa95b3638f713c43deb468488013218be11fed manager: conda name: xorg-libxt optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libxt-1.2.1-h7f98852_2.tar.bz2 - version: 1.2.1 + url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libxt-1.3.0-hd590300_0.conda + version: 1.3.0 - category: main dependencies: python: '>=3.7' @@ -3434,9 +3451,9 @@ package: freetype: '>=2.12.1,<3.0a0' icu: '>=72.1,<73.0a0' libgcc-ng: '>=12' - libglib: '>=2.74.1,<3.0a0' + libglib: '>=2.76.2,<3.0a0' libpng: '>=1.6.39,<1.7.0a0' - libxcb: '>=1.13,<1.14.0a0' + libxcb: '>=1.15,<1.16.0a0' libzlib: '>=1.2.13,<1.3.0a0' pixman: '>=0.40.0,<1.0a0' xorg-libice: '' @@ -3446,13 +3463,13 @@ package: xorg-libxrender: '' zlib: '' hash: - md5: 0c944213e40c9e4aa32292776b9c6903 - sha256: 0be3064cb30e3e69a47370abae85b2780cd81fbca00cbd17076d40c0f6302fdb + md5: c1dd96500b9b1a75e9e511931f415cbc + sha256: 1fffecc684c26e0f1aed6d9857ad0f2abfe3a849977f718ad82366c68c7a9a36 manager: conda name: cairo optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-h35add3b_1015.conda + url: https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-hbbf8b49_1016.conda version: 1.16.0 - category: main dependencies: @@ -3477,13 +3494,13 @@ package: libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: 14a18f87f492a905cee3d833eae4e86b - sha256: 0896316dbdcd3dca118c61127b2d79cc0c0bdb08f869cff9f35fe2c5a4673555 + md5: 738a21e17b4d9d846cf96503810c9b45 + sha256: 2d0c4ecdf647bf0bf3602495f0a3b85aa1985d0027cc787aa43e0c810ebbc704 manager: conda name: clang-format-16 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-16-16.0.3-default_h83cc7fd_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-16-16.0.3-default_h1cdf331_2.conda version: 16.0.3 - category: main dependencies: @@ -3614,14 +3631,14 @@ package: python_abi: 3.10.* *_cp310 unicodedata2: '>=14.0.0' hash: - md5: 4f39f656d6ff2761d698e69af952be82 - sha256: 9c3765958a18d9bfc33e42d78a554aff00041d3da474db3045d6ce95ef6a4643 + md5: 76426eaff204520e719207700359a855 + sha256: 253a41d41f4ccaef49412c3c628dc2032526821a3bad26b8cd65b311d6346519 manager: conda name: fonttools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.3-py310h1fa729e_0.conda - version: 4.39.3 + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.4-py310h2372a71_0.conda + version: 4.39.4 - category: main dependencies: python: '>=3.4' @@ -3776,27 +3793,27 @@ package: tomli: '>=1.1.0' typing_extensions: '>=3.10' hash: - md5: 7696ac5b7bc40cd66e483f16ee652243 - sha256: 20901dc450437d7e583c1c8e63321bdaf105e6703a41f9d3a6d5551a0707bcfc + md5: e090e0c360bf9b1f846c2608c70422da + sha256: 95047c6684009b08c6b9e45eb9693585fc6ed40758bb93ebc5e76376c643939f manager: conda name: mypy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/mypy-1.2.0-py310h1fa729e_0.conda - version: 1.2.0 + url: https://conda.anaconda.org/conda-forge/linux-64/mypy-1.3.0-py310h2372a71_0.conda + version: 1.3.0 - category: main dependencies: python: 2.7|>=3.7 setuptools: '' hash: - md5: fbe1182f650c04513046d6894046cd6c - sha256: 8f5afb243a9dd4ba6961eacc7d3c3da104cdc30162de863164b09f8920493d46 + md5: 2a75b296096adabbabadd5e9782e5fcc + sha256: 1320306234552717149f36f825ddc7e27ea295f24829e9db4cc6ceaff0b032bd manager: conda name: nodeenv optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2 - version: 1.7.0 + url: https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.8.0-pyhd8ed1ab_0.conda + version: 1.8.0 - category: main dependencies: freetype: '>=2.12.1,<3.0a0' @@ -3805,20 +3822,20 @@ package: libjpeg-turbo: '>=2.1.5.1,<3.0a0' libtiff: '>=4.5.0,<4.6.0a0' libwebp-base: '>=1.3.0,<2.0a0' - libxcb: '>=1.13,<1.14.0a0' + libxcb: '>=1.15,<1.16.0a0' libzlib: '>=1.2.13,<1.3.0a0' openjpeg: '>=2.5.0,<3.0a0' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* *_cp310 tk: '>=8.6.12,<8.7.0a0' hash: - md5: 58ea77873883be5b59328e29ca50997e - sha256: ca081b2a1af2dcab802dece28ac1a95e873c9ee278bbd50a5c2882b621dd0d99 + md5: cf62f6cff3536eafaaa0c740b0bf7465 + sha256: 1fd549c5f9e229890fd2b31e54c0718994120d850f5abbf1d2b7614791b4bd60 manager: conda name: pillow optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pillow-9.5.0-py310h065c6d2_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pillow-9.5.0-py310h582fbeb_1.conda version: 9.5.0 - category: main dependencies: @@ -3887,14 +3904,14 @@ package: ruamel.yaml.clib: '>=0.1.2' setuptools: '' hash: - md5: 475a6b5d3a01fc0d7d494ccd94db0b1d - sha256: 90ea9bbd357fa206ac07623f57d990adb318a43bc402a85d31bcb907552e2b5e + md5: 4e7b661f0d26c930d5bb01c15d8e27be + sha256: d540cd5aacac05f7d3e31ae2d0d590888c70fc9fa6cc576c8553aed657b111b3 manager: conda name: ruamel.yaml optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml-0.17.25-py310h2372a71_0.conda - version: 0.17.25 + url: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml-0.17.30-py310h2372a71_0.conda + version: 0.17.30 - category: main dependencies: colorama: '' @@ -3913,26 +3930,26 @@ package: python: '>=3.6' types-urllib3: <1.27 hash: - md5: 1ab2e9a47f24fac257f88956828f1956 - sha256: 19d2affb4d3fab4d1d60eb3748b2d80b9ff2983c9b196e74aae7a0dc03fe74d8 + md5: d4edae6cf0af5332243c2d995f5e8745 + sha256: c417ed8470ad4f5b7189ba3496ce5b5973d7767e64723b5c3d4c7d436d64ced9 manager: conda name: types-requests optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-requests-2.30.0.0-pyhd8ed1ab_0.conda - version: 2.30.0.0 + url: https://conda.anaconda.org/conda-forge/noarch/types-requests-2.31.0.1-pyhd8ed1ab_0.conda + version: 2.31.0.1 - category: main dependencies: - typing_extensions: 4.5.0 pyha770c72_0 + typing_extensions: 4.6.2 pyha770c72_0 hash: - md5: b3c594fde1a80a1fc3eb9cc4a5dfe392 - sha256: 6da5e15fa533620ae2e7aca9a7d16013eed3a73ac64c47d7c3bf3deec39b63b9 + md5: f676553904bb8f7c1dfe71c9db0d9ba7 + sha256: 5c6dcf5ff0d6be8a15d6bf5297867d9cb0154b6b946e8c87f69becf8a356e71b manager: conda name: typing-extensions optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda - version: 4.5.0 + url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.6.2-hd8ed1ab_0.conda + version: 4.6.2 - category: main dependencies: gettext: '>=0.21.1,<1.0a0' @@ -3990,14 +4007,14 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* *_cp310 hash: - md5: e8ede9a6fedf3e0e640e810749b4cb6e - sha256: d56b21d563c673023561a4e83e9f5731441ce2bce80ca5cfe55cfa8bfa5d5eb1 + md5: 73deaf595eb21f3e76a02ba1ae2edee6 + sha256: 943c644a13a517d5ca9761e2c3f8697db85ea0c05a44e13697d826f7f5e1d351 manager: conda name: yarl optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/yarl-1.9.1-py310h2372a71_0.conda - version: 1.9.1 + url: https://conda.anaconda.org/conda-forge/linux-64/yarl-1.9.2-py310h2372a71_0.conda + version: 1.9.2 - category: main dependencies: python: '>=3.6' @@ -4045,36 +4062,36 @@ package: version: 0.7.0 - category: main dependencies: - clang-format-16: 16.0.3 default_h83cc7fd_0 + clang-format-16: 16.0.3 default_h1cdf331_2 libclang-cpp16: '>=16.0.3,<16.1.0a0' libgcc-ng: '>=12' libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: a1f13606e670bdaaee724536218f5c40 - sha256: 5eb61124b6f96015aee46217f081953cb4efee9f9d39ac7c98e76d734f384693 + md5: c15e6c12bbd093170f1dab9d1ee922a8 + sha256: fe8d04e73e28a844e3513b214ca83a218d6d7115b1a86d5dfe1eb4e80e4bd15a manager: conda name: clang-format optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-16.0.3-default_h83cc7fd_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-16.0.3-default_h1cdf331_2.conda version: 16.0.3 - category: main dependencies: cffi: '>=1.12' libgcc-ng: '>=12' - openssl: '>=3.1.0,<4.0a0' + openssl: '>=3.1.1,<4.0a0' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* *_cp310 hash: - md5: 991a12eccbca3c9897c62f44b1104a54 - sha256: 692b0394bb3104ec117faa0130d67109a0132e9bd57084ebfde81fc2b9790e58 + md5: 18fbc834d896a9a182c23aee7cf1eca8 + sha256: 996fbdef1d386bc983116ed9c454733571f2a9f21911cb28d796b781af49a746 manager: conda name: cryptography optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-40.0.2-py310h34c0648_0.conda - version: 40.0.2 + url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-41.0.0-py310h75e40e8_0.conda + version: 41.0.0 - category: main dependencies: cloudpickle: '' @@ -4148,17 +4165,17 @@ package: graphite2: '' icu: '>=72.1,<73.0a0' libgcc-ng: '>=12' - libglib: '>=2.74.1,<3.0a0' + libglib: '>=2.76.2,<3.0a0' libstdcxx-ng: '>=12' hash: - md5: 73d2c2d25fdcec40c24929bab9f44831 - sha256: d4bf8a3e23478efefe39ac2d965f44b55cee4058277f2ad7478384e7973fc97f + md5: 765bc76c0dfaf24ff9d8a2935b2510df + sha256: 9d99416e9d4a01ea0915f65ea7fac71dee11916de115fbd0325c0cb82e0b63f8 manager: conda name: harfbuzz optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-6.0.0-h3ff4399_1.conda - version: 6.0.0 + url: https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-7.3.0-hdb3a94d_0.conda + version: 7.3.0 - category: main dependencies: importlib-metadata: '>=6.6.0,<6.6.1.0a0' @@ -4195,6 +4212,7 @@ package: libzlib: '>=1.2.12,<1.3.0a0' hash: md5: 5b3ed39ee3809d63d347b649de0a45f8 + sha256: null manager: conda name: libdwarf optional: false @@ -4239,14 +4257,14 @@ package: python_abi: 3.10.* *_cp310 pytz: '>=2020.1' hash: - md5: 25fc16ee9a1df69e91c8213530f2cc8c - sha256: 4af68421353f552c6d321bfc8b76040eaa89fa35c0a7854be8acaddf154be63e + md5: e0b845c6b29a1ed2e409bef6c0f5d96b + sha256: 38b0937c9b099cc5bf7cd4b19dfb03f8b2a8454e1895d65dfa888d189e3a3ab5 manager: conda name: pandas optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.0.1-py310h7cbd5c2_1.conda - version: 2.0.1 + url: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.0.2-py310h7cbd5c2_0.conda + version: 2.0.2 - category: main dependencies: pip: '' @@ -4265,14 +4283,14 @@ package: python: '>=3.7' typing-extensions: '>=4.5' hash: - md5: 6c36f1c42dd0069b7f23acc74f19be46 - sha256: e6d247b9a645ac6a2e4909cbe9cfad5cf9ba1a2f4352fee7aac3acb640371a54 + md5: e2be672aece1f060adf7154f76531a35 + sha256: d7845c01a9ee5a224cc9242782befed7d12dc6aac1103650ec87917b20f3579e manager: conda name: platformdirs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.5.0-pyhd8ed1ab_0.conda - version: 3.5.0 + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.5.1-pyhd8ed1ab_0.conda + version: 3.5.1 - category: main dependencies: libgcc-ng: '>=12' @@ -4280,14 +4298,14 @@ package: python_abi: 3.10.* *_cp310 typing-extensions: '>=4.2.0' hash: - md5: 6306ca76bc0635d84940349cf8d96264 - sha256: b0d9edaba389b3714bbc59266cfe7e7fef9c7f0bc664f455026455c998129b30 + md5: 38ba96ab3cb505a83ca294a82aa95f6a + sha256: 25ce5ed5f662abe3c5a8be3cbad8e886a180886da7aee46ecc6d38189985d324 manager: conda name: pydantic optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-1.10.7-py310h1fa729e_0.conda - version: 1.10.7 + url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-1.10.8-py310h2372a71_0.conda + version: 1.10.8 - category: main dependencies: cffi: '>=1.4.1' @@ -4329,14 +4347,14 @@ package: pip: '' python: '>=3.7,<4.0' hash: - md5: 8462b4f53fa7d7dc057a26d589ec71de - sha256: dc2928817ff89e3628f82f3cedd4369c84d7079d04493b33dc67e4288d1de35d + md5: 82e8ad8e403f7183c54806064eaad6f0 + sha256: 558698d3bf59058578c3b7919d8f92a678ece0da20332970b58fa29e666c4684 manager: conda name: types-awscrt optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.17-pyhd8ed1ab_0.conda - version: 0.16.17 + url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.18-pyhd8ed1ab_0.conda + version: 0.16.18 - category: main dependencies: cffi: '' @@ -4413,44 +4431,44 @@ package: types-awscrt: '' typing_extensions: '' hash: - md5: 01961f718d29cabd188e863a61d8fd81 - sha256: 1fc8f40eb33d7e38590d88d847fb39329628c31269c8a2e5aaab7d51cc5b501f + md5: 02c4d0596fd90242135cbd533368f723 + sha256: eaa094606d1dd54579fd78299d39b185e80d0c91c031915eeaeae963aa5d271c manager: conda name: botocore-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.129-pyhd8ed1ab_0.conda - version: 1.29.129 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.141-pyhd8ed1ab_0.conda + version: 1.29.141 - category: main dependencies: - clang-format: 16.0.3 default_h83cc7fd_0 + clang-format: 16.0.3 default_h1cdf331_2 libclang-cpp16: '>=16.0.3,<16.1.0a0' libclang13: '>=16.0.3' libgcc-ng: '>=12' libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: ceedc73b354682b0d63d61d654ebcd33 - sha256: b5ea9bef3e3316c34bfbde0a3a50cb53a2bf2db89221c9b145d37fc1e5c89576 + md5: 8910812419605001db20734aad191191 + sha256: 236cd870e4a155d323202961cbcf13b1de84a86dde4ef6bf160b7e05b699b9d8 manager: conda name: clang-tools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/clang-tools-16.0.3-default_h83cc7fd_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/clang-tools-16.0.3-default_h1cdf331_2.conda version: 16.0.3 - category: main dependencies: python: '>=3.7' zstandard: '>=0.15' hash: - md5: 1a2fa9e53cfbc2e4d9ab21990805a436 - sha256: 48cde99cc0abe5e50fb00713710851db9f76812a644892a9a2b5cbf9fe9707f5 + md5: ebe3230a4c1e135954eee4fb6ef8cded + sha256: a437007aa798f6d1c9f079f4dbb2a38685ac306d5a5ce3d1ee797c2de9f7d6e9 manager: conda name: conda-package-streaming optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/conda-package-streaming-0.7.0-pyhd8ed1ab_1.conda - version: 0.7.0 + url: https://conda.anaconda.org/conda-forge/noarch/conda-package-streaming-0.8.0-pyhd8ed1ab_0.conda + version: 0.8.0 - category: main dependencies: flask: '>=0.9' @@ -4499,6 +4517,7 @@ package: libzlib: '>=1.2.12,<1.3.0a0' hash: md5: 899c511688e6c41cb51c2921a8d25e63 + sha256: null manager: conda name: libdwarf-dev optional: false @@ -4520,12 +4539,12 @@ package: version: 0.2.3 - category: main dependencies: - alsa-lib: '>=1.2.8,<1.2.9.0a0' + alsa-lib: '>=1.2.9,<1.2.10.0a0' fontconfig: '>=2.14.2,<3.0a0' fonts-conda-ecosystem: '' freetype: '>=2.12.1,<3.0a0' giflib: '>=5.2.1,<5.3.0a0' - harfbuzz: '>=6.0.0,<7.0a0' + harfbuzz: '>=7.3.0,<8.0a0' lcms2: '>=2.15,<3.0a0' libcups: '>=2.3.3,<2.4.0a0' libgcc-ng: '>=12' @@ -4539,13 +4558,13 @@ package: xorg-libxrender: '' xorg-libxtst: '' hash: - md5: 33527b036cd6d369be12fd772cdd49e4 - sha256: 221de13214f051654177dd331c019a889ab1bbe3b2cf30d5cf17596378740359 + md5: 0e10da8ba3087130edd8a91fd2a7140f + sha256: 1b403f59ee32bbe3d38342559c35679d4fc29391d4d4ef17039f4c7f505e9fb1 manager: conda name: openjdk optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/openjdk-17.0.3-h4335b31_6.conda + url: https://conda.anaconda.org/conda-forge/linux-64/openjdk-17.0.3-h8e330f5_8.conda version: 17.0.3 - category: main dependencies: @@ -4554,18 +4573,18 @@ package: fonts-conda-ecosystem: '' freetype: '>=2.12.1,<3.0a0' fribidi: '>=1.0.10,<2.0a0' - harfbuzz: '>=6.0.0,<7.0a0' + harfbuzz: '>=7.1.0,<8.0a0' libgcc-ng: '>=12' - libglib: '>=2.74.1,<3.0a0' + libglib: '>=2.76.1,<3.0a0' libpng: '>=1.6.39,<1.7.0a0' hash: - md5: a8b9e35dd7be2c945b0de4fe19a7c3a9 - sha256: 80648fb4691839a81f83fe55f4353357d198cd75e61dbb61b815e39d577e87d2 + md5: cde553e0e32389e26595db4eacf859eb + sha256: 3bb7cf6e826fa6d867318ba4866470b02d2efcc1dcd6b8b6307afaa8ac21aff4 manager: conda name: pango optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pango-1.50.14-hd33c08f_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pango-1.50.14-heaa33ce_1.conda version: 1.50.14 - category: main dependencies: @@ -4574,27 +4593,28 @@ package: pynacl: '>=1.5' python: '>=3.6' hash: - md5: 748d328d93daa18c35220e251b610b25 - sha256: 35d35d9eea83058068d23213976d3d990a87692cd0fb52104c8cd7eedda5b555 + md5: f212c7eb95e909df4795297f73690993 + sha256: e425a03e5e2ef2ec5a78711686c59cfceeeeec3a98165fbc7d186bd6a5cb78de manager: conda name: paramiko optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/paramiko-3.1.0-pyhd8ed1ab_0.conda - version: 3.1.0 + url: https://conda.anaconda.org/conda-forge/noarch/paramiko-3.2.0-pyhd8ed1ab_0.conda + version: 3.2.0 - category: main dependencies: - cryptography: '>=38.0.0,<41' - python: '>=3.6' + cryptography: '>=3.3' + python: '>=2.7' + six: '>=1.5.2' hash: - md5: 0b34aa3ab7e7ccb1765a03dd9ed29938 - sha256: 458428cb867f70f2af2a4ed59d382291ea3eb3f10490196070a15d1d71d5432a + md5: 8c49efecb7dca466e18b06015e8c88ce + sha256: c9bb8059b6de4acfde65cc39e0d04127e82c496023223fe92c05d8b9a06f9cc8 manager: conda name: pyopenssl optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pyopenssl-23.1.1-pyhd8ed1ab_0.conda - version: 23.1.1 + url: https://conda.anaconda.org/conda-forge/noarch/pyopenssl-21.0.0-pyhd8ed1ab_0.tar.bz2 + version: 21.0.0 - category: main dependencies: pytest: '>=3.6.0' @@ -4802,14 +4822,14 @@ package: pyyaml: '>=5.1' virtualenv: '>=20.10.0' hash: - md5: c3ad8d291556452edb6c301c91f330ed - sha256: db90abf2c06c8bace41c491e2af445d06178fa8c9111e0e2ae4738866cb929ef + md5: dbb0111b18ea5c9983fb8db0aef6000b + sha256: a55d8a19bb00c2c5bf8a074c94d5ac1ffed8d63c53c9df4cee76f3764ad7a304 manager: conda name: pre-commit optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.3.1-pyha770c72_0.conda - version: 3.3.1 + url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.3.2-pyha770c72_0.conda + version: 3.3.2 - category: main dependencies: __unix: '' @@ -4848,14 +4868,14 @@ package: python-dateutil: '>=2.1,<3.0.0' urllib3: '>=1.25.4,<1.27' hash: - md5: 7da51e7dabbb80ebe3064e9343e8e818 - sha256: 1806dfc46c9f4b51ff56575025e7e5491ee630a6be5997dd1536009585da4c4c + md5: a5c15ea2e1c6558ac0f15429bb774084 + sha256: 1534363d9da1cf7ee28fcd9883b02ef9b548e7e325261e602d06cb43be773dd3 manager: conda name: botocore optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.131-pyhd8ed1ab_0.conda - version: 1.29.131 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.142-pyhd8ed1ab_0.conda + version: 1.29.142 - category: main dependencies: cairo: '>=1.16.0,<2.0a0' @@ -4892,16 +4912,16 @@ package: charset-normalizer: '>=2,<4' idna: '>=2.5,<4' python: '>=3.7' - urllib3: '>=1.21.1,<1.27' + urllib3: '>=1.21.1,<3' hash: - md5: 5fa992d972fbccfc069161805122cb8d - sha256: bd06a6603104050fc9c4fd9bf3de7b28bbb6b9ce4b33130519d8611488213f67 + md5: a30144e4156cdbb236f99ebb49828f8b + sha256: 9f629d6fd3c8ac5f2a198639fe7af87c4db2ac9235279164bfe0fcb49d8c4bad manager: conda name: requests optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/requests-2.29.0-pyhd8ed1ab_0.conda - version: 2.29.0 + url: https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda + version: 2.31.0 - category: main dependencies: botocore: '>=1.11.3' @@ -5087,7 +5107,7 @@ package: version: 5.1.1 - category: main dependencies: - botocore: 1.29.131 + botocore: 1.29.142 colorama: '>=0.2.5,<0.4.5' docutils: '>=0.10,<0.17' python: '>=3.10,<3.11.0a0' @@ -5096,29 +5116,29 @@ package: rsa: '>=3.1.2,<4.8' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: a8803614b98f834dd8e9239b1c172bb1 - sha256: 627c4db1e6c5e2febb5b9a7acf92b68a3c26afc26800700b510e076c46c02129 + md5: a12caee33189a2730faf21477e971491 + sha256: 1211e8873f71a6c288b86d5b86e88baa534eabe8a1ffef6f987f47e23fba77b4 manager: conda name: awscli optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.131-py310hff52083_0.conda - version: 1.27.131 + url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.142-py310hff52083_0.conda + version: 1.27.142 - category: main dependencies: - botocore: '>=1.29.131,<1.30.0' + botocore: '>=1.29.142,<1.30.0' jmespath: '>=0.7.1,<2.0.0' python: '>=3.7' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: f51fe6d09662dc8ec9672be8567b7430 - sha256: 888fa362ba6db8b881a200539c1cc4379379ec1937168e5e475245fa1a3544c7 + md5: 7183f27eb377ee481de34fbcfa40b67e + sha256: fd2fb41bcec9bd6b70d367d4d83c4fed054ee4c6853c422b67e55ea5cf233c86 manager: conda name: boto3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.131-pyhd8ed1ab_0.conda - version: 1.26.131 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.142-pyhd8ed1ab_0.conda + version: 1.26.142 - category: main dependencies: cachecontrol: 0.12.11 pyhd8ed1ab_1 @@ -5244,14 +5264,14 @@ package: python: '' typing_extensions: '' hash: - md5: da03042814034e36f0938058b7b218fb - sha256: d18385d39e4af117b99cbd931cb68cbd33582949a837ae4e6453964ecc64d80a + md5: e4035713762b745fe7521141eef9cbec + sha256: d0f14dcdaf50e693a5a3422945cf034587b9c19e0b41ef04a8525b3f5418e737 manager: conda name: boto3-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.130-pyhd8ed1ab_0.conda - version: 1.26.130 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.143-pyhd8ed1ab_0.conda + version: 1.26.143 - category: main dependencies: cachecontrol-with-filecache: '>=0.12.9' @@ -5306,14 +5326,14 @@ package: python: '>=3.6' typing-extensions: '' hash: - md5: 35a0dc87b7ff0abd9e3012bea164f439 - sha256: 706be4a8f070af47d29e18315c3053977315c1c58479ecfebb2443d3a72edf87 + md5: 2f58c5525f108a1525553e081c90f815 + sha256: 66d980a4aa02be974410c64d0631ea54d26e538f49300ac5e3b46d44a4acec78 manager: conda name: mypy_boto3_ec2 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.129-pyhd8ed1ab_0.conda - version: 1.26.129 + url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.136-pyhd8ed1ab_0.conda + version: 1.26.136 - category: main dependencies: boto3: '' @@ -5335,14 +5355,14 @@ package: sphinx: '>=1.6,<7' sphinxcontrib-jquery: '>=2.0.0,!=3.0.0' hash: - md5: 55f8f3f0fa3fd6b7522f4133fac8ee59 - sha256: 3774803e81091a64d2f3990246bb9310f1b9df13887914e1c77eab917bf102ec + md5: dd1ec3c6beac662d7bf9c996975f637f + sha256: 818659eb58b74da694e7ff6ecb907d417ae0de4db8231c42f0b0ba75f56ef3f4 manager: conda name: sphinx_rtd_theme optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/sphinx_rtd_theme-1.2.0-pyha770c72_0.conda - version: 1.2.0 + url: https://conda.anaconda.org/conda-forge/noarch/sphinx_rtd_theme-1.2.1-pyha770c72_0.conda + version: 1.2.1 - category: main dependencies: aws-sam-translator: '>=1.55.0' @@ -5392,14 +5412,14 @@ package: werkzeug: '>=0.5,!=2.2.0,!=2.2.1' xmltodict: '' hash: - md5: 89dfb6776dcc992a100cafd0c612b7fb - sha256: f5de61e07e99798c0f73947fae9f947a4eb7aeff7adc04e78b9a9a3ef2ddc780 + md5: 7f8865d0f6df238a407cab06d884c211 + sha256: c51cc65dac1b0b1f5139860c07030b9465417cebcb8529ffa97fcd8615aba606 manager: conda name: moto optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.9-pyhd8ed1ab_0.conda - version: 4.1.9 + url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.10-pyhd8ed1ab_0.conda + version: 4.1.10 - category: main dependencies: {} hash: @@ -5408,6 +5428,7 @@ package: name: mock optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/27/6f/fbb16f260a7107ee98871d83f6793d88c4311b7189b10ef239da0b2181db/mock-5.0.2-py3-none-any.whl version: 5.0.2 - dependencies: {} @@ -5416,6 +5437,7 @@ package: manager: pip name: pyyaml platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/02/25/6ba9f6bb50a3d4fbe22c1a02554dc670682a07c8701d1716d19ddea2c940/PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl version: '6.0' - category: main @@ -5427,6 +5449,7 @@ package: name: asttokens optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/f3/e1/64679d9d0759db5b182222c81ff322c2fe2c31e156a59afd6e9208c960e5/asttokens-2.2.1-py2.py3-none-any.whl version: 2.2.1 - category: main @@ -5438,6 +5461,7 @@ package: name: gdspy optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/1d/e4/97b8add92fbec2a9890ad4777272e9a9e4d7a0ceeac42b7e1febe94f0e86/gdspy-1.4.zip version: '1.4' - category: main @@ -5450,6 +5474,7 @@ package: name: paramiko-ng optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/9f/53/1ac75eab589149b1e02e38185ecebf09e1b805fc3fdeadbc16d1a2b7d208/paramiko_ng-2.8.10-py2.py3-none-any.whl version: 2.8.10 - category: main @@ -5461,6 +5486,7 @@ package: name: ruamel.yaml optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/23/33/dbc62343de0cf92e0f9c15bc0a287bdaea0953f1cadca0480c78d5ac6641/ruamel.yaml-0.17.26-py3-none-any.whl version: 0.17.26 - category: main @@ -5473,6 +5499,7 @@ package: name: sure optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/dd/ae/eb28ee3b6768e51cb938abcf521cb678217203f33385a2df54d3f23331c5/sure-2.0.1.tar.gz version: 2.0.1 - category: main @@ -5485,6 +5512,7 @@ package: name: fab-classic optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/6b/0f/efc537eebfd2a2c470250c0ac8bd8a05ffc13d95a7fb22021367890d7c46/fab_classic-1.19.2-py2.py3-none-any.whl version: 1.19.2 - category: main @@ -5500,6 +5528,7 @@ package: name: hammer-vlsi optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/0a/da/1897421311c6332655e2f73d02d8c914ecb724198a1988aacd8f4c61ae6e/hammer_vlsi-1.1.1-py3-none-any.whl version: 1.1.1 - category: main @@ -5512,6 +5541,7 @@ package: name: icontract optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/d8/91/9756e7cf0b155e80bf9a62beffdd1dec4afce43cc6ab7f432f2267c62762/icontract-2.6.2-py3-none-any.whl version: 2.6.2 - category: main @@ -5524,6 +5554,7 @@ package: name: pylddwrap optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/c9/12/4afd6542c43cd20271f0e53bf0211decc10079a76a41e53c0288025a7b85/pylddwrap-1.2.2.tar.gz version: 1.2.2 version: 1 diff --git a/docs/Chipyard-Basics/Initial-Repo-Setup.rst b/docs/Chipyard-Basics/Initial-Repo-Setup.rst index 45263a14..87deef33 100644 --- a/docs/Chipyard-Basics/Initial-Repo-Setup.rst +++ b/docs/Chipyard-Basics/Initial-Repo-Setup.rst @@ -46,7 +46,7 @@ This is done by the following: .. code-block:: shell - conda install -n base conda-lock + conda install -n base conda-lock=1 conda activate base .. Note:: We also recommended switching to `libmamba `__ for much faster dependency solving. diff --git a/fpga/fpga-shells b/fpga/fpga-shells index 9f4c6ac5..d650f81c 160000 --- a/fpga/fpga-shells +++ b/fpga/fpga-shells @@ -1 +1 @@ -Subproject commit 9f4c6ac5719b03ded61022dc3767e750872d0535 +Subproject commit d650f81c0728f3108719d37396c2a651a7463520 diff --git a/fpga/src/main/scala/vcu118/TestHarness.scala b/fpga/src/main/scala/vcu118/TestHarness.scala index ac9f9d05..850b7f62 100644 --- a/fpga/src/main/scala/vcu118/TestHarness.scala +++ b/fpga/src/main/scala/vcu118/TestHarness.scala @@ -84,7 +84,7 @@ class VCU118FPGATestHarness(override implicit val p: Parameters) extends VCU118S name = "chip_ddr", sourceId = IdRange(0, 1 << dp(ExtTLMem).get.master.idBits) ))))) - ddrNode := ddrClient + ddrNode := TLWidthWidget(dp(ExtTLMem).get.master.beatBytes) := ddrClient // module implementation override lazy val module = new VCU118FPGATestHarnessImp(this) diff --git a/generators/boom b/generators/boom index 679f3587..f732ceb6 160000 --- a/generators/boom +++ b/generators/boom @@ -1 +1 @@ -Subproject commit 679f358755c57524f18cf46b72fc3fc1ac67f127 +Subproject commit f732ceb602bcccd4adb6a5f7137c7c0bea08be9d diff --git a/generators/chipyard/src/main/scala/Cospike.scala b/generators/chipyard/src/main/scala/Cospike.scala index cee23413..de04b032 100644 --- a/generators/chipyard/src/main/scala/Cospike.scala +++ b/generators/chipyard/src/main/scala/Cospike.scala @@ -72,17 +72,18 @@ object SpikeCosim }) cosim.io.hartid := hartid.U for (i <- 0 until trace.numInsns) { - cosim.io.trace(i).valid := trace.insns(i).valid + val insn = trace.trace.insns(i) + cosim.io.trace(i).valid := insn.valid val signed = Wire(SInt(64.W)) - signed := trace.insns(i).iaddr.asSInt + signed := insn.iaddr.asSInt cosim.io.trace(i).iaddr := signed.asUInt - cosim.io.trace(i).insn := trace.insns(i).insn - cosim.io.trace(i).exception := trace.insns(i).exception - cosim.io.trace(i).interrupt := trace.insns(i).interrupt - cosim.io.trace(i).cause := trace.insns(i).cause - cosim.io.trace(i).has_wdata := trace.insns(i).wdata.isDefined.B - cosim.io.trace(i).wdata := trace.insns(i).wdata.getOrElse(0.U) - cosim.io.trace(i).priv := trace.insns(i).priv + cosim.io.trace(i).insn := insn.insn + cosim.io.trace(i).exception := insn.exception + cosim.io.trace(i).interrupt := insn.interrupt + cosim.io.trace(i).cause := insn.cause + cosim.io.trace(i).has_wdata := insn.wdata.isDefined.B + cosim.io.trace(i).wdata := insn.wdata.getOrElse(0.U) + cosim.io.trace(i).priv := insn.priv } } } diff --git a/generators/chipyard/src/main/scala/SpikeTile.scala b/generators/chipyard/src/main/scala/SpikeTile.scala index c6ec13ae..fc822c22 100644 --- a/generators/chipyard/src/main/scala/SpikeTile.scala +++ b/generators/chipyard/src/main/scala/SpikeTile.scala @@ -62,6 +62,7 @@ case class SpikeCoreParams() extends CoreParams { val useBitManipCrypto = false val useCryptoNIST = false val useCryptoSM = false + val useConditionalZero = false override def vLen = 128 override def vMemDataBits = 128 diff --git a/generators/chipyard/src/main/scala/clocking/ClockBinders.scala b/generators/chipyard/src/main/scala/clocking/ClockBinders.scala index 5618f582..9fa6f32b 100644 --- a/generators/chipyard/src/main/scala/clocking/ClockBinders.scala +++ b/generators/chipyard/src/main/scala/clocking/ClockBinders.scala @@ -38,9 +38,9 @@ class WithPLLSelectorDividerClockGenerator extends OverrideLazyIOBinder({ val clockSelector = system.prci_ctrl_domain { LazyModule(new TLClockSelector(baseAddress + 0x30000, tlbus.beatBytes)) } val pllCtrl = system.prci_ctrl_domain { LazyModule(new FakePLLCtrl (baseAddress + 0x40000, tlbus.beatBytes)) } - tlbus.toVariableWidthSlave(Some("clock-div-ctrl")) { clockDivider.tlNode := TLBuffer() } - tlbus.toVariableWidthSlave(Some("clock-sel-ctrl")) { clockSelector.tlNode := TLBuffer() } - tlbus.toVariableWidthSlave(Some("pll-ctrl")) { pllCtrl.tlNode := TLBuffer() } + clockDivider.tlNode := system.prci_ctrl_bus + clockSelector.tlNode := system.prci_ctrl_bus + pllCtrl.tlNode := system.prci_ctrl_bus system.allClockGroupsNode := clockDivider.clockNode := clockSelector.clockNode diff --git a/generators/chipyard/src/main/scala/clocking/ClockGroupCombiner.scala b/generators/chipyard/src/main/scala/clocking/ClockGroupCombiner.scala index ff6c52e9..e5236804 100644 --- a/generators/chipyard/src/main/scala/clocking/ClockGroupCombiner.scala +++ b/generators/chipyard/src/main/scala/clocking/ClockGroupCombiner.scala @@ -23,9 +23,9 @@ object ClockGroupCombiner { case object ClockGroupCombinerKey extends Field[Seq[(String, ClockSinkParameters => Boolean)]](Nil) // All clock groups with a name containing any substring in names will be combined into a single clock group -class WithClockGroupsCombinedByName(groups: (String, Seq[String])*) extends Config((site, here, up) => { - case ClockGroupCombinerKey => groups.map { case (grouped_name, matched_names) => - (grouped_name, (m: ClockSinkParameters) => matched_names.map(n => m.name.get.contains(n)).reduce(_||_)) +class WithClockGroupsCombinedByName(groups: (String, Seq[String], Seq[String])*) extends Config((site, here, up) => { + case ClockGroupCombinerKey => groups.map { case (grouped_name, matched_names, unmatched_names) => + (grouped_name, (m: ClockSinkParameters) => matched_names.exists(n => m.name.get.contains(n)) && !unmatched_names.exists(n => m.name.get.contains(n))) } }) diff --git a/generators/chipyard/src/main/scala/clocking/HasChipyardPRCI.scala b/generators/chipyard/src/main/scala/clocking/HasChipyardPRCI.scala index 6a2c82ca..71010c66 100644 --- a/generators/chipyard/src/main/scala/clocking/HasChipyardPRCI.scala +++ b/generators/chipyard/src/main/scala/clocking/HasChipyardPRCI.scala @@ -36,6 +36,14 @@ trait HasChipyardPRCI { this: BaseSubsystem with InstantiatesTiles => val prci_ctrl_domain = LazyModule(new ClockSinkDomain(name=Some("chipyard-prci-control"))) prci_ctrl_domain.clockNode := tlbus.fixedClockNode + val prci_ctrl_bus = prci_ctrl_domain { TLXbar() } + tlbus.coupleTo("prci_ctrl") { (prci_ctrl_bus + := TLFIFOFixer(TLFIFOFixer.all) + := TLFragmenter(tlbus.beatBytes, tlbus.blockBytes) + := TLBuffer() + := _) + } + // Aggregate all the clock groups into a single node val aggregator = LazyModule(new ClockGroupAggregator("allClocks")).node val allClockGroupsNode = ClockGroupEphemeralNode() @@ -71,19 +79,24 @@ trait HasChipyardPRCI { this: BaseSubsystem with InstantiatesTiles => // diplomatic IOBinder should drive val frequencySpecifier = ClockGroupFrequencySpecifier(p(ClockFrequencyAssignersKey)) val clockGroupCombiner = ClockGroupCombiner() - val resetSynchronizer = ClockGroupResetSynchronizer() - val tileClockGater = if (prciParams.enableTileClockGating) { prci_ctrl_domain { - TileClockGater(prciParams.baseAddress + 0x00000, tlbus) - } } else { ClockGroupEphemeralNode() } - val tileResetSetter = if (prciParams.enableTileResetSetting) { prci_ctrl_domain { - TileResetSetter(prciParams.baseAddress + 0x10000, tlbus, tile_prci_domains.map(_.tile_reset_domain.clockNode.portParams(0).name.get), Nil) - } } else { ClockGroupEphemeralNode() } + val resetSynchronizer = prci_ctrl_domain { ClockGroupResetSynchronizer() } + val tileClockGater = Option.when(prciParams.enableTileClockGating) { prci_ctrl_domain { + val clock_gater = LazyModule(new TileClockGater(prciParams.baseAddress + 0x00000, tlbus.beatBytes)) + clock_gater.tlNode := prci_ctrl_bus + clock_gater + } } + val tileResetSetter = Option.when(prciParams.enableTileResetSetting) { prci_ctrl_domain { + val reset_setter = LazyModule(new TileResetSetter(prciParams.baseAddress + 0x10000, tlbus.beatBytes, + tile_prci_domains.map(_.tile_reset_domain.clockNode.portParams(0).name.get), Nil)) + reset_setter.tlNode := prci_ctrl_bus + reset_setter + } } (aggregator := frequencySpecifier := clockGroupCombiner := resetSynchronizer - := tileClockGater - := tileResetSetter + := tileClockGater.map(_.clockNode).getOrElse(ClockGroupEphemeralNode()(ValName("temp"))) + := tileResetSetter.map(_.clockNode).getOrElse(ClockGroupEphemeralNode()(ValName("temp"))) := allClockGroupsNode) } diff --git a/generators/chipyard/src/main/scala/clocking/TLClockDivider.scala b/generators/chipyard/src/main/scala/clocking/TLClockDivider.scala index bc722799..45f9374d 100644 --- a/generators/chipyard/src/main/scala/clocking/TLClockDivider.scala +++ b/generators/chipyard/src/main/scala/clocking/TLClockDivider.scala @@ -26,20 +26,26 @@ class TLClockDivider(address: BigInt, beatBytes: Int, divBits: Int = 8)(implicit val sinks = clockNode.out.head._1.member.elements.toSeq require (sources.size == sinks.size) val nSinks = sinks.size + // The implicit clock of this module is the clock of the tilelink bus + // busReset is sync'd to that clock, and will be asserted longer than the + // resets coming in through the clockNode, since the busReset is derived from + // the clockNode resets in downstream PRCI nodes + val busReset = reset val regs = (0 until nSinks) .map { i => val sinkName = sinks(i)._1 val asyncReset = sources(i).reset - val reg = withReset (asyncReset) { - Module(new AsyncResetRegVec(w=divBits, init=0)) - } + val reg = Module(new AsyncResetRegVec(w=divBits, init=0)) + println(s"${(address+i*4).toString(16)}: Clock domain $sinkName divider") - sinks(i)._2.clock := withClockAndReset(sources(i).clock, asyncReset) { - val divider = Module(new testchipip.ClockDivideOrPass(divBits, depth = 3, genClockGate = p(ClockGateImpl))) - divider.io.divisor := reg.io.q - divider.io.resetAsync := ResetStretcher(sources(i).clock, asyncReset, 20).asAsyncReset - divider.io.clockOut - } + val divider = Module(new testchipip.ClockDivideOrPass(divBits, depth = 3, genClockGate = p(ClockGateImpl))) + divider.io.clockIn := sources(i).clock + // busReset is expected to be high for a long time, since reset will take a while to propagate + // to the TL bus. While reset is propagating, make sure we propagate a fast, undivided clock + // by setting divisor=0. The divisor signal into the ClockDividerOrPass is synchronized internally + divider.io.divisor := Mux(busReset.asBool, 0.U, reg.io.q) + divider.io.resetAsync := ResetStretcher(sources(i).clock, asyncReset, 20).asAsyncReset + sinks(i)._2.clock := divider.io.clockOut // Note this is not synchronized to the output clock, which takes time to appear // so this is still asyncreset diff --git a/generators/chipyard/src/main/scala/clocking/TileClockGater.scala b/generators/chipyard/src/main/scala/clocking/TileClockGater.scala index 23d525a6..b50ddd6d 100644 --- a/generators/chipyard/src/main/scala/clocking/TileClockGater.scala +++ b/generators/chipyard/src/main/scala/clocking/TileClockGater.scala @@ -46,10 +46,3 @@ class TileClockGater(address: BigInt, beatBytes: Int)(implicit p: Parameters, va } } -object TileClockGater { - def apply(address: BigInt, tlbus: TLBusWrapper)(implicit p: Parameters, v: ValName) = { - val gater = LazyModule(new TileClockGater(address, tlbus.beatBytes)) - tlbus.toVariableWidthSlave(Some("clock-gater")) { gater.tlNode := TLBuffer() } - gater.clockNode - } -} diff --git a/generators/chipyard/src/main/scala/clocking/TileResetSetter.scala b/generators/chipyard/src/main/scala/clocking/TileResetSetter.scala index 9ea4bfd5..53dd36d0 100644 --- a/generators/chipyard/src/main/scala/clocking/TileResetSetter.scala +++ b/generators/chipyard/src/main/scala/clocking/TileResetSetter.scala @@ -62,12 +62,3 @@ class TileResetSetter(address: BigInt, beatBytes: Int, tileNames: Seq[String], i } } } - - -object TileResetSetter { - def apply(address: BigInt, tlbus: TLBusWrapper, tileNames: Seq[String], initResetHarts: Seq[Int])(implicit p: Parameters, v: ValName) = { - val setter = LazyModule(new TileResetSetter(address, tlbus.beatBytes, tileNames, initResetHarts)) - tlbus.toVariableWidthSlave(Some("tile-reset-setter")) { setter.tlNode := TLBuffer() } - setter.clockNode - } -} diff --git a/generators/chipyard/src/main/scala/config/AbstractConfig.scala b/generators/chipyard/src/main/scala/config/AbstractConfig.scala index 063b21d4..218b435c 100644 --- a/generators/chipyard/src/main/scala/config/AbstractConfig.scala +++ b/generators/chipyard/src/main/scala/config/AbstractConfig.scala @@ -48,7 +48,7 @@ class AbstractConfig extends Config( // By default, punch out IOs to the Harness new chipyard.clocking.WithPassthroughClockGenerator ++ - new chipyard.clocking.WithClockGroupsCombinedByName(("uncore", Seq("sbus", "mbus", "pbus", "fbus", "cbus", "implicit"))) ++ + new chipyard.clocking.WithClockGroupsCombinedByName(("uncore", Seq("sbus", "mbus", "pbus", "fbus", "cbus", "implicit"), Seq("tile"))) ++ new chipyard.config.WithPeripheryBusFrequency(500.0) ++ // Default 500 MHz pbus new chipyard.config.WithMemoryBusFrequency(500.0) ++ // Default 500 MHz mbus diff --git a/generators/chipyard/src/main/scala/config/ChipConfigs.scala b/generators/chipyard/src/main/scala/config/ChipConfigs.scala index c85ef593..c8564a26 100644 --- a/generators/chipyard/src/main/scala/config/ChipConfigs.scala +++ b/generators/chipyard/src/main/scala/config/ChipConfigs.scala @@ -40,7 +40,7 @@ class ChipLikeRocketConfig extends Config( new chipyard.clocking.WithPLLSelectorDividerClockGenerator ++ // Use a PLL-based clock selector/divider generator structure // Create the uncore clock group - new chipyard.clocking.WithClockGroupsCombinedByName(("uncore", Seq("implicit", "sbus", "mbus", "cbus", "system_bus", "fbus", "pbus"))) ++ + new chipyard.clocking.WithClockGroupsCombinedByName(("uncore", Seq("implicit", "sbus", "mbus", "cbus", "system_bus", "fbus", "pbus"), Nil)) ++ new chipyard.config.AbstractConfig) diff --git a/generators/chipyard/src/main/scala/config/RocketConfigs.scala b/generators/chipyard/src/main/scala/config/RocketConfigs.scala index 2bcc0089..099705e4 100644 --- a/generators/chipyard/src/main/scala/config/RocketConfigs.scala +++ b/generators/chipyard/src/main/scala/config/RocketConfigs.scala @@ -78,8 +78,8 @@ class MulticlockRocketConfig extends Config( new freechips.rocketchip.subsystem.WithNBigCores(1) ++ // Frequency specifications new chipyard.config.WithTileFrequency(1000.0) ++ // Matches the maximum frequency of U540 - new chipyard.clocking.WithClockGroupsCombinedByName(("uncore" , Seq("sbus", "cbus", "implicit")), - ("periphery", Seq("pbus", "fbus"))) ++ + new chipyard.clocking.WithClockGroupsCombinedByName(("uncore" , Seq("sbus", "cbus", "implicit"), Nil), + ("periphery", Seq("pbus", "fbus"), Nil)) ++ new chipyard.config.WithSystemBusFrequency(500.0) ++ // Matches the maximum frequency of U540 new chipyard.config.WithMemoryBusFrequency(500.0) ++ // Matches the maximum frequency of U540 new chipyard.config.WithPeripheryBusFrequency(500.0) ++ // Matches the maximum frequency of U540 diff --git a/generators/chipyard/src/main/scala/config/TracegenConfigs.scala b/generators/chipyard/src/main/scala/config/TracegenConfigs.scala index 20286fd6..ab00ad24 100644 --- a/generators/chipyard/src/main/scala/config/TracegenConfigs.scala +++ b/generators/chipyard/src/main/scala/config/TracegenConfigs.scala @@ -11,7 +11,7 @@ class AbstractTraceGenConfig extends Config( new chipyard.iobinders.WithAXI4MemPunchthrough ++ new chipyard.iobinders.WithTraceGenSuccessPunchthrough ++ new chipyard.clocking.WithPassthroughClockGenerator ++ - new chipyard.clocking.WithClockGroupsCombinedByName(("uncore", Seq("sbus", "implicit"))) ++ + new chipyard.clocking.WithClockGroupsCombinedByName(("uncore", Seq("sbus", "implicit"), Nil)) ++ new chipyard.config.WithTracegenSystem ++ new chipyard.config.WithNoSubsystemDrivenClocks ++ new chipyard.config.WithMemoryBusFrequency(1000.0) ++ diff --git a/generators/chipyard/src/main/scala/example/FlatChipTop.scala b/generators/chipyard/src/main/scala/example/FlatChipTop.scala index c10baab4..b960251d 100644 --- a/generators/chipyard/src/main/scala/example/FlatChipTop.scala +++ b/generators/chipyard/src/main/scala/example/FlatChipTop.scala @@ -7,7 +7,7 @@ import freechips.rocketchip.diplomacy._ import freechips.rocketchip.prci._ import freechips.rocketchip.util._ import freechips.rocketchip.devices.debug.{ExportDebug, JtagDTMKey, Debug} -import freechips.rocketchip.tilelink.{TLBuffer} +import freechips.rocketchip.tilelink.{TLBuffer, TLFragmenter} import chipyard.{BuildSystem, DigitalTop} import chipyard.clocking._ import chipyard.iobinders.{IOCellKey, JTAGChipIO} @@ -33,9 +33,9 @@ class FlatChipTop(implicit p: Parameters) extends LazyModule { val clockSelector = system.prci_ctrl_domain { LazyModule(new TLClockSelector(baseAddress + 0x30000, tlbus.beatBytes)) } val pllCtrl = system.prci_ctrl_domain { LazyModule(new FakePLLCtrl (baseAddress + 0x40000, tlbus.beatBytes)) } - tlbus.toVariableWidthSlave(Some("clock-div-ctrl")) { clockDivider.tlNode := TLBuffer() } - tlbus.toVariableWidthSlave(Some("clock-sel-ctrl")) { clockSelector.tlNode := TLBuffer() } - tlbus.toVariableWidthSlave(Some("pll-ctrl")) { pllCtrl.tlNode := TLBuffer() } + tlbus.coupleTo("clock-div-ctrl") { clockDivider.tlNode := TLFragmenter(tlbus.beatBytes, tlbus.blockBytes) := TLBuffer() := _ } + tlbus.coupleTo("clock-sel-ctrl") { clockSelector.tlNode := TLFragmenter(tlbus.beatBytes, tlbus.blockBytes) := TLBuffer() := _ } + tlbus.coupleTo("pll-ctrl") { pllCtrl.tlNode := TLFragmenter(tlbus.beatBytes, tlbus.blockBytes) := TLBuffer() := _ } system.allClockGroupsNode := clockDivider.clockNode := clockSelector.clockNode diff --git a/generators/chipyard/src/main/scala/example/GCD.scala b/generators/chipyard/src/main/scala/example/GCD.scala index bf05ba9c..5e6c5d67 100644 --- a/generators/chipyard/src/main/scala/example/GCD.scala +++ b/generators/chipyard/src/main/scala/example/GCD.scala @@ -165,17 +165,17 @@ trait CanHavePeripheryGCD { this: BaseSubsystem => case Some(params) => { if (params.useAXI4) { val gcd = LazyModule(new GCDAXI4(params, pbus.beatBytes)(p)) - pbus.toSlave(Some(portName)) { + pbus.coupleTo(portName) { gcd.node := AXI4Buffer () := TLToAXI4 () := // toVariableWidthSlave doesn't use holdFirstDeny, which TLToAXI4() needsx - TLFragmenter(pbus.beatBytes, pbus.blockBytes, holdFirstDeny = true) + TLFragmenter(pbus.beatBytes, pbus.blockBytes, holdFirstDeny = true) := _ } Some(gcd) } else { val gcd = LazyModule(new GCDTL(params, pbus.beatBytes)(p)) - pbus.toVariableWidthSlave(Some(portName)) { gcd.node } + pbus.coupleTo(portName) { gcd.node := TLFragmenter(pbus.beatBytes, pbus.blockBytes) := _ } Some(gcd) } } diff --git a/generators/chipyard/src/main/scala/example/InitZero.scala b/generators/chipyard/src/main/scala/example/InitZero.scala index bb6ecd72..78237eca 100644 --- a/generators/chipyard/src/main/scala/example/InitZero.scala +++ b/generators/chipyard/src/main/scala/example/InitZero.scala @@ -62,7 +62,7 @@ trait CanHavePeripheryInitZero { this: BaseSubsystem => p(InitZeroKey) .map { k => val initZero = LazyModule(new InitZero()(p)) - fbus.fromPort(Some("init-zero"))() := initZero.node + fbus.coupleFrom("init-zero") { _ := initZero.node } } } diff --git a/generators/chipyard/src/main/scala/example/TutorialTile.scala b/generators/chipyard/src/main/scala/example/TutorialTile.scala index 1a9114b9..38c8577a 100644 --- a/generators/chipyard/src/main/scala/example/TutorialTile.scala +++ b/generators/chipyard/src/main/scala/example/TutorialTile.scala @@ -67,6 +67,7 @@ case class MyCoreParams( val useCryptoNIST: Boolean = false val useCryptoSM: Boolean = false val traceHasWdata: Boolean = false + val useConditionalZero = false } // DOC include start: CanAttachTile diff --git a/generators/chipyard/src/main/scala/example/dsptools/GenericFIR.scala b/generators/chipyard/src/main/scala/example/dsptools/GenericFIR.scala index 15dfb992..3e315e65 100644 --- a/generators/chipyard/src/main/scala/example/dsptools/GenericFIR.scala +++ b/generators/chipyard/src/main/scala/example/dsptools/GenericFIR.scala @@ -203,7 +203,7 @@ trait CanHavePeripheryStreamingFIR extends BaseSubsystem { genOut = FixedPoint(8.W, 3.BP), coeffs = Seq(1.F(0.BP), 2.F(0.BP), 3.F(0.BP)), params = params)) - pbus.toVariableWidthSlave(Some("streamingFIR")) { streamingFIR.mem.get := TLFIFOFixer() } + pbus.coupleTo("streamingFIR") { streamingFIR.mem.get := TLFIFOFixer() := TLFragmenter(pbus.beatBytes, pbus.blockBytes) := _ } Some(streamingFIR) } case None => None diff --git a/generators/chipyard/src/main/scala/example/dsptools/StreamingPassthrough.scala b/generators/chipyard/src/main/scala/example/dsptools/StreamingPassthrough.scala index 2846277c..45e05fc2 100644 --- a/generators/chipyard/src/main/scala/example/dsptools/StreamingPassthrough.scala +++ b/generators/chipyard/src/main/scala/example/dsptools/StreamingPassthrough.scala @@ -132,7 +132,7 @@ trait CanHavePeripheryStreamingPassthrough { this: BaseSubsystem => val passthrough = p(StreamingPassthroughKey) match { case Some(params) => { val streamingPassthroughChain = LazyModule(new TLStreamingPassthroughChain(params, UInt(32.W))) - pbus.toVariableWidthSlave(Some("streamingPassthrough")) { streamingPassthroughChain.mem.get := TLFIFOFixer() } + pbus.coupleTo("streamingPassthrough") { streamingPassthroughChain.mem.get := TLFIFOFixer() := TLFragmenter(pbus.beatBytes, pbus.blockBytes) := _ } Some(streamingPassthroughChain) } case None => None diff --git a/generators/cva6 b/generators/cva6 index 0011494b..46323fcd 160000 --- a/generators/cva6 +++ b/generators/cva6 @@ -1 +1 @@ -Subproject commit 0011494bb70d2327ab4d6b0258f5073f137927ee +Subproject commit 46323fcd7407544c751b353f52e356eb8f33e9d1 diff --git a/generators/fft-generator b/generators/fft-generator index be8ab768..f598d0c3 160000 --- a/generators/fft-generator +++ b/generators/fft-generator @@ -1 +1 @@ -Subproject commit be8ab768bd15824c69531df632478e4429078b94 +Subproject commit f598d0c359c896e7853c8ef01c39ebecdd48b344 diff --git a/generators/firechip/src/main/scala/FireSim.scala b/generators/firechip/src/main/scala/FireSim.scala index be016e6a..c20abca1 100644 --- a/generators/firechip/src/main/scala/FireSim.scala +++ b/generators/firechip/src/main/scala/FireSim.scala @@ -38,16 +38,22 @@ class FireSimClockBridgeInstantiator extends HarnessClockInstantiator { var instantiatedClocks = LinkedHashMap[Int, (Clock, Seq[String])]() // connect wires to clock source - for ((name, (freq, clock)) <- clockMap) { - val freqMHz = (freq / (1000 * 1000)).toInt + def findOrInstantiate(freqMHz: Int, name: String): Clock = { if (!instantiatedClocks.contains(freqMHz)) { val clock = Wire(Clock()) instantiatedClocks(freqMHz) = (clock, Seq(name)) } else { instantiatedClocks(freqMHz) = (instantiatedClocks(freqMHz)._1, instantiatedClocks(freqMHz)._2 :+ name) } - clock := instantiatedClocks(freqMHz)._1 + instantiatedClocks(freqMHz)._1 } + for ((name, (freq, clock)) <- clockMap) { + val freqMHz = (freq / (1000 * 1000)).toInt + clock := findOrInstantiate(freqMHz, name) + } + + // The undivided reference clock as calculated by pllConfig must be instantiated + findOrInstantiate(pllConfig.referenceFreqMHz.toInt, "reference") val ratClocks = instantiatedClocks.map { case (freqMHz, (clock, names)) => (RationalClock(names.mkString(","), 1, pllConfig.referenceFreqMHz.toInt / freqMHz), clock) diff --git a/generators/firechip/src/main/scala/TargetConfigs.scala b/generators/firechip/src/main/scala/TargetConfigs.scala index d2f8b994..c27abd50 100644 --- a/generators/firechip/src/main/scala/TargetConfigs.scala +++ b/generators/firechip/src/main/scala/TargetConfigs.scala @@ -103,11 +103,15 @@ class WithFireSimDesignTweaks extends Config( // Tweaks to modify target clock frequencies / crossings to legacy firesim defaults class WithFireSimHighPerfClocking extends Config( + // Create clock group for uncore that does not include mbus + new chipyard.clocking.WithClockGroupsCombinedByName(("uncore", Seq("sbus", "pbus", "fbus", "cbus", "implicit"), Nil)) ++ // Optional: This sets the default frequency for all buses in the system to 3.2 GHz // (since unspecified bus frequencies will use the pbus frequency) // This frequency selection matches FireSim's legacy selection and is required // to support 200Gb NIC performance. You may select a smaller value. new chipyard.config.WithPeripheryBusFrequency(3200.0) ++ + new chipyard.config.WithSystemBusFrequency(3200.0) ++ + new chipyard.config.WithFrontBusFrequency(3200.0) ++ // Optional: These three configs put the DRAM memory system in it's own clock domain. // Removing the first config will result in the FASED timing model running // at the pbus freq (above, 3.2 GHz), which is outside the range of valid DDR3 speedgrades. @@ -164,6 +168,23 @@ class WithFireSimHighPerfConfigTweaks extends Config( new WithFireSimDesignTweaks ) +// Tweak more representative of testchip configs +class WithFireSimTestChipConfigTweaks extends Config( + // Frequency specifications + new chipyard.config.WithTileFrequency(1000.0) ++ // Realistic tile frequency for a test chip + new chipyard.config.WithSystemBusFrequency(500.0) ++ // Realistic system bus frequency + new chipyard.config.WithMemoryBusFrequency(1000.0) ++ // Needs to be 1000 MHz to model DDR performance accurately + new chipyard.config.WithPeripheryBusFrequency(500.0) ++ // Match the sbus and pbus frequency + new chipyard.clocking.WithClockGroupsCombinedByName(("uncore", Seq("sbus", "pbus", "fbus", "cbus", "implicit"), Seq("tile"))) ++ + // Crossing specifications + new chipyard.config.WithCbusToPbusCrossingType(AsynchronousCrossing()) ++ // Add Async crossing between PBUS and CBUS + new chipyard.config.WithSbusToMbusCrossingType(AsynchronousCrossing()) ++ // Add Async crossings between backside of L2 and MBUS + new freechips.rocketchip.subsystem.WithRationalRocketTiles ++ // Add rational crossings between RocketTile and uncore + new boom.common.WithRationalBoomTiles ++ // Add rational crossings between BoomTile and uncore + new testchipip.WithAsynchronousSerialSlaveCrossing ++ // Add Async crossing between serial and MBUS. Its master-side is tied to the FBUS + new WithFireSimDesignTweaks +) + /******************************************************************************* * Full TARGET_CONFIG configurations. These set parameters of the target being * simulated. diff --git a/generators/ibex b/generators/ibex index 916fb7a6..66ec6e56 160000 --- a/generators/ibex +++ b/generators/ibex @@ -1 +1 @@ -Subproject commit 916fb7a6ff4a65f989279bcc082676a565beee0c +Subproject commit 66ec6e56ed69df4e4af5383128cf21adf88b08fc diff --git a/generators/icenet b/generators/icenet index ce1ec55c..68b4c7f3 160000 --- a/generators/icenet +++ b/generators/icenet @@ -1 +1 @@ -Subproject commit ce1ec55c1fd9c4339e7c0eec3a82d86041fa5d20 +Subproject commit 68b4c7f30f0119fe5cfab7ea99fb6927a563e112 diff --git a/generators/nvdla b/generators/nvdla index 7130a5c0..730fad43 160000 --- a/generators/nvdla +++ b/generators/nvdla @@ -1 +1 @@ -Subproject commit 7130a5c0f7016cd177ec9cf908a18edd668660d1 +Subproject commit 730fad4360e67b14b1a4656ac58aaa40cfd4fe6b diff --git a/generators/riscv-sodor b/generators/riscv-sodor index c051956d..c1c809eb 160000 --- a/generators/riscv-sodor +++ b/generators/riscv-sodor @@ -1 +1 @@ -Subproject commit c051956d3be3269c4ed9fcbb6afe920a6f54fd32 +Subproject commit c1c809ebd5c9a76cd60d8c3169cea4bf4b2fa8fd diff --git a/generators/rocket-chip b/generators/rocket-chip index 25e2c635..47f7b714 160000 --- a/generators/rocket-chip +++ b/generators/rocket-chip @@ -1 +1 @@ -Subproject commit 25e2c63567689ebe1fc5e60fdfe3375a8dba071c +Subproject commit 47f7b7144727f0340d511d35b9f6c7a91b2a276f diff --git a/generators/sha3 b/generators/sha3 index 1fa5ef8a..b19b7c76 160000 --- a/generators/sha3 +++ b/generators/sha3 @@ -1 +1 @@ -Subproject commit 1fa5ef8ae5b67126d709193896e75dba50c5fd28 +Subproject commit b19b7c76fc865598b6a9806c8ef799064fc496ab diff --git a/generators/testchipip b/generators/testchipip index 456223c9..90401326 160000 --- a/generators/testchipip +++ b/generators/testchipip @@ -1 +1 @@ -Subproject commit 456223c9164596f7c57e114b69b2584e0dcf2901 +Subproject commit 904013261858f74140558522eaea2419dd466c79 diff --git a/project/plugins.sbt b/project/plugins.sbt index 2425544f..36e1e8b6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4") -addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.3") +addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.6") diff --git a/scripts/repo-clean.sh b/scripts/repo-clean.sh index 0ecdbb27..c966f265 100755 --- a/scripts/repo-clean.sh +++ b/scripts/repo-clean.sh @@ -26,10 +26,13 @@ rm -rf $RDIR/toolchains/esp-tools/riscv-tests/build.log popd ) ( - pushd $RDIR/generators/cva6/src/main/resources/vsrc - if [ -d cva6 ] + if [ -d $RDIR/generators/cva6/src/main/resources/cva6/vsrc ] then - git submodule deinit -f cva6 + pushd $RDIR/generators/cva6/src/main/resources/cva6/vsrc + if [ -d cva6 ] + then + git submodule deinit -f cva6 + fi + popd fi - popd ) diff --git a/sims/firesim b/sims/firesim index 966e0990..b0007729 160000 --- a/sims/firesim +++ b/sims/firesim @@ -1 +1 @@ -Subproject commit 966e09907cde52f0ce68eb654bf6020b5b97a6c3 +Subproject commit b0007729905bb3be4125440924ecc97bed9ecf88 diff --git a/sims/vcs/Makefile b/sims/vcs/Makefile index fc0a9fdb..8517fc1d 100644 --- a/sims/vcs/Makefile +++ b/sims/vcs/Makefile @@ -93,7 +93,7 @@ $(output_dir)/%.fsdb: $(output_dir)/% $(sim_debug) ######################################################################################### .PHONY: clean clean-sim clean-sim-debug clean: - rm -rf $(gen_dir) $(sim_prefix)-* ucli.key + rm -rf $(CLASSPATH_CACHE) $(gen_dir) $(sim_prefix)-* ucli.key clean-sim: rm -rf $(model_dir) $(build_dir)/vc_hdrs.h $(sim) $(sim).daidir ucli.key diff --git a/sims/verilator/Makefile b/sims/verilator/Makefile index dc556862..8cf51e23 100644 --- a/sims/verilator/Makefile +++ b/sims/verilator/Makefile @@ -226,7 +226,7 @@ $(output_dir)/%.vpd: $(output_dir)/% $(sim_debug) ######################################################################################### .PHONY: clean clean-sim clean-sim-debug clean: - rm -rf $(gen_dir) $(sim_prefix)-* + rm -rf $(CLASSPATH_CACHE) $(gen_dir) $(sim_prefix)-* clean-sim: rm -rf $(model_dir) $(sim) diff --git a/sims/xcelium/Makefile b/sims/xcelium/Makefile index 2ca75d91..e37c12a1 100644 --- a/sims/xcelium/Makefile +++ b/sims/xcelium/Makefile @@ -77,7 +77,6 @@ XCELIUM_OPTS = $(XCELIUM_CC_OPTS) $(XCELIUM_NONCC_OPTS) $(PREPROC_DEFINES) model_dir = $(build_dir)/$(long_name) model_dir_debug = $(build_dir)/$(long_name).debug - ######################################################################################### # xcelium simulator rules ######################################################################################### @@ -87,37 +86,35 @@ $(sim_workdir): $(sim_common_files) $(dramsim_lib) $(EXTRA_SIM_REQS) $(XCELIUM) -elaborate $(XCELIUM_OPTS) $(EXTRA_SIM_SOURCES) $(XCELIUM_COMMON_ARGS) $(sim_run_tcl): $(sim_workdir) - echo "$$CAD_INFO_HEADER" > $(sim_run_tcl) - echo "run" >> $(sim_run_tcl) - echo "exit" >> $(sim_run_tcl) + echo "$$CAD_INFO_HEADER" > $@ + echo "run" >> $@ + echo "exit" >> $@ # The system libstdc++ may not link correctly with some of our dynamic libs, so # force loading the conda one (if present) with LD_PRELOAD $(sim): $(sim_workdir) $(sim_run_tcl) - echo "#!/usr/bin/env bash" > $(sim) - echo "$$CAD_INFO_HEADER" >> $(sim) - cat arg-reshuffle >> $(sim) - echo "LD_PRELOAD=$(base_dir)/.conda-env/lib/libstdc++.so.6 $(XCELIUM) +permissive -R -input $(sim_run_tcl) $(XCELIUM_COMMON_ARGS) +permissive-off \$$INPUT_ARGS" >> $(sim) - chmod +x $(sim) + echo "#!/usr/bin/env bash" > $@ + echo "$$CAD_INFO_HEADER" >> $@ + cat arg-reshuffle >> $@ + echo "LD_PRELOAD=$(CONDA_PREFIX)/lib/libstdc++.so.6 $(XCELIUM) +permissive -R -input $(sim_run_tcl) $(XCELIUM_COMMON_ARGS) +permissive-off \$$INPUT_ARGS" >> $@ + chmod +x $@ $(sim_debug_run_tcl): $(sim_workdir) - echo "$$CAD_INFO_HEADER" > $(sim_debug_run_tcl) - echo "database -open default_vcd_dump -vcd -into \$$env(XCELIUM_WAVEFORM_FLAG)" >> $(sim_debug_run_tcl) - echo "set probe_packed_limit 64k" >> $(sim_debug_run_tcl) - echo "probe -create $(TB) -database default_vcd_dump -depth all -all" >> $(sim_debug_run_tcl) - echo "run" >> $(sim_debug_run_tcl) - echo "database -close default_vcd_dump" >> $(sim_debug_run_tcl) - echo "exit" >> $(sim_debug_run_tcl) - + echo "$$CAD_INFO_HEADER" > $@ + echo "database -open default_vcd_dump -vcd -into \$$env(XCELIUM_WAVEFORM_FLAG)" >> $@ + echo "set probe_packed_limit 64k" >> $@ + echo "probe -create $(TB) -database default_vcd_dump -depth all -all" >> $@ + echo "run" >> $@ + echo "database -close default_vcd_dump" >> $@ + echo "exit" >> $@ $(sim_debug): $(sim_workdir) $(sim_debug_run_tcl) - echo "#!/usr/bin/env bash" > $(sim_debug) - echo "$$CAD_INFO_HEADER" >> $(sim_debug) - cat arg-reshuffle >> $(sim_debug) - echo "export XCELIUM_WAVEFORM_FLAG=\$$XCELIUM_WAVEFORM_FLAG" >> $(sim_debug) - echo "LD_PRELOAD=$(base_dir)/.conda-env/lib/libstdc++.so.6 $(XCELIUM) +permissive -R -input $(sim_debug_run_tcl) $(XCELIUM_COMMON_ARGS) +permissive-off \$$INPUT_ARGS" >> $(sim_debug) - chmod +x $(sim_debug) - + echo "#!/usr/bin/env bash" > $@ + echo "$$CAD_INFO_HEADER" >> $@ + cat arg-reshuffle >> $@ + echo "export XCELIUM_WAVEFORM_FLAG=\$$XCELIUM_WAVEFORM_FLAG" >> $@ + echo "LD_PRELOAD=$(CONDA_PREFIX)/lib/libstdc++.so.6 $(XCELIUM) +permissive -R -input $(sim_debug_run_tcl) $(XCELIUM_COMMON_ARGS) +permissive-off \$$INPUT_ARGS" >> $@ + chmod +x $@ ######################################################################################### # create vcd rules @@ -131,7 +128,7 @@ $(output_dir)/%.vcd: $(output_dir)/% $(sim_debug) ######################################################################################### .PHONY: clean clean-sim clean-sim-debug clean: - rm -rf $(gen_dir) $(sim_prefix)-* + rm -rf $(CLASSPATH_CACHE) $(gen_dir) $(sim_prefix)-* clean-sim: rm -rf $(model_dir) $(sim) $(sim_workdir) $(sim_run_tcl) ucli.key bpad_*.err sigusrdump.out dramsim*.log diff --git a/tools/barstools b/tools/barstools index 30900965..fe81afec 160000 --- a/tools/barstools +++ b/tools/barstools @@ -1 +1 @@ -Subproject commit 30900965f0cc2d5046e2160dd9c700805a8e0542 +Subproject commit fe81afec14634316606a9dd10628c220d53bd256 diff --git a/variables.mk b/variables.mk index f4e3d3c9..2beec438 100644 --- a/variables.mk +++ b/variables.mk @@ -8,7 +8,7 @@ HELP_COMPILATION_VARIABLES = \ " JAVA_TOOL_OPTIONS = if overridden, set underlying java tool options (default sets misc. sizes and tmp dir)" \ " SBT_OPTS = set additional sbt command line options (these take the form -Dsbt.