From 4c0314a46a2c93d8faae4914a8d226b616eea98e Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Sun, 12 Mar 2023 11:19:37 -0700
Subject: [PATCH] Bump verilator

---
 conda-reqs/chipyard.yaml                      |   2 +-
 ...ements-riscv-tools-linux-64.conda-lock.yml | 200 ++++++++++--------
 sims/verilator/Makefile                       |   2 +-
 3 files changed, 114 insertions(+), 90 deletions(-)

diff --git a/conda-reqs/chipyard.yaml b/conda-reqs/chipyard.yaml
index 9396f3b9..511fd70d 100644
--- a/conda-reqs/chipyard.yaml
+++ b/conda-reqs/chipyard.yaml
@@ -89,7 +89,7 @@ dependencies:
     - graphviz
     - expect
     - dtc
-    - verilator==4.226
+    - verilator==5.006
     - screen
     - elfutils
     - libdwarf-dev==0.0.0.20190110_28_ga81397fc4 # from ucb-bar channel - using mainline libdwarf-feedstock
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 673bc0f9..de819a23 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
@@ -19,7 +19,7 @@ metadata:
   - url: nodefaults
     used_env_vars: []
   content_hash:
-    linux-64: c24ce91cc2acc7e81ada9fe14d2a5dc398fc977952ab8ab03b82a6d32de079b3
+    linux-64: e51f9c0b2e38f85b5879f02e9ae73bc539026c4e9196d97447f2249e5a486d43
   platforms:
   - linux-64
   sources:
@@ -1421,16 +1421,16 @@ package:
 - category: main
   dependencies:
     gmp: '>=6.2.1,<7.0a0'
-    libgcc-ng: '>=7.5.0'
+    libgcc-ng: '>=12'
   hash:
-    md5: ea9ebeddb066da8fad4a815e61b139be
-    sha256: d2d71ac6ed3b32f06b7db2691e0a1760016ce13fb0c50a9de6ed1ccc33e35ff3
+    md5: 14d87bdff2cbd3b1179a29fb316ed743
+    sha256: 03097f21c75b0936471809e533dbae44af9d9ae696ecf264d1a929fc9f9e4b83
   manager: conda
   name: mpfr
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/mpfr-4.1.0-h9202a9a_1.tar.bz2
-  version: 4.1.0
+  url: https://conda.anaconda.org/conda-forge/linux-64/mpfr-4.2.0-hb012696_0.conda
+  version: 4.2.0
 - category: main
   dependencies:
     libffi: '>=3.4.2,<3.5.0a0'
@@ -3078,14 +3078,14 @@ package:
   dependencies:
     python: '>=3.7'
   hash:
-    md5: 5aec57dd42104f4916c397fe291f9697
-    sha256: bf40dd7bde1902859517888f72802fbc97709af7675de78eec38a1cd73ab898a
+    md5: e18ed61c37145bb9b48d1d98801960f7
+    sha256: a5c48b1fc7c89c5c937475e9434a63af7ce2e591f8e51afd56e3b2e232a9989d
   manager: conda
   name: setuptools
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/setuptools-67.5.1-pyhd8ed1ab_0.conda
-  version: 67.5.1
+  url: https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda
+  version: 67.6.0
 - category: main
   dependencies:
     python: '>=3.6'
@@ -3320,14 +3320,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'
@@ -3365,18 +3365,19 @@ package:
     gxx_impl_linux-64: ''
     libgcc-ng: '>=12'
     libstdcxx-ng: '>=12'
-    libzlib: '>=1.2.12,<1.3.0a0'
+    libzlib: '>=1.2.13,<1.3.0a0'
     make: ''
     perl: ''
+    python: ''
   hash:
-    md5: 41af6df1758bae89161daf268566384e
-    sha256: e2f2302d69c0d6928d95a1c699b5ef0b14e0243e78495734962c78136d2e6b9f
+    md5: 1a0130b3de431ee4dd26734a234a1cde
+    sha256: 12971e7e175a7dfb70d4afcf76e38d1ed21a979d49e215d439e7392de221a14d
   manager: conda
   name: verilator
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/verilator-4.226-he0ac6c6_1.tar.bz2
-  version: '4.226'
+  url: https://conda.anaconda.org/conda-forge/linux-64/verilator-5.006-h07cc95c_1.conda
+  version: '5.006'
 - category: main
   dependencies:
     gettext: '>=0.21.1,<1.0a0'
