aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Newsome <tim@sifive.com>2022-10-20 15:31:42 -0700
committerGitHub <noreply@github.com>2022-10-20 15:31:42 -0700
commit90d1637f8c934b218c0e0f98c942b4d60cef97e2 (patch)
tree7c36d466117010e446a087c0ca44930a23c35e66
parent774246fda3d80108243b5ad1cda0068add3d38aa (diff)
parent79a3db2657d4cebb468f63466343f8023459783c (diff)
downloadriscv-tests-90d1637f8c934b218c0e0f98c942b4d60cef97e2.zip
riscv-tests-90d1637f8c934b218c0e0f98c942b4d60cef97e2.tar.gz
riscv-tests-90d1637f8c934b218c0e0f98c942b4d60cef97e2.tar.bz2
Merge pull request #420 from riscv-software-src/test_fpr_progbuf
Get coverage of progbuf FPR accesses.
-rw-r--r--debug/targets/RISC-V/spike32-2.py3
-rw-r--r--debug/targets/RISC-V/spike64.py3
-rw-r--r--debug/testlib.py5
3 files changed, 9 insertions, 2 deletions
diff --git a/debug/targets/RISC-V/spike32-2.py b/debug/targets/RISC-V/spike32-2.py
index ca62610..6a5a839 100644
--- a/debug/targets/RISC-V/spike32-2.py
+++ b/debug/targets/RISC-V/spike32-2.py
@@ -12,4 +12,5 @@ class spike32_2(targets.Target):
def create(self):
return testlib.Spike(self, isa="RV32IMAFC", progbufsize=0, dmi_rti=4,
- support_abstract_csr=True, support_haltgroups=False)
+ support_abstract_csr=True, support_abstract_fpr=True,
+ support_haltgroups=False)
diff --git a/debug/targets/RISC-V/spike64.py b/debug/targets/RISC-V/spike64.py
index 31088ff..79176c2 100644
--- a/debug/targets/RISC-V/spike64.py
+++ b/debug/targets/RISC-V/spike64.py
@@ -21,4 +21,5 @@ class spike64(targets.Target):
def create(self):
# 32-bit FPRs only
return testlib.Spike(self, isa="RV64IMAFC", progbufsize=0,
- abstract_rti=30, support_abstract_csr=True)
+ abstract_rti=30, support_abstract_csr=True,
+ support_abstract_fpr=True)
diff --git a/debug/testlib.py b/debug/testlib.py
index 67f2e5b..c53ca04 100644
--- a/debug/testlib.py
+++ b/debug/testlib.py
@@ -65,6 +65,7 @@ class Spike:
def __init__(self, target, halted=False, timeout=None, with_jtag_gdb=True,
isa=None, progbufsize=None, dmi_rti=None, abstract_rti=None,
support_hasel=True, support_abstract_csr=True,
+ support_abstract_fpr=False,
support_haltgroups=True, vlen=128, elen=64, harts=None):
"""Launch spike. Return tuple of its process and the port it's running
on."""
@@ -74,6 +75,7 @@ class Spike:
self.dmi_rti = dmi_rti
self.abstract_rti = abstract_rti
self.support_abstract_csr = support_abstract_csr
+ self.support_abstract_fpr = support_abstract_fpr
self.support_hasel = support_hasel
self.support_haltgroups = support_haltgroups
self.vlen = vlen
@@ -149,6 +151,9 @@ class Spike:
if not self.support_abstract_csr:
cmd.append("--dm-no-abstract-csr")
+ if not self.support_abstract_fpr:
+ cmd.append("--dm-no-abstract-fpr")
+
if not self.support_hasel:
cmd.append("--dm-no-hasel")