Converted pmpsm and pmpzca tests for ACT4 by hamza-1821 · Pull Request #948 · riscv/riscv-arch-test

hamza-1821 · 2026-02-18T14:26:56Z

This PR has both rv32 and rv64 tests for pmpsm and pmpzca

Makefile

tests/priv/pmp/pmp32/pmpsm_all_entries_check-03.S

tests/priv/pmp/pmp32/pmpsm_all_entires_check-03.S

jordancarlin

Beyond the labels that need to be updated, it looks like there are a few outstanding issues with the configuration settings.

Also, have you checked coverage with this version of the tests (by running make coverage --jobs $(nproc) and checking the report in work/sail-rv{32/64}-max/reports)? It looks like right now it won't run the PMP coverage because the directory name doesn't match the coverage file. The PMPSm tests need to be in a PMPSm directory so they get run against the PMPSm covergroups. Same for PMPZca tests in a PMPZca directory.

tests/priv/pmp/pmp32/pmpsm_cfg_A_all.S

tests/priv/pmp/pmp32/pmpsm_all_entries_check-03.S

tests/priv/pmp/pmp32/pmpzca_aligned_napot.S

UmerShahidengr · 2026-02-27T18:11:08Z

@hamza-1821 you are getting a conflict, and CI is still failing

hamza-1821 · 2026-02-27T18:15:33Z

@hamza-1821 you are getting a conflict, and CI is still failing

yes, haven't pushed the latest changes yet. That will resolve CI issue. Still working on it.

At this point, the repo holds a number of different projects that all require different people to review things. To make organizing this easier, add issue templates that automatically apply labels for common types of issues: - CTP bugs/suggestions - CRD bugs/suggestions - Test framework bugs - Test bugs - Feature requests --------- Signed-off-by: Jordan Carlin <jordanmcarlin@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Umer Shahid <umer.shahid@10xengineers.ai>

Co-authored-by: Umer Shahid <umer.shahid@10xengineers.ai>

Signed-off-by: Hamza <humza.ali1821@gmail.com>

jordancarlin

Still haven't reviewed most of the tests, but here are more structural comments. Also still need the test directory structure to be recategorized so that coverage works.

tests/priv/pmp/pmp32/pmpsm_all_entries_check-01.S

tests/priv/pmp/pmp32/pmpsm_all_entries_check-02.S

tests/priv/pmp/pmp32/pmpsm_cfg_A_all.S

jordancarlin · 2026-03-01T06:29:54Z

tests/priv/pmp/pmp32/pmpsm_all_entries_check-01.S

+
+// Test case strings for reporting
+canary_mismatch: .string "Testcase signature canary mismatch!"
+test_1_str: .string "\"test: 1; cp: cp_pmpm64_lw\""


Fine to defer this to a follow-up PR after this one is merged, but the test strings should include the covergroup and bin in addition just the coverpoint. That will probably require the VERIFICATION_RWX macro to include the TEST_CASE number argument as part of the debug string (similar to what is already done for the labels).

tests/priv/pmp/pmp32/pmpzca_aligned_off.S

UmerShahidengr · 2026-03-02T15:35:35Z

@hamza-1821 Clang CI was running for almost 2hours, I have cancelled that. CI was stuck at Sm-00.S test.
I cant seem to find anything in this PR which should keep it stuck. Can you check why it is hanging?
CC: @jordancarlin

tests/priv/pmp/pmp32/PMPSm/pmpsm_all_entries_check.S

tests/env/utils.h

tests/priv/pmp/pmp32/PMPSm/pmpsm_all_entries_check.S

jordancarlin · 2026-03-02T15:37:11Z

tests/priv/pmp/pmp32/PMPSm/pmpsm_cfg_A_tor_bot.S

+RVTEST_BEGIN
+
+#define NOP             0x13
+#define g       (1<<(RVMODEL_PMP_GRAIN+2))


g will be the same for all tests. Might make sense to define it once in a more central location.

jordancarlin · 2026-03-02T15:49:46Z

tests/priv/pmp/pmp32/PMPSm/pmpsm_cfg_tor_check-01.S

+    sw a4, 0(a5)                                            // word-level store test
+    nop
+    nop
+    RVTEST_SIGUPD(x2, x5, x4, a4, \TEST_CASE\()_1, test_1_str)                               // Signature update


Why do we need 2 nop in all of these? If it traps, doesn't it just skip the next instruction? So only one nop should be needed.

jordancarlin · 2026-03-02T15:51:12Z

tests/priv/pmp/pmp32/PMPSm/pmpsm_csr_walk.S

+    // Loop to SET ALL pmpaddr REGs to zeros
+    .set pmpaddri, CSR_PMPADDR0
+    .rept RVMODEL_NUM_PMPS
+    csrw pmpaddri, x0
+    .set pmpaddri, pmpaddri+1
+    .endr
+
+    li t0, -1
+    // Loop to SET ALL pmpaddr REGs to ones
+    .set pmpaddri, CSR_PMPADDR0
+    .rept RVMODEL_NUM_PMPS
+    csrw pmpaddri, t0
+    .set pmpaddri, pmpaddri+1
+    .endr
+
+    // Loop to SET ALL pmpcfg REGs to zero
+    .set pmpcfgi, CSR_PMPCFG0
+    .rept RVMODEL_NUM_PMPS/4
+    csrw pmpcfgi , x0
+    .set pmpcfgi, pmpcfgi+1
+    .endr


