Merge pull request #32 from anku-anand/master

add isa strings of bitmanip and crypto scalar specs

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.23.3] - 2022-01-27
+- Added missing subextensions for B and K specs in ISA generation function.
+
 ## [1.23.2] - 2021-11-23
 - Fixed report generation for failing tests. Removed HTML table and added manual diff of lines in the report.
 - Added no_clean flag to CLI. 

riscof/__init__.py

@@ -4,4 +4,4 @@
 
 __author__ = """InCore Semiconductors Pvt Ltd"""
 __email__ = 'info@incoresemi.com'
-__version__ = '1.23.2'
+__version__ = '1.23.3'

riscof/framework/test.py

@@ -260,8 +260,8 @@ def isa_set(string):
 
 def canonicalise(isa):
     all_ext = ["M","A","F","D","Q","L","C","B","J","K","T","P","V","N","S","H","U","Zicsr",
-            "Zifencei","Zihintpause","Zmmul","Zam","Zbc","Zbb","Zbp","Zbm","Zbe","Zbf","Zkne",
-            "Zknd","Zknh","Zkse","Zksh","Zkg","Zkb","Zkr","Zks","Zkn","Ztso"]
+            "Zifencei","Zihintpause","Zmmul","Zam","Zba","Zbc","Zbb","Zbs","Zbp","Zbm","Zbe","Zbf","Zkne",
+            "Zknd","Zknh","Zkse","Zksh","Zkg","Zkb","Zkr","Zks","Zkn","Ztso","Zbkb","Zbkc","Zbkx"]
     canonical_string = ""
     switch = False
     for ext in all_ext:
@@ -298,6 +298,7 @@ def prod_isa(dut_isa, test_isa):
     isa = set([])
     last_prefix = ''
     atleast_1 = False
+
     for entry in test_isa:
         match = re.findall("(?P<prefix>RV(64|128|32)(I|E))",entry)
         prefix = match[0][0]

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.23.2
+current_version = 1.23.3
 commit = True
 tag = True
 

setup.py

@@ -23,7 +23,7 @@ def read_requires():
 test_requirements = [ ]
 
 setup(name="riscof",
-      version='1.23.2',
+      version='1.23.3',
       description="RISC-V Architectural Test Framework",
       long_description=readme + '\n\n',
       classifiers=[