Merge pull request #234 from riscv-non-isa/misc-fixes

Misc fixes

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## [2.6.2] - 2022-02-24
+  - modified verify.sh to ignore comments in reference signature during diff operation [#230]
+  - udpated test-format spec to include the order of lines in the signature file [#214]
+  - RVTEST_E macro to be enabled for all rv32E tests. [#227]
+
 ## [2.6.1] - 2021-11-25
   - Fixed RVTEST_FP_ENABLE macro for the issue #223
 

README.md

@@ -1,5 +1,14 @@
-# RISC-V Architecture Test SIG
 
+# :red_circle: IMPORTANT DISCLAIMER :red_circle:
+
+The current default branch [master] will be  completely replaced with branch [riscof-dev](https://github.com/riscv-non-isa/riscv-arch-test/tree/riscof-dev) on  **1st MAY 2022**.
+This transition essentially migrates the current framework to the RISCOF framework.
+This provides a much richer and configurable environment for targets to test their compatibility.
+The current framework will be archived and **NO LONGER SUPPORTED AFTER 1st MAY 2022.**
+It is therefore recommended that ALL model/target owners  migrate their targets to the riscof environment ASAP.
+More information on porting your target to RISCOF is available here: https://riscof.readthedocs.io/en/stable/
+
+# RISC-V Architecture Test SIG
 
 This is a repository for the work of the RISC-V Foundation Architecture Test SIG. The repository owners are:
 
@@ -14,6 +23,7 @@ For more details on the test format spec see: [spec/TestFormatSpec.adoc](spec/Te
 
 For contributions and reporting issues please refer to [CONTRIBUTION.md](CONTRIBUTION.md)
 
+
 ## Test Disclaimers
 
 The following are the exhaustive list of disclaimers that can be used as waivers by target owners 

riscv-test-env/verify.sh

@@ -28,7 +28,8 @@ do
         echo -e  "Check $(printf %-24s ${stub}) \e[33m ... IGNORE \e[39m"
         continue
     fi
-    diff --ignore-case --strip-trailing-cr ${ref} ${sig} &> /dev/null
+    #diff --ignore-case --strip-trailing-cr ${ref} ${sig} &> /dev/null
+    diff --ignore-case --ignore-trailing-space --strip-trailing-cr <(grep -o '^[^#]*' ${ref}) ${sig} &> /dev/null
     if [ $? == 0 ]
     then
         echo -e "\e[32m ... OK \e[39m"

riscv-test-suite/rv32e_unratified/C/Makefile

@@ -1,3 +1,3 @@
 include ../../Makefile.include
 
-$(eval $(call compile_template,-march=rv32ec -mabi=ilp32e -DXLEN=$(XLEN)))
+$(eval $(call compile_template,-march=rv32ec -mabi=ilp32e -DXLEN=$(XLEN) -DRVTEST_E))

riscv-test-suite/rv32e_unratified/E/Makefile

@@ -1,3 +1,3 @@
 include ../../Makefile.include
 
-$(eval $(call compile_template,-march=rv32e -mabi=ilp32e -DXLEN=$(XLEN)))
+$(eval $(call compile_template,-march=rv32e -mabi=ilp32e -DXLEN=$(XLEN) -DRVTEST_E))

riscv-test-suite/rv32e_unratified/M/Makefile

@@ -1,3 +1,3 @@
 include ../../Makefile.include
 
-$(eval $(call compile_template,-march=rv32em -mabi=ilp32e -DXLEN=$(XLEN)))
+$(eval $(call compile_template,-march=rv32em -mabi=ilp32e -DXLEN=$(XLEN) -DRVTEST_E))

spec/TestFormatSpec.adoc

@@ -176,7 +176,7 @@ image::./testpool.jpg[testStruct]
 The _test case signature_ is represented by single or multiple values. Values are written to memory at the address starting at the address specified by the RVMODEL_DATA_BEGIN and ending at RVMODEL_DATA_END. Signatures can be generated most easily using the RVTEST_SIGUPD macro.
 
 === The test signature
-The <<The test signature,_test signature_>> is a characteristic value which is generated by the architectural test run. The <<The test signature,_test signature_>> may consist of several <<The test case signature,_test case signatures_>>, prefixed with a separate line containing the name of the test and a unique value indicating its version (e.g. git checkin hash). The test target is responsible for extracting values from memory and properly formatting them, using metadata provided to it by the framework using the RVMODEL_DATA_BEGIN and RVMODEL_DATA_END macros. Test case signature values are written one per line, starting with the most-significant byte on the left-hand side with the format <hex_value> where the length of value will be 32 bits (so 8 characters), regardless of the actual value length computed by the test. Furthermore, the signature should always begin at a 16-byte (128-bit) boundary and the size of the signature should be a multiple of 16-bytes (i.e. it should also end at a 16-byte boundary). 
+The <<The test signature,_test signature_>> is a characteristic value which is generated by the architectural test run. The <<The test signature,_test signature_>> may consist of several <<The test case signature,_test case signatures_>>, prefixed with a separate line containing the name of the test and a unique value indicating its version (e.g. git checkin hash). The test target is responsible for extracting values from memory and properly formatting them, using metadata provided to it by the framework using the RVMODEL_DATA_BEGIN and RVMODEL_DATA_END macros. Test case signature values are written one per line, starting with the most-significant byte on the left-hand side with the format <hex_value> where the length of value will be 32 bits (so 8 characters), regardless of the actual value length computed by the test. The file should start with values stored at the lowest address of the signature (i.e. from RVMODEL_DATA_BEGIN to RVMODEL_DATA_END).  Furthermore, the signature should always begin at a 16-byte (128-bit) boundary and the size of the signature should be a multiple of 16-bytes (i.e. it should also end at a 16-byte boundary). 
 
 === The test suite signature
 The _test suite signature_ is defined as a set of <<The test signature,_test signatures_>> valid for given <<The RISC-V architectural test suite,_architectural test suite_>>. It represents the test signature of the particular RISC-V configuration selected for the architectural test.