March 2021 Bump

.github/workflows/apt-packages.txt

@@ -0,0 +1,2 @@
+build-essential
+device-tree-compiler

.github/workflows/continuous-integration.yml

@@ -0,0 +1,28 @@
+# This file describes the GitHub Actions workflow for continuous integration of Spike.
+#
+# See
+# https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
+# for API reference documentation on this file format.
+
+name: Continuous Integration
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+
+jobs:
+  test:
+    name: Test Spike build
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Dependencies
+        run: sudo xargs apt-get install -y < .github/workflows/apt-packages.txt
+
+      - run: ci-tests/test-spike

Makefile.in

@@ -37,6 +37,7 @@ src_dir      := @srcdir@
 scripts_dir  := $(src_dir)/scripts
 
 HAVE_INT128 := @HAVE_INT128@
+HAVE_DLOPEN := @HAVE_DLOPEN@
 
 # If the version information is not in the configure script, then we
 # assume that we are in a working directory. We use the vcs-version.sh
@@ -242,7 +243,7 @@ $(2)_lib_libnames_shared	:= $$(if $$($(2)_install_shared_lib),lib$(1).so,)
 
 lib$(1).a : $$($(2)_objs) $$($(2)_c_objs) $$($(2)_lib_libnames)
 	$(AR) rcs $$@ $$^
-lib$(1).so : $$($(2)_objs) $$($(2)_c_objs) $$($(2)_lib_libnames) $$($(2)_lib_libnames_shared)
+lib$(1).so : $$($(2)_objs) $$($(2)_c_objs) $$($(2)_lib_libnames_shared) $$($(2)_lib_libnames)
 	$(LINK) -shared -o $$@ $(if $(filter Darwin,$(shell uname -s)),-install_name $(install_libs_dir)/$$@) $$^ $$($(2)_lib_libnames) $(LIBS)
 
 $(2)_junk += lib$(1).a
@@ -334,11 +335,12 @@ deps += $$($(2)_deps)
 
 test_outs += $$($(2)_test_outs)
 
+install_config_hdrs += $$(if $$($(2)_install_config_hdr),$(1),)
 install_hdrs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_install_hdrs))
 install_libs += $$(if $$($(2)_install_lib),lib$(1).a,)
 install_libs += $$(if $$($(2)_install_shared_lib),lib$(1).so,)
 install_exes += $$($(2)_install_prog_exes)
-install_pcs  += riscv-$(1).pc
+install_pcs  += $$(if $$($(2)_install_lib),riscv-$(1).pc,)
 
 endef
 
@@ -381,6 +383,14 @@ check : check-cpp check-bin
 # Installation
 #-------------------------------------------------------------------------
 
+install-config-hdrs : config.h
+	$(MKINSTALLDIRS) $(install_hdrs_dir)
+	for dir in $(install_config_hdrs); \
+  do \
+		$(MKINSTALLDIRS) $(install_hdrs_dir)/$$dir; \
+    $(INSTALL_HDR) $< $(install_hdrs_dir)/$$dir; \
+  done
+
 install-hdrs : $(install_hdrs)
 	$(MKINSTALLDIRS) $(install_hdrs_dir)
 	for file in $(subst $(src_dir)/,,$^); \
@@ -410,9 +420,9 @@ install-pc : $(install_pcs)
     $(INSTALL_HDR) $$file $(install_libs_dir)/pkgconfig/; \
   done
 
-install : install-hdrs install-libs install-exes install-pc
+install : install-hdrs install-config-hdrs install-libs install-exes install-pc
 
-.PHONY : install install-hdrs install-libs install-exes
+.PHONY : install install-hdrs install-config-hdrs install-libs install-exes
 
 #-------------------------------------------------------------------------
 # Regenerate configure information

README.md

@@ -18,9 +18,15 @@ Spike supports the following RISC-V ISA features:
   - D extension, v2.2
   - Q extension, v2.2
   - C extension, v2.0
