From 733ae454380810c04639d1e63fbd90e170b3bf5b Mon Sep 17 00:00:00 2001 From: neelgala Date: Sat, 23 Sep 2023 20:38:06 +0530 Subject: [PATCH 1/2] do not assign subfield to None --- CHANGELOG.md | 3 +++ riscv_config/warl.py | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7406901..bdc5223 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.13.3] - 2023-09-23 + - do not assign subfield to None + ## [3.13.2] - 2023-09-20 - Perform satp checks only when the CSR is accessible. diff --git a/riscv_config/warl.py b/riscv_config/warl.py index c91da79..2811a16 100644 --- a/riscv_config/warl.py +++ b/riscv_config/warl.py @@ -502,19 +502,18 @@ def create_uarch_depends(self, uarch_signals): subfield = d.split('::')[1] else: depcsrname = d - subfield = None # if the depcsrname has the 'uarch_' prefix, then drop that dependency for all checks entirely if depcsrname.startswith('uarch_'): - subfield_str = '' if subfield is None else f'{subfield} field from ' + subfield_str = '' if subfield == '' else f'{subfield} field from ' logger.warning(f'WARL for csr {csrname} depends on \ {subfield_str}uarch csr {depcsrname}. Treating this as a uarch dependency.') - if subfield is None: + if subfield == '': subfield = depcsrname depcsrname = 'uarch_signals' if depcsrname not in self.uarch_depends: self.uarch_depends[depcsrname] = [] - if subfield is not None and subfield not in self.uarch_depends[depcsrname]: + if subfield != '' and subfield not in self.uarch_depends[depcsrname]: self.uarch_depends[depcsrname].append(subfield) logger.debug(f'uArch dependencies are: {self.uarch_depends}') @@ -585,7 +584,6 @@ def iserr(self): subfield = d.split('::')[1] else: depcsrname = d - subfield = None # if the csr is a uarch dependency and also exists in the spec, throw an error if depcsrname in self.uarch_depends and depcsrname in self.spec: From ddb60a593ada712d395ea229df271e3ada5c7016 Mon Sep 17 00:00:00 2001 From: neelgala Date: Sat, 23 Sep 2023 20:38:24 +0530 Subject: [PATCH 2/2] =?UTF-8?q?Bump=20version:=203.13.2=20=E2=86=92=203.13?= =?UTF-8?q?.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- riscv_config/__init__.py | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/riscv_config/__init__.py b/riscv_config/__init__.py index ff5baad..b544c8d 100644 --- a/riscv_config/__init__.py +++ b/riscv_config/__init__.py @@ -1,3 +1,3 @@ from pkgutil import extend_path __path__ = extend_path(__path__, __name__) -__version__ = '3.13.2' \ No newline at end of file +__version__ = '3.13.3' \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index b45ae17..5f97967 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.13.2 +current_version = 3.13.3 commit = True tag = True