Remove Cadence & Synopsys plugins (#1410)

* remove Cadence & Synopsys plugins from docs and scripts * update conda-locks
2023-03-21 09:34:38 -07:00
parent c62ff145eb
commit 9ef3001ce1
15 changed files with 332 additions and 286 deletions
--- a/.github/scripts/check-commit.sh
+++ b/.github/scripts/check-commit.sh
@@ -12,9 +12,7 @@ source $SCRIPT_DIR/defaults.sh
 cd $LOCAL_CHIPYARD_DIR

 # ignore the private vlsi submodules
-git config submodule.vlsi/hammer-cadence-plugins.update none
 git config submodule.vlsi/hammer-mentor-plugins.update none
-git config submodule.vlsi/hammer-synopsys-plugins.update none

 # initialize submodules and get the hashes
 git submodule update --init
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,12 +34,6 @@
 [submodule "generators/sha3"]
 	path = generators/sha3
 	url = https://github.com/ucb-bar/sha3.git
-[submodule "vlsi/hammer-cadence-plugins"]
-	path = vlsi/hammer-cadence-plugins
-	url = https://github.com/ucb-bar/hammer-cadence-plugins.git
-[submodule "vlsi/hammer-synopsys-plugins"]
-	path = vlsi/hammer-synopsys-plugins
-	url = https://github.com/ucb-bar/hammer-synopsys-plugins.git
 [submodule "vlsi/hammer-mentor-plugins"]
 	path = vlsi/hammer-mentor-plugins
 	url = https://github.com/ucb-bar/hammer-mentor-plugins.git
--- a/conda-reqs/chipyard.yaml
+++ b/conda-reqs/chipyard.yaml
@@ -1,7 +1,7 @@
 channels:
    - ucb-bar
-    - litex-hub
    - conda-forge
+    - litex-hub
    - nodefaults

 platforms:
@@ -103,7 +103,7 @@ dependencies:
    - sty
    - open_pdks.sky130a
    - pip:
-        - hammer-vlsi[asap7]==1.0.5
+        - hammer-vlsi[asap7]==1.1.0

    # doc requirements
    - sphinx
--- 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
@@ -9,24 +9,24 @@
 # 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
 # To re-solve the entire environment, e.g. after changing a version constraint in the source file:
-#     conda-lock -f /home/eecs/nayiri/chipyard/conda-reqs/chipyard.yaml -f /home/eecs/nayiri/chipyard/conda-reqs/esp-tools.yaml --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml
+#     conda-lock -f /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/chipyard.yaml -f /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/esp-tools.yaml --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml
 metadata:
  channels:
  - url: ucb-bar
    used_env_vars: []
-  - url: litex-hub
-    used_env_vars: []
  - url: conda-forge
    used_env_vars: []
+  - url: litex-hub
+    used_env_vars: []
  - url: nodefaults
    used_env_vars: []
  content_hash:
-    linux-64: 576de47cdf62e8c328cee203cd3150231e6bf142d2f735eaa760aedc342b7f2b
+    linux-64: cee2f923f616452b736c4314db2e791c5402803fdf7a7e344bb8233950f19b67
  platforms:
  - linux-64
  sources:
-  - /home/eecs/nayiri/chipyard/conda-reqs/chipyard.yaml
-  - /home/eecs/nayiri/chipyard/conda-reqs/esp-tools.yaml
+  - /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/chipyard.yaml
+  - /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/esp-tools.yaml
 package:
 - category: main
  dependencies: {}
@@ -185,14 +185,14 @@ package:
 - category: main
  dependencies: {}
  hash:
-    md5: b81ebefd12ddbf18353d1a227f2dccf8
-    sha256: d7b45d7f379d65cbbdaf557aa5e1f0e1c2aef6f1a1b7b598622e75f77da318e2
+    md5: 7697d37e29669a14b053e82fad22a16b
+    sha256: ac993fa2774b90befcd6aba55b1c08853b2fa3b818753094c09bebd35fc55532
  manager: conda
  name: open_pdks.sky130a
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/litex-hub/noarch/open_pdks.sky130a-1.0.399_0_g63dbde9-20230225_164303.tar.bz2
-  version: 1.0.399_0_g63dbde9
+  url: https://conda.anaconda.org/litex-hub/noarch/open_pdks.sky130a-1.0.402_1_g12df12e-20230225_164303.tar.bz2
+  version: 1.0.402_1_g12df12e
 - category: main
  dependencies: {}
  hash:
@@ -392,16 +392,16 @@ package:
  version: 1.18.1
 - category: main
  dependencies:
-    libgcc-ng: '>=10.3.0'
+    libgcc-ng: '>=12'
  hash:
-    md5: b0929effe5b852ce3e7b2a78c2c35376
-    sha256: 164bd59917902450fcc5e4ca6f12f190e08e0c39c31f20c8330b0dba865ddc5a
+    md5: 80968e6760b2448f739cd32b1324d07d
+    sha256: c8b52559c1867ad59510c9479a15581cbfda0a7857a33ff2fce03a76a0775cfb
  manager: conda
  name: coreutils
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/coreutils-9.1-h166bdaf_0.tar.bz2
-  version: '9.1'
+  url: https://conda.anaconda.org/conda-forge/linux-64/coreutils-9.2-h0b41bf4_0.conda
+  version: '9.2'
 - category: main
  dependencies:
    libgcc-ng: '>=7.3.0'
@@ -872,14 +872,14 @@ package:
    ca-certificates: ''
    libgcc-ng: '>=12'
  hash:
-    md5: e043403cd18faf815bf7705ab6c1e092
-    sha256: cd981c5c18463bc7a164fcf45c5cf697d58852b780b4dfa5e83c18c1fda6d7cd
+    md5: 2d833be81a21128e317325a01326d36f
+    sha256: d378afcec34b86fef4da3ebd622b3e614cb3f71e54b6a5a10adb1d23745ecc72
  manager: conda
  name: openssl
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.0.8-h0b41bf4_0.conda
-  version: 3.0.8
+  url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.0-h0b41bf4_0.conda
+  version: 3.1.0
 - category: main
  dependencies:
    libgcc-ng: '>=9.3.0'
@@ -1379,13 +1379,13 @@ package:
    libzlib: '>=1.2.13,<1.3.0a0'
    xz: '>=5.2.6,<6.0a0'
  hash:
-    md5: 3b933ea47ef8f330c4c068af25fcd6a8
-    sha256: b30713fb4477ff4f722280d956593e7e7a2cb705b7444dcc278de447432b43b1
+    md5: bb808b654bdc3c783deaf107a2ffb503
+    sha256: d4170f1fe356768758b13a51db123f990bff81b0eae0d5a0ba11c7ca6b9536f4
  manager: conda
  name: libxml2
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.3-h7463322_0.tar.bz2
+  url: https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.3-hca2bb57_4.conda
  version: 2.10.3
 - category: main
  dependencies:
@@ -1810,13 +1810,13 @@ package:
    libzlib: '>=1.2.13,<1.3.0a0'
    zstd: '>=1.5.2,<1.6.0a0'
  hash:
-    md5: 70cbb0c2033665f2a7339bf0ec51a67f
-    sha256: 3fb9a9cfd2f5c79e8116c67f95d5a9b790ec66807ae0d8cebefc26fda9f836a7
+    md5: 17d91085ccf5934ce652cb448d0cb65a
+    sha256: f649fac60cb122bf0d85c4955725d94c353fdbd768bcd44f0444979b363cc9ab
  manager: conda
  name: libllvm15
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/libllvm15-15.0.7-hadd5161_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libllvm15-15.0.7-hadd5161_1.conda
  version: 15.0.7
 - category: main
  dependencies:
@@ -1990,14 +1990,14 @@ package:
  dependencies:
    python: '>=3.6'
  hash:
-    md5: c02e756991820cd4746bdb1d222133d0
-    sha256: c79a280482d7aca315e1dbab271c720a77d6e4df6b0cb5138d2c7c3b70588c5b
+    md5: b3c15cb1d45fd10bc6f652bbc51e023a
+    sha256: 8dbc6de55113ea67a64f0be5d16ba939d1b58a25dbd9a5cc62b571cef24ef85c
  manager: conda
  name: argcomplete
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-2.1.1-pyhd8ed1ab_0.conda
-  version: 2.1.1
+  url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-3.0.2-pyhd8ed1ab_0.conda
+  version: 3.0.2
 - category: main
  dependencies:
    libgcc-ng: '>=12'
@@ -2220,14 +2220,14 @@ package:
  dependencies:
    python: '>=3.7'
  hash:
-    md5: 1addc115923d646ca19ed90edc413506
-    sha256: 739c48f62747c942aa733041d36a2c1af41c2ecf2a59f1fec90cd7200e01be9a
+    md5: 6f90f1dc834447823b11d155726fcb37
+    sha256: 6a6901f20c5b4d81aebd25a0645b3578ebb6a323f9fd7e87ee05ecbcfe19069e
  manager: conda
  name: filelock
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/filelock-3.9.0-pyhd8ed1ab_0.conda
-  version: 3.9.0
+  url: https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.0-pyhd8ed1ab_0.conda
+  version: 3.10.0
 - category: main
  dependencies:
    expat: '>=2.5.0,<3.0a0'
@@ -2517,32 +2517,33 @@ package:
  dependencies:
    krb5: '>=1.20.1,<1.21.0a0'
    libgcc-ng: '>=12'
-    libnghttp2: '>=1.51.0,<2.0a0'
+    libnghttp2: '>=1.52.0,<2.0a0'
    libssh2: '>=1.10.0,<2.0a0'
    libzlib: '>=1.2.13,<1.3.0a0'
-    openssl: '>=3.0.8,<4.0a0'
+    openssl: '>=3.1.0,<4.0a0'
+    zstd: '>=1.5.2,<1.6.0a0'
  hash:
-    md5: 81eaeb3b35163c8e90e57532bc93754d
-    sha256: abc7a5f4dad4559a1db998a58952226035f20977a186b68ce78bd4db4a6a6286
+    md5: 3d1189864d1c0ed2a5919cb067b5903d
+    sha256: 500c08e61871df6dc4fc87913c99cb799f5fa8333db991201be32b657e9dcdb1
  manager: conda
  name: libcurl
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.88.1-hdc1c0ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.88.1-hdc1c0ab_1.conda
  version: 7.88.1
 - category: main
  dependencies:
-    gnutls: '>=3.7.6,<3.8.0a0'
+    gnutls: '>=3.7.8,<3.8.0a0'
    libgcc-ng: '>=12'
  hash:
-    md5: 78ff89df42ec0d4fe4355490d7843d9b
-    sha256: 780c82366caab4a741f2a4baa901a9b71fad6c2b8f1f64c168f10f61a939e9d4
+    md5: a946cb6b36807a772748b55f59089a08
+    sha256: 33ddfa3d91816ee44df405424ee2fedf5df5c02a1ffa1819aa4c956eedae4533
  manager: conda
  name: libmicrohttpd
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/libmicrohttpd-0.9.75-h2603550_1.tar.bz2
-  version: 0.9.75
+  url: https://conda.anaconda.org/conda-forge/linux-64/libmicrohttpd-0.9.76-h87ba234_0.conda
+  version: 0.9.76
 - category: main
  dependencies:
    python: '>=3.4'
@@ -3362,6 +3363,19 @@ package:
  platform: linux-64
  url: https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda
  version: 3.15.0
+- category: main
+  dependencies:
+    python: '>=3.6'
+    typing_extensions: '>=4.0'
+  hash:
+    md5: 59c40397276a286241c65faec5e1be3c
+    sha256: be2dbd6710438fa48b83bf06841091227276ae545d145dfe5cb5149c6484e951
+  manager: conda
+  name: aioitertools
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/noarch/aioitertools-0.11.0-pyhd8ed1ab_0.tar.bz2
+  version: 0.11.0
 - category: main
  dependencies:
    frozenlist: '>=1.1.0'
@@ -3489,14 +3503,14 @@ package:
    zlib: ''
    zstd: '>=1.5.2,<1.6.0a0'
  hash:
-    md5: 6709d5b453c44b4e630b146d596d1d41
-    sha256: 806ddedebceedb0147f53851b10069dac521a2f83a2edb8039445ce20e5fb4e9
+    md5: 02142080aee43c8ef90db543ffbc13dd
+    sha256: cbd17c0375a021b7de854e0841f3f1b28b1359bc52bdc0ba5aabaee0f65a0b7d
  manager: conda
  name: cmake
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/cmake-3.25.3-h077f3f9_0.conda
-  version: 3.25.3
+  url: https://conda.anaconda.org/conda-forge/linux-64/cmake-3.26.0-h077f3f9_0.conda
+  version: 3.26.0
 - category: main
  dependencies:
    libgcc-ng: '>=12'
@@ -3516,19 +3530,20 @@ package:
 - category: main
  dependencies:
    krb5: '>=1.20.1,<1.21.0a0'
-    libcurl: 7.88.1 hdc1c0ab_0
+    libcurl: 7.88.1 hdc1c0ab_1
    libgcc-ng: '>=12'
    libssh2: '>=1.10.0,<2.0a0'
    libzlib: '>=1.2.13,<1.3.0a0'
-    openssl: '>=3.0.8,<4.0a0'
+    openssl: '>=3.1.0,<4.0a0'
+    zstd: '>=1.5.2,<1.6.0a0'
  hash:
-    md5: 1968e4fef727858ac04746560e820928
-    sha256: 60e6b8c474c5a1f833e9a6e727a8a4a106701678e66ef2f3ddaf6a3e887757e8
+    md5: 2016c398f234cfa354ea704c6731b5d5
+    sha256: b52a3b97e4c3d2acca8380d405da49c2fdc2f770fcbb9dd842eb6058f8476def
  manager: conda
  name: curl
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/curl-7.88.1-hdc1c0ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/curl-7.88.1-hdc1c0ab_1.conda
  version: 7.88.1
 - category: main
  dependencies:
@@ -3574,14 +3589,14 @@ package:
    python_abi: 3.9.* *_cp39
    unicodedata2: '>=14.0.0'
  hash:
-    md5: 7ed17a60087175112fbbf5882bebddc2
-    sha256: cd5bce3af985c9ada2d9cc1c42f5c6f135fabbb56c2917fc7c9f5ecf27f3cff0
+    md5: f87853cd6f76c4b8014b41fa522e5bda
+    sha256: 2c9ca5aba1d6d038b60f77b73e533e81feee882cd4f22e99bdaa77fd7bfcc7cc
  manager: conda
  name: fonttools
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.0-py39h72bdee0_0.conda
-  version: 4.39.0
+  url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.2-py39h72bdee0_0.conda
+  version: 4.39.2
 - category: main
  dependencies:
    python: '>=3.4'
@@ -3627,14 +3642,14 @@ package:
    python: '>=3.8'
    zipp: '>=0.5'
  hash:
-    md5: 691644becbcdca9f73243450b1c63e62
-    sha256: 0062e6ae1719395c25f0b60a21215470b4ea67514fed8a9330869da8604acfca
+    md5: 30b3127c385ca2ed5ef87f3d53d466bc
+    sha256: 4fe127138487a2aa171862407605f0cd601d005f85e0eee7f38c770b407e4145
  manager: conda
  name: importlib-metadata
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.0.0-pyha770c72_0.conda
-  version: 6.0.0
+  url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda
+  version: 6.1.0
 - category: main
  dependencies:
    python: '>=3.7'
@@ -4175,16 +4190,16 @@ package:
  version: 5.12.0
 - category: main
  dependencies:
-    importlib-metadata: '>=6.0.0,<6.0.1.0a0'
+    importlib-metadata: '>=6.1.0,<6.1.1.0a0'
  hash:
-    md5: a67d43e1527a37199dd8db913366f68e
-    sha256: 99579d0c636ac87c47ad79faec5d84f00b76bff8cc54dd5f8056494277325354
+    md5: 90bab1d97fdb6bb40c8e00207bf222dc
+    sha256: 80a10ad1bacf5bb85d497fd3e5629f5805b6e90ad8c8b923daa3e36729e7429a
  manager: conda
  name: importlib_metadata
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.0.0-hd8ed1ab_0.conda
-  version: 6.0.0
+  url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda
+  version: 6.1.0
 - category: main
  dependencies:
    attrs: '>=17.4.0'
@@ -4322,14 +4337,14 @@ package:
    pip: ''
    python: '>=3.7,<4.0'
  hash:
-    md5: 1b96b6926c03bc190c9425da6cc637e7
-    sha256: dfa8e083442b18006c0015154b5e88dbe624a268ec9fd8abe4959dae484d5ef3
+    md5: 25923bf9620c56f8bc0d4923d870edd8
+    sha256: 3f8be46ba1cbd8533d25eba1a5b32062bb9231b16e308bbbc92b5e32177cbdad
  manager: conda
  name: types-awscrt
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.12-pyhd8ed1ab_0.conda
-  version: 0.16.12
+  url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.13-pyhd8ed1ab_0.conda
+  version: 0.16.13
 - category: main
  dependencies:
    cffi: ''
@@ -4406,14 +4421,14 @@ package:
    types-awscrt: ''
    typing_extensions: ''
  hash:
-    md5: 77b2ba7cde37be73d8edfd6b292e9ee9
-    sha256: e9fe8bc0b8fa005067cd67d24456157afc9d6082b1e2bb229ffde3061ad02e5b
+    md5: 96971bc5cc944a1743fdde0634e55480
+    sha256: fee2b0596dd34a70081d745e06f9302dd06fb56dd366e51a302f93c9764126d9
  manager: conda
  name: botocore-stubs
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.90-pyhd8ed1ab_0.conda
-  version: 1.29.90
+  url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.94-pyhd8ed1ab_0.conda
+  version: 1.29.94
 - category: main
  dependencies:
    clang-format: 15.0.7 default_had23c3d_1
@@ -4464,14 +4479,14 @@ package:
    python: '>=3.6'
    ukkonen: ''
  hash:
-    md5: e886aa3ceb206963720799725ffcd414
-    sha256: 688845fde60145cdeb47d78de3d9632ef6bd4d4793bdf1cb9055ed2fc0a84a8a
+    md5: b5ada314668cded097e08fea86262317
+    sha256: 88bcba64d462867b5759e29784cf24685e1e49fffea75452b94d438d6bd9587c
  manager: conda
  name: identify
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/identify-2.5.20-pyhd8ed1ab_0.conda
-  version: 2.5.20
+  url: https://conda.anaconda.org/conda-forge/noarch/identify-2.5.21-pyhd8ed1ab_0.conda
+  version: 2.5.21
 - category: main
  dependencies:
    importlib_metadata: ''
@@ -4795,19 +4810,18 @@ package:
    cfgv: '>=2.0.0'
    identify: '>=1.0.0'
    nodeenv: '>=0.11.1'
-    python: '>=3.9,<3.10.0a0'
-    python_abi: 3.9.* *_cp39
+    python: '>=3.8'
    pyyaml: '>=5.1'
-    virtualenv: '>=20.0.8'
+    virtualenv: '>=20.10.0'
  hash:
-    md5: 17994a38cb9daeb1beecacec5885745c
-    sha256: ca03c667f8b60428c1bf4f155f9aa343593b1af13b33ff0e079c191c5ddc7657
+    md5: 9a160452d1d88a9f10c373888f93586b
+    sha256: 91e104de6854e07a580603a7affb1a6e77823e9d4246486ecfd47d3978839212
  manager: conda
  name: pre-commit
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/pre-commit-3.1.1-py39hf3d152e_0.conda
-  version: 3.1.1
+  url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda
+  version: 3.2.0
 - category: main
  dependencies:
    __unix: ''
@@ -4846,14 +4860,14 @@ package:
    python-dateutil: '>=2.1,<3.0.0'
    urllib3: '>=1.25.4,<1.27'
  hash:
-    md5: f5f163a412ecc6be50ef913cf3de6ad6
-    sha256: 1172449dfba0f4bba3adb2a0c9878878fdf7c4cc22c0f6c3ebbc42d3b11bfda4
+    md5: 3faabd8720a81a91566e6c01bf7bbacb
+    sha256: c677cba87c7027ccf264574a87130bf44f69be008315d2a840ae6cfaa61b7e44
  manager: conda
  name: botocore
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.90-pyhd8ed1ab_0.conda
-  version: 1.29.90
+  url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.27.59-pyhd8ed1ab_0.tar.bz2
+  version: 1.27.59
 - category: main
  dependencies:
    cairo: '>=1.16.0,<2.0a0'
@@ -4899,6 +4913,22 @@ package:
  platform: linux-64
  url: https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda
  version: 2.28.2
+- category: main
+  dependencies:
+    aiohttp: '>=3.3.1'
+    aioitertools: '>=0.5.1'
+    botocore: '>=1.27.59,<1.27.60'
+    python: '>=3.6'
+    wrapt: '>=1.10.10'
+  hash:
+    md5: a3f48ea10883a5df371b895008b1ca4b
+    sha256: 76068553358b26c9c03be992cbe982a369d1e015a53700f092db92c784ce98a9
+  manager: conda
+  name: aiobotocore
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/noarch/aiobotocore-2.4.2-pyhd8ed1ab_0.conda
+  version: 2.4.2
 - category: main
  dependencies:
    botocore: '>=1.11.3'
@@ -5084,7 +5114,7 @@ package:
  version: 5.1.1
 - category: main
  dependencies:
-    botocore: 1.29.90
+    botocore: 1.27.59
    colorama: '>=0.2.5,<0.4.5'
    docutils: '>=0.10,<0.17'
    python: '>=3.9,<3.10.0a0'
@@ -5093,29 +5123,29 @@ package:
    rsa: '>=3.1.2,<4.8'
    s3transfer: '>=0.6.0,<0.7.0'
  hash:
-    md5: 1aad173d6a406ea8e26aa7ac6ec92b77
-    sha256: dbc0e344cc63263aca1bc1257563f1caa46d11b4484d3767d52715a61e3e1395
+    md5: fa62dd9ed5d234c493ff14914d43f332
+    sha256: 61483c628f9751a038d5634ce8ba2ed7ab484ffad50a7e7da13c2e3b30f93eae
  manager: conda
  name: awscli
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.90-py39hf3d152e_0.conda
-  version: 1.27.90
+  url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.25.60-py39hf3d152e_0.tar.bz2
+  version: 1.25.60
 - category: main
  dependencies:
-    botocore: '>=1.29.90,<1.30.0'
+    botocore: '>=1.27.59,<1.28.0'
    jmespath: '>=0.7.1,<2.0.0'
    python: '>=3.7'
    s3transfer: '>=0.6.0,<0.7.0'
  hash:
-    md5: a57ff13af4774f422569fe6630d73c08
-    sha256: 045c5d6441b6b6790d0e9a826bee129b6f6c14ce65e8c50556b8a109a84d9912
+    md5: ffb13a0a5fc8e17ce396f4dfcdf5dab5
+    sha256: 89fd09bdc9d9a608387fd80b19fd084f26309d7857bd9a3957216a718f58b3de
  manager: conda
  name: boto3
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.90-pyhd8ed1ab_0.conda
-  version: 1.26.90
+  url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.24.59-pyhd8ed1ab_0.tar.bz2
+  version: 1.24.59
 - category: main
  dependencies:
    cachecontrol: 0.12.11 pyhd8ed1ab_1
@@ -5176,6 +5206,21 @@ package:
  platform: linux-64
  url: https://conda.anaconda.org/conda-forge/noarch/msal_extensions-1.0.0-pyhd8ed1ab_0.tar.bz2
  version: 1.0.0
+- category: main
+  dependencies:
+    aiobotocore: '>=2.4.2,<2.4.3'
+    aiohttp: ''
+    fsspec: 2023.3.0
+    python: '>=3.8'
+  hash:
+    md5: 53b2e3e80df2a18eb74d53729b9464f2
+    sha256: 2737102a9d3d538dccf22fc32e32e2ec608d69c2a002a1f137091b9611bf5d6e
+  manager: conda
+  name: s3fs
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/noarch/s3fs-2023.3.0-pyhd8ed1ab_0.conda
+  version: 2023.3.0
 - category: main
  dependencies:
    livereload: '>=2.3.0'
@@ -5241,14 +5286,14 @@ package:
    python: ''
    typing_extensions: ''
  hash:
-    md5: 72b6b21dfad72737aab3d4988b51244f
-    sha256: 77179ed8be45e06e010dc0143bf56201aa028ba59d573e4216be8c1a49ff372b
+    md5: 009fa15810ae5d376e1bd29ab93c1081
+    sha256: 380426f97ae074ad86a1b52bb106e1f10e868bc8b7c575bea6ea5ac7725bc84d
  manager: conda
  name: boto3-stubs
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.90-pyhd8ed1ab_0.conda
-  version: 1.26.90
+  url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.95-pyhd8ed1ab_0.conda
+  version: 1.26.95
 - category: main
  dependencies:
    cachecontrol-with-filecache: '>=0.12.9'
@@ -5303,28 +5348,14 @@ package:
    python: '>=3.6'
    typing-extensions: ''
  hash:
-    md5: 1d91d141687b375eab2e63bbecf191b1
-    sha256: 8c5af95bf4090318c138501ca271158cd00ff51898c608a4753a4fb09a31973c
+    md5: a0ead2e95ffa5942c419234c15463344
+    sha256: 7e7bb339939a50d9e682c01938062d2d4e1157a7b034d7f91e44e11d98c0d05d
  manager: conda
  name: mypy_boto3_ec2
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.87-pyhd8ed1ab_0.conda
-  version: 1.26.87
- category: main
-  dependencies:
-    boto3: ''
-    fsspec: '>=0.6.0'
-    python: '>=3.5'
-  hash:
-    md5: ead328eb12f01d88706126ba061e7a69
-    sha256: 7a4cb574ff7edf773e5e4c396733dcb08ffcfd6e4f8b27e5b84b35fd4666ef5b
-  manager: conda
-  name: s3fs
-  optional: false
-  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/s3fs-0.4.2-py_0.tar.bz2
-  version: 0.4.2
+  url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.91-pyhd8ed1ab_0.conda
+  version: 1.26.91
 - category: main
  dependencies:
    docutils: <0.19
@@ -5352,14 +5383,14 @@ package:
    pyyaml: '>5.4'
    sarif-om: ~=1.0.4
  hash:
-    md5: a607f8ae4533e3b4a8f351b485daee03
-    sha256: 7c1ac284f75362698321857ac6b63f53dbc7bbfe61d70ff70eecf41ae5161012
+    md5: 97bf916949bb4eb9f69c77d365a4da72
+    sha256: 7d8c32e83b839abbb4c2a6b476b2a4a60f03394ac6156740f81abba64dbcf756
  manager: conda
  name: cfn-lint
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/cfn-lint-0.74.1-pyhd8ed1ab_0.conda
-  version: 0.74.1
+  url: https://conda.anaconda.org/conda-forge/noarch/cfn-lint-0.75.1-pyhd8ed1ab_0.conda
+  version: 0.75.1
 - category: main
  dependencies:
    aws-xray-sdk: '!=0.96,>=0.93'
@@ -5389,14 +5420,14 @@ package:
    werkzeug: <2.2.0,>=0.5
    xmltodict: ''
  hash:
-    md5: 7b8eaea28d5c08c8539c3b35a07fe3d1
-    sha256: 47f8f38a9eff042ebd7754fa6c36739021c0e6cdca1848cc4b0138cfc4043ace
+    md5: 702e5d281f691be1bec2f23d1f24fee8
+    sha256: 5f7094094ef361b135068b12facdf34c18d2b285c4bd87a935ab1c7e633990ee
  manager: conda
  name: moto
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.4-pyhd8ed1ab_0.conda
-  version: 4.1.4
+  url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.5-pyhd8ed1ab_0.conda
+  version: 4.1.5
 - category: main
  dependencies: {}
  hash:
@@ -5490,13 +5521,13 @@ package:
    pyyaml: '>=6.0,<7.0'
    ruamel.yaml: '>=0.17.21,<0.18.0'
  hash:
-    sha256: 1e4b942c42a2292f2e6140fc8df51edc8fd5f8a5c7141e471ecb1d6676fe0bb6
+    sha256: 638a6b8c3e631f85f235acf02d3bef35a0a6d7da2ec9fef17420d5dd2ce66678
  manager: pip
  name: hammer-vlsi
  optional: false
  platform: linux-64
-  url: https://files.pythonhosted.org/packages/86/15/6643fe3965aabde680eab7f64eef1e3967b516640c756858cd246dd0b427/hammer_vlsi-1.0.5-py3-none-any.whl
-  version: 1.0.5
+  url: https://files.pythonhosted.org/packages/53/39/18367e6fb4f20e9ae4fb3097f7b80704ff5cccf62980ea2871ba1d817a74/hammer_vlsi-1.1.0-py3-none-any.whl
+  version: 1.1.0
 - category: main
  dependencies:
    asttokens: '>=2,<3'
--- 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
@@ -9,24 +9,24 @@
 # 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
 # To re-solve the entire environment, e.g. after changing a version constraint in the source file:
-#     conda-lock -f /home/eecs/nayiri/chipyard/conda-reqs/chipyard.yaml -f /home/eecs/nayiri/chipyard/conda-reqs/riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml
+#     conda-lock -f /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/chipyard.yaml -f /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml
 metadata:
  channels:
  - url: ucb-bar
    used_env_vars: []
-  - url: litex-hub
-    used_env_vars: []
  - url: conda-forge
    used_env_vars: []
+  - url: litex-hub
+    used_env_vars: []
  - url: nodefaults
    used_env_vars: []
  content_hash:
-    linux-64: 627a36ef251d91a4b9367ab331f17aff95a8eea6e2bbb80089fb5f1016740d25
+    linux-64: 1a7b0ae002798a28682d700644302284790c06503a7d3d04caa019aa74da7123
  platforms:
  - linux-64
  sources:
-  - /home/eecs/nayiri/chipyard/conda-reqs/chipyard.yaml
-  - /home/eecs/nayiri/chipyard/conda-reqs/riscv-tools.yaml
+  - /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/chipyard.yaml
+  - /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/riscv-tools.yaml
 package:
 - category: main
  dependencies: {}
@@ -185,14 +185,14 @@ package:
 - category: main
  dependencies: {}
  hash:
-    md5: b81ebefd12ddbf18353d1a227f2dccf8
-    sha256: d7b45d7f379d65cbbdaf557aa5e1f0e1c2aef6f1a1b7b598622e75f77da318e2
+    md5: 7697d37e29669a14b053e82fad22a16b
+    sha256: ac993fa2774b90befcd6aba55b1c08853b2fa3b818753094c09bebd35fc55532
  manager: conda
  name: open_pdks.sky130a
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/litex-hub/noarch/open_pdks.sky130a-1.0.399_0_g63dbde9-20230225_164303.tar.bz2
-  version: 1.0.399_0_g63dbde9
+  url: https://conda.anaconda.org/litex-hub/noarch/open_pdks.sky130a-1.0.402_1_g12df12e-20230225_164303.tar.bz2
+  version: 1.0.402_1_g12df12e
 - category: main
  dependencies: {}
  hash:
@@ -392,16 +392,16 @@ package:
  version: 1.18.1
 - category: main
  dependencies:
-    libgcc-ng: '>=10.3.0'
+    libgcc-ng: '>=12'
  hash:
-    md5: b0929effe5b852ce3e7b2a78c2c35376
-    sha256: 164bd59917902450fcc5e4ca6f12f190e08e0c39c31f20c8330b0dba865ddc5a
+    md5: 80968e6760b2448f739cd32b1324d07d
+    sha256: c8b52559c1867ad59510c9479a15581cbfda0a7857a33ff2fce03a76a0775cfb
  manager: conda
  name: coreutils
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/coreutils-9.1-h166bdaf_0.tar.bz2
-  version: '9.1'
+  url: https://conda.anaconda.org/conda-forge/linux-64/coreutils-9.2-h0b41bf4_0.conda
+  version: '9.2'
 - category: main
  dependencies:
    libgcc-ng: '>=7.3.0'
@@ -872,14 +872,14 @@ package:
    ca-certificates: ''
    libgcc-ng: '>=12'
  hash:
-    md5: e043403cd18faf815bf7705ab6c1e092
-    sha256: cd981c5c18463bc7a164fcf45c5cf697d58852b780b4dfa5e83c18c1fda6d7cd
+    md5: 2d833be81a21128e317325a01326d36f
+    sha256: d378afcec34b86fef4da3ebd622b3e614cb3f71e54b6a5a10adb1d23745ecc72
  manager: conda
  name: openssl
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.0.8-h0b41bf4_0.conda
-  version: 3.0.8
+  url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.0-h0b41bf4_0.conda
+  version: 3.1.0
 - category: main
  dependencies:
    libgcc-ng: '>=9.3.0'
@@ -1379,13 +1379,13 @@ package:
    libzlib: '>=1.2.13,<1.3.0a0'
    xz: '>=5.2.6,<6.0a0'
  hash:
-    md5: 3b933ea47ef8f330c4c068af25fcd6a8
-    sha256: b30713fb4477ff4f722280d956593e7e7a2cb705b7444dcc278de447432b43b1
+    md5: bb808b654bdc3c783deaf107a2ffb503
+    sha256: d4170f1fe356768758b13a51db123f990bff81b0eae0d5a0ba11c7ca6b9536f4
  manager: conda
  name: libxml2
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.3-h7463322_0.tar.bz2
+  url: https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.3-hca2bb57_4.conda
  version: 2.10.3
 - category: main
  dependencies:
@@ -1810,13 +1810,13 @@ package:
    libzlib: '>=1.2.13,<1.3.0a0'
    zstd: '>=1.5.2,<1.6.0a0'
  hash:
-    md5: 70cbb0c2033665f2a7339bf0ec51a67f
-    sha256: 3fb9a9cfd2f5c79e8116c67f95d5a9b790ec66807ae0d8cebefc26fda9f836a7
+    md5: 17d91085ccf5934ce652cb448d0cb65a
+    sha256: f649fac60cb122bf0d85c4955725d94c353fdbd768bcd44f0444979b363cc9ab
  manager: conda
  name: libllvm15
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/libllvm15-15.0.7-hadd5161_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libllvm15-15.0.7-hadd5161_1.conda
  version: 15.0.7
 - category: main
  dependencies:
@@ -1990,14 +1990,14 @@ package:
  dependencies:
    python: '>=3.6'
  hash:
-    md5: c02e756991820cd4746bdb1d222133d0
-    sha256: c79a280482d7aca315e1dbab271c720a77d6e4df6b0cb5138d2c7c3b70588c5b
+    md5: b3c15cb1d45fd10bc6f652bbc51e023a
+    sha256: 8dbc6de55113ea67a64f0be5d16ba939d1b58a25dbd9a5cc62b571cef24ef85c
  manager: conda
  name: argcomplete
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-2.1.1-pyhd8ed1ab_0.conda
-  version: 2.1.1
+  url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-3.0.2-pyhd8ed1ab_0.conda
+  version: 3.0.2
 - category: main
  dependencies:
    libgcc-ng: '>=12'
@@ -2203,14 +2203,14 @@ package:
  dependencies:
    python: '>=3.7'
  hash:
-    md5: 1addc115923d646ca19ed90edc413506
-    sha256: 739c48f62747c942aa733041d36a2c1af41c2ecf2a59f1fec90cd7200e01be9a
+    md5: 6f90f1dc834447823b11d155726fcb37
+    sha256: 6a6901f20c5b4d81aebd25a0645b3578ebb6a323f9fd7e87ee05ecbcfe19069e
  manager: conda
  name: filelock
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/filelock-3.9.0-pyhd8ed1ab_0.conda
-  version: 3.9.0
+  url: https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.0-pyhd8ed1ab_0.conda
+  version: 3.10.0
 - category: main
  dependencies:
    expat: '>=2.5.0,<3.0a0'
@@ -2500,32 +2500,33 @@ package:
  dependencies:
    krb5: '>=1.20.1,<1.21.0a0'
    libgcc-ng: '>=12'
-    libnghttp2: '>=1.51.0,<2.0a0'
+    libnghttp2: '>=1.52.0,<2.0a0'
    libssh2: '>=1.10.0,<2.0a0'
    libzlib: '>=1.2.13,<1.3.0a0'
-    openssl: '>=3.0.8,<4.0a0'
+    openssl: '>=3.1.0,<4.0a0'
+    zstd: '>=1.5.2,<1.6.0a0'
  hash:
-    md5: 81eaeb3b35163c8e90e57532bc93754d
-    sha256: abc7a5f4dad4559a1db998a58952226035f20977a186b68ce78bd4db4a6a6286
+    md5: 3d1189864d1c0ed2a5919cb067b5903d
+    sha256: 500c08e61871df6dc4fc87913c99cb799f5fa8333db991201be32b657e9dcdb1
  manager: conda
  name: libcurl
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.88.1-hdc1c0ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.88.1-hdc1c0ab_1.conda
  version: 7.88.1
 - category: main
  dependencies:
-    gnutls: '>=3.7.6,<3.8.0a0'
+    gnutls: '>=3.7.8,<3.8.0a0'
    libgcc-ng: '>=12'
  hash:
-    md5: 78ff89df42ec0d4fe4355490d7843d9b
-    sha256: 780c82366caab4a741f2a4baa901a9b71fad6c2b8f1f64c168f10f61a939e9d4
+    md5: a946cb6b36807a772748b55f59089a08
+    sha256: 33ddfa3d91816ee44df405424ee2fedf5df5c02a1ffa1819aa4c956eedae4533
  manager: conda
  name: libmicrohttpd
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/libmicrohttpd-0.9.75-h2603550_1.tar.bz2
-  version: 0.9.75
+  url: https://conda.anaconda.org/conda-forge/linux-64/libmicrohttpd-0.9.76-h87ba234_0.conda
+  version: 0.9.76
 - category: main
  dependencies:
    python: '>=3.4'
@@ -3364,6 +3365,19 @@ package:
  platform: linux-64
  url: https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda
  version: 3.15.0
+- category: main
+  dependencies:
+    python: '>=3.6'
+    typing_extensions: '>=4.0'
+  hash:
+    md5: 59c40397276a286241c65faec5e1be3c
+    sha256: be2dbd6710438fa48b83bf06841091227276ae545d145dfe5cb5149c6484e951
+  manager: conda
+  name: aioitertools
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/noarch/aioitertools-0.11.0-pyhd8ed1ab_0.tar.bz2
+  version: 0.11.0
 - category: main
  dependencies:
    frozenlist: '>=1.1.0'
@@ -3491,14 +3505,14 @@ package:
    zlib: ''
    zstd: '>=1.5.2,<1.6.0a0'
  hash:
-    md5: 6709d5b453c44b4e630b146d596d1d41
-    sha256: 806ddedebceedb0147f53851b10069dac521a2f83a2edb8039445ce20e5fb4e9
+    md5: 02142080aee43c8ef90db543ffbc13dd
+    sha256: cbd17c0375a021b7de854e0841f3f1b28b1359bc52bdc0ba5aabaee0f65a0b7d
  manager: conda
  name: cmake
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/cmake-3.25.3-h077f3f9_0.conda
-  version: 3.25.3
+  url: https://conda.anaconda.org/conda-forge/linux-64/cmake-3.26.0-h077f3f9_0.conda
+  version: 3.26.0
 - category: main
  dependencies:
    libgcc-ng: '>=12'
@@ -3518,19 +3532,20 @@ package:
 - category: main
  dependencies:
    krb5: '>=1.20.1,<1.21.0a0'
-    libcurl: 7.88.1 hdc1c0ab_0
+    libcurl: 7.88.1 hdc1c0ab_1
    libgcc-ng: '>=12'
    libssh2: '>=1.10.0,<2.0a0'
    libzlib: '>=1.2.13,<1.3.0a0'
-    openssl: '>=3.0.8,<4.0a0'
+    openssl: '>=3.1.0,<4.0a0'
+    zstd: '>=1.5.2,<1.6.0a0'
  hash:
-    md5: 1968e4fef727858ac04746560e820928
-    sha256: 60e6b8c474c5a1f833e9a6e727a8a4a106701678e66ef2f3ddaf6a3e887757e8
+    md5: 2016c398f234cfa354ea704c6731b5d5
+    sha256: b52a3b97e4c3d2acca8380d405da49c2fdc2f770fcbb9dd842eb6058f8476def
  manager: conda
  name: curl
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/curl-7.88.1-hdc1c0ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/curl-7.88.1-hdc1c0ab_1.conda
  version: 7.88.1
 - category: main
  dependencies:
@@ -3576,14 +3591,14 @@ package:
    python_abi: 3.10.* *_cp310
    unicodedata2: '>=14.0.0'
  hash:
-    md5: c8a9099d7b381fa9860d4c68bbd7e7a3
-    sha256: 4a1bddf064521479280be397d422e7562673efb74868d0918ea590f9fa737ff0
+    md5: 3b354798e12b65fa8ebe1d189de6a507
+    sha256: 20b42570005cd3f6d961efa3ac1e389ef763a94224406a6f33121824390f5b71
  manager: conda
  name: fonttools
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.0-py310h1fa729e_0.conda
-  version: 4.39.0
+  url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.2-py310h1fa729e_0.conda
+  version: 4.39.2
 - category: main
  dependencies:
    python: '>=3.4'
@@ -3629,14 +3644,14 @@ package:
    python: '>=3.8'
    zipp: '>=0.5'
  hash:
-    md5: 691644becbcdca9f73243450b1c63e62
-    sha256: 0062e6ae1719395c25f0b60a21215470b4ea67514fed8a9330869da8604acfca
+    md5: 30b3127c385ca2ed5ef87f3d53d466bc
+    sha256: 4fe127138487a2aa171862407605f0cd601d005f85e0eee7f38c770b407e4145
  manager: conda
  name: importlib-metadata
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.0.0-pyha770c72_0.conda
-  version: 6.0.0
+  url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda
+  version: 6.1.0
 - category: main
  dependencies:
    more-itertools: ''
@@ -4151,16 +4166,16 @@ package:
  version: 6.0.0
 - category: main
  dependencies:
-    importlib-metadata: '>=6.0.0,<6.0.1.0a0'
+    importlib-metadata: '>=6.1.0,<6.1.1.0a0'
  hash:
-    md5: a67d43e1527a37199dd8db913366f68e
-    sha256: 99579d0c636ac87c47ad79faec5d84f00b76bff8cc54dd5f8056494277325354
+    md5: 90bab1d97fdb6bb40c8e00207bf222dc
+    sha256: 80a10ad1bacf5bb85d497fd3e5629f5805b6e90ad8c8b923daa3e36729e7429a
  manager: conda
  name: importlib_metadata
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.0.0-hd8ed1ab_0.conda
-  version: 6.0.0
+  url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda
+  version: 6.1.0
 - category: main
  dependencies:
    attrs: '>=17.4.0'
@@ -4325,14 +4340,14 @@ package:
    pip: ''
    python: '>=3.7,<4.0'
  hash:
-    md5: 1b96b6926c03bc190c9425da6cc637e7
-    sha256: dfa8e083442b18006c0015154b5e88dbe624a268ec9fd8abe4959dae484d5ef3
+    md5: 25923bf9620c56f8bc0d4923d870edd8
+    sha256: 3f8be46ba1cbd8533d25eba1a5b32062bb9231b16e308bbbc92b5e32177cbdad
  manager: conda
  name: types-awscrt
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.12-pyhd8ed1ab_0.conda
-  version: 0.16.12
+  url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.13-pyhd8ed1ab_0.conda
+  version: 0.16.13
 - category: main
  dependencies:
    cffi: ''
@@ -4409,14 +4424,14 @@ package:
    types-awscrt: ''
    typing_extensions: ''
  hash:
-    md5: 77b2ba7cde37be73d8edfd6b292e9ee9
-    sha256: e9fe8bc0b8fa005067cd67d24456157afc9d6082b1e2bb229ffde3061ad02e5b
+    md5: 96971bc5cc944a1743fdde0634e55480
+    sha256: fee2b0596dd34a70081d745e06f9302dd06fb56dd366e51a302f93c9764126d9
  manager: conda
  name: botocore-stubs
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.90-pyhd8ed1ab_0.conda
-  version: 1.29.90
+  url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.94-pyhd8ed1ab_0.conda
+  version: 1.29.94
 - category: main
  dependencies:
    clang-format: 15.0.7 default_had23c3d_1
@@ -4467,14 +4482,14 @@ package:
    python: '>=3.6'
    ukkonen: ''
  hash:
-    md5: e886aa3ceb206963720799725ffcd414
-    sha256: 688845fde60145cdeb47d78de3d9632ef6bd4d4793bdf1cb9055ed2fc0a84a8a
+    md5: b5ada314668cded097e08fea86262317
+    sha256: 88bcba64d462867b5759e29784cf24685e1e49fffea75452b94d438d6bd9587c
  manager: conda
  name: identify
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/identify-2.5.20-pyhd8ed1ab_0.conda
-  version: 2.5.20
+  url: https://conda.anaconda.org/conda-forge/noarch/identify-2.5.21-pyhd8ed1ab_0.conda
+  version: 2.5.21
 - category: main
  dependencies:
    importlib_metadata: ''
@@ -4770,19 +4785,18 @@ package:
    cfgv: '>=2.0.0'
    identify: '>=1.0.0'
    nodeenv: '>=0.11.1'
-    python: '>=3.10,<3.11.0a0'
-    python_abi: 3.10.* *_cp310
+    python: '>=3.8'
    pyyaml: '>=5.1'
-    virtualenv: '>=20.0.8'
+    virtualenv: '>=20.10.0'
  hash:
-    md5: 759bfcb929decd0dfa0489070c9cc992
-    sha256: 6dd5a76b655cc28c6385861a480e2b1c35e20437fdd10cb9fd560fd04eaeeb38
+    md5: 9a160452d1d88a9f10c373888f93586b
+    sha256: 91e104de6854e07a580603a7affb1a6e77823e9d4246486ecfd47d3978839212
  manager: conda
  name: pre-commit
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/pre-commit-3.1.1-py310hff52083_0.conda
-  version: 3.1.1
+  url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda
+  version: 3.2.0
 - category: main
  dependencies:
    __unix: ''
@@ -4821,14 +4835,14 @@ package:
    python-dateutil: '>=2.1,<3.0.0'
    urllib3: '>=1.25.4,<1.27'
  hash:
-    md5: f5f163a412ecc6be50ef913cf3de6ad6
-    sha256: 1172449dfba0f4bba3adb2a0c9878878fdf7c4cc22c0f6c3ebbc42d3b11bfda4
+    md5: 3faabd8720a81a91566e6c01bf7bbacb
+    sha256: c677cba87c7027ccf264574a87130bf44f69be008315d2a840ae6cfaa61b7e44
  manager: conda
  name: botocore
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.90-pyhd8ed1ab_0.conda
-  version: 1.29.90
+  url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.27.59-pyhd8ed1ab_0.tar.bz2
+  version: 1.27.59
 - category: main
  dependencies:
    cairo: '>=1.16.0,<2.0a0'
@@ -4874,6 +4888,22 @@ package:
  platform: linux-64
  url: https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda
  version: 2.28.2
+- category: main
+  dependencies:
+    aiohttp: '>=3.3.1'
+    aioitertools: '>=0.5.1'
+    botocore: '>=1.27.59,<1.27.60'
+    python: '>=3.6'
+    wrapt: '>=1.10.10'
+  hash:
+    md5: a3f48ea10883a5df371b895008b1ca4b
+    sha256: 76068553358b26c9c03be992cbe982a369d1e015a53700f092db92c784ce98a9
+  manager: conda
+  name: aiobotocore
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/noarch/aiobotocore-2.4.2-pyhd8ed1ab_0.conda
+  version: 2.4.2
 - category: main
  dependencies:
    botocore: '>=1.11.3'
@@ -5059,7 +5089,7 @@ package:
  version: 5.1.1
 - category: main
  dependencies:
-    botocore: 1.29.90
+    botocore: 1.27.59
    colorama: '>=0.2.5,<0.4.5'
    docutils: '>=0.10,<0.17'
    python: '>=3.10,<3.11.0a0'
@@ -5068,29 +5098,29 @@ package:
    rsa: '>=3.1.2,<4.8'
    s3transfer: '>=0.6.0,<0.7.0'
  hash:
-    md5: f22d497dccdfef2df007457017d9caf2
-    sha256: 564d3ad709000c3b043c68e42e0614732c34ad6cd94179ba5162109df800d6e3
+    md5: 7fca00e32e7d64340bebb17799aafd16
+    sha256: 118e95635796784bb1d0072d65be0fc1151ba7aca7118a5c79764ff2667301ad
  manager: conda
  name: awscli
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.90-py310hff52083_0.conda
-  version: 1.27.90
+  url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.25.60-py310hff52083_0.tar.bz2
+  version: 1.25.60
 - category: main
  dependencies:
-    botocore: '>=1.29.90,<1.30.0'
+    botocore: '>=1.27.59,<1.28.0'
    jmespath: '>=0.7.1,<2.0.0'
    python: '>=3.7'
    s3transfer: '>=0.6.0,<0.7.0'
  hash:
-    md5: a57ff13af4774f422569fe6630d73c08
-    sha256: 045c5d6441b6b6790d0e9a826bee129b6f6c14ce65e8c50556b8a109a84d9912
+    md5: ffb13a0a5fc8e17ce396f4dfcdf5dab5
+    sha256: 89fd09bdc9d9a608387fd80b19fd084f26309d7857bd9a3957216a718f58b3de
  manager: conda
  name: boto3
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.90-pyhd8ed1ab_0.conda
-  version: 1.26.90
+  url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.24.59-pyhd8ed1ab_0.tar.bz2
+  version: 1.24.59
 - category: main
  dependencies:
    cachecontrol: 0.12.11 pyhd8ed1ab_1
@@ -5151,6 +5181,21 @@ package:
  platform: linux-64
  url: https://conda.anaconda.org/conda-forge/noarch/msal_extensions-1.0.0-pyhd8ed1ab_0.tar.bz2
  version: 1.0.0
+- category: main
+  dependencies:
+    aiobotocore: '>=2.4.2,<2.4.3'
+    aiohttp: ''
+    fsspec: 2023.3.0
+    python: '>=3.8'
+  hash:
+    md5: 53b2e3e80df2a18eb74d53729b9464f2
+    sha256: 2737102a9d3d538dccf22fc32e32e2ec608d69c2a002a1f137091b9611bf5d6e
+  manager: conda
+  name: s3fs
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/noarch/s3fs-2023.3.0-pyhd8ed1ab_0.conda
+  version: 2023.3.0
 - category: main
  dependencies:
    livereload: '>=2.3.0'
@@ -5216,14 +5261,14 @@ package:
    python: ''
    typing_extensions: ''
  hash:
-    md5: 72b6b21dfad72737aab3d4988b51244f
-    sha256: 77179ed8be45e06e010dc0143bf56201aa028ba59d573e4216be8c1a49ff372b
+    md5: 009fa15810ae5d376e1bd29ab93c1081
+    sha256: 380426f97ae074ad86a1b52bb106e1f10e868bc8b7c575bea6ea5ac7725bc84d
  manager: conda
  name: boto3-stubs
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.90-pyhd8ed1ab_0.conda
-  version: 1.26.90
+  url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.95-pyhd8ed1ab_0.conda
+  version: 1.26.95
 - category: main
  dependencies:
    cachecontrol-with-filecache: '>=0.12.9'
@@ -5278,28 +5323,14 @@ package:
    python: '>=3.6'
    typing-extensions: ''
  hash:
-    md5: 1d91d141687b375eab2e63bbecf191b1
-    sha256: 8c5af95bf4090318c138501ca271158cd00ff51898c608a4753a4fb09a31973c
+    md5: a0ead2e95ffa5942c419234c15463344
+    sha256: 7e7bb339939a50d9e682c01938062d2d4e1157a7b034d7f91e44e11d98c0d05d
  manager: conda
  name: mypy_boto3_ec2
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.87-pyhd8ed1ab_0.conda
-  version: 1.26.87
- category: main
-  dependencies:
-    boto3: ''
-    fsspec: '>=0.6.0'
-    python: '>=3.5'
-  hash:
-    md5: ead328eb12f01d88706126ba061e7a69
-    sha256: 7a4cb574ff7edf773e5e4c396733dcb08ffcfd6e4f8b27e5b84b35fd4666ef5b
-  manager: conda
-  name: s3fs
-  optional: false
-  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/s3fs-0.4.2-py_0.tar.bz2
-  version: 0.4.2
+  url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.91-pyhd8ed1ab_0.conda
+  version: 1.26.91
 - category: main
  dependencies:
    docutils: <0.19
@@ -5327,14 +5358,14 @@ package:
    pyyaml: '>5.4'
    sarif-om: ~=1.0.4
  hash:
-    md5: a607f8ae4533e3b4a8f351b485daee03
-    sha256: 7c1ac284f75362698321857ac6b63f53dbc7bbfe61d70ff70eecf41ae5161012
+    md5: 97bf916949bb4eb9f69c77d365a4da72
+    sha256: 7d8c32e83b839abbb4c2a6b476b2a4a60f03394ac6156740f81abba64dbcf756
  manager: conda
  name: cfn-lint
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/cfn-lint-0.74.1-pyhd8ed1ab_0.conda
-  version: 0.74.1
+  url: https://conda.anaconda.org/conda-forge/noarch/cfn-lint-0.75.1-pyhd8ed1ab_0.conda
+  version: 0.75.1
 - category: main
  dependencies:
    aws-xray-sdk: '!=0.96,>=0.93'
@@ -5364,14 +5395,14 @@ package:
    werkzeug: <2.2.0,>=0.5
    xmltodict: ''
  hash:
-    md5: 7b8eaea28d5c08c8539c3b35a07fe3d1
-    sha256: 47f8f38a9eff042ebd7754fa6c36739021c0e6cdca1848cc4b0138cfc4043ace
+    md5: 702e5d281f691be1bec2f23d1f24fee8
+    sha256: 5f7094094ef361b135068b12facdf34c18d2b285c4bd87a935ab1c7e633990ee
  manager: conda
  name: moto
  optional: false
  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.4-pyhd8ed1ab_0.conda
-  version: 4.1.4
+  url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.5-pyhd8ed1ab_0.conda
+  version: 4.1.5
 - category: main
  dependencies: {}
  hash:
@@ -5465,13 +5496,13 @@ package:
    pyyaml: '>=6.0,<7.0'
    ruamel.yaml: '>=0.17.21,<0.18.0'
  hash:
-    sha256: 1e4b942c42a2292f2e6140fc8df51edc8fd5f8a5c7141e471ecb1d6676fe0bb6
+    sha256: 638a6b8c3e631f85f235acf02d3bef35a0a6d7da2ec9fef17420d5dd2ce66678
  manager: pip
  name: hammer-vlsi
  optional: false
  platform: linux-64
-  url: https://files.pythonhosted.org/packages/86/15/6643fe3965aabde680eab7f64eef1e3967b516640c756858cd246dd0b427/hammer_vlsi-1.0.5-py3-none-any.whl
-  version: 1.0.5
+  url: https://files.pythonhosted.org/packages/53/39/18367e6fb4f20e9ae4fb3097f7b80704ff5cccf62980ea2871ba1d817a74/hammer_vlsi-1.1.0-py3-none-any.whl
+  version: 1.1.0
 - category: main
  dependencies:
    asttokens: '>=2,<3'
--- a/conda-reqs/esp-tools.yaml
+++ b/conda-reqs/esp-tools.yaml
@@ -1,7 +1,7 @@
 channels:
    - ucb-bar
-    - litex-hub
    - conda-forge
+    - litex-hub
    - nodefaults

 platforms:
--- a/conda-reqs/riscv-tools.yaml
+++ b/conda-reqs/riscv-tools.yaml
@@ -1,7 +1,7 @@
 channels:
    - ucb-bar
-    - litex-hub
    - conda-forge
+    - litex-hub
    - nodefaults

 platforms:
--- a/docs/VLSI/ASAP7-Tutorial.rst
+++ b/docs/VLSI/ASAP7-Tutorial.rst
@@ -2,7 +2,7 @@

 ASAP7 Tutorial
 ==============
-The ``vlsi`` folder of this repository contains an example Hammer flow with the SHA-3 accelerator and a dummy hard macro. This example tutorial uses the built-in ASAP7 technology plugin and requires access to the included Cadence and Mentor tool plugin submodules. Cadence is necessary for synthesis & place-and-route, while Mentor is needed for DRC & LVS.
+The ``vlsi`` folder of this repository contains an example Hammer flow with the SHA-3 accelerator and a dummy hard macro. This example tutorial uses the built-in ASAP7 technology plugin and requires access to the included Mentor tool plugin submodule, which is needed for DRC & LVS.

 Project Structure
 -----------------
--- a/docs/VLSI/Basic-Flow.rst
+++ b/docs/VLSI/Basic-Flow.rst
@@ -162,7 +162,7 @@ Simulation-exacted power estimation often requires a dedicated testharness for t
 The simulation-extracted power estimation flow implicitly uses Hammer's gate-level simulation flow (in order to generate the ``saif`` activity data file). This gate-level simulation flow can also be run independantly from the power estimation flow using the ``make sim-par`` command.


-.. Note:: The gate-level simulation flow (and there the simulation-extracted power-estimation) is currently integrated only with the Synopsys VCS simulation (Verilator does not support gate-level simulation. Support for Cadence Incisive is work-in-progress)
+.. Note:: The gate-level simulation flow (and there the simulation-extracted power-estimation) is currently integrated only with the Synopsys VCS simulation (Verilator does not support gate-level simulation. Support for Cadence Xcelium is work-in-progress)


 Signoff
--- a/docs/VLSI/Hammer.rst
+++ b/docs/VLSI/Hammer.rst
@@ -46,7 +46,7 @@ The current set of all available Hammer APIs is codified `here <https://github.c
 Tool Plugins
 ============

-Hammer supports separately managed plugins for different CAD tool vendors. You may be able to acquire access to the included Cadence, Synopsys, and Mentor plugins repositories with permission from the respective CAD tool vendor.
+Hammer supports separately managed plugins for different CAD tool vendors. You may be able to acquire access to the included Mentor plugins submodule with permission from the respective CAD tool vendor.
 The types of tools (by Hammer names) supported currently include:

 * synthesis
--- a/docs/VLSI/Sky130-Commercial-Tutorial.rst
+++ b/docs/VLSI/Sky130-Commercial-Tutorial.rst
@@ -2,7 +2,7 @@

 Sky130 Commercial Tutorial
 ==========================
-The ``vlsi`` folder of this repository contains an example Hammer flow with the TinyRocketConfig from Chipyard. This example tutorial uses the built-in Sky130 technology plugin and requires access to the included Cadence and Mentor tool plugin submodules. Cadence is necessary for synthesis & place-and-route, while Mentor is needed for DRC & LVS.
+The ``vlsi`` folder of this repository contains an example Hammer flow with the TinyRocketConfig from Chipyard. This example tutorial uses the built-in Sky130 technology plugin and requires access to the included Mentor tool plugin submodule, which is needed for DRC & LVS.

 Project Structure
 -----------------
--- a/scripts/init-submodules-no-riscv-tools-nolog.sh
+++ b/scripts/init-submodules-no-riscv-tools-nolog.sh
@@ -106,8 +106,6 @@ cd "$RDIR"
            software/coremark \
            software/firemarshal \
            software/spec2017 \
-            vlsi/hammer-cadence-plugins \
-            vlsi/hammer-synopsys-plugins \
            vlsi/hammer-mentor-plugins \
            fpga/fpga-shells
        do
--- a/scripts/init-vlsi.sh
+++ b/scripts/init-vlsi.sh
@@ -12,10 +12,6 @@ fi

 # Initialize HAMMER CAD-plugins
 if [[ $1 != *openroad* ]] && [[ $2 != *openroad* ]]; then
-    git submodule update --init --recursive vlsi/hammer-cadence-plugins
-    pip install -e vlsi/hammer-cadence-plugins
-    git submodule update --init --recursive vlsi/hammer-synopsys-plugins
-    pip install -e vlsi/hammer-synopsys-plugins
    git submodule update --init --recursive vlsi/hammer-mentor-plugins
    pip install -e vlsi/hammer-mentor-plugins
 fi
--- a/vlsi/hammer-cadence-plugins
+++ b/vlsi/hammer-cadence-plugins
--- a/vlsi/hammer-synopsys-plugins
+++ b/vlsi/hammer-synopsys-plugins