@@ -3523,6 +3524,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'
@@ -4171,16 +4185,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'
@@ -4416,20 +4430,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'
@@ -4635,14 +4648,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
@@ -4775,19 +4788,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'
@@ -5024,22 +5035,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'
@@ -5081,14 +5090,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'
@@ -5096,14 +5105,14 @@ package:
     python-dateutil: '>=2.1,<3.0.0'
     urllib3: '>=1.25.4,<1.27'
   hash:
-    md5: 2b1918369bcec3f3ff8dc380c60dff99
-    sha256: 15b4107b40b9c39b3ca3631acc64f9734c71a7f1ede4e3b9c28275a2f62c4777
+    md5: 7aa03b260e0e7803fafc414707cac996
+    sha256: 9c3f2b48b8b69e436f80c4b5bd716ba4410ea1fe5f851406916e43f3feca05df
   manager: conda
   name: botocore
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.87-pyhd8ed1ab_0.conda
-  version: 1.29.87
+  url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.88-pyhd8ed1ab_0.conda
+  version: 1.29.88
 - category: main
   dependencies:
     cairo: '>=1.16.0,<2.0a0'
@@ -5149,6 +5158,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'
@@ -5347,7 +5372,7 @@ package:
   version: 5.1.1
 - category: main
   dependencies:
-    botocore: 1.29.87
+    botocore: 1.29.88
     colorama: '>=0.2.5,<0.4.5'
     docutils: '>=0.10,<0.17'
     python: '>=3.9,<3.10.0a0'
@@ -5356,29 +5381,29 @@ package:
     rsa: '>=3.1.2,<4.8'
     s3transfer: '>=0.6.0,<0.7.0'
   hash:
-    md5: e34597b1774f550f23cca3fb3ad44079
-    sha256: b92577f1601b257e7fc64bef8e733a8be7ac2ce1602d53e05c4497902371ad3c
+    md5: e9c5b0e909628d74e4ce807bb2a7693f
+    sha256: 2c641bc5be23dc659180c46126cb509034c67e4e5d3f68dc286d06199459f57e
   manager: conda
   name: awscli
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.87-py39hf3d152e_0.conda
-  version: 1.27.87
+  url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.88-py39hf3d152e_0.conda
+  version: 1.27.88
 - category: main
   dependencies:
-    botocore: '>=1.29.87,<1.30.0'
+    botocore: '>=1.29.88,<1.30.0'
     jmespath: '>=0.7.1,<2.0.0'
     python: '>=3.7'
     s3transfer: '>=0.6.0,<0.7.0'
   hash:
-    md5: 81cc299ce1dec9d92f55163356553fbe
-    sha256: 4712065876e3303bda6b2995770f2a7c131f6184b4d372c055ba505f56c77b50
+    md5: 6d9d3d9ed7d005bf4180948445cf15a7
+    sha256: f073885ff0739d25e35d62aa202f44df59fa75beb95a247b0f041c4973964c4b
   manager: conda
   name: boto3
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.87-pyhd8ed1ab_0.conda
-  version: 1.26.87
+  url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.88-pyhd8ed1ab_0.conda
+  version: 1.26.88
 - category: main
   dependencies:
     cachecontrol: 0.12.11 pyhd8ed1ab_1
@@ -5500,20 +5525,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'
@@ -5537,14 +5561,14 @@ package:
     python: ''
     typing_extensions: ''
   hash:
-    md5: 5a9a5263ff74eabd589aab692b8d56cf
-    sha256: 2f4a2d7918d6aa3256c9491ccd3786206c1329825c2b7a21c902b0cb77c82703
+    md5: 0665225dcc452177ebf284917328c4c1
+    sha256: b03ab85abbac40c456ae8447d8a03345f54a6c7690efc1e1cf687db0ace600b8
   manager: conda
   name: boto3-stubs
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.87-pyhd8ed1ab_0.conda
-  version: 1.26.87
+  url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.88-pyhd8ed1ab_0.conda
+  version: 1.26.88
 - category: main
   dependencies:
     cachecontrol-with-filecache: '>=0.12.9'
@@ -5685,14 +5709,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
 - dependencies: {}
   hash:
     sha256: ae88eca3024bb34bb3430f964beab71226e761f51b912de5133470b649d82344
diff --git a/sims/verilator/Makefile b/sims/verilator/Makefile
index d48da28e..a6b97a1e 100644
--- a/sims/verilator/Makefile
+++ b/sims/verilator/Makefile
@@ -92,7 +92,7 @@ HELP_COMPILATION_VARIABLES += \
 #########################################################################################
 # verilator/cxx binary and flags
 #########################################################################################
-VERILATOR := verilator --cc --exe
+VERILATOR := verilator --cc --exe --timing
 
 #----------------------------------------------------------------------------------------
 # user configs