Merge last 2.x upstream version

Author: bobbl

.github/workflows/main.yml

@@ -34,10 +34,14 @@ jobs:
         uses: ffurrer2/extract-release-notes@v1
 
       - name: Tag
+        id: create_tag
         if: github.ref == 'refs/heads/master'
-        run: |
-          git tag ${{ steps.get_version.outputs.version }}
-          git push origin ${{ steps.get_version.outputs.version }}
+        uses: mathieudutour/github-tag-action@v5.5
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+          custom_tag: ${{ steps.get_version.outputs.version }} 
+          create_annotated_tag: True
+          tag_prefix: ''
 
       - name: Build PDF
         id: build_pdf

.github/workflows/test.yml

@@ -0,0 +1,35 @@
+# This is a basic workflow to help you get started with Actions
+
+name: test
+
+# Controls when the action will run. 
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  pull_request:
+    branches: [ master ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  check-version:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      
+      - uses: actions-ecosystem/action-get-latest-tag@v1
+        id: get-latest-tag
+      
+      - name: version check
+        run: |
+          export CHNGVER=$(grep -P -o '(?<=## \[).*(?=\])' -m1 CHANGELOG.md); 
+          echo "CHANGELOG VERSION: $CHNGVER"
+          export TAGVER=${{ steps.get-latest-tag.outputs.tag }}; 
+          echo "TAG VERSION: $TAGVER"
+          if [ "$CHNGVER" = "$TAGVER" ]; then
+              echo "No changelog update."
+              exit 1
+          else
+              echo "Changelog updated."
+          fi

CHANGELOG.md

@@ -1,5 +1,85 @@
 # CHANGELOG
 
+
+## [2.7.4] - 2022-04-18
+  - Clean fflags in F* macros
+  - Update rv32i_m/F and rv64i_m/D signatures
+
+## [2.7.3] - 2022-03-31
+  - Update framework to support test suite compilation with LLVM.
+
+## [2.7.2] - 2022-03-18
+- Add sigalign based changes to F&D sigupd macros.
+- Add helper macro to check offset legality.
+
+
+## [2.7.1] - 2022-03-18
+- Fix bug in auto-offset update for SIGUPD macros.
+
+## [2.7.0] - 2022-03-15
+  - Updated K Crypto (Scalar) instructions for the V.1.0.0 ratified spec.
+  - changed xperm.n -> xperm4 and xperm.b -> xperm8 instructions 
+  - removed unsupported packu
+
+## [2.6.3] - 2022-03-04
+  - import and synchronize P-ext changes in arch_test.h from riscv-ctg
+  - automatically adjust base and offset if offset gets too big
+
+
+## [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
+
+## [2.6.0] - 2021-10-21
+  - Added rv64d tests, references, coverage files and data propagation reports
+  - removed unwated re-assignment of macros for RV64F combination in `arch_test.h`
+  - fixed rvtest-case strings for flw and fsw tests in rv32if suite
+
+## [2.5.4] - 2021-10-20
+  - Second Fix for the issue #206
+
+## [2.5.3] - 2021-10-15
+  - fix the lower case `i` in the `RVTEST_CASE` macros used in the shift operation tests.
+
+## [2.5.2] - 2021-10-14
+  - update format for aes32 and sm4 instructions
+  - update reference signature for sha256 and sm3 instructions in rv64i_m/K_unratified
+  - delete zip and unzip tests in rv64i_m/K_unratified
+  - update tests for aes64ks1i, sm4ed and sm4ks to use byte_count with overlap = "Y" to improve the coverage of S-boxes
+
+## [2.5.1] - 2021-10-07
+  - added styles files to the F coverage report directories.
+
+## [2.5.0] - 2021-10-01
+  - Added rv32f tests, references, coverage files and data propagation reports
+  - fixed broken links in READMEs across the repo.
+  - corrected string "EBREAK" in io string macro to "ECALL" for ecall.S tests. #207
+  - fixed typo `.alive` --> `.align` in `riscv-target/example_target/model_test.h`.
+
+## [2.4.7] - 2021-10-01
+  - Fix for the issue #206
+
+## [2.4.6] - 2021-08-02
+  - Added rv32e tests in riscv-test-suite
+  
+## [2.4.5] - 2021-07-29
+  - fix for issue #195
+
+## [2.4.4] - 2021-07-19
+  - Annotating tags during releases
+
+## [2.4.3] - 2021-05-20
+  - added new 64-bit K crypto tests as per the test-plan presented by the scalar crypto task group
+    [here](https://github.com/riscv/riscv-crypto/blob/d89dfee25780f79c162da4eb69cd9076dd701c88/tests/compliance/test-plan-scalar.adoc)
+  - added new 32-bit K crypto tests as per the above mentioned test-plan.
+  - added coverage and data propagation reports for the above tests.
+  - updated README in riscv-test-suite
+  - added missing semi-colon in example target Makefile.include files
+
 ## [2.4.2] - 2021-04-20
   - changed all occurances of SPTBR to the new name SATP
 

README.md

@@ -21,8 +21,17 @@ Special cases:
 
 ---
 
-# 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:
 
@@ -37,6 +46,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 
@@ -53,7 +63,7 @@ when reporting the status of pass/fail on the execution of the architectural sui
    have compressed extension support enabled by default. Targets without the compressed extension 
    support will fail the following tests:
    1. rv[32/64]i_m/privilege/src/misalign-b[ge[u],lt[u],eq,ne]-01.S
-   2. rv[32/64]i_m/privilege/src/misalign[1,2]-jalr-01.S
+   2. rv[32/64]i_m/privilege/src/misalign2-jalr-01.S
 
 3. The machine mode trap handler used in the privilege tests assumes one of the following conditions. 
    Targets not satisfying any of the following conditions are bound to fail the entire 
@@ -88,9 +98,9 @@ The files [`COPYING.BSD`](./COPYING.BSD), [`COPYING.APACHE`](./COPYING.APACHE) a
 
 ## Quick Links:
 
-- RISCOF \[[DOCS](https://riscof.readthedocs.io/en/latest/)\] \[[REPO](https://gitlab.com/incoresemi/riscof/)\]: This is the next version of the architectural test framework currently under development
-- RISCV-ISAC \[[DOCS](https://riscv-isac.readthedocs.io/en/latest/index.html)\] \[[REPO](https://github.com/riscv/riscv-isac)\] : This is an ISA level coverage extraction tool for RISC-V which used to generate the coverage statistics of the architectural tests.
-- RISCV-CTG: \[[DOCS](https://riscv-ctg.readthedocs.io/en/latest/index.html)\]\[[REPO](https://github.com/riscv/riscv-ctg)\]: This is a RISC-V Architectural Test generator used to generate some of the tests already checked into this repository. Docs to be updated soon !!
+- RISCOF \[[DOCS](https://riscof.readthedocs.io/en/latest/)\] \[[REPO](https://github.com/riscv-software-src/riscof)\]: This is the next version of the architectural test framework currently under development
+- RISCV-ISAC \[[DOCS](https://riscv-isac.readthedocs.io/en/latest/index.html)\] \[[REPO](https://github.com/riscv-software-src/riscv-isac)\] : This is an ISA level coverage extraction tool for RISC-V which used to generate the coverage statistics of the architectural tests.
+- RISCV-CTG: \[[DOCS](https://riscv-ctg.readthedocs.io/en/latest/index.html)\]\[[REPO](https://github.com/riscv-software-src/riscv-ctg)\]: This is a RISC-V Architectural Test generator used to generate some of the tests already checked into this repository.
 - [Videos](https://youtu.be/VIW1or1Oubo): This Global Forum 2020 video provides an introduction to the above mentioned tools
 - [riscvOVPsim](https://github.com/riscv-ovpsim/imperas-riscv-tests): Imperas freeware RISC-V reference simulator for compliance testing
 - [riscvOVPsimPlus](https://www.ovpworld.org/riscvOVPsimPlus/): Imperas enhanced freeware RISC-V reference simulator for test development and verification

riscv-target/example-target/device/rv32i_m/Makefile.include

@@ -20,7 +20,7 @@ COMPILE_CMD=\
 	$$(RISCV_OBJCOPY) -O binary $$@ $$@.bin
 
 OBJ_CMD = $$(RISCV_OBJDUMP) $$@ -D > $$@.objdump; \
-		  $$(RISCV_OBJDUMP) $$@ --source > $$@.debug \
+		  $$(RISCV_OBJDUMP) $$@ --source > $$@.debug; \
 		  $$(RISCV_READELF) -a $$@ > $$@.readelf
 
 

riscv-target/example-target/device/rv64i_m/Makefile.include

@@ -20,7 +20,7 @@ COMPILE_CMD=\
 	$$(RISCV_OBJCOPY) -O binary $$@ $$@.bin
 
 OBJ_CMD = $$(RISCV_OBJDUMP) $$@ -D > $$@.objdump; \
-		  $$(RISCV_OBJDUMP) $$@ --source-comment="// " > $$@.debug \
+		  $$(RISCV_OBJDUMP) $$@ --source-comment="// " > $$@.debug; \
 		  $$(RISCV_READELF) -a $$@ > $$@.readelf
 
 

riscv-target/example-target/model_test.h

@@ -24,7 +24,7 @@
 
 //TODO: declare the end of the signature region here. Add other target specific contents here.
 #define RVMODEL_DATA_END                                                      \
-  .alive 4; .global end_signature; end_signature:                             \
+  .align 4; .global end_signature; end_signature:                             \
   RVMODEL_DATA_SECTION                                                        
 
 

riscv-target/ibex/device/rv32i_m/K

@@ -0,0 +1 @@
+../rv32imc/

riscv-target/sail-riscv-c/device/rv32i_m/F/Makefile.include

@@ -0,0 +1,41 @@
+TARGET_SIM   ?= riscv_sim_RV32 -V
+TARGET_FLAGS ?= $(RISCV_TARGET_FLAGS)
+ifeq ($(shell command -v $(TARGET_SIM) 2> /dev/null),)
+    $(error Target simulator executable '$(TARGET_SIM)` not found)
+endif
+
+RUN_CMD=\
+    $(TARGET_SIM) $(TARGET_FLAGS) \
+        --test-signature=$(*).signature.output \
+        $(<)
+
+RISCV_PREFIX   ?= riscv32-unknown-elf-
+RISCV_GCC      ?= $(RISCV_PREFIX)gcc
+RISCV_OBJDUMP  ?= $(RISCV_PREFIX)objdump
+RISCV_GCC_OPTS ?= -g -static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles $(RVTEST_DEFINES)
+
+COMPILE_CMD = $$(RISCV_GCC) $(1) $$(RISCV_GCC_OPTS) \
+							-I$(ROOTDIR)/riscv-test-suite/env/ \
+							-I$(TARGETDIR)/$(RISCV_TARGET)/ \
+							-T$(TARGETDIR)/$(RISCV_TARGET)/link.ld \
+							$$(<) -o $$@ 
+OBJ_CMD = $$(RISCV_OBJDUMP) $$@ -D > $$@.objdump; \
+					$$(RISCV_OBJDUMP) $$@ --source > $$@.debug
+
+
+COMPILE_TARGET=\
+				$(COMPILE_CMD); \
+        if [ $$$$? -ne 0 ] ; \
+                then \
+                echo "\e[31m$$(RISCV_GCC) failed for target $$(@) \e[39m" ; \
+                exit 1 ; \
+                fi ; \
+				$(OBJ_CMD); \
+        if [ $$$$? -ne 0 ] ; \
+                then \
+                echo "\e[31m $$(RISCV_OBJDUMP) failed for target $$(@) \e[39m" ; \
+                exit 1 ; \
+                fi ;
+
+RUN_TARGET=\
+	$(RUN_CMD) 

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"