-  - V extension, v0.8, w/ Zvlsseg, w/o Zvamo/Zvediv, (_requires a 64-bit host_)
+  - B extension, v0.92
+  - K extension, v0.8.1 ([Scalar Cryptography](https://github.com/riscv/riscv-crypto))
+  - V extension, v0.10, w/ Zvlsseg/Zvamo (_requires a 64-bit host_)
+  - P extension, v0.9.2
+  - Bi-endianness
   - Conformance to both RVWMO and RVTSO (Spike is sequentially consistent)
   - Machine, Supervisor, and User modes, v1.11
+  - Hypervisor extension, v0.6.1
+  - Svnapot extension, v0.1
   - Debug v0.14
 
 Versioning and APIs
@@ -52,6 +58,9 @@ install path.
     $ make
     $ [sudo] make install
 
+If your system uses the `yum` package manager, you can substitute
+`yum install dtc` for the first step.
+
 Build Steps on OpenBSD
 ----------------------
 

arch_test_target/spike/Makefile.include

@@ -0,0 +1,25 @@
+# set TARGETDIR to point to the directory which contains a sub-folder in the same name as the target
+export TARGETDIR ?= /scratch/git-repo/github/neel/riscv-isa-sim/arch_test_target
+
+# set XLEN to max supported XLEN. Allowed values are 32 and 64
+export XLEN 							?= 64
+
+# name of the target. Note a folder of the same name must exist in the TARGETDIR directory
+export RISCV_TARGET       ?= spike
+
+# set the RISCV_DEVICE environment to a single extension you want to compile, simulate and/or verify. 
+# Leave this blank if you want to iterate through all the supported extensions available in the target
+export RISCV_DEVICE       ?= 
+
+# set this to a string which needs to be passed to your target Makefile.include files
+export RISCV_TARGET_FLAGS ?= 
+
+# set this if you want to enable assertions on the test-suites. Currently no tests support
+# assertions.
+export RISCV_ASSERT       ?= 0
+
+# set the number of parallel jobs (along with any other arguments) you would like to execute. Note that the target needs to ensure
+# that no common files across jobs are created/overwritten leading to unknown behavior
+JOBS= -j1
+
+

arch_test_target/spike/README.md

@@ -0,0 +1,58 @@
+# Using the Spike Simulator as an Architectural test model
+
+This is a reference for running Spike as a target for the RISC-V Architectural Test framework.
+
+## Getting Spike
+
+The Spike repository should be cloned from [here](https://github.com/riscv/riscv-isa-sim/), preferably at the same directory level as the riscv-arch-test repository.
+
+## Building Spike
+
+The [README.md](../README.md) at the top level of the riscv-isa-sim directory gives details on building an executable spike model.
+
+## Adding Spike as a target to the Architectural Test framework
+
+Also at the top level is an ``arch_test_target directory``. This directory contains all the collaterals
+required to add Spike as a target to the architectural test framework.
+
+The file ``arch_test_target/spike/Makefile.include`` contains various parameters which can be set by 
+the user to modify the instance of spike on which the tests need to be run.
+The user can modify the ``XLEN`` variable based on whether 32-bit or 64-bit tests need to be run.
+If one would like to run tests of a single extension then set the `RISCV_DEVICE` to that extension
+name (eg. M, C, Zifencei, etc). Leaving the ``RISCV_DEVICE`` empty would indicate running all tests
+for all extensions available in the ``device/rv{XLEN}i_m`` directory No other variables should be modified.
+
+Now clone the architectural test framework repo and copy the updated Makefile.include to it:
+
+```
+  $ git clone https://github.com/riscv/riscv-arch-test.git
+  $ cd riscv-arch-test
+  $ cp <custom-path>/riscv-isa-sim/arch_test_target/Makefile.include .
+```
+
+The user will have to modify the ``TARGETDIR`` variable in ``riscv-arch-test/Makefile.include`` to point to the
+absolute location of the ``riscv-isa-sim/arch_test_target`` directory. 
+
+You can execute the tests from the root directory of the riscv-arch-test repo:
+
+```
+make compile simulate verify
+```
+
+## Updating the target for new tests
+
+As tests for new extensions are added to the architectural test repo, the spike target (i.e.
+arch_test_target directory) will also need to be updated accordingly. Please refer to the [Porting a new target](https://github.com/riscv/riscv-arch-test/blob/master/doc/README.adoc#5-porting-a-new-target)
+section for more details on what those changes/updates should be.
+
+
+
+
+
+
+
+
+
+
+
+

arch_test_target/spike/device/rv32i_m/C/Makefile.include

@@ -0,0 +1,40 @@
+TARGET_SIM   ?= spike
+TARGET_FLAGS ?= $(RISCV_TARGET_FLAGS)
+ifeq ($(shell command -v $(TARGET_SIM) 2> /dev/null),)
+    $(error Target simulator executable '$(TARGET_SIM)` not found)
+endif
+
+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 > [email protected]; \
+					$$(RISCV_OBJDUMP) $$@ --source > [email protected]
+
+
+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_CMD = $(TARGET_SIM) $(TARGET_FLAGS) --isa=rv32ic \
+        +signature=$(*).signature.output +signature-granularity=4\
+        $< 
+
+RUN_TARGET=\
+	$(RUN_CMD)

arch_test_target/spike/device/rv32i_m/I/Makefile.include

@@ -0,0 +1,40 @@
+TARGET_SIM   ?= spike
+TARGET_FLAGS ?= $(RISCV_TARGET_FLAGS)
+ifeq ($(shell command -v $(TARGET_SIM) 2> /dev/null),)
+    $(error Target simulator executable '$(TARGET_SIM)` not found)
+endif
+
+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 > [email protected]; \
+					$$(RISCV_OBJDUMP) $$@ --source > [email protected]
+
+
+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_CMD = $(TARGET_SIM) $(TARGET_FLAGS) --isa=rv32i \
+        +signature=$(*).signature.output +signature-granularity=4\
+        $< 
+
+RUN_TARGET=\
+	$(RUN_CMD) 

arch_test_target/spike/device/rv32i_m/M/Makefile.include

@@ -0,0 +1,40 @@
+TARGET_SIM   ?= spike
+TARGET_FLAGS ?= $(RISCV_TARGET_FLAGS)
+ifeq ($(shell command -v $(TARGET_SIM) 2> /dev/null),)
+    $(error Target simulator executable '$(TARGET_SIM)` not found)
+endif
+
+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 > [email protected]; \
+					$$(RISCV_OBJDUMP) $$@ --source > [email protected]
+
+
+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_CMD = $(TARGET_SIM) $(TARGET_FLAGS) --isa=rv32im \
+        +signature=$(*).signature.output +signature-granularity=4\
+        $< 
+
+RUN_TARGET=\
+	$(RUN_CMD)

arch_test_target/spike/device/rv32i_m/Zifencei/Makefile.include

@@ -0,0 +1,40 @@
+TARGET_SIM   ?= spike
+TARGET_FLAGS ?= $(RISCV_TARGET_FLAGS)
+ifeq ($(shell command -v $(TARGET_SIM) 2> /dev/null),)
+    $(error Target simulator executable '$(TARGET_SIM)` not found)
+endif
+
+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 > [email protected]; \
+					$$(RISCV_OBJDUMP) $$@ --source > [email protected]
+
+
+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_CMD = $(TARGET_SIM) $(TARGET_FLAGS) --isa=rv32i \
+        +signature=$(*).signature.output +signature-granularity=4\
+        $< 
+
+RUN_TARGET=\
+	$(RUN_CMD)