This is all missing self-checking.

This loop is applied only to initialise all pmp-regs to zero, so self-checking is not required here.

It sets all of the pmpaddr CSRs to zeros and then ones, which is listed in the header as one of the things this test is checking.

jordancarlin · 2026-03-02T15:52:05Z

tests/priv/pmp/pmp32/PMPSm/pmpsm_csr_walk.S

+    .endif
+
+    slli t2, t2, 1
+    bnez t2, 9b


I think we decided that we don't want tests to have loops in them. @davidharrishmc thoughts on this one since it is not coming from a Python generator?

We've gone to a ton of work to remove loops because it is hard to report failures when there are loops. If it is practical to remove this loop as well, I'd prefer to do so.

jordancarlin · 2026-03-02T15:56:33Z

tests/priv/pmp/pmp32/PMPZca/pmpzca_aligned_na4.S

+# REQUIRED_EXTENSIONS: ['I','Zca','Smpmp']
+# params:
+#   MXLEN: 32
+# MARCH: rv32ic_zicsr


Can we use zca instead of c in the march string here? Applies to all Zca tests.

Signed-off-by: Umer Shahid <umer@riscv.org>

hamza-1821 changed the title ~~pushing pmpsm and pmpzca tests~~ pushing pmpsm and pmpzca tests for ACT$ Feb 18, 2026

hamza-1821 changed the title ~~pushing pmpsm and pmpzca tests for ACT$~~ pushing pmpsm and pmpzca tests for ACT4 Feb 18, 2026

jordancarlin requested changes Feb 18, 2026

View reviewed changes

jordancarlin added the ACT4 Issues or PRs applicable to ACT4 label Feb 20, 2026

hamza-1821 added 11 commits February 24, 2026 04:40

pushing pmpsm and pmpzca tests

f36d692

remove accidental test pmpm_cfg_A_tor_zero

69132b4

renamed PMP tests from pmpm to pmpsm

1d2081b

reverted unintended sail.json changes

8486012

Reverted accidental Makefile changes

d1d783d

Fixed some PMP tests and renamed entries_check-03 test

4874c93

Removed typo file pmpsm_all_entires_check-03

3bffc48

Fixed codespell and formatting issues

b765d99

modified tests to pass on sail

23f36b3

pushing rv64 tests for pmpsm and zca

5300795

updateing test config

a6fda36

hamza-1821 force-pushed the act4-work branch from 77ae973 to a6fda36 Compare February 24, 2026 13:57

hamza-1821 and others added 3 commits February 25, 2026 02:48

fixed test config and added skipmepc in trap handler

e9a6ee0

pushing pmpsm tests from draft PR

16f149a

Merge branch 'act4' into act4-work

8de2efc

jordancarlin requested changes Feb 27, 2026

View reviewed changes

jordancarlin and others added 7 commits February 28, 2026 14:17

Coverpoints for SvH Cont'd (riscv#877)

55dd6d5

Co-authored-by: Umer Shahid <umer.shahid@10xengineers.ai>

updated selfchecking macro

39d05ff

Merge branch 'act4' into act4-work

90b3d6a

Signed-off-by: Hamza <humza.ali1821@gmail.com>

corrected test config for pmpsm napot legal test

5816e91

changed pmpcfg3 to pmpcfg2 in rv64 test

d32c9c7

fixed test name in test file

46cb66b

jordancarlin requested changes Mar 1, 2026

View reviewed changes

hamza-1821 added 8 commits March 1, 2026 10:52

fixed top of files, added liscense, included NOP from utils.h

d2ab3b7

added a check in pmpsm_all_entries_check.S

a7b4636

fixed unclear comment

2bd5cbd

added sig update for csr reads and writes in dedicated tests

9c271f8

fixed a repeating test case string

7c73341

fixed csr walk test

9c99556

Refactor PMP tests: separate PMPSm and PMPZca directories

f64f5da

adjusted csr walk for rv32

1f9ce32

Merge branch 'act4' into act4-work

e9d4e08

jordancarlin requested changes Mar 2, 2026

View reviewed changes

hamza-1821 and others added 6 commits March 2, 2026 09:37

resolved some comments, changed qemu grainularity, change sail config

c0be474

removed comments

76a2661

corrected signature count

df5c381

Change PMP_GRANULARITY from 0 to 1

45f9936

Signed-off-by: Umer Shahid <umer@riscv.org>

Merge branch 'act4' into act4-work

3eb2d9f

Changed qemu granularity to 2

a78754b

hamza-1821 changed the title ~~pushing pmpsm and pmpzca tests for ACT4~~ Converted pmpsm and pmpzca tests for ACT4 Mar 4, 2026

jordancarlin mentioned this pull request Mar 8, 2026

pmpm_cfg_A_tor_zero.S has load/store from/to address of 0 #721

Open

UmerShahidengr added 2 commits March 9, 2026 22:56

Merge branch 'act4' into act4-work

13eec08

Merge branch 'act4' into act4-work

c18caa6

Conversation

hamza-1821 commented Feb 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jordancarlin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

UmerShahidengr commented Feb 27, 2026

Uh oh!

hamza-1821 commented Feb 27, 2026

Uh oh!

jordancarlin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

UmerShahidengr commented Mar 2, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

hamza-1821 commented Feb 18, 2026 •

edited

Loading