From a681bedae05fb9ae9d0d5302a9a4a5b3128eebf7 Mon Sep 17 00:00:00 2001 From: Harrison Liew Date: Fri, 24 Feb 2023 20:37:36 -0800 Subject: [PATCH 01/19] fix top/model separation for rtl vs. post-syn/par sim --- vlsi/Makefile | 6 ++++++ vlsi/sim.mk | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/vlsi/Makefile b/vlsi/Makefile index ab8438d5..97fba910 100644 --- a/vlsi/Makefile +++ b/vlsi/Makefile @@ -118,6 +118,12 @@ endif $(SYN_CONF): $(VLSI_RTL) mkdir -p $(dir $@) + echo "sim.inputs:" > $@ + echo " input_files:" >> $@ + for x in $(VLSI_RTL); do \ + echo ' - "'$$x'"' >> $@; \ + done + echo " input_files_meta: 'append'" >> $@ echo "synthesis.inputs:" >> $@ echo " top_module: $(VLSI_TOP)" >> $@ echo " input_files:" >> $@ diff --git a/vlsi/sim.mk b/vlsi/sim.mk index 5623f9d3..b487657c 100644 --- a/vlsi/sim.mk +++ b/vlsi/sim.mk @@ -10,7 +10,7 @@ $(SIM_CONF): $(sim_common_files) echo " top_module: $(VLSI_TOP)" >> $@ echo " tb_name: ''" >> $@ # don't specify -top echo " input_files:" >> $@ - for x in $$(cat $(sim_common_files)); do \ + for x in $$(cat $(MODEL_MODS_FILELIST) $(MODEL_BB_MODS_FILELIST) | sort -u) $(MODEL_SMEMS_FILE); do \ echo ' - "'$$x'"' >> $@; \ done echo " input_files_meta: 'append'" >> $@ From c1e8b202347349a4f67a2d08679afb61b994e07d Mon Sep 17 00:00:00 2001 From: Harrison Liew Date: Mon, 27 Feb 2023 15:24:00 -0800 Subject: [PATCH 02/19] add SIM_FILE_REQS --- vlsi/sim.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlsi/sim.mk b/vlsi/sim.mk index b487657c..13a7fcc3 100644 --- a/vlsi/sim.mk +++ b/vlsi/sim.mk @@ -10,7 +10,7 @@ $(SIM_CONF): $(sim_common_files) echo " top_module: $(VLSI_TOP)" >> $@ echo " tb_name: ''" >> $@ # don't specify -top echo " input_files:" >> $@ - for x in $$(cat $(MODEL_MODS_FILELIST) $(MODEL_BB_MODS_FILELIST) | sort -u) $(MODEL_SMEMS_FILE); do \ + for x in $$(cat $(MODEL_MODS_FILELIST) $(MODEL_BB_MODS_FILELIST) | sort -u) $(MODEL_SMEMS_FILE) $(SIM_FILE_REQS); do \ echo ' - "'$$x'"' >> $@; \ done echo " input_files_meta: 'append'" >> $@ From 89929cbb6eeac1a46ed39499ef8e79e4bd81aea1 Mon Sep 17 00:00:00 2001 From: Harrison Liew Date: Tue, 28 Feb 2023 13:10:49 -0800 Subject: [PATCH 03/19] cat VLSI_RTL --- vlsi/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlsi/Makefile b/vlsi/Makefile index 97fba910..c31f7304 100644 --- a/vlsi/Makefile +++ b/vlsi/Makefile @@ -120,7 +120,7 @@ $(SYN_CONF): $(VLSI_RTL) mkdir -p $(dir $@) echo "sim.inputs:" > $@ echo " input_files:" >> $@ - for x in $(VLSI_RTL); do \ + for x in $$(cat $(VLSI_RTL)); do \ echo ' - "'$$x'"' >> $@; \ done echo " input_files_meta: 'append'" >> $@ From 54c55875e169649f45f9ef3e47183df8507ba88b Mon Sep 17 00:00:00 2001 From: Harrison Liew Date: Fri, 3 Mar 2023 14:50:09 -0800 Subject: [PATCH 04/19] hierarchical flows should all fall under TOP suffix instead of VLSI_TOP which will change --- vlsi/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vlsi/Makefile b/vlsi/Makefile index c31f7304..8259e7a6 100644 --- a/vlsi/Makefile +++ b/vlsi/Makefile @@ -46,9 +46,9 @@ VLSI_MODEL_DUT_NAME ?= chiptop # If overriding, this should be relative to $(vlsi_dir) VLSI_OBJ_DIR ?= build ifneq ($(CUSTOM_VLOG),) - OBJ_DIR ?= $(vlsi_dir)/$(VLSI_OBJ_DIR)/custom-$(VLSI_TOP) + OBJ_DIR ?= $(vlsi_dir)/$(VLSI_OBJ_DIR)/$(VLSI_TOP) else - OBJ_DIR ?= $(vlsi_dir)/$(VLSI_OBJ_DIR)/$(long_name)-$(VLSI_TOP) + OBJ_DIR ?= $(vlsi_dir)/$(VLSI_OBJ_DIR)/$(long_name)-$(TOP) endif ######################################################################################### From 08839930009a6f15f2b3ba73940c243d34750ab6 Mon Sep 17 00:00:00 2001 From: Harrison Liew Date: Wed, 8 Mar 2023 16:11:01 -0800 Subject: [PATCH 05/19] model and top reference common modules, need to filter them out from sim to avoid module collisions --- vlsi/sim.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlsi/sim.mk b/vlsi/sim.mk index 13a7fcc3..1f5b530d 100644 --- a/vlsi/sim.mk +++ b/vlsi/sim.mk @@ -10,7 +10,7 @@ $(SIM_CONF): $(sim_common_files) echo " top_module: $(VLSI_TOP)" >> $@ echo " tb_name: ''" >> $@ # don't specify -top echo " input_files:" >> $@ - for x in $$(cat $(MODEL_MODS_FILELIST) $(MODEL_BB_MODS_FILELIST) | sort -u) $(MODEL_SMEMS_FILE) $(SIM_FILE_REQS); do \ + for x in $$(comm -23 <(cat $(MODEL_MODS_FILELIST) $(MODEL_BB_MODS_FILELIST) | sort -u) <(sort $(VLSI_RTL))) $(MODEL_SMEMS_FILE) $(SIM_FILE_REQS); do \ echo ' - "'$$x'"' >> $@; \ done echo " input_files_meta: 'append'" >> $@ From a62c1f5010fc04f85169904666571ebd5f763a42 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Thu, 9 Mar 2023 20:09:46 -0800 Subject: [PATCH 06/19] Add a frag./config for MMIO only bridges --- .../firechip/src/main/scala/BridgeBinders.scala | 11 +++++++++++ .../firechip/src/main/scala/TargetConfigs.scala | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/generators/firechip/src/main/scala/BridgeBinders.scala b/generators/firechip/src/main/scala/BridgeBinders.scala index d442c959..4d64a8ad 100644 --- a/generators/firechip/src/main/scala/BridgeBinders.scala +++ b/generators/firechip/src/main/scala/BridgeBinders.scala @@ -242,3 +242,14 @@ class WithDefaultFireSimBridges extends Config( new WithTracerVBridge ++ new WithFireSimIOCellModels ) + +// Shorthand to register all of the provided mmio-only bridges above +class WithDefaultMMIOOnlyFireSimBridges extends Config( + new WithSerialBridge ++ + new WithUARTBridge ++ + new WithBlockDeviceBridge ++ + new WithFASEDBridge ++ + new WithFireSimMultiCycleRegfile ++ + new WithFireSimFAME5 ++ + new WithFireSimIOCellModels +) diff --git a/generators/firechip/src/main/scala/TargetConfigs.scala b/generators/firechip/src/main/scala/TargetConfigs.scala index bfdaad63..35846c0f 100644 --- a/generators/firechip/src/main/scala/TargetConfigs.scala +++ b/generators/firechip/src/main/scala/TargetConfigs.scala @@ -282,3 +282,9 @@ class FireSimNoMemPortConfig extends Config( new testchipip.WithBackingScratchpad ++ new WithFireSimConfigTweaks ++ new chipyard.RocketConfig) + +class FireSimRocketMMIOOnlyConfig extends Config( + new WithDefaultMMIOOnlyFireSimBridges ++ + new WithDefaultMemModel ++ + new WithFireSimConfigTweaks ++ + new chipyard.RocketConfig) From c43dcc6aa572b604d166b040bcbc46614e166797 Mon Sep 17 00:00:00 2001 From: Nayiri Krzysztofowicz Date: Fri, 10 Mar 2023 16:00:56 -0800 Subject: [PATCH 07/19] testing out chipyard tutorial flow --- .github/workflows/chipyard-full-flow.yml | 43 ++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/.github/workflows/chipyard-full-flow.yml b/.github/workflows/chipyard-full-flow.yml index 7fe09a23..2d8ec412 100644 --- a/.github/workflows/chipyard-full-flow.yml +++ b/.github/workflows/chipyard-full-flow.yml @@ -107,6 +107,49 @@ jobs: source env.sh cd sims/verilator make verilog + - name: VLSI test + run: | + cd ${{ env.REMOTE_WORK_DIR }} + eval "$(conda shell.bash hook)" + + # set up all eda tools + cd vlsi + conda create -y --prefix ./osflow python=3.7 + conda activate ./osflow + conda install -y -c litex-hub open_pdks.sky130a + conda install -y -c litex-hub yosys + conda install -y -c litex-hub openroad + conda install -y -c litex-hub klayout + conda install -y -c litex-hub magic + conda install -y -c litex-hub netgen + + # modify vlsi yaml files + git clone https://github.com/rahulk29/sram22_sky130_macros.git + echo "" >> example-sky130.yml + echo "# tutorial configs" >> example-sky130.yml + echo "technology.sky130.sky130A: $PWD/osflow/share/pdk/sky130A" >> example-sky130.yml + echo "technology.sky130.sram22_sky130_macros: $PWD/sram22_sky130_macros" >> example-sky130.yml + + echo "" >> example-openroad.yml + echo "# tutorial configs" >> example-openroad.yml + echo "synthesis.yosys.yosys_bin: $(which yosys)" >> example-openroad.yml + echo "par.openroad.openroad_bin: $(which openroad)" >> example-openroad.yml + echo "par.openroad.klayout_bin: $(which klayout)" >> example-openroad.yml + echo "drc.magic.magic_bin: $(which klayout)" >> example-openroad.yml + echo "lvs.netgen.netgen_bin: $(which klayout)" >> example-openroad.yml + conda deactivate + + # normal chipyard setup + cd ${{ env.REMOTE_WORK_DIR }} + source env.sh + + # vlsi flow + cd vlsi + export tutorial=sky130-openroad + # TODO: consider setting VLSI_TOP=RocketTile + make buildfile + make syn + make par cleanup: name: cleanup From e78b424db983a04ca1a38cd90f0043a8c43ce55f Mon Sep 17 00:00:00 2001 From: Nayiri Krzysztofowicz Date: Fri, 10 Mar 2023 18:09:19 -0800 Subject: [PATCH 08/19] testing commands thru syn --- .github/workflows/chipyard-full-flow.yml | 60 ++++++++++++++---------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/.github/workflows/chipyard-full-flow.yml b/.github/workflows/chipyard-full-flow.yml index 2d8ec412..7d71a5f7 100644 --- a/.github/workflows/chipyard-full-flow.yml +++ b/.github/workflows/chipyard-full-flow.yml @@ -111,45 +111,55 @@ jobs: run: | cd ${{ env.REMOTE_WORK_DIR }} eval "$(conda shell.bash hook)" + source env.sh - # set up all eda tools cd vlsi - conda create -y --prefix ./osflow python=3.7 - conda activate ./osflow - conda install -y -c litex-hub open_pdks.sky130a - conda install -y -c litex-hub yosys - conda install -y -c litex-hub openroad - conda install -y -c litex-hub klayout - conda install -y -c litex-hub magic - conda install -y -c litex-hub netgen + export tutorial=sky130-openroad - # modify vlsi yaml files + # NOTE: most conda installs are in separate conda envs because they mess up each other's versions (for no apparent reason) + + # installs for example-sky130.yml + conda create -y --prefix ./.conda_sky130 open_pdks.sky130a=1.0.399_0_g63dbde9 git clone https://github.com/rahulk29/sram22_sky130_macros.git echo "" >> example-sky130.yml echo "# tutorial configs" >> example-sky130.yml - echo "technology.sky130.sky130A: $PWD/osflow/share/pdk/sky130A" >> example-sky130.yml + echo "technology.sky130.sky130A: $PWD/sky130/share/pdk/sky130A" >> example-sky130.yml echo "technology.sky130.sram22_sky130_macros: $PWD/sram22_sky130_macros" >> example-sky130.yml - + make buildfile + + # installs for example-openroad.yml + # yosys + conda create -y --prefix ./.conda_yosys yosys=0.27_4_gb58664d44 echo "" >> example-openroad.yml echo "# tutorial configs" >> example-openroad.yml - echo "synthesis.yosys.yosys_bin: $(which yosys)" >> example-openroad.yml - echo "par.openroad.openroad_bin: $(which openroad)" >> example-openroad.yml - echo "par.openroad.klayout_bin: $(which klayout)" >> example-openroad.yml - echo "drc.magic.magic_bin: $(which klayout)" >> example-openroad.yml - echo "lvs.netgen.netgen_bin: $(which klayout)" >> example-openroad.yml + echo "synthesis.yosys.yosys_bin: $PWD/.conda_yosys/bin/yosys" >> example-openroad.yml + make syn + + # remaining tools + # conda create -y --prefix ./.conda_openroad openroad=2.0_7070_g0264023b6 + # conda create -y --prefix ./.conda_openroad + # conda activate ./.conda_openroad + # conda install -y -c litex-hub openroad=2.0_7070_g0264023b6 + # conda create -y --prefix ./.conda_klayout klayout=0.28.5_98_g87e2def28 + # echo "par.openroad.openroad_bin: $PWD/.conda_openroad/bin/openroad" >> example-openroad.yml + # echo "par.openroad.klayout_bin: $PWD/.conda_klayout/bin/klayout" >> example-openroad.yml + + conda create -y --prefix ./.conda_signoff magic netgen + echo "drc.magic.magic_bin: $PWD/.conda_signoff/bin/magic" >> example-openroad.yml + echo "lvs.netgen.netgen_bin: $PWD/.conda_signoff/bin/netgen" >> example-openroad.yml conda deactivate - # normal chipyard setup - cd ${{ env.REMOTE_WORK_DIR }} - source env.sh + # # normal chipyard setup + # cd ${{ env.REMOTE_WORK_DIR }} + # source env.sh # vlsi flow - cd vlsi - export tutorial=sky130-openroad + # cd vlsi + # TODO: consider setting VLSI_TOP=RocketTile - make buildfile - make syn - make par + # make buildfile + # make syn + # make par cleanup: name: cleanup From 8d88ffbd2b39f85d3e2292978a5daeea0a6104aa Mon Sep 17 00:00:00 2001 From: Nayiri Krzysztofowicz Date: Fri, 10 Mar 2023 20:25:11 -0800 Subject: [PATCH 09/19] moving vlsi flow setup earlier for testing --- .github/workflows/chipyard-full-flow.yml | 93 +++++++++++++++++------- 1 file changed, 66 insertions(+), 27 deletions(-) diff --git a/.github/workflows/chipyard-full-flow.yml b/.github/workflows/chipyard-full-flow.yml index 7d71a5f7..78238f0c 100644 --- a/.github/workflows/chipyard-full-flow.yml +++ b/.github/workflows/chipyard-full-flow.yml @@ -74,6 +74,53 @@ jobs: - name: Setup repo copy run: | git clone $GITHUB_WORKSPACE ${{ env.REMOTE_WORK_DIR }} + - name: VLSI test + run: | + cd ${{ env.REMOTE_WORK_DIR }} + eval "$(conda shell.bash hook)" + source env.sh + + cd vlsi + export tutorial=sky130-openroad + # TODO: consider setting VLSI_TOP=RocketTile + + # 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 litex-hub + conda config --add channels defaults + + # installs for example-sky130.yml + conda create -y --prefix ./.conda-sky130 open_pdks.sky130a=1.0.399_0_g63dbde9 + git clone https://github.com/rahulk29/sram22_sky130_macros.git + echo "" >> example-sky130.yml + echo "# tutorial configs" >> example-sky130.yml + echo "technology.sky130.sky130A: $PWD/sky130/share/pdk/sky130A" >> example-sky130.yml + echo "technology.sky130.sram22_sky130_macros: $PWD/sram22_sky130_macros" >> example-sky130.yml + make buildfile + + # installs for example-openroad.yml + # yosys + conda create -y --prefix ./.conda-yosys yosys=0.27_4_gb58664d44 + echo "" >> example-openroad.yml + echo "# tutorial configs" >> example-openroad.yml + echo "synthesis.yosys.yosys_bin: $PWD/.conda-yosys/bin/yosys" >> example-openroad.yml + make syn + + # openroad + conda create -y --prefix ./.conda-openroad openroad=2.0_7070_g0264023b6 + echo "par.openroad.openroad_bin: $PWD/.conda-openroad/bin/openroad" >> example-openroad.yml + # klayout + conda create -y --prefix ./.conda-klayout klayout=0.28.5_98_g87e2def28 + echo "par.openroad.klayout_bin: $PWD/.conda-klayout/bin/klayout" >> example-openroad.yml + make par + + # magic/netgen + conda create -y --prefix ./.conda-signoff magic=8.3.376_0_g5e5879c netgen=1.5.250_0_g178b172 + echo "drc.magic.magic_bin: $PWD/.conda-signoff/bin/magic" >> example-openroad.yml + echo "lvs.netgen.netgen_bin: $PWD/.conda-signoff/bin/netgen" >> example-openroad.yml + + conda config --remove channels litex-hub + conda config --remove channels defaults - name: Setup repo run: | cd ${{ env.REMOTE_WORK_DIR }} @@ -115,11 +162,15 @@ jobs: cd vlsi export tutorial=sky130-openroad + # TODO: consider setting VLSI_TOP=RocketTile - # NOTE: most conda installs are in separate conda envs because they mess up each other's versions (for no apparent reason) + # 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 litex-hub + conda config --add channels defaults # installs for example-sky130.yml - conda create -y --prefix ./.conda_sky130 open_pdks.sky130a=1.0.399_0_g63dbde9 + conda create -y --prefix ./.conda-sky130 open_pdks.sky130a=1.0.399_0_g63dbde9 git clone https://github.com/rahulk29/sram22_sky130_macros.git echo "" >> example-sky130.yml echo "# tutorial configs" >> example-sky130.yml @@ -129,37 +180,25 @@ jobs: # installs for example-openroad.yml # yosys - conda create -y --prefix ./.conda_yosys yosys=0.27_4_gb58664d44 + conda create -y --prefix ./.conda-yosys yosys=0.27_4_gb58664d44 echo "" >> example-openroad.yml echo "# tutorial configs" >> example-openroad.yml - echo "synthesis.yosys.yosys_bin: $PWD/.conda_yosys/bin/yosys" >> example-openroad.yml + echo "synthesis.yosys.yosys_bin: $PWD/.conda-yosys/bin/yosys" >> example-openroad.yml make syn - # remaining tools - # conda create -y --prefix ./.conda_openroad openroad=2.0_7070_g0264023b6 - # conda create -y --prefix ./.conda_openroad - # conda activate ./.conda_openroad - # conda install -y -c litex-hub openroad=2.0_7070_g0264023b6 - # conda create -y --prefix ./.conda_klayout klayout=0.28.5_98_g87e2def28 - # echo "par.openroad.openroad_bin: $PWD/.conda_openroad/bin/openroad" >> example-openroad.yml - # echo "par.openroad.klayout_bin: $PWD/.conda_klayout/bin/klayout" >> example-openroad.yml + # openroad + conda create -y --prefix ./.conda-openroad openroad=2.0_7070_g0264023b6 + echo "par.openroad.openroad_bin: $PWD/.conda-openroad/bin/openroad" >> example-openroad.yml + # klayout + conda create -y --prefix ./.conda-klayout klayout=0.28.5_98_g87e2def28 + echo "par.openroad.klayout_bin: $PWD/.conda-klayout/bin/klayout" >> example-openroad.yml + make par - conda create -y --prefix ./.conda_signoff magic netgen - echo "drc.magic.magic_bin: $PWD/.conda_signoff/bin/magic" >> example-openroad.yml - echo "lvs.netgen.netgen_bin: $PWD/.conda_signoff/bin/netgen" >> example-openroad.yml - conda deactivate + # magic/netgen + conda create -y --prefix ./.conda-signoff magic=8.3.376_0_g5e5879c netgen=1.5.250_0_g178b172 + echo "drc.magic.magic_bin: $PWD/.conda-signoff/bin/magic" >> example-openroad.yml + echo "lvs.netgen.netgen_bin: $PWD/.conda-signoff/bin/netgen" >> example-openroad.yml - # # normal chipyard setup - # cd ${{ env.REMOTE_WORK_DIR }} - # source env.sh - - # vlsi flow - # cd vlsi - - # TODO: consider setting VLSI_TOP=RocketTile - # make buildfile - # make syn - # make par cleanup: name: cleanup From 2a0c2222c84d73ebfe542161af7a81f2babb9ea3 Mon Sep 17 00:00:00 2001 From: Nayiri Krzysztofowicz Date: Fri, 10 Mar 2023 20:31:18 -0800 Subject: [PATCH 10/19] small fix --- .github/workflows/chipyard-full-flow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/chipyard-full-flow.yml b/.github/workflows/chipyard-full-flow.yml index 78238f0c..58a17622 100644 --- a/.github/workflows/chipyard-full-flow.yml +++ b/.github/workflows/chipyard-full-flow.yml @@ -78,7 +78,7 @@ jobs: run: | cd ${{ env.REMOTE_WORK_DIR }} eval "$(conda shell.bash hook)" - source env.sh + # ***source env.sh cd vlsi export tutorial=sky130-openroad @@ -86,11 +86,11 @@ jobs: # 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 litex-hub conda config --add channels defaults + conda config --add channels litex-hub # installs for example-sky130.yml - conda create -y --prefix ./.conda-sky130 open_pdks.sky130a=1.0.399_0_g63dbde9 + conda create -y --prefix ./.conda-sky1302 open_pdks.sky130a=1.0.399_0_g63dbde9 git clone https://github.com/rahulk29/sram22_sky130_macros.git echo "" >> example-sky130.yml echo "# tutorial configs" >> example-sky130.yml From 07e547ffe354397a1a4757fa0d1e263936a1f9fd Mon Sep 17 00:00:00 2001 From: Nayiri Krzysztofowicz Date: Fri, 10 Mar 2023 20:35:03 -0800 Subject: [PATCH 11/19] another small fix --- .github/workflows/chipyard-full-flow.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/chipyard-full-flow.yml b/.github/workflows/chipyard-full-flow.yml index 58a17622..12a32278 100644 --- a/.github/workflows/chipyard-full-flow.yml +++ b/.github/workflows/chipyard-full-flow.yml @@ -78,7 +78,7 @@ jobs: run: | cd ${{ env.REMOTE_WORK_DIR }} eval "$(conda shell.bash hook)" - # ***source env.sh + # *** source env.sh cd vlsi export tutorial=sky130-openroad @@ -96,7 +96,7 @@ jobs: echo "# tutorial configs" >> example-sky130.yml echo "technology.sky130.sky130A: $PWD/sky130/share/pdk/sky130A" >> example-sky130.yml echo "technology.sky130.sram22_sky130_macros: $PWD/sram22_sky130_macros" >> example-sky130.yml - make buildfile + # *** make buildfile # installs for example-openroad.yml # yosys @@ -104,7 +104,7 @@ jobs: echo "" >> example-openroad.yml echo "# tutorial configs" >> example-openroad.yml echo "synthesis.yosys.yosys_bin: $PWD/.conda-yosys/bin/yosys" >> example-openroad.yml - make syn + # *** make syn # openroad conda create -y --prefix ./.conda-openroad openroad=2.0_7070_g0264023b6 @@ -112,7 +112,7 @@ jobs: # klayout conda create -y --prefix ./.conda-klayout klayout=0.28.5_98_g87e2def28 echo "par.openroad.klayout_bin: $PWD/.conda-klayout/bin/klayout" >> example-openroad.yml - make par + # *** make par # magic/netgen conda create -y --prefix ./.conda-signoff magic=8.3.376_0_g5e5879c netgen=1.5.250_0_g178b172 From 883b9209abcbdd6a1de47f738ea43bc3a0074acb Mon Sep 17 00:00:00 2001 From: Nayiri Krzysztofowicz Date: Fri, 10 Mar 2023 20:40:39 -0800 Subject: [PATCH 12/19] checking that this still works --- .github/workflows/chipyard-full-flow.yml | 64 ++++-------------------- 1 file changed, 11 insertions(+), 53 deletions(-) diff --git a/.github/workflows/chipyard-full-flow.yml b/.github/workflows/chipyard-full-flow.yml index 12a32278..1e17e5e5 100644 --- a/.github/workflows/chipyard-full-flow.yml +++ b/.github/workflows/chipyard-full-flow.yml @@ -96,31 +96,28 @@ jobs: echo "# tutorial configs" >> example-sky130.yml echo "technology.sky130.sky130A: $PWD/sky130/share/pdk/sky130A" >> example-sky130.yml echo "technology.sky130.sram22_sky130_macros: $PWD/sram22_sky130_macros" >> example-sky130.yml - # *** make buildfile # installs for example-openroad.yml - # yosys conda create -y --prefix ./.conda-yosys yosys=0.27_4_gb58664d44 + conda create -y --prefix ./.conda-openroad openroad=2.0_7070_g0264023b6 + conda create -y --prefix ./.conda-klayout klayout=0.28.5_98_g87e2def28 + conda create -y --prefix ./.conda-signoff magic=8.3.376_0_g5e5879c netgen=1.5.250_0_g178b172 echo "" >> example-openroad.yml echo "# tutorial configs" >> example-openroad.yml echo "synthesis.yosys.yosys_bin: $PWD/.conda-yosys/bin/yosys" >> example-openroad.yml - # *** make syn - - # openroad - conda create -y --prefix ./.conda-openroad openroad=2.0_7070_g0264023b6 echo "par.openroad.openroad_bin: $PWD/.conda-openroad/bin/openroad" >> example-openroad.yml - # klayout - conda create -y --prefix ./.conda-klayout klayout=0.28.5_98_g87e2def28 echo "par.openroad.klayout_bin: $PWD/.conda-klayout/bin/klayout" >> example-openroad.yml - # *** make par - - # magic/netgen - conda create -y --prefix ./.conda-signoff magic=8.3.376_0_g5e5879c netgen=1.5.250_0_g178b172 echo "drc.magic.magic_bin: $PWD/.conda-signoff/bin/magic" >> example-openroad.yml echo "lvs.netgen.netgen_bin: $PWD/.conda-signoff/bin/netgen" >> example-openroad.yml conda config --remove channels litex-hub conda config --remove channels defaults + + # *** make buildfile + # *** make syn + # *** make par + + - name: Setup repo run: | cd ${{ env.REMOTE_WORK_DIR }} @@ -154,50 +151,11 @@ jobs: source env.sh cd sims/verilator make verilog - - name: VLSI test + - name: VLSI flow run: | cd ${{ env.REMOTE_WORK_DIR }} eval "$(conda shell.bash hook)" - source env.sh - - cd vlsi - export tutorial=sky130-openroad - # TODO: consider setting VLSI_TOP=RocketTile - - # 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 litex-hub - conda config --add channels defaults - - # installs for example-sky130.yml - conda create -y --prefix ./.conda-sky130 open_pdks.sky130a=1.0.399_0_g63dbde9 - git clone https://github.com/rahulk29/sram22_sky130_macros.git - echo "" >> example-sky130.yml - echo "# tutorial configs" >> example-sky130.yml - echo "technology.sky130.sky130A: $PWD/sky130/share/pdk/sky130A" >> example-sky130.yml - echo "technology.sky130.sram22_sky130_macros: $PWD/sram22_sky130_macros" >> example-sky130.yml - make buildfile - - # installs for example-openroad.yml - # yosys - conda create -y --prefix ./.conda-yosys yosys=0.27_4_gb58664d44 - echo "" >> example-openroad.yml - echo "# tutorial configs" >> example-openroad.yml - echo "synthesis.yosys.yosys_bin: $PWD/.conda-yosys/bin/yosys" >> example-openroad.yml - make syn - - # openroad - conda create -y --prefix ./.conda-openroad openroad=2.0_7070_g0264023b6 - echo "par.openroad.openroad_bin: $PWD/.conda-openroad/bin/openroad" >> example-openroad.yml - # klayout - conda create -y --prefix ./.conda-klayout klayout=0.28.5_98_g87e2def28 - echo "par.openroad.klayout_bin: $PWD/.conda-klayout/bin/klayout" >> example-openroad.yml - make par - - # magic/netgen - conda create -y --prefix ./.conda-signoff magic=8.3.376_0_g5e5879c netgen=1.5.250_0_g178b172 - echo "drc.magic.magic_bin: $PWD/.conda-signoff/bin/magic" >> example-openroad.yml - echo "lvs.netgen.netgen_bin: $PWD/.conda-signoff/bin/netgen" >> example-openroad.yml + # *** source env.sh cleanup: From 3a7286544747ab1749dbac7c3e1177bff8bc20c7 Mon Sep 17 00:00:00 2001 From: Nayiri Krzysztofowicz Date: Fri, 10 Mar 2023 20:53:12 -0800 Subject: [PATCH 13/19] moved test back to after setup repo --- .github/workflows/chipyard-full-flow.yml | 89 +++++++++++------------- 1 file changed, 42 insertions(+), 47 deletions(-) diff --git a/.github/workflows/chipyard-full-flow.yml b/.github/workflows/chipyard-full-flow.yml index 1e17e5e5..f07548d0 100644 --- a/.github/workflows/chipyard-full-flow.yml +++ b/.github/workflows/chipyard-full-flow.yml @@ -74,50 +74,6 @@ jobs: - name: Setup repo copy run: | git clone $GITHUB_WORKSPACE ${{ env.REMOTE_WORK_DIR }} - - name: VLSI test - run: | - cd ${{ env.REMOTE_WORK_DIR }} - eval "$(conda shell.bash hook)" - # *** source env.sh - - cd vlsi - export tutorial=sky130-openroad - # TODO: consider setting VLSI_TOP=RocketTile - - # 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 - - # installs for example-sky130.yml - conda create -y --prefix ./.conda-sky1302 open_pdks.sky130a=1.0.399_0_g63dbde9 - git clone https://github.com/rahulk29/sram22_sky130_macros.git - echo "" >> example-sky130.yml - echo "# tutorial configs" >> example-sky130.yml - echo "technology.sky130.sky130A: $PWD/sky130/share/pdk/sky130A" >> example-sky130.yml - echo "technology.sky130.sram22_sky130_macros: $PWD/sram22_sky130_macros" >> example-sky130.yml - - # installs for example-openroad.yml - conda create -y --prefix ./.conda-yosys yosys=0.27_4_gb58664d44 - conda create -y --prefix ./.conda-openroad openroad=2.0_7070_g0264023b6 - conda create -y --prefix ./.conda-klayout klayout=0.28.5_98_g87e2def28 - conda create -y --prefix ./.conda-signoff magic=8.3.376_0_g5e5879c netgen=1.5.250_0_g178b172 - echo "" >> example-openroad.yml - echo "# tutorial configs" >> example-openroad.yml - echo "synthesis.yosys.yosys_bin: $PWD/.conda-yosys/bin/yosys" >> example-openroad.yml - echo "par.openroad.openroad_bin: $PWD/.conda-openroad/bin/openroad" >> example-openroad.yml - echo "par.openroad.klayout_bin: $PWD/.conda-klayout/bin/klayout" >> example-openroad.yml - echo "drc.magic.magic_bin: $PWD/.conda-signoff/bin/magic" >> example-openroad.yml - echo "lvs.netgen.netgen_bin: $PWD/.conda-signoff/bin/netgen" >> example-openroad.yml - - conda config --remove channels litex-hub - conda config --remove channels defaults - - # *** make buildfile - # *** make syn - # *** make par - - - name: Setup repo run: | cd ${{ env.REMOTE_WORK_DIR }} @@ -151,12 +107,51 @@ jobs: source env.sh cd sims/verilator make verilog - - name: VLSI flow + - name: VLSI test run: | cd ${{ env.REMOTE_WORK_DIR }} eval "$(conda shell.bash hook)" - # *** source env.sh - + source env.sh + + cd vlsi + export tutorial=sky130-openroad + # TODO: consider setting VLSI_TOP=RocketTile + + # 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 + + # installs for example-sky130.yml + conda create -y --prefix ./.conda-sky130 open_pdks.sky130a=1.0.399_0_g63dbde9 + git clone https://github.com/rahulk29/sram22_sky130_macros.git + echo "" >> example-sky130.yml + echo "# tutorial configs" >> example-sky130.yml + echo "technology.sky130.sky130A: $PWD/.conda-sky130/share/pdk/sky130A" >> example-sky130.yml + echo "technology.sky130.sram22_sky130_macros: $PWD/sram22_sky130_macros" >> example-sky130.yml + + # installs for example-openroad.yml + conda create -y --prefix ./.conda-yosys yosys=0.27_4_gb58664d44 + conda create -y --prefix ./.conda-openroad openroad=2.0_7070_g0264023b6 + conda create -y --prefix ./.conda-klayout klayout=0.28.5_98_g87e2def28 + conda create -y --prefix ./.conda-signoff magic=8.3.376_0_g5e5879c netgen=1.5.250_0_g178b172 + echo "" >> example-openroad.yml + echo "# tutorial configs" >> example-openroad.yml + echo "synthesis.yosys.yosys_bin: $PWD/.conda-yosys/bin/yosys" >> example-openroad.yml + echo "par.openroad.openroad_bin: $PWD/.conda-openroad/bin/openroad" >> example-openroad.yml + echo "par.openroad.klayout_bin: $PWD/.conda-klayout/bin/klayout" >> example-openroad.yml + echo "drc.magic.magic_bin: $PWD/.conda-signoff/bin/magic" >> example-openroad.yml + echo "lvs.netgen.netgen_bin: $PWD/.conda-signoff/bin/netgen" >> example-openroad.yml + + conda config --remove channels litex-hub + conda config --remove channels defaults + + make buildfile + make syn + make par + make drc + make lvs + cleanup: name: cleanup From 884053d6612ef556c28c7220ccff372412935ee1 Mon Sep 17 00:00:00 2001 From: Nayiri Krzysztofowicz Date: Fri, 10 Mar 2023 23:24:01 -0800 Subject: [PATCH 14/19] bumped to Hammer v1.0.2 --- conda-reqs/chipyard.yaml | 2 +- .../conda-requirements-esp-tools-linux-64.conda-lock.yml | 8 ++++---- ...conda-requirements-riscv-tools-linux-64.conda-lock.yml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conda-reqs/chipyard.yaml b/conda-reqs/chipyard.yaml index c2f6e020..a01c79cf 100644 --- a/conda-reqs/chipyard.yaml +++ b/conda-reqs/chipyard.yaml @@ -103,7 +103,7 @@ dependencies: # hammer packages - sty - pip: - - hammer-vlsi[asap7]==1.0.1 + - hammer-vlsi[asap7]==1.0.2 # doc requirements - sphinx 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 5ce4f1e1..ed2b6904 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 @@ -21,7 +21,7 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: 9bd3b3b16bcfb572bdf13d61fd0396b9b21a5b53c4885e1ab7519a54f016cea2 + linux-64: 5b4a5104618d8d30a43de11ac1573218299a1d16387cfb481309d42c1531e487 platforms: - linux-64 sources: @@ -5607,13 +5607,13 @@ package: pyyaml: '>=6.0,<7.0' ruamel.yaml: '>=0.17.21,<0.18.0' hash: - sha256: f476c58c84d01bda7a642b09514a4ecd798503fdd47fe466b83a7945d44fcb93 + sha256: 6a7843b67ffa3feaac92e39523cd9fd1f54c8f7cc38af4af158519a4a2f4b873 manager: pip name: hammer-vlsi optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/85/0f/7fcab088a5e2780d165bbea5ea3974b0f2286ddc98499e98aa29609bd0ee/hammer_vlsi-1.0.1-py3-none-any.whl - version: 1.0.1 + url: https://files.pythonhosted.org/packages/03/5c/800227902883e784ffe0e215a9ac384e6002d17b3dfa191691761fd13491/hammer_vlsi-1.0.2-py3-none-any.whl + version: 1.0.2 - category: main dependencies: asttokens: '>=2,<3' 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 73748d1f..6b1e617f 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 @@ -21,7 +21,7 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: 3ef38211139adc6c0c849eaed6fd59c2a3c880282f0f47f25fe54bc05c510201 + linux-64: 26a591cc55d09a027f1bb93c0e0bf2ca8dafaa9ba5e3cf45b3a3a1ba77e1384b platforms: - linux-64 sources: @@ -5607,13 +5607,13 @@ package: pyyaml: '>=6.0,<7.0' ruamel.yaml: '>=0.17.21,<0.18.0' hash: - sha256: f476c58c84d01bda7a642b09514a4ecd798503fdd47fe466b83a7945d44fcb93 + sha256: 6a7843b67ffa3feaac92e39523cd9fd1f54c8f7cc38af4af158519a4a2f4b873 manager: pip name: hammer-vlsi optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/85/0f/7fcab088a5e2780d165bbea5ea3974b0f2286ddc98499e98aa29609bd0ee/hammer_vlsi-1.0.1-py3-none-any.whl - version: 1.0.1 + url: https://files.pythonhosted.org/packages/03/5c/800227902883e784ffe0e215a9ac384e6002d17b3dfa191691761fd13491/hammer_vlsi-1.0.2-py3-none-any.whl + version: 1.0.2 - category: main dependencies: asttokens: '>=2,<3' From 1c1b0effa34e06bd73a816edcc5a0d79e7990318 Mon Sep 17 00:00:00 2001 From: joey0320 Date: Sat, 11 Mar 2023 16:52:35 -0800 Subject: [PATCH 15/19] update docs for release --- docs/Customization/Firrtl-Transforms.rst | 7 ++++--- docs/Tools/FIRRTL.rst | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/Customization/Firrtl-Transforms.rst b/docs/Customization/Firrtl-Transforms.rst index 4a467207..c089357b 100644 --- a/docs/Customization/Firrtl-Transforms.rst +++ b/docs/Customization/Firrtl-Transforms.rst @@ -12,13 +12,14 @@ The Scala FIRRTL Compiler and the MLIR FIRRTL Compiler ------------------------------------------------------ In Chipyard, two FIRRTL compilers work together to compile Chisel into Verilog. The Scala FIRRTL compiler(SFC) and the MLIR FIRRTL compiler(MFC). They are basically doing the same thing, except that MFC is written in C++ which makes compilation much faster. In the default setting, the SFC will compile Chisel into CHIRRTL and MFC will -compile CHIRRTL into Verilog(as of now, we are using SFC as a backup for cases when MFC doesn't work, e.g., when the design is using Fixed types). By setting the ``ENABLE_CUSTOM_FIRRTL_PASS`` env variable to a non-zero value, we can make the SFC compile Chisel into LowFIRRTL so that our custom FIRRTL passes are applied. +compile CHIRRTL into Verilog(as of now, we are using SFC as a backup for cases when MFC doesn't work, e.g., when the design is using Fixed types). By setting the ``ENABLE_CUSTOM_FIRRTL_PASS`` env variable to a non-zero value, +we can make the SFC compile Chisel into LowFIRRTL so that our custom FIRRTL passes are applied. Where to add transforms ----------------------- -In Chipyard, the FIRRTL compiler is called multiple times to create a "Top" file that contains the DUT and a "Harness" file containing the test harness, which instantiates the DUT. -The "Harness" file does not contain the DUT's module definition or any of its submodules. +In Chipyard, the FIRRTL compiler is called multiple times to create a "Top" file that contains the DUT and a "Model" file containing the test harness, which instantiates the DUT. +The "Model" file does not contain the DUT's module definition or any of its submodules. This is done by the ``tapeout`` SBT project (located in ``tools/barstools/tapeout``) which calls ``GenerateModelStageMain`` (a function that wraps the multiple FIRRTL compiler calls and extra transforms). .. literalinclude:: ../../common.mk diff --git a/docs/Tools/FIRRTL.rst b/docs/Tools/FIRRTL.rst index e9e6425a..268d7728 100644 --- a/docs/Tools/FIRRTL.rst +++ b/docs/Tools/FIRRTL.rst @@ -3,7 +3,7 @@ FIRRTL `FIRRTL `__ is an intermediate representation of your circuit. It is emitted by the Chisel compiler and is used to translate Chisel source files into another representation such as Verilog. -Without going into too much detail, FIRRTL is consumed by a FIRRTL compiler (another Scala program) which passes the circuit through a series of circuit-level transformations. +Without going into too much detail, FIRRTL is consumed by FIRRTL compilers which passes the circuit through a series of circuit-level transformations. An example of a FIRRTL pass (transformation) is one that optimizes out unused signals. Once the transformations are done, a Verilog file is emitted and the build process is done. From d7574084c19220a10b97a4c054d7f8488c529367 Mon Sep 17 00:00:00 2001 From: joey0320 Date: Sat, 11 Mar 2023 18:56:36 -0800 Subject: [PATCH 16/19] Update docs related to circt --- docs/Customization/Firrtl-Transforms.rst | 8 +++++--- docs/Tools/FIRRTL.rst | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/Customization/Firrtl-Transforms.rst b/docs/Customization/Firrtl-Transforms.rst index c089357b..1113bde6 100644 --- a/docs/Customization/Firrtl-Transforms.rst +++ b/docs/Customization/Firrtl-Transforms.rst @@ -10,11 +10,13 @@ Transforms are a powerful tool to take in the FIRRTL IR that is emitted from Chi The Scala FIRRTL Compiler and the MLIR FIRRTL Compiler ------------------------------------------------------ -In Chipyard, two FIRRTL compilers work together to compile Chisel into Verilog. The Scala FIRRTL compiler(SFC) and the MLIR FIRRTL compiler(MFC). -They are basically doing the same thing, except that MFC is written in C++ which makes compilation much faster. In the default setting, the SFC will compile Chisel into CHIRRTL and MFC will -compile CHIRRTL into Verilog(as of now, we are using SFC as a backup for cases when MFC doesn't work, e.g., when the design is using Fixed types). By setting the ``ENABLE_CUSTOM_FIRRTL_PASS`` env variable to a non-zero value, +In Chipyard, two FIRRTL compilers work together to compile Chisel into Verilog. The Scala FIRRTL compiler (SFC) and the MLIR FIRRTL compiler (MFC). +They are basically doing the same thing, except that MFC is written in C++ which makes compilation much faster (the generated Verilog will be different). In the default setting, the SFC will compile Chisel into CHIRRTL and MFC will +compile CHIRRTL into Verilog (as of now, we are using SFC as a backup for cases when MFC doesn't work, e.g., when the design is using Fixed types). By setting the ``ENABLE_CUSTOM_FIRRTL_PASS`` env variable to a non-zero value, we can make the SFC compile Chisel into LowFIRRTL so that our custom FIRRTL passes are applied. +For more information on MLIR FIRRTL Compiler, please visit https://mlir.llvm.org/ and https://circt.llvm.org/. + Where to add transforms ----------------------- diff --git a/docs/Tools/FIRRTL.rst b/docs/Tools/FIRRTL.rst index 268d7728..67adde2d 100644 --- a/docs/Tools/FIRRTL.rst +++ b/docs/Tools/FIRRTL.rst @@ -7,4 +7,6 @@ Without going into too much detail, FIRRTL is consumed by FIRRTL compilers which An example of a FIRRTL pass (transformation) is one that optimizes out unused signals. Once the transformations are done, a Verilog file is emitted and the build process is done. -For more information on please visit their `website `__. +To see how FIRRTL is transformed to Verilog in Chipyard, please visit the :ref:`Customization/Firrtl-Transforms` section. + +For more information on FIRRTL, please visit their `website `__. From 3b79de660f38118b1c52d18c45d1c88fa17e8b9d Mon Sep 17 00:00:00 2001 From: joey0320 Date: Sat, 11 Mar 2023 20:02:53 -0800 Subject: [PATCH 17/19] fix --- docs/Tools/FIRRTL.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Tools/FIRRTL.rst b/docs/Tools/FIRRTL.rst index 67adde2d..2e88218f 100644 --- a/docs/Tools/FIRRTL.rst +++ b/docs/Tools/FIRRTL.rst @@ -7,6 +7,6 @@ Without going into too much detail, FIRRTL is consumed by FIRRTL compilers which An example of a FIRRTL pass (transformation) is one that optimizes out unused signals. Once the transformations are done, a Verilog file is emitted and the build process is done. -To see how FIRRTL is transformed to Verilog in Chipyard, please visit the :ref:`Customization/Firrtl-Transforms` section. +To see how FIRRTL is transformed to Verilog in Chipyard, please visit the :ref:`firrtl-transforms` section. For more information on FIRRTL, please visit their `website `__. From 908a2676742a486db5ba80748a7faa03fccd020a Mon Sep 17 00:00:00 2001 From: Nayiri Krzysztofowicz Date: Sun, 12 Mar 2023 10:43:29 -0700 Subject: [PATCH 18/19] bumping hammer in conda reqs --- conda-reqs/chipyard.yaml | 2 +- ...irements-esp-tools-linux-64.conda-lock.yml | 179 ++++++------------ ...ements-riscv-tools-linux-64.conda-lock.yml | 179 ++++++------------ 3 files changed, 107 insertions(+), 253 deletions(-) diff --git a/conda-reqs/chipyard.yaml b/conda-reqs/chipyard.yaml index a01c79cf..d2cd562d 100644 --- a/conda-reqs/chipyard.yaml +++ b/conda-reqs/chipyard.yaml @@ -103,7 +103,7 @@ dependencies: # hammer packages - sty - pip: - - hammer-vlsi[asap7]==1.0.2 + - hammer-vlsi[asap7]==1.0.3 # doc requirements - sphinx 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 ed2b6904..ab61ecbc 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 @@ -21,7 +21,7 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: 5b4a5104618d8d30a43de11ac1573218299a1d16387cfb481309d42c1531e487 + linux-64: 63f33698b3df11d1d30eec60e45fa43e1a9316cddfdf2a8bf9eb859556c56e2e platforms: - linux-64 sources: @@ -2466,20 +2466,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/kiwisolver-1.4.4-py39hf939315_1.tar.bz2 version: 1.4.4 -- category: main - dependencies: - libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 - hash: - md5: a0238daacd28c07735c6bc75aedf2014 - sha256: bbae929b429f39a10432e86d87bf02864e6640287245de71edeac6b3c29b0ff7 - manager: conda - name: lazy-object-proxy - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/lazy-object-proxy-1.9.0-py39h72bdee0_0.conda - version: 1.9.0 - category: main dependencies: jpeg: '>=9e,<10a' @@ -2759,18 +2745,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/pastel-0.2.1-pyhd8ed1ab_0.tar.bz2 version: 0.2.1 -- category: main - dependencies: - python: '>=3.7' - hash: - md5: f3e7301de38fd621c902faf8087bc564 - sha256: 7258b7f6a8e5fcd5e5a22e0a85b89e03e9cf5049d1591bc98420fd080007f25d - manager: conda - name: pathable - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pathable-0.4.3-pyhd8ed1ab_0.tar.bz2 - version: 0.4.3 - category: main dependencies: python: '>=3.6' @@ -2783,18 +2757,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/pkginfo-1.9.6-pyhd8ed1ab_0.conda version: 1.9.6 -- category: main - dependencies: - python: '>=3.6' - hash: - md5: 89e3c7cdde7d3aaa2aee933b604dd07f - sha256: 7d055ffc8a02bf781a89d069db3454b453605cdaff300b82cedcc7133283e47e - manager: conda - name: pkgutil-resolve-name - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2 - version: 1.3.10 - category: main dependencies: python: '>=3.8' @@ -3226,14 +3188,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 2d93b130d148d7fc77e583677792fc6a - sha256: 70c57b5ac94cd32e78f1a2fa2c38572bfac85b901a6a99aa254a9e8e126c132d + md5: 43e7d9e50261fb11deb76e17d8431aac + sha256: f81eee64fcdfb379e27d01773b34041fbf7f9e86f33b157c9925d19e0a442452 manager: conda name: typing_extensions optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.4.0-pyha770c72_0.tar.bz2 - version: 4.4.0 + url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda + version: 4.5.0 - category: main dependencies: libgcc-ng: '>=12' @@ -3968,19 +3930,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/ucb-bar/linux-64/qemu-5.0.0-hb15d774_0.tar.bz2 version: 5.0.0 -- category: main - dependencies: - python: '>=3.5' - six: '' - hash: - md5: fed45fc5ea0813240707998abe49f520 - sha256: 7c7052b51de0b5c558f890bb11f8b5edbb9934a653d76be086b1182b9f54185d - manager: conda - name: rfc3339-validator - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/rfc3339-validator-0.1.4-pyhd8ed1ab_0.tar.bz2 - version: 0.1.4 - category: main dependencies: pyasn1: '>=0.1.3' @@ -4051,16 +4000,16 @@ package: version: 2.28.11.15 - category: main dependencies: - typing_extensions: 4.4.0 pyha770c72_0 + typing_extensions: 4.5.0 pyha770c72_0 hash: - md5: be969210b61b897775a0de63cd9e9026 - sha256: 6f129b1bc18d111dcf3abaec6fcf6cbee00f1b77bb42d0f0bc8d85f8faa65cf0 + md5: b3c594fde1a80a1fc3eb9cc4a5dfe392 + sha256: 6da5e15fa533620ae2e7aca9a7d16013eed3a73ac64c47d7c3bf3deec39b63b9 manager: conda name: typing-extensions optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.4.0-hd8ed1ab_0.tar.bz2 - version: 4.4.0 + url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda + version: 4.5.0 - category: main dependencies: libgcc-ng: '>=9.3.0' @@ -4283,20 +4232,19 @@ package: dependencies: attrs: '>=17.4.0' importlib-metadata: '' - importlib_resources: '>=1.4.0' - pkgutil-resolve-name: '>=1.3.10' - pyrsistent: '!=0.17.0,!=0.17.1,!=0.17.2,>=0.14.0' - python: '>=3.7' - typing_extensions: '' + pyrsistent: '>=0.14.0' + python: '>=3.6' + setuptools: '' + six: '>=1.11.0' hash: - md5: 723268a468177cd44568eb8f794e0d80 - sha256: 4f68a23430d1afc5c9b41c46fbac0ade33c0bf57a293c646bfdd6dc65350eada + md5: 66125e28711d8ffc04a207a2b170316d + sha256: d74a3ddd3c3dd9bd7b00110a196e3af90490c5660674f18bfd53a8fdf91de418 manager: conda name: jsonschema optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda - version: 4.17.3 + url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-3.2.0-pyhd8ed1ab_3.tar.bz2 + version: 3.2.0 - category: main dependencies: elfutils: '>=0.187,<0.188.0a0' @@ -4501,14 +4449,14 @@ package: types-awscrt: '' typing_extensions: '' hash: - md5: 1284ea7cf431f599298c3e86922cb6ef - sha256: 949071f4ffaada1a7df890a0eca82507446f427d913272bae109c39f42b03361 + md5: 038f7d8f0f0b7cae4aee87bfbd09bd06 + sha256: 4c3babde56c86a3d0f83add59002275f8e8fd328acf432377c86ceb82b693131 manager: conda name: botocore-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.87-pyhd8ed1ab_0.conda - version: 1.29.87 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.88-pyhd8ed1ab_0.conda + version: 1.29.88 - category: main dependencies: clang-format: 15.0.7 default_had23c3d_1 @@ -4580,22 +4528,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/jsonpickle-2.2.0-pyhd8ed1ab_0.tar.bz2 version: 2.2.0 -- category: main - dependencies: - jsonschema: '>=4.0.0,<5.0.0' - pathable: '>=0.4.1,<0.5.0' - python: '>=3.6' - pyyaml: '>=5.1' - typing_extensions: '>=4.3.0,<5.0.0' - hash: - md5: a0266083a9eb9c4871fb27c1b30681b7 - sha256: 6bc2645c224994d2f456a59972aaf194937e373381bd5ae2c12052577b8a1db4 - manager: conda - name: jsonschema-spec - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-spec-0.1.2-pyhd8ed1ab_0.tar.bz2 - version: 0.1.2 - category: main dependencies: elfutils: '>=0.187,<0.188.0a0' @@ -4640,19 +4572,17 @@ package: version: 3.7.1 - category: main dependencies: - attrs: '>=19.2.0' - jsonschema: '>=4.0.0,<5.0.0' + jsonschema: '>=3.0.0,<5.0.0' python: '>=3.7' - rfc3339-validator: '' hash: - md5: 8b32c5ef540b6afe23ea8e75dd400fbb - sha256: 8e69b65ffdc0d71f5d924c34d8e45bb2ca169573db29ede1844a46a2c8e3a5d0 + md5: 277aff70bb1def188c9c016ba4564e23 + sha256: 0c2f971f86211f2b6db431de9d8ab4c9e38eed5422bd06f93cd8be3cbb882a2c manager: conda name: openapi-schema-validator optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/openapi-schema-validator-0.4.3-pyhd8ed1ab_0.conda - version: 0.4.3 + url: https://conda.anaconda.org/conda-forge/noarch/openapi-schema-validator-0.2.3-pyhd8ed1ab_0.tar.bz2 + version: 0.2.3 - category: main dependencies: alsa-lib: '>=1.2.8,<1.2.9.0a0' @@ -4889,22 +4819,20 @@ package: version: 2.54.4 - category: main dependencies: - importlib_resources: '>=5.8.0,<6.0.0' - jsonschema: '>=4.0.0,<5.0.0' - jsonschema-spec: '>=0.1.1,<0.2.0' - lazy-object-proxy: '>=1.7.1,<2.0.0' - openapi-schema-validator: '>=0.4.2,<0.5' + jsonschema: '>=3.2.0,<5.0.0' + openapi-schema-validator: '>=0.2.0,<0.3.0' python: '>=3.7' pyyaml: '>=5.1' + setuptools: '' hash: - md5: 243b7dc9b3e129a2e7d5f2ca690f337c - sha256: 3053d96adb90a7dd6002c1151531485d9973a94050139a233701c3c25f94e0ea + md5: 5ff3ff67d18fd4938c4ae38c3baf21bb + sha256: 11f24d36001aaba0a7197ff7b9a07ab943d05f969b13e5a9c4ffec13eca19cd0 manager: conda name: openapi-spec-validator optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/openapi-spec-validator-0.5.5-pyhd8ed1ab_0.conda - version: 0.5.5 + url: https://conda.anaconda.org/conda-forge/noarch/openapi-spec-validator-0.4.0-pyhd8ed1ab_1.tar.bz2 + version: 0.4.0 - category: main dependencies: cfgv: '>=2.0.0' @@ -4946,14 +4874,14 @@ package: pysocks: '>=1.5.6,<2.0,!=1.5.7' python: <4.0 hash: - md5: 01f33ad2e0aaf6b5ba4add50dad5ad29 - sha256: f2f09c44e47946ce631dbc9a8a79bb463ac0f4122aaafdbcc51f200a1e420ca6 + md5: 27db656619a55d727eaf5a6ece3d2fd6 + sha256: 213bdf6c3a5d721fa83b45d527d3ecd340f9547c0d6bbd0b8d9d746ec9a1fb4b manager: conda name: urllib3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.14-pyhd8ed1ab_0.conda - version: 1.26.14 + url: https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda + version: 1.26.15 - category: main dependencies: jmespath: '>=0.7.1,<2.0.0' @@ -5321,20 +5249,19 @@ package: version: 2.0.0 - category: main dependencies: - boto3: '>=1.19.5,<2' - jsonschema: '>=3.2,<5' - pydantic: ~=1.10.2 - python: '>=3.7' - typing_extensions: ~=4.4.0 + boto3: ~=1.5 + jsonschema: ~=3.2 + python: '>=3.6' + six: ~=1.15 hash: - md5: 1136b4bb3893069daeb272a3d6aecd7b - sha256: 9d9316f995fa2aedd97a8495b1a8b87265d3d8fc0771c8a0e51da7c3c1a0571c + md5: 6a8ad721f4edea85a40070c78f379dd4 + sha256: d9b2ff5fdf1e8de7cf80f2a14a7cb76c65c0bae18a2fe51700e6ed3c71fdb5b5 manager: conda name: aws-sam-translator optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/aws-sam-translator-1.60.1-pyhd8ed1ab_0.conda - version: 1.60.1 + url: https://conda.anaconda.org/conda-forge/noarch/aws-sam-translator-1.55.0-pyhd8ed1ab_0.conda + version: 1.55.0 - category: main dependencies: azure-core: '>=1.11.0,<2.0.0' @@ -5506,14 +5433,14 @@ package: werkzeug: <2.2.0,>=0.5 xmltodict: '' hash: - md5: 24a19f3ea233ebd0cc0b8e6e0bc5df58 - sha256: 55e3f4fd163518afd72e926d88011cc47933779c97523b4d64b3680f99bd787b + md5: 7b8eaea28d5c08c8539c3b35a07fe3d1 + sha256: 47f8f38a9eff042ebd7754fa6c36739021c0e6cdca1848cc4b0138cfc4043ace manager: conda name: moto optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.3-pyhd8ed1ab_0.conda - version: 4.1.3 + url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.4-pyhd8ed1ab_0.conda + version: 4.1.4 - category: main dependencies: {} hash: @@ -5607,13 +5534,13 @@ package: pyyaml: '>=6.0,<7.0' ruamel.yaml: '>=0.17.21,<0.18.0' hash: - sha256: 6a7843b67ffa3feaac92e39523cd9fd1f54c8f7cc38af4af158519a4a2f4b873 + sha256: d3646ea047d17bb5115f29d58a11941052eee45c86ef50debe288da887d88828 manager: pip name: hammer-vlsi optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/03/5c/800227902883e784ffe0e215a9ac384e6002d17b3dfa191691761fd13491/hammer_vlsi-1.0.2-py3-none-any.whl - version: 1.0.2 + url: https://files.pythonhosted.org/packages/c5/9f/fe767a72adcc2882b1be486da481c9d602952057a9470aa409cbb01dd596/hammer_vlsi-1.0.3-py3-none-any.whl + version: 1.0.3 - category: main dependencies: asttokens: '>=2,<3' 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 6b1e617f..30e9ac4d 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 @@ -21,7 +21,7 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: 26a591cc55d09a027f1bb93c0e0bf2ca8dafaa9ba5e3cf45b3a3a1ba77e1384b + linux-64: 842e724161a92610b043040d99ffc3398c82d3f42a1ac6314b1b9c89d1ea5605 platforms: - linux-64 sources: @@ -2449,20 +2449,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/kiwisolver-1.4.4-py39hf939315_1.tar.bz2 version: 1.4.4 -- category: main - dependencies: - libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 - hash: - md5: a0238daacd28c07735c6bc75aedf2014 - sha256: bbae929b429f39a10432e86d87bf02864e6640287245de71edeac6b3c29b0ff7 - manager: conda - name: lazy-object-proxy - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/lazy-object-proxy-1.9.0-py39h72bdee0_0.conda - version: 1.9.0 - category: main dependencies: jpeg: '>=9e,<10a' @@ -2742,18 +2728,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/pastel-0.2.1-pyhd8ed1ab_0.tar.bz2 version: 0.2.1 -- category: main - dependencies: - python: '>=3.7' - hash: - md5: f3e7301de38fd621c902faf8087bc564 - sha256: 7258b7f6a8e5fcd5e5a22e0a85b89e03e9cf5049d1591bc98420fd080007f25d - manager: conda - name: pathable - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pathable-0.4.3-pyhd8ed1ab_0.tar.bz2 - version: 0.4.3 - category: main dependencies: python: '>=3.6' @@ -2766,18 +2740,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/pkginfo-1.9.6-pyhd8ed1ab_0.conda version: 1.9.6 -- category: main - dependencies: - python: '>=3.6' - hash: - md5: 89e3c7cdde7d3aaa2aee933b604dd07f - sha256: 7d055ffc8a02bf781a89d069db3454b453605cdaff300b82cedcc7133283e47e - manager: conda - name: pkgutil-resolve-name - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2 - version: 1.3.10 - category: main dependencies: python: '>=3.8' @@ -3226,14 +3188,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 2d93b130d148d7fc77e583677792fc6a - sha256: 70c57b5ac94cd32e78f1a2fa2c38572bfac85b901a6a99aa254a9e8e126c132d + md5: 43e7d9e50261fb11deb76e17d8431aac + sha256: f81eee64fcdfb379e27d01773b34041fbf7f9e86f33b157c9925d19e0a442452 manager: conda name: typing_extensions optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.4.0-pyha770c72_0.tar.bz2 - version: 4.4.0 + url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda + version: 4.5.0 - category: main dependencies: libgcc-ng: '>=12' @@ -3968,19 +3930,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/ucb-bar/linux-64/qemu-5.0.0-hb15d774_0.tar.bz2 version: 5.0.0 -- category: main - dependencies: - python: '>=3.5' - six: '' - hash: - md5: fed45fc5ea0813240707998abe49f520 - sha256: 7c7052b51de0b5c558f890bb11f8b5edbb9934a653d76be086b1182b9f54185d - manager: conda - name: rfc3339-validator - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/rfc3339-validator-0.1.4-pyhd8ed1ab_0.tar.bz2 - version: 0.1.4 - category: main dependencies: pyasn1: '>=0.1.3' @@ -4051,16 +4000,16 @@ package: version: 2.28.11.15 - category: main dependencies: - typing_extensions: 4.4.0 pyha770c72_0 + typing_extensions: 4.5.0 pyha770c72_0 hash: - md5: be969210b61b897775a0de63cd9e9026 - sha256: 6f129b1bc18d111dcf3abaec6fcf6cbee00f1b77bb42d0f0bc8d85f8faa65cf0 + md5: b3c594fde1a80a1fc3eb9cc4a5dfe392 + sha256: 6da5e15fa533620ae2e7aca9a7d16013eed3a73ac64c47d7c3bf3deec39b63b9 manager: conda name: typing-extensions optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.4.0-hd8ed1ab_0.tar.bz2 - version: 4.4.0 + url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda + version: 4.5.0 - category: main dependencies: libgcc-ng: '>=9.3.0' @@ -4283,20 +4232,19 @@ package: dependencies: attrs: '>=17.4.0' importlib-metadata: '' - importlib_resources: '>=1.4.0' - pkgutil-resolve-name: '>=1.3.10' - pyrsistent: '!=0.17.0,!=0.17.1,!=0.17.2,>=0.14.0' - python: '>=3.7' - typing_extensions: '' + pyrsistent: '>=0.14.0' + python: '>=3.6' + setuptools: '' + six: '>=1.11.0' hash: - md5: 723268a468177cd44568eb8f794e0d80 - sha256: 4f68a23430d1afc5c9b41c46fbac0ade33c0bf57a293c646bfdd6dc65350eada + md5: 66125e28711d8ffc04a207a2b170316d + sha256: d74a3ddd3c3dd9bd7b00110a196e3af90490c5660674f18bfd53a8fdf91de418 manager: conda name: jsonschema optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda - version: 4.17.3 + url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-3.2.0-pyhd8ed1ab_3.tar.bz2 + version: 3.2.0 - category: main dependencies: elfutils: '>=0.187,<0.188.0a0' @@ -4501,14 +4449,14 @@ package: types-awscrt: '' typing_extensions: '' hash: - md5: 1284ea7cf431f599298c3e86922cb6ef - sha256: 949071f4ffaada1a7df890a0eca82507446f427d913272bae109c39f42b03361 + md5: 038f7d8f0f0b7cae4aee87bfbd09bd06 + sha256: 4c3babde56c86a3d0f83add59002275f8e8fd328acf432377c86ceb82b693131 manager: conda name: botocore-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.87-pyhd8ed1ab_0.conda - version: 1.29.87 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.88-pyhd8ed1ab_0.conda + version: 1.29.88 - category: main dependencies: clang-format: 15.0.7 default_had23c3d_1 @@ -4580,22 +4528,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/jsonpickle-2.2.0-pyhd8ed1ab_0.tar.bz2 version: 2.2.0 -- category: main - dependencies: - jsonschema: '>=4.0.0,<5.0.0' - pathable: '>=0.4.1,<0.5.0' - python: '>=3.6' - pyyaml: '>=5.1' - typing_extensions: '>=4.3.0,<5.0.0' - hash: - md5: a0266083a9eb9c4871fb27c1b30681b7 - sha256: 6bc2645c224994d2f456a59972aaf194937e373381bd5ae2c12052577b8a1db4 - manager: conda - name: jsonschema-spec - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-spec-0.1.2-pyhd8ed1ab_0.tar.bz2 - version: 0.1.2 - category: main dependencies: elfutils: '>=0.187,<0.188.0a0' @@ -4640,19 +4572,17 @@ package: version: 3.7.1 - category: main dependencies: - attrs: '>=19.2.0' - jsonschema: '>=4.0.0,<5.0.0' + jsonschema: '>=3.0.0,<5.0.0' python: '>=3.7' - rfc3339-validator: '' hash: - md5: 8b32c5ef540b6afe23ea8e75dd400fbb - sha256: 8e69b65ffdc0d71f5d924c34d8e45bb2ca169573db29ede1844a46a2c8e3a5d0 + md5: 277aff70bb1def188c9c016ba4564e23 + sha256: 0c2f971f86211f2b6db431de9d8ab4c9e38eed5422bd06f93cd8be3cbb882a2c manager: conda name: openapi-schema-validator optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/openapi-schema-validator-0.4.3-pyhd8ed1ab_0.conda - version: 0.4.3 + url: https://conda.anaconda.org/conda-forge/noarch/openapi-schema-validator-0.2.3-pyhd8ed1ab_0.tar.bz2 + version: 0.2.3 - category: main dependencies: alsa-lib: '>=1.2.8,<1.2.9.0a0' @@ -4889,22 +4819,20 @@ package: version: 2.54.4 - category: main dependencies: - importlib_resources: '>=5.8.0,<6.0.0' - jsonschema: '>=4.0.0,<5.0.0' - jsonschema-spec: '>=0.1.1,<0.2.0' - lazy-object-proxy: '>=1.7.1,<2.0.0' - openapi-schema-validator: '>=0.4.2,<0.5' + jsonschema: '>=3.2.0,<5.0.0' + openapi-schema-validator: '>=0.2.0,<0.3.0' python: '>=3.7' pyyaml: '>=5.1' + setuptools: '' hash: - md5: 243b7dc9b3e129a2e7d5f2ca690f337c - sha256: 3053d96adb90a7dd6002c1151531485d9973a94050139a233701c3c25f94e0ea + md5: 5ff3ff67d18fd4938c4ae38c3baf21bb + sha256: 11f24d36001aaba0a7197ff7b9a07ab943d05f969b13e5a9c4ffec13eca19cd0 manager: conda name: openapi-spec-validator optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/openapi-spec-validator-0.5.5-pyhd8ed1ab_0.conda - version: 0.5.5 + url: https://conda.anaconda.org/conda-forge/noarch/openapi-spec-validator-0.4.0-pyhd8ed1ab_1.tar.bz2 + version: 0.4.0 - category: main dependencies: cfgv: '>=2.0.0' @@ -4946,14 +4874,14 @@ package: pysocks: '>=1.5.6,<2.0,!=1.5.7' python: <4.0 hash: - md5: 01f33ad2e0aaf6b5ba4add50dad5ad29 - sha256: f2f09c44e47946ce631dbc9a8a79bb463ac0f4122aaafdbcc51f200a1e420ca6 + md5: 27db656619a55d727eaf5a6ece3d2fd6 + sha256: 213bdf6c3a5d721fa83b45d527d3ecd340f9547c0d6bbd0b8d9d746ec9a1fb4b manager: conda name: urllib3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.14-pyhd8ed1ab_0.conda - version: 1.26.14 + url: https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda + version: 1.26.15 - category: main dependencies: jmespath: '>=0.7.1,<2.0.0' @@ -5321,20 +5249,19 @@ package: version: 2.0.0 - category: main dependencies: - boto3: '>=1.19.5,<2' - jsonschema: '>=3.2,<5' - pydantic: ~=1.10.2 - python: '>=3.7' - typing_extensions: ~=4.4.0 + boto3: ~=1.5 + jsonschema: ~=3.2 + python: '>=3.6' + six: ~=1.15 hash: - md5: 1136b4bb3893069daeb272a3d6aecd7b - sha256: 9d9316f995fa2aedd97a8495b1a8b87265d3d8fc0771c8a0e51da7c3c1a0571c + md5: 6a8ad721f4edea85a40070c78f379dd4 + sha256: d9b2ff5fdf1e8de7cf80f2a14a7cb76c65c0bae18a2fe51700e6ed3c71fdb5b5 manager: conda name: aws-sam-translator optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/aws-sam-translator-1.60.1-pyhd8ed1ab_0.conda - version: 1.60.1 + url: https://conda.anaconda.org/conda-forge/noarch/aws-sam-translator-1.55.0-pyhd8ed1ab_0.conda + version: 1.55.0 - category: main dependencies: azure-core: '>=1.11.0,<2.0.0' @@ -5506,14 +5433,14 @@ package: werkzeug: <2.2.0,>=0.5 xmltodict: '' hash: - md5: 24a19f3ea233ebd0cc0b8e6e0bc5df58 - sha256: 55e3f4fd163518afd72e926d88011cc47933779c97523b4d64b3680f99bd787b + md5: 7b8eaea28d5c08c8539c3b35a07fe3d1 + sha256: 47f8f38a9eff042ebd7754fa6c36739021c0e6cdca1848cc4b0138cfc4043ace manager: conda name: moto optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.3-pyhd8ed1ab_0.conda - version: 4.1.3 + url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.4-pyhd8ed1ab_0.conda + version: 4.1.4 - category: main dependencies: {} hash: @@ -5607,13 +5534,13 @@ package: pyyaml: '>=6.0,<7.0' ruamel.yaml: '>=0.17.21,<0.18.0' hash: - sha256: 6a7843b67ffa3feaac92e39523cd9fd1f54c8f7cc38af4af158519a4a2f4b873 + sha256: d3646ea047d17bb5115f29d58a11941052eee45c86ef50debe288da887d88828 manager: pip name: hammer-vlsi optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/03/5c/800227902883e784ffe0e215a9ac384e6002d17b3dfa191691761fd13491/hammer_vlsi-1.0.2-py3-none-any.whl - version: 1.0.2 + url: https://files.pythonhosted.org/packages/c5/9f/fe767a72adcc2882b1be486da481c9d602952057a9470aa409cbb01dd596/hammer_vlsi-1.0.3-py3-none-any.whl + version: 1.0.3 - category: main dependencies: asttokens: '>=2,<3' From b68ee34d1e6fd1b998e0998a4bbb2c7479ad0935 Mon Sep 17 00:00:00 2001 From: Nayiri Krzysztofowicz Date: Sun, 12 Mar 2023 12:24:57 -0700 Subject: [PATCH 19/19] bumped to hammer v1.0.4 --- conda-reqs/chipyard.yaml | 2 +- .../conda-requirements-esp-tools-linux-64.conda-lock.yml | 8 ++++---- ...conda-requirements-riscv-tools-linux-64.conda-lock.yml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conda-reqs/chipyard.yaml b/conda-reqs/chipyard.yaml index d2cd562d..19cac294 100644 --- a/conda-reqs/chipyard.yaml +++ b/conda-reqs/chipyard.yaml @@ -103,7 +103,7 @@ dependencies: # hammer packages - sty - pip: - - hammer-vlsi[asap7]==1.0.3 + - hammer-vlsi[asap7]==1.0.4 # doc requirements - sphinx 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 ab61ecbc..605024eb 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 @@ -21,7 +21,7 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: 63f33698b3df11d1d30eec60e45fa43e1a9316cddfdf2a8bf9eb859556c56e2e + linux-64: 54c064cc392aed21ebf9caa5c4333f9d4a072c30165d37a56916a3c39dd86eb9 platforms: - linux-64 sources: @@ -5534,13 +5534,13 @@ package: pyyaml: '>=6.0,<7.0' ruamel.yaml: '>=0.17.21,<0.18.0' hash: - sha256: d3646ea047d17bb5115f29d58a11941052eee45c86ef50debe288da887d88828 + sha256: 6bcd6cef086b6b6b6ab00822699d436451ef5f8f8460e07cad7c05ab6d05bfcf manager: pip name: hammer-vlsi optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/c5/9f/fe767a72adcc2882b1be486da481c9d602952057a9470aa409cbb01dd596/hammer_vlsi-1.0.3-py3-none-any.whl - version: 1.0.3 + url: https://files.pythonhosted.org/packages/65/f8/5ec3f1e3c629724fec4613e13c3da9be114b306ae452cd1e0f75eaf694a6/hammer_vlsi-1.0.4-py3-none-any.whl + version: 1.0.4 - category: main dependencies: asttokens: '>=2,<3' 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 30e9ac4d..803b93c2 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 @@ -21,7 +21,7 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: 842e724161a92610b043040d99ffc3398c82d3f42a1ac6314b1b9c89d1ea5605 + linux-64: 01a33092d9b6501c87e830b4dd22683af0a3c8f5ede87d42d7a079b5c345161b platforms: - linux-64 sources: @@ -5534,13 +5534,13 @@ package: pyyaml: '>=6.0,<7.0' ruamel.yaml: '>=0.17.21,<0.18.0' hash: - sha256: d3646ea047d17bb5115f29d58a11941052eee45c86ef50debe288da887d88828 + sha256: 6bcd6cef086b6b6b6ab00822699d436451ef5f8f8460e07cad7c05ab6d05bfcf manager: pip name: hammer-vlsi optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/c5/9f/fe767a72adcc2882b1be486da481c9d602952057a9470aa409cbb01dd596/hammer_vlsi-1.0.3-py3-none-any.whl - version: 1.0.3 + url: https://files.pythonhosted.org/packages/65/f8/5ec3f1e3c629724fec4613e13c3da9be114b306ae452cd1e0f75eaf694a6/hammer_vlsi-1.0.4-py3-none-any.whl + version: 1.0.4 - category: main dependencies: asttokens: '>=2,<3'