diff --git a/conda-reqs/chipyard.yaml b/conda-reqs/chipyard.yaml
index 32abb674..cfa40e6f 100644
--- a/conda-reqs/chipyard.yaml
+++ b/conda-reqs/chipyard.yaml
@@ -29,7 +29,7 @@ dependencies:
     - binutils
 
     - dromajo # from ucb-bar channel - https://github.com/riscv-boom/dromajo
-    - firtool>=1.29 # from ucb-bar channel - https://github.com/ucb-bar/firtool-feedstock
+    - firtool==1.29.0.newhammerhotfix # from ucb-bar channel - https://github.com/ucb-bar/firtool-feedstock
 
     # firemarshal deps
     - python>=3.9
@@ -129,7 +129,7 @@ dependencies:
         - mypy-boto3-ec2==1.21.9
         - sure==2.0.0
         - pylddwrap==1.2.1
-        - hammer-vlsi[asap7]
+        - hammer-vlsi[asap7]==1.0.0
 
     # 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 a40f571e..eeefa04c 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
@@ -9,7 +9,7 @@
 # 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 /scratch/abejgonza/cy-circt/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy-circt/conda-reqs/esp-tools.yaml -f /scratch/abejgonza/chipyard/conda-reqs/chipyard.yaml -f /scratch/abejgonza/chipyard/conda-reqs/esp-tools.yaml --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml
+#     conda-lock -f /scratch/abejgonza/cy-circt/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy-circt/conda-reqs/esp-tools.yaml -f /scratch/abejgonza/chipyard/conda-reqs/chipyard.yaml -f /scratch/abejgonza/chipyard/conda-reqs/esp-tools.yaml
 metadata:
   channels:
   - url: ucb-bar
@@ -19,7 +19,7 @@ metadata:
   - url: nodefaults
     used_env_vars: []
   content_hash:
-    linux-64: f9f3f7cef557df255bdd726e764500a2fea6dfbc8c9ec8572aa0f287b19775b4
+    linux-64: 74a3ef6460565c7ee37ad0be73fb5b78e4a2a7ca57ee4126f9c093fced1e963b
   platforms:
   - linux-64
   sources:
@@ -873,14 +873,14 @@ package:
     ca-certificates: ''
     libgcc-ng: '>=12'
   hash:
-    md5: 45758f4ece9c8b7b5f99328bd5caae51
-    sha256: 2fca71b8d95edc0e530f9512cdd9187407ad486868b7c247fc16cab1e4172ffa
+    md5: e043403cd18faf815bf7705ab6c1e092
+    sha256: cd981c5c18463bc7a164fcf45c5cf697d58852b780b4dfa5e83c18c1fda6d7cd
   manager: conda
   name: openssl
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.0.7-h0b41bf4_2.conda
-  version: 3.0.7
+  url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.0.8-h0b41bf4_0.conda
+  version: 3.0.8
 - category: main
   dependencies:
     libgcc-ng: '>=9.3.0'
@@ -1155,14 +1155,14 @@ package:
     libstdcxx-ng: '>=12'
     ncurses: '>=6.3,<7.0a0'
   hash:
-    md5: a4aa97b71e4c7d735cda9149f2379796
-    sha256: a27405754cea702dc7634ba79035d533f0e43956e8ceebc33cffc0b474cad3fb
+    md5: b5c5f55b4ec3a7c8d3646ce21e2b76e4
+    sha256: 90b9b6dc6d9ff620b443e696542ce8fcc850ed3e718b612cfa3867492ebededc
   manager: conda
   name: firtool
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/ucb-bar/linux-64/firtool-1.29.0-0_h1234567_ga5f6aa51f.conda
-  version: 1.29.0
+  url: https://conda.anaconda.org/ucb-bar/linux-64/firtool-1.29.0.newhammerhotfix-0_h1234567_ga5f6aa51f.conda
+  version: 1.29.0.newhammerhotfix
 - category: main
   dependencies:
     libgcc-ng: '>=7.5.0'
@@ -2034,16 +2034,16 @@ package:
   version: 2.1.1
 - category: main
   dependencies:
-    python: '>=3.9,<3.10.0a0'
-    python_abi: 3.9.* *_cp39
+    __unix: ''
+    python: '>=3.8'
   hash:
-    md5: 3613ff4128b3e565d048106196206929
-    sha256: 21c425ecc4e6f4ec97aab1285b22ad629c75d2efb62f89cd6d9618ab6a2e606c
+    md5: 20e4087407c7cb04a40817114b333dbf
+    sha256: 23676470b591b100393bb0f6c46fe10624dcbefc696a6a9f42932ed8816ef0ea
   manager: conda
   name: click
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/click-8.1.3-py39hf3d152e_1.tar.bz2
+  url: https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2
   version: 8.1.3
 - category: main
   dependencies:
@@ -2382,13 +2382,13 @@ package:
     libstdcxx-ng: '>=12'
     libzlib: '>=1.2.13,<1.3.0a0'
   hash:
