Merge pull request #20 from riscv-software-src/fix-sig-align-in-templ…

…ates fix signature alignment in model headers to 16-byte alignment
riscv-software-src · Sep 10, 2021 · cfa79f9 · cfa79f9
2 parents 0bf2b97 + 7c81ef7
commit cfa79f9
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.22.0] - 2021-09-10
+- Fixed signature alignment to begin and end at 16-byte boundaries for all header templates.
+
 ## [1.21.2] - 2021-09-03
 - Ported CLI to use click package
 - Improved documentation for using plugins.

diff --git a/riscof/Templates/setup/model/env/model_test.h b/riscof/Templates/setup/model/env/model_test.h
@@ -1,11 +1,5 @@
 #ifndef _COMPLIANCE_MODEL_H
 #define _COMPLIANCE_MODEL_H
-#if XLEN == 64
-  #define ALIGNMENT 3
-#else
-  #define ALIGNMENT 2
-#endif
-
 #define RVMODEL_DATA_SECTION \
         .pushsection .tohost,"aw",@progbits;                            \
         .align 8; .global tohost; tohost: .dword 0;                     \
@@ -28,11 +22,12 @@
 //RV_COMPLIANCE_DATA_BEGIN
 #define RVMODEL_DATA_BEGIN                                              \
   RVMODEL_DATA_SECTION                                                        \
-  .align ALIGNMENT;\
+  .align 4;\
   .global begin_signature; begin_signature:
 
 //RV_COMPLIANCE_DATA_END
 #define RVMODEL_DATA_END                                                      \
+  .align 4;\
   .global end_signature; end_signature:  
 
 //RVTEST_IO_INIT

diff --git a/riscof/Templates/setup/reference/env/model_test.h b/riscof/Templates/setup/reference/env/model_test.h
@@ -1,11 +1,5 @@
 #ifndef _COMPLIANCE_MODEL_H
 #define _COMPLIANCE_MODEL_H
-#if XLEN == 64
-  #define ALIGNMENT 3
-#else
-  #define ALIGNMENT 2
-#endif
-
 #define RVMODEL_DATA_SECTION \
         .pushsection .tohost,"aw",@progbits;                            \
         .align 8; .global tohost; tohost: .dword 0;                     \

diff --git a/riscof/Templates/setup/sail_cSim/env/model_test.h b/riscof/Templates/setup/sail_cSim/env/model_test.h
@@ -1,10 +1,5 @@
 #ifndef _COMPLIANCE_MODEL_H
 #define _COMPLIANCE_MODEL_H
-#if XLEN == 64
-  #define ALIGNMENT 3
-#else
-  #define ALIGNMENT 2
-#endif
 
 #define RVMODEL_DATA_SECTION \
         .pushsection .tohost,"aw",@progbits;                            \
@@ -28,12 +23,12 @@
 //RV_COMPLIANCE_DATA_BEGIN
 #define RVMODEL_DATA_BEGIN                                              \
   RVMODEL_DATA_SECTION                                                        \
-  .align ALIGNMENT;\
+  .align 4;\
   .global begin_signature; begin_signature:
 
 //RV_COMPLIANCE_DATA_END
 #define RVMODEL_DATA_END                                                      \
-  .global end_signature; end_signature:  
+  .align 4; .global end_signature; end_signature:  
 
 //RVTEST_IO_INIT
 #define RVMODEL_IO_INIT

diff --git a/riscof/__init__.py b/riscof/__init__.py
@@ -4,4 +4,4 @@
 
 __author__ = """InCore Semiconductors Pvt Ltd"""
 __email__ = 'info@incoresemi.com'
-__version__ = '1.21.2'
+__version__ = '1.22.0'
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.21.2
+current_version = 1.22.0
 commit = True
 tag = True
 

diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@ def read_requires():
 test_requirements = [ ]
 
 setup(name="riscof",
-      version='1.21.2',
+      version='1.22.0',
       description="RISC-V Architectural Test Framework",
       long_description=readme + '\n\n',
       classifiers=[