Added support of newer additional PMP configuration and address CSRs #168

Abdulwadoodd · 2022-06-29T17:14:55Z

This PR contains all the PMP configuration and address CSRs to support 64 PMP entries as defined by the spec

Abdulwadoodd · 2022-06-29T17:16:29Z

Hi @martinberger @jrtc27,
Kindly review the PR

jrtc27

Haven't methodically checked for copy/paste errors but this is what I found skimming it.

I had some ideas a while back about how to reduce the code duplication, but I don't think that should block adding this support, even if it gets rather silly.

jrtc27 · 2022-06-29T17:20:10Z

model/riscv_csr_map.sail

+mapping clause csr_name_map = 0x3A0 <-> "pmpcfg0"
+mapping clause csr_name_map = 0x3A1 <-> "pmpcfg1"
+mapping clause csr_name_map = 0x3A2 <-> "pmpcfg2"
+mapping clause csr_name_map = 0x3A3 <-> "pmpcfg3"


Suggested change

mapping clause csr_name_map = 0x3A0 <-> "pmpcfg0"

mapping clause csr_name_map = 0x3A1 <-> "pmpcfg1"

mapping clause csr_name_map = 0x3A2 <-> "pmpcfg2"

mapping clause csr_name_map = 0x3A3 <-> "pmpcfg3"

jrtc27 · 2022-06-29T17:21:21Z

model/riscv_insts_zicsr.sail

+ (0x3A7, 32) => { pmpWriteCfgReg(7, value); Some(pmpReadCfgReg(7)) }, // pmpcfg7,
+ (0x3A8, _) => { pmpWriteCfgReg(8, value); Some(pmpReadCfgReg(8)) }, // pmpcfg8,
+ (0x3A9, 32) => { pmpWriteCfgReg(9, value); Some(pmpReadCfgReg(9)) }, // pmpcfg9,
+ (0x3AA, _) => { pmpWriteCfgReg(10, value); Some(pmpReadCfgReg(10))}, // pmpcfg10,


Need a space before the }

model/riscv_pmp_control.sail

jrtc27 · 2022-06-29T17:23:01Z

model/riscv_sys_control.sail

+ 0x3ED => p == Machine, // pmpaddr61
+ 0x3EE => p == Machine, // pmpaddr62
+ 0x3EF => p == Machine, // pmpaddr63
+


Suggested change

jrtc27 · 2022-06-29T17:23:09Z

model/riscv_pmp_regs.sail

}
+

Suggested change

jrtc27 · 2022-06-29T17:23:29Z

model/riscv_insts_zicsr.sail

+ (0x3AD, 32) => { pmpWriteCfgReg(13, value); Some(pmpReadCfgReg(13))}, // pmpcfg13,
+ (0x3AE, _) => { pmpWriteCfgReg(14, value); Some(pmpReadCfgReg(14))}, // pmpcfg14,
+ (0x3AF, 32) => { pmpWriteCfgReg(15, value); Some(pmpReadCfgReg(15))}, // pmpcfg15,
+


Suggested change

jrtc27 · 2022-06-29T17:23:44Z

model/riscv_csr_map.sail

+mapping clause csr_name_map = 0x3ED <-> "pmpaddr61"
+mapping clause csr_name_map = 0x3EE <-> "pmpaddr62"
+mapping clause csr_name_map = 0x3EF <-> "pmpaddr63"
+


Suggested change

github-actions · 2022-06-29T20:41:49Z

Unit Test Results

712 tests ±0 712 ✔️ ±0 0s ⏱️ ±0s
    6 suites ±0     0 💤 ±0
    1 files ±0     0 ❌ ±0

Results for commit cf411dc. ± Comparison against base commit 5fce6fb.

♻️ This comment has been updated with latest results.

Abdulwadoodd · 2022-06-30T10:06:29Z

Resolved the formatting issues, empty lines and duplications

Abdulwadoodd · 2022-07-14T12:27:51Z

Hello @jrtc27 @martinberger I have tested the updated SAIL model by writing tests that contain pmpcfg[4,15] and pmpaddr[16,63]. And SAIL is giving the expected result. Is there anything else to do before merging this PR?

scottj97 · 2022-07-14T18:06:56Z

@Abdulwadoodd please squash the fixes back into the first commit, instead of adding a new commit to clean up the earlier one.

Abdulwadoodd · 2022-07-15T10:13:39Z

Hi @scottj97, I have squashed the changes into a single (earlier) commit.

jrtc27

Commit message is wrong, PMP configuration and address CSRs already exist, just not the newer additional ones

jrtc27 · 2022-09-01T19:29:31Z

model/riscv_pmp_control.sail

+ Machine  => true,
+ _  => false


Don't reformat this

jrtc27 · 2022-09-01T19:30:31Z

model/riscv_pmp_regs.sail

+ pmp17cfg = pmpWriteCfg(pmp17cfg, v[15..8]);
+ pmp18cfg = pmpWriteCfg(pmp18cfg, v[23..16]);
+ pmp19cfg = pmpWriteCfg(pmp19cfg, v[31..24]);
+ pmp20cfg = pmpWriteCfg(pmp19cfg, v[39..32]);


Lots of copy/paste errors in these

…d address CSRs

Abdulwadoodd · 2022-09-01T20:09:14Z

Commit message updated

ptomsich · 2023-05-29T19:32:20Z

This PR has no activity for almost 9 months.
Please help to update its status:

@jrtc27 Have the style issues been sufficiently addressed?
@Abdulwadoodd Please rebase onto master, so this applies without conflicts!

jrtc27 · 2023-05-29T19:33:17Z

Style looks fine

ptomsich · 2023-05-30T11:54:40Z

Open questions from the golden-model meeting:

@Abdulwadoodd Are you still maintaining this PR? Can you provide an ETA for rebasing this?

Abdulwadoodd · 2023-05-30T12:55:51Z

@ptomsich, thanks for the reminder. I will rebase it by 2nd June.

ptomsich · 2023-05-30T12:58:11Z

@Abdulwadoodd Thanks for the update! I'll keep this in the queue, so we can move it forward shortly thereafter.
@billmcspadden-riscv As discussed, please review the new version (once it comes in) for correctness relative to the specification!

martinberger · 2023-09-20T19:45:03Z

I will rebase it by 2nd June.

Hello @Abdulwadoodd , any updates on this?

Timmmm · 2023-10-23T09:33:13Z

Since the PMP CSR addresses are nicely aligned, you can somewhat reduce the crazy amount of copy and pasting like this:

readCSR:
    (0b001111 @ idx : bits(6),  _) => pmpReadAddrReg(unsigned(idx)),
...
register pmpaddr  : vec(64, dec, xlenbits)
...
function pmpReadAddrReg(n : range(0, 63)) -> xlenbits = {
   ...
}

(pmpReadAddrReg is needed anyway to support PMP grain, which we have implemented an plan to upstream.)

Timmmm · 2023-10-23T10:53:51Z

In fact maybe hold off on this. I have implemented the approach I mentioned above which means adding support for 64 PMPs is a 1 line change instead of a gazillion line copy/paste. I'll try to send a PR soon.

Abdulwadoodd · 2024-02-14T10:52:58Z

It is completed by #350.

jrtc27 reviewed Jun 29, 2022

View reviewed changes

Abdulwadoodd force-pushed the master branch from 009f758 to cf411dc Compare July 15, 2022 10:11

Abdulwadoodd mentioned this pull request Jul 15, 2022

Spike throws exception on PMP CSR access riscv-software-src/riscv-isa-sim#1046

Closed

Abdulwadoodd requested a review from jrtc27 September 1, 2022 18:44

jrtc27 reviewed Sep 1, 2022

View reviewed changes

Fixed riscv#165: Added support of new additional PMP configuration an…

a087234

…d address CSRs

Abdulwadoodd force-pushed the master branch from cf411dc to a087234 Compare September 1, 2022 20:03

Abdulwadoodd requested a review from jrtc27 September 1, 2022 20:11

Abdulwadoodd changed the title ~~Added support of PMP configuration and address CSRs~~ Added support of newer additional PMP configuration and address CSRs Sep 2, 2022

ptomsich added tgmm-agenda Tagged for the next Golden Model meeting agenda. and removed tgmm-agenda Tagged for the next Golden Model meeting agenda. labels May 29, 2023

Abdulwadoodd closed this Feb 14, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added support of newer additional PMP configuration and address CSRs #168

Added support of newer additional PMP configuration and address CSRs #168

Abdulwadoodd commented Jun 29, 2022

Abdulwadoodd commented Jun 29, 2022

jrtc27 left a comment

jrtc27 Jun 29, 2022

jrtc27 Jun 29, 2022

jrtc27 Jun 29, 2022

jrtc27 Jun 29, 2022

jrtc27 Jun 29, 2022

jrtc27 Jun 29, 2022

github-actions bot commented Jun 29, 2022 •

edited

Loading

Abdulwadoodd commented Jun 30, 2022

Abdulwadoodd commented Jul 14, 2022 •

edited

Loading

scottj97 commented Jul 14, 2022

Abdulwadoodd commented Jul 15, 2022

jrtc27 left a comment

jrtc27 Sep 1, 2022

Abdulwadoodd Sep 1, 2022

jrtc27 Sep 1, 2022

Abdulwadoodd Sep 1, 2022

Abdulwadoodd commented Sep 1, 2022

ptomsich commented May 29, 2023

jrtc27 commented May 29, 2023

ptomsich commented May 30, 2023

Abdulwadoodd commented May 30, 2023 •

edited

Loading

ptomsich commented May 30, 2023

martinberger commented Sep 20, 2023

Timmmm commented Oct 23, 2023

Timmmm commented Oct 23, 2023

Abdulwadoodd commented Feb 14, 2024

Added support of newer additional PMP configuration and address CSRs #168

Added support of newer additional PMP configuration and address CSRs #168

Conversation

Abdulwadoodd commented Jun 29, 2022

Abdulwadoodd commented Jun 29, 2022

jrtc27 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Jun 29, 2022 • edited Loading

Unit Test Results

Abdulwadoodd commented Jun 30, 2022

Abdulwadoodd commented Jul 14, 2022 • edited Loading

scottj97 commented Jul 14, 2022

Abdulwadoodd commented Jul 15, 2022

jrtc27 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Abdulwadoodd commented Sep 1, 2022

ptomsich commented May 29, 2023

jrtc27 commented May 29, 2023

ptomsich commented May 30, 2023

Abdulwadoodd commented May 30, 2023 • edited Loading

ptomsich commented May 30, 2023

martinberger commented Sep 20, 2023

Timmmm commented Oct 23, 2023

Timmmm commented Oct 23, 2023

Abdulwadoodd commented Feb 14, 2024

github-actions bot commented Jun 29, 2022 •

edited

Loading

Abdulwadoodd commented Jul 14, 2022 •

edited

Loading

Abdulwadoodd commented May 30, 2023 •

edited

Loading