-    md5: e80f44a23af61278b5efce3562f25e91
-    sha256: 81e2f7b100fe0d458460a21d81535b88c84534e55fdc7023e8337086755543dc
+    md5: 276ec1f956a520363016f909ec166f65
+    sha256: 48c0820ba1fe5701d11a5b7967a2c93d73607741a20e511214ece7fec7b9dc7f
   manager: conda
   name: libclang-cpp15
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp15-15.0.7-default_had23c3d_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp15-15.0.7-default_had23c3d_1.conda
   version: 15.0.7
 - category: main
   dependencies:
@@ -2397,13 +2397,13 @@ package:
     libstdcxx-ng: '>=12'
     libzlib: '>=1.2.13,<1.3.0a0'
   hash:
-    md5: dcfae510179c3de2e42b3a2276d059e0
-    sha256: 71539a4d472adc39a52e3cbbf5d33c06f09fd63f0c8f718fd2fb1274e7511b57
+    md5: a3a0f7a6f0885f5e1e0ec691566afb77
+    sha256: e48481c37d02aefeddcfac20d48cf13b838c5f7b9018300fa7eac404d30f3d7f
   manager: conda
   name: libclang13
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/libclang13-15.0.7-default_h3e3d535_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libclang13-15.0.7-default_h3e3d535_1.conda
   version: 15.0.7
 - category: main
   dependencies:
@@ -2628,16 +2628,15 @@ package:
   version: 1.9.6
 - category: main
   dependencies:
-    python: '>=3.9,<3.10.0a0'
-    python_abi: 3.9.* *_cp39
+    python: '>=3.8'
   hash:
-    md5: d86903c57fe229d9dd8878a6dd9d149f
-    sha256: abf2d34464c6255d35703e3c9477475e3e6e353ca8675990596d2477cdbc5b52
+    md5: 7d301a0d25f424d96175f810935f0da9
+    sha256: c25e1757e4e90638bb1e778aba3ee5f3c01fae9752e3c3929f9be7d367f6c7f3
   manager: conda
   name: pluggy
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/pluggy-1.0.0-py39hf3d152e_4.tar.bz2
+  url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2
   version: 1.0.0
 - category: main
   dependencies:
@@ -2781,16 +2780,16 @@ package:
   version: 0.19.3
 - category: main
   dependencies:
-    python: '>=3.9,<3.10.0a0'
-    python_abi: 3.9.* *_cp39
+    __unix: ''
+    python: '>=3.8'
   hash:
-    md5: d34b97a2386932b97c7cb80916a673e7
-    sha256: 42d46baeab725d3c70d22a4258549e9f0f1a72b740166cd9c3b394c4369cb306
+    md5: 2a7de29fb590ca14b5243c4c812c8025
+    sha256: a42f826e958a8d22e65b3394f437af7332610e43ee313393d1cf143f0a2d274b
   manager: conda
   name: pysocks
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/pysocks-1.7.1-py39hf3d152e_5.tar.bz2
+  url: https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2
   version: 1.7.1
 - category: main
   dependencies:
@@ -2994,6 +2993,18 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-serializinghtml-1.1.5-pyhd8ed1ab_2.tar.bz2
   version: 1.1.5
+- category: main
+  dependencies:
+    python: '>=3.6'
+  hash:
+    md5: 72271e8e64d467a534ee93f04f018dff
+    sha256: 8f3dc4eb4d7aa22c67e4c51e83a048fc546834dd53456330dad5377e9e2b2f4a
+  manager: conda
+  name: sty
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/noarch/sty-1.0.0-pyhd8ed1ab_0.tar.bz2
+  version: 1.0.0
 - category: main
   dependencies:
     python: '>=2.7'
@@ -3241,14 +3252,14 @@ package:
   dependencies:
     python: '>=3.7'
   hash:
-    md5: 7cc265528c9db5e40a771438108f6810
-    sha256: b0b7af936586069051cb43a120ac4dd04a795fdb93a21479e7dea78c8780bd0d
+    md5: 41b09d997939e83b231c4557a90c3b13
+    sha256: 0a9a545b8dc46c847658ebfa636257ea5993a355419c1d3b2f14810730ee0a82
   manager: conda
   name: zipp
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/zipp-3.12.1-pyhd8ed1ab_0.conda
-  version: 3.12.1
+  url: https://conda.anaconda.org/conda-forge/noarch/zipp-3.13.0-pyhd8ed1ab_0.conda
+  version: 3.13.0
 - category: main
   dependencies:
     python: '>=3.6'
@@ -3326,13 +3337,13 @@ package:
     libstdcxx-ng: '>=12'
     libzlib: '>=1.2.13,<1.3.0a0'
   hash:
-    md5: ffc64b2f543d2d128a9fc4e75e4436ac
-    sha256: e793476788a00ddedd2cd4f41fb59d9ca6f47e593eb04d5012b11206a1a3d0c7
+    md5: d2fcc7c0381194ca6fcb38a6d06255b8
+    sha256: eee53b98b40099c9289a732f6c915f9c80714d8a7a8a977f921c0782c6f5200f
   manager: conda
   name: clang-format-15
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-15-15.0.7-default_had23c3d_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-15-15.0.7-default_had23c3d_1.conda
   version: 15.0.7
 - category: main
   dependencies:
@@ -3600,19 +3611,19 @@ package:
   version: '1.9'
 - category: main
   dependencies:
-    libclang13: 15.0.7 default_h3e3d535_0
+    libclang13: 15.0.7 default_h3e3d535_1
     libgcc-ng: '>=12'
     libllvm15: '>=15.0.7,<15.1.0a0'
     libstdcxx-ng: '>=12'
     libzlib: '>=1.2.13,<1.3.0a0'
   hash:
-    md5: 189f7f97245f594b7a9d8e2b9f311cf8
-    sha256: e837bd39a07949e6f27d69bcc784ecc1e7c9f7c96c920c0a1f875f5c23b986b2
+    md5: 36c65ed73b7c92589bd9562ef8a6023d
+    sha256: eba3ed760c72c992a04d86455556ecb90c0e1e3688defcac44b28a848d71651c
   manager: conda
   name: libclang
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/libclang-15.0.7-default_had23c3d_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libclang-15.0.7-default_had23c3d_1.conda
   version: 15.0.7
 - category: main
   dependencies:
@@ -3928,20 +3939,20 @@ package:
   version: 0.7.0
 - category: main
   dependencies:
-    clang-format-15: 15.0.7 default_had23c3d_0
+    clang-format-15: 15.0.7 default_had23c3d_1
     libclang-cpp15: '>=15.0.7,<15.1.0a0'
     libgcc-ng: '>=12'
     libllvm15: '>=15.0.7,<15.1.0a0'
     libstdcxx-ng: '>=12'
     libzlib: '>=1.2.13,<1.3.0a0'
   hash:
-    md5: 01a6a903c7217697422aed91a0ba197d
-    sha256: c240e47db71a38f975d05c4467a8d0cc068a14f91189fce24c36187f369220b5
+    md5: 841d93c086f15b68916b3455711c2638
+    sha256: 517c759576600decafd005b14f3df9660b525fdb85645a0c588ea979b62bdc5e
   manager: conda
   name: clang-format
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-15.0.7-default_had23c3d_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-15.0.7-default_had23c3d_1.conda
   version: 15.0.7
 - category: main
   dependencies:
@@ -3960,18 +3971,18 @@ package:
   dependencies:
     cffi: '>=1.12'
     libgcc-ng: '>=12'
-    openssl: '>=3.0.7,<4.0a0'
+    openssl: '>=3.0.8,<4.0a0'
     python: '>=3.9,<3.10.0a0'
     python_abi: 3.9.* *_cp39
   hash:
-    md5: 70ac60b214a8df9b9ce63e05af7d0976
-    sha256: eae8fcb35d983ee2155b8450f8aaf8709062366855d992cb7f9aa686623b99b8
+    md5: 3245013812dfbff6a22e57533ac6f69d
+    sha256: 4349d5416c718c331454b957e0a077500fb4fb9e8f3b7eadb8777a3842021818
   manager: conda
   name: cryptography
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-39.0.0-py39h079d5ae_0.conda
-  version: 39.0.0
+  url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-39.0.1-py39h079d5ae_0.conda
+  version: 39.0.1
 - category: main
   dependencies:
     click: '>=8.0'
@@ -4146,14 +4157,14 @@ package:
     python: '>=3.7'
     typing-extensions: '>=4.4'
   hash:
-    md5: 0b4cc3f8181b0d8446eb5387d7848a54
-    sha256: 5d469cd150e4413b15eedb66bdc7a3831a4249e2e5646b8c9dcdf713e35fc598
+    md5: c34694044915d7f291ef257029f2e2af
+    sha256: ba1c3ea59cc5419756fd6597b3d691802b862689fa9e9fcac189333a1915ea1e
   manager: conda
   name: platformdirs
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-2.6.2-pyhd8ed1ab_0.conda
-  version: 2.6.2
+  url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.0.0-pyhd8ed1ab_0.conda
+  version: 3.0.0
 - category: main
   dependencies:
     libgcc-ng: '>=12'
@@ -4276,7 +4287,7 @@ package:
   version: 1.12.3
 - category: main
   dependencies:
-    clang-format: 15.0.7 default_had23c3d_0
+    clang-format: 15.0.7 default_had23c3d_1
     libclang: '>=15.0.7,<15.1.0a0'
     libclang-cpp15: '>=15.0.7,<15.1.0a0'
     libgcc-ng: '>=12'
@@ -4284,13 +4295,13 @@ package:
     libstdcxx-ng: '>=12'
     libzlib: '>=1.2.13,<1.3.0a0'
   hash:
-    md5: d08e8e7facf7aa93aaf8ae20b31fda65
-    sha256: 5456e5d86b908d1cad5d2dc924f836404b5e5d97a77db518372e7ad7d5daf469
+    md5: c23e2b0154fb2eb92442fa8ecbcf571c
+    sha256: d9931c1ce5907073de0269666881309cc896267723f38ef269101bd211e49062
   manager: conda
   name: clang-tools
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/clang-tools-15.0.7-default_had23c3d_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/clang-tools-15.0.7-default_had23c3d_1.conda
   version: 15.0.7
 - category: main
   dependencies:
@@ -4498,20 +4509,20 @@ package:
   version: 3.3.1
 - category: main
   dependencies:
-    distlib: '>=0.3.6,<1'
-    filelock: '>=3.4.1,<4'
-    platformdirs: '>=2.4,<3'
-    python: '>=3.9,<3.10.0a0'
-    python_abi: 3.9.* *_cp39
+    distlib: <1,>=0.3.6
+    filelock: <4,>=3.4.1
+    importlib-metadata: '>=4.8.3'
+    platformdirs: <4,>=2.4
+    python: '>=3.7'
   hash:
-    md5: dd1be6ccb267f13bdc5c44cfb76c4080
-    sha256: 3d9c15c6a69160d4133dc77adad49c70d932139631a5e52602637cd77ba82e10
+    md5: afaa9bf6992f67a82d75fad47a93ec84
+    sha256: 1b69ac8afbb4ab6fe38ad4ceda4922d80d8951716683f891d501bc985fdac7ff
   manager: conda
   name: virtualenv
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/virtualenv-20.17.1-py39hf3d152e_0.conda
-  version: 20.17.1
+  url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.19.0-pyhd8ed1ab_0.conda
+  version: 20.19.0
 - category: main
   dependencies:
     conda-package-streaming: '>=0.7.0'
@@ -4603,14 +4614,14 @@ package:
     pyyaml: '>=5.1'
     virtualenv: '>=20.0.8'
   hash:
-    md5: 9800c173ab73153bbed00e51a0f86c83
-    sha256: b93e2f0ef4639347373bba685dec1892a21de923ea9d51cabafe75c189f82c2d
+    md5: 8a98273ee904735747a8f6706b187f3e
+    sha256: 39a494a675956f12f1db2c875b3fd083ba2d0696891ac829b68ecf1c177b4b7b
   manager: conda
   name: pre-commit
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/pre-commit-3.0.3-py39hf3d152e_0.conda
-  version: 3.0.3
+  url: https://conda.anaconda.org/conda-forge/linux-64/pre-commit-3.0.4-py39hf3d152e_0.conda
+  version: 3.0.4
 - category: main
   dependencies:
     __unix: ''
@@ -5015,14 +5026,14 @@ package:
     python: '>=3.7'
     typing_extensions: ~=4.4.0
   hash:
-    md5: 598c51cdb44da89abe884e6d36f3309f
-    sha256: 2b52ec2fdd49f9aca3b764b407f1aa1549c43cbb78762912c5ae86551b4c57ca
+    md5: 8012988888c1b6416ed03ac04979bbc3
+    sha256: b2c364bedc4e5d6b17e50aee57c9bf1c151e96b04f3deb6d194e6911fa6f2117
   manager: conda
   name: aws-sam-translator
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/aws-sam-translator-1.58.1-pyhd8ed1ab_0.conda
-  version: 1.58.1
+  url: https://conda.anaconda.org/conda-forge/noarch/aws-sam-translator-1.59.0-pyhd8ed1ab_0.conda
+  version: 1.59.0
 - category: main
   dependencies:
     boto3: ''
@@ -5194,6 +5205,17 @@ package:
   platform: linux-64
   url: https://files.pythonhosted.org/packages/2d/1b/fdbdf82b86e07ca90985740ac160a1dd4ab09cb81071ec12d71c701e1138/asttokens-2.0.8-py2.py3-none-any.whl
   version: 2.0.8
+- category: main
+  dependencies:
+    numpy: '*'
+  hash:
+    sha256: 0ce8a159d253399ba5092692548b5b6990cbf3d1febd9117f79400cb7a5426df
+  manager: pip
+  name: gdspy
+  optional: false
+  platform: linux-64
+  url: https://files.pythonhosted.org/packages/1d/e4/97b8add92fbec2a9890ad4777272e9a9e4d7a0ceeac42b7e1febe94f0e86/gdspy-1.4.zip
+  version: '1.4'
 - category: main
   dependencies:
     bcrypt: '>=3'
@@ -5241,18 +5263,19 @@ package:
   version: 1.19.1
 - category: main
   dependencies:
+    gdspy: '1.4'
     numpy: '>=1.23.0,<2.0.0'
     pydantic: '>=1.9.2,<2.0.0'
     pyyaml: '>=6.0,<7.0'
     ruamel.yaml: '>=0.17.21,<0.18.0'
   hash:
-    sha256: c593396dee542e25632a5cb2487f255bbdf9d7e7e6e311e8cb5b8278b2c27e10
+    sha256: 2945516583e15adb10da14a819796b73ef289061c9c130762514aeb88dca8aee
   manager: pip
   name: hammer-vlsi
   optional: false
   platform: linux-64
-  url: https://files.pythonhosted.org/packages/63/98/235edaf1baccb3fb2c6b1bc96d278d4cf6854e765363cfbf7da8c80b9751/hammer_vlsi-1.0.0rc2-py3-none-any.whl
-  version: 1.0.0rc2
+  url: https://files.pythonhosted.org/packages/e2/d3/215e1a6ae3e3d6a7e1e960a61f0c90393a8e4f7b9fdaa669bd00d1e9be1d/hammer_vlsi-1.0.0-py3-none-any.whl
+  version: 1.0.0
 - 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 35cb54d8..5fb44362 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
@@ -9,7 +9,7 @@
 # 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 /scratch/abejgonza/cy-circt/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy-circt/conda-reqs/riscv-tools.yaml -f /scratch/abejgonza/chipyard/conda-reqs/chipyard.yaml -f /scratch/abejgonza/chipyard/conda-reqs/riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml
+#     conda-lock -f /scratch/abejgonza/cy-circt/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy-circt/conda-reqs/riscv-tools.yaml -f /scratch/abejgonza/chipyard/conda-reqs/chipyard.yaml -f /scratch/abejgonza/chipyard/conda-reqs/riscv-tools.yaml
 metadata:
   channels:
   - url: ucb-bar
@@ -19,7 +19,7 @@ metadata:
   - url: nodefaults
     used_env_vars: []
   content_hash:
-    linux-64: a4e47e2bc87e218df5a95db5c131d80b5abb1be6c992fc5bec4cfc7b186890d6
+    linux-64: 17813c362ebc2af7a855bbeaa954812467d2552b1697c7d0b80ecef3f5b0b278
   platforms:
   - linux-64
   sources:
@@ -873,14 +873,14 @@ package:
     ca-certificates: ''
     libgcc-ng: '>=12'
   hash:
-    md5: 45758f4ece9c8b7b5f99328bd5caae51
-    sha256: 2fca71b8d95edc0e530f9512cdd9187407ad486868b7c247fc16cab1e4172ffa
+    md5: e043403cd18faf815bf7705ab6c1e092
+    sha256: cd981c5c18463bc7a164fcf45c5cf697d58852b780b4dfa5e83c18c1fda6d7cd
   manager: conda
   name: openssl
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.0.7-h0b41bf4_2.conda
-  version: 3.0.7
+  url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.0.8-h0b41bf4_0.conda
+  version: 3.0.8
 - category: main
   dependencies:
     libgcc-ng: '>=9.3.0'
@@ -1155,14 +1155,14 @@ package:
     libstdcxx-ng: '>=12'
     ncurses: '>=6.3,<7.0a0'
   hash:
-    md5: a4aa97b71e4c7d735cda9149f2379796
-    sha256: a27405754cea702dc7634ba79035d533f0e43956e8ceebc33cffc0b474cad3fb
+    md5: b5c5f55b4ec3a7c8d3646ce21e2b76e4
+    sha256: 90b9b6dc6d9ff620b443e696542ce8fcc850ed3e718b612cfa3867492ebededc
   manager: conda
   name: firtool
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/ucb-bar/linux-64/firtool-1.29.0-0_h1234567_ga5f6aa51f.conda
-  version: 1.29.0
+  url: https://conda.anaconda.org/ucb-bar/linux-64/firtool-1.29.0.newhammerhotfix-0_h1234567_ga5f6aa51f.conda
+  version: 1.29.0.newhammerhotfix
 - category: main
   dependencies:
     libgcc-ng: '>=7.5.0'
@@ -2034,16 +2034,16 @@ package:
   version: 2.1.1
 - category: main
   dependencies:
-    python: '>=3.9,<3.10.0a0'
-    python_abi: 3.9.* *_cp39
+    __unix: ''
+    python: '>=3.8'
   hash:
-    md5: 3613ff4128b3e565d048106196206929
-    sha256: 21c425ecc4e6f4ec97aab1285b22ad629c75d2efb62f89cd6d9618ab6a2e606c
+    md5: 20e4087407c7cb04a40817114b333dbf
+    sha256: 23676470b591b100393bb0f6c46fe10624dcbefc696a6a9f42932ed8816ef0ea
   manager: conda
   name: click
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/click-8.1.3-py39hf3d152e_1.tar.bz2
+  url: https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2
   version: 8.1.3
 - category: main
   dependencies:
@@ -2365,13 +2365,13 @@ package:
     libstdcxx-ng: '>=12'
     libzlib: '>=1.2.13,<1.3.0a0'
   hash:
-    md5: e80f44a23af61278b5efce3562f25e91
-    sha256: 81e2f7b100fe0d458460a21d81535b88c84534e55fdc7023e8337086755543dc
+    md5: 276ec1f956a520363016f909ec166f65
+    sha256: 48c0820ba1fe5701d11a5b7967a2c93d73607741a20e511214ece7fec7b9dc7f
   manager: conda
   name: libclang-cpp15
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp15-15.0.7-default_had23c3d_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp15-15.0.7-default_had23c3d_1.conda
   version: 15.0.7
 - category: main
   dependencies:
@@ -2380,13 +2380,13 @@ package:
     libstdcxx-ng: '>=12'
     libzlib: '>=1.2.13,<1.3.0a0'
   hash:
-    md5: dcfae510179c3de2e42b3a2276d059e0
-    sha256: 71539a4d472adc39a52e3cbbf5d33c06f09fd63f0c8f718fd2fb1274e7511b57
+    md5: a3a0f7a6f0885f5e1e0ec691566afb77
+    sha256: e48481c37d02aefeddcfac20d48cf13b838c5f7b9018300fa7eac404d30f3d7f
   manager: conda
   name: libclang13
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/libclang13-15.0.7-default_h3e3d535_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libclang13-15.0.7-default_h3e3d535_1.conda
   version: 15.0.7
 - category: main
   dependencies:
@@ -2611,16 +2611,15 @@ package:
   version: 1.9.6
 - category: main
   dependencies:
-    python: '>=3.9,<3.10.0a0'
-    python_abi: 3.9.* *_cp39
+    python: '>=3.8'
   hash:
-    md5: d86903c57fe229d9dd8878a6dd9d149f
-    sha256: abf2d34464c6255d35703e3c9477475e3e6e353ca8675990596d2477cdbc5b52
+    md5: 7d301a0d25f424d96175f810935f0da9
+    sha256: c25e1757e4e90638bb1e778aba3ee5f3c01fae9752e3c3929f9be7d367f6c7f3
   manager: conda
   name: pluggy
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/pluggy-1.0.0-py39hf3d152e_4.tar.bz2
+  url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2
   version: 1.0.0
 - category: main
   dependencies:
@@ -2764,16 +2763,16 @@ package:
   version: 0.19.3
 - category: main
   dependencies:
-    python: '>=3.9,<3.10.0a0'
-    python_abi: 3.9.* *_cp39
+    __unix: ''
+    python: '>=3.8'
   hash:
-    md5: d34b97a2386932b97c7cb80916a673e7
-    sha256: 42d46baeab725d3c70d22a4258549e9f0f1a72b740166cd9c3b394c4369cb306
+    md5: 2a7de29fb590ca14b5243c4c812c8025
+    sha256: a42f826e958a8d22e65b3394f437af7332610e43ee313393d1cf143f0a2d274b
   manager: conda
   name: pysocks
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/pysocks-1.7.1-py39hf3d152e_5.tar.bz2
+  url: https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2
   version: 1.7.1
 - category: main
   dependencies:
@@ -2994,6 +2993,18 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-serializinghtml-1.1.5-pyhd8ed1ab_2.tar.bz2
   version: 1.1.5
+- category: main
+  dependencies:
+    python: '>=3.6'
+  hash:
+    md5: 72271e8e64d467a534ee93f04f018dff
+    sha256: 8f3dc4eb4d7aa22c67e4c51e83a048fc546834dd53456330dad5377e9e2b2f4a
+  manager: conda
+  name: sty
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/noarch/sty-1.0.0-pyhd8ed1ab_0.tar.bz2
+  version: 1.0.0
 - category: main
   dependencies:
     python: '>=2.7'
@@ -3241,14 +3252,14 @@ package:
   dependencies:
     python: '>=3.7'
   hash:
-    md5: 7cc265528c9db5e40a771438108f6810
-    sha256: b0b7af936586069051cb43a120ac4dd04a795fdb93a21479e7dea78c8780bd0d
+    md5: 41b09d997939e83b231c4557a90c3b13
+    sha256: 0a9a545b8dc46c847658ebfa636257ea5993a355419c1d3b2f14810730ee0a82
   manager: conda
   name: zipp
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/zipp-3.12.1-pyhd8ed1ab_0.conda
-  version: 3.12.1
+  url: https://conda.anaconda.org/conda-forge/noarch/zipp-3.13.0-pyhd8ed1ab_0.conda
+  version: 3.13.0
 - category: main
   dependencies:
     python: '>=3.6'
@@ -3326,13 +3337,13 @@ package:
     libstdcxx-ng: '>=12'
     libzlib: '>=1.2.13,<1.3.0a0'
   hash:
-    md5: ffc64b2f543d2d128a9fc4e75e4436ac
-    sha256: e793476788a00ddedd2cd4f41fb59d9ca6f47e593eb04d5012b11206a1a3d0c7
+    md5: d2fcc7c0381194ca6fcb38a6d06255b8
+    sha256: eee53b98b40099c9289a732f6c915f9c80714d8a7a8a977f921c0782c6f5200f
   manager: conda
   name: clang-format-15
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-15-15.0.7-default_had23c3d_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-15-15.0.7-default_had23c3d_1.conda
   version: 15.0.7
 - category: main
   dependencies:
@@ -3600,19 +3611,19 @@ package:
   version: '1.9'
 - category: main
   dependencies:
-    libclang13: 15.0.7 default_h3e3d535_0
+    libclang13: 15.0.7 default_h3e3d535_1
     libgcc-ng: '>=12'
     libllvm15: '>=15.0.7,<15.1.0a0'
     libstdcxx-ng: '>=12'
     libzlib: '>=1.2.13,<1.3.0a0'
   hash:
-    md5: 189f7f97245f594b7a9d8e2b9f311cf8
-    sha256: e837bd39a07949e6f27d69bcc784ecc1e7c9f7c96c920c0a1f875f5c23b986b2
+    md5: 36c65ed73b7c92589bd9562ef8a6023d
+    sha256: eba3ed760c72c992a04d86455556ecb90c0e1e3688defcac44b28a848d71651c
   manager: conda
   name: libclang
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/libclang-15.0.7-default_had23c3d_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libclang-15.0.7-default_had23c3d_1.conda
   version: 15.0.7
 - category: main
   dependencies:
@@ -3928,20 +3939,20 @@ package:
   version: 0.7.0
 - category: main
   dependencies:
-    clang-format-15: 15.0.7 default_had23c3d_0
+    clang-format-15: 15.0.7 default_had23c3d_1
     libclang-cpp15: '>=15.0.7,<15.1.0a0'
     libgcc-ng: '>=12'
     libllvm15: '>=15.0.7,<15.1.0a0'
     libstdcxx-ng: '>=12'
     libzlib: '>=1.2.13,<1.3.0a0'
   hash:
-    md5: 01a6a903c7217697422aed91a0ba197d
-    sha256: c240e47db71a38f975d05c4467a8d0cc068a14f91189fce24c36187f369220b5
+    md5: 841d93c086f15b68916b3455711c2638
+    sha256: 517c759576600decafd005b14f3df9660b525fdb85645a0c588ea979b62bdc5e
   manager: conda
   name: clang-format
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-15.0.7-default_had23c3d_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-15.0.7-default_had23c3d_1.conda
   version: 15.0.7
 - category: main
   dependencies:
@@ -3960,18 +3971,18 @@ package:
   dependencies:
     cffi: '>=1.12'
     libgcc-ng: '>=12'
-    openssl: '>=3.0.7,<4.0a0'
+    openssl: '>=3.0.8,<4.0a0'
     python: '>=3.9,<3.10.0a0'
     python_abi: 3.9.* *_cp39
   hash:
-    md5: 70ac60b214a8df9b9ce63e05af7d0976
-    sha256: eae8fcb35d983ee2155b8450f8aaf8709062366855d992cb7f9aa686623b99b8
+    md5: 3245013812dfbff6a22e57533ac6f69d
+    sha256: 4349d5416c718c331454b957e0a077500fb4fb9e8f3b7eadb8777a3842021818
   manager: conda
   name: cryptography
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-39.0.0-py39h079d5ae_0.conda
-  version: 39.0.0
+  url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-39.0.1-py39h079d5ae_0.conda
+  version: 39.0.1
 - category: main
   dependencies:
     click: '>=8.0'
@@ -4146,14 +4157,14 @@ package:
     python: '>=3.7'
     typing-extensions: '>=4.4'
   hash:
-    md5: 0b4cc3f8181b0d8446eb5387d7848a54
-    sha256: 5d469cd150e4413b15eedb66bdc7a3831a4249e2e5646b8c9dcdf713e35fc598
+    md5: c34694044915d7f291ef257029f2e2af
+    sha256: ba1c3ea59cc5419756fd6597b3d691802b862689fa9e9fcac189333a1915ea1e
   manager: conda
   name: platformdirs
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-2.6.2-pyhd8ed1ab_0.conda
-  version: 2.6.2
+  url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.0.0-pyhd8ed1ab_0.conda
+  version: 3.0.0
 - category: main
   dependencies:
     libgcc-ng: '>=12'
@@ -4276,7 +4287,7 @@ package:
   version: 1.12.3
 - category: main
   dependencies:
-    clang-format: 15.0.7 default_had23c3d_0
+    clang-format: 15.0.7 default_had23c3d_1
     libclang: '>=15.0.7,<15.1.0a0'
     libclang-cpp15: '>=15.0.7,<15.1.0a0'
     libgcc-ng: '>=12'
@@ -4284,13 +4295,13 @@ package:
     libstdcxx-ng: '>=12'
     libzlib: '>=1.2.13,<1.3.0a0'
   hash:
-    md5: d08e8e7facf7aa93aaf8ae20b31fda65
-    sha256: 5456e5d86b908d1cad5d2dc924f836404b5e5d97a77db518372e7ad7d5daf469
+    md5: c23e2b0154fb2eb92442fa8ecbcf571c
+    sha256: d9931c1ce5907073de0269666881309cc896267723f38ef269101bd211e49062
   manager: conda
   name: clang-tools
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/clang-tools-15.0.7-default_had23c3d_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/clang-tools-15.0.7-default_had23c3d_1.conda
   version: 15.0.7
 - category: main
   dependencies:
@@ -4498,20 +4509,20 @@ package:
   version: 3.3.1
 - category: main
   dependencies:
-    distlib: '>=0.3.6,<1'
-    filelock: '>=3.4.1,<4'
-    platformdirs: '>=2.4,<3'
-    python: '>=3.9,<3.10.0a0'
-    python_abi: 3.9.* *_cp39
+    distlib: <1,>=0.3.6
+    filelock: <4,>=3.4.1
+    importlib-metadata: '>=4.8.3'
+    platformdirs: <4,>=2.4
+    python: '>=3.7'
   hash:
-    md5: dd1be6ccb267f13bdc5c44cfb76c4080
-    sha256: 3d9c15c6a69160d4133dc77adad49c70d932139631a5e52602637cd77ba82e10
+    md5: afaa9bf6992f67a82d75fad47a93ec84
+    sha256: 1b69ac8afbb4ab6fe38ad4ceda4922d80d8951716683f891d501bc985fdac7ff
   manager: conda
   name: virtualenv
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/virtualenv-20.17.1-py39hf3d152e_0.conda
-  version: 20.17.1
+  url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.19.0-pyhd8ed1ab_0.conda
+  version: 20.19.0
 - category: main
   dependencies:
     conda-package-streaming: '>=0.7.0'
@@ -4603,14 +4614,14 @@ package:
     pyyaml: '>=5.1'
     virtualenv: '>=20.0.8'
   hash:
-    md5: 9800c173ab73153bbed00e51a0f86c83
-    sha256: b93e2f0ef4639347373bba685dec1892a21de923ea9d51cabafe75c189f82c2d
+    md5: 8a98273ee904735747a8f6706b187f3e
+    sha256: 39a494a675956f12f1db2c875b3fd083ba2d0696891ac829b68ecf1c177b4b7b
   manager: conda
   name: pre-commit
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/pre-commit-3.0.3-py39hf3d152e_0.conda
-  version: 3.0.3
+  url: https://conda.anaconda.org/conda-forge/linux-64/pre-commit-3.0.4-py39hf3d152e_0.conda
+  version: 3.0.4
 - category: main
   dependencies:
     __unix: ''
@@ -5015,14 +5026,14 @@ package:
     python: '>=3.7'
     typing_extensions: ~=4.4.0
   hash:
-    md5: 598c51cdb44da89abe884e6d36f3309f
-    sha256: 2b52ec2fdd49f9aca3b764b407f1aa1549c43cbb78762912c5ae86551b4c57ca
+    md5: 8012988888c1b6416ed03ac04979bbc3
+    sha256: b2c364bedc4e5d6b17e50aee57c9bf1c151e96b04f3deb6d194e6911fa6f2117
   manager: conda
   name: aws-sam-translator
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/aws-sam-translator-1.58.1-pyhd8ed1ab_0.conda
-  version: 1.58.1
+  url: https://conda.anaconda.org/conda-forge/noarch/aws-sam-translator-1.59.0-pyhd8ed1ab_0.conda
+  version: 1.59.0
 - category: main
   dependencies:
     boto3: ''
@@ -5194,6 +5205,17 @@ package:
   platform: linux-64
   url: https://files.pythonhosted.org/packages/2d/1b/fdbdf82b86e07ca90985740ac160a1dd4ab09cb81071ec12d71c701e1138/asttokens-2.0.8-py2.py3-none-any.whl
   version: 2.0.8
+- category: main
+  dependencies:
+    numpy: '*'
+  hash:
+    sha256: 0ce8a159d253399ba5092692548b5b6990cbf3d1febd9117f79400cb7a5426df
+  manager: pip
+  name: gdspy
+  optional: false
+  platform: linux-64
+  url: https://files.pythonhosted.org/packages/1d/e4/97b8add92fbec2a9890ad4777272e9a9e4d7a0ceeac42b7e1febe94f0e86/gdspy-1.4.zip
+  version: '1.4'
 - category: main
   dependencies:
     bcrypt: '>=3'
@@ -5241,18 +5263,19 @@ package:
   version: 1.19.1
 - category: main
   dependencies:
+    gdspy: '1.4'
     numpy: '>=1.23.0,<2.0.0'
     pydantic: '>=1.9.2,<2.0.0'
     pyyaml: '>=6.0,<7.0'
     ruamel.yaml: '>=0.17.21,<0.18.0'
   hash:
-    sha256: c593396dee542e25632a5cb2487f255bbdf9d7e7e6e311e8cb5b8278b2c27e10
+    sha256: 2945516583e15adb10da14a819796b73ef289061c9c130762514aeb88dca8aee
   manager: pip
   name: hammer-vlsi
   optional: false
   platform: linux-64
-  url: https://files.pythonhosted.org/packages/63/98/235edaf1baccb3fb2c6b1bc96d278d4cf6854e765363cfbf7da8c80b9751/hammer_vlsi-1.0.0rc2-py3-none-any.whl
-  version: 1.0.0rc2
+  url: https://files.pythonhosted.org/packages/e2/d3/215e1a6ae3e3d6a7e1e960a61f0c90393a8e4f7b9fdaa669bd00d1e9be1d/hammer_vlsi-1.0.0-py3-none-any.whl
+  version: 1.0.0
 - category: main
   dependencies:
     asttokens: '>=2,<3'
diff --git a/vlsi/tutorial.mk b/vlsi/tutorial.mk
index 6ce000a2..9b69b149 100644
--- a/vlsi/tutorial.mk
+++ b/vlsi/tutorial.mk
@@ -33,6 +33,6 @@ ifeq ($(tutorial),sky130-openroad)
     EXTRA_CONFS       ?= $(if $(filter $(VLSI_TOP),Rocket), example-designs/sky130-rocket.yml, )
     INPUT_CONFS       ?= $(TOOLS_CONF) $(TECH_CONF) $(DESIGN_CONF) $(EXTRA_CONFS)
     VLSI_OBJ_DIR      ?= build-sky130-openroad
-    # This prevents multidimensional arrays (unsupported by Yosys) at the expense of elaboration time.
+    # Yosys compatibility for CIRCT-generated Verilog, at the expense of elaboration time.
     ENABLE_CUSTOM_FIRRTL_PASS = 1
 endif