feat: add sie and scountinhibit CSRs #958

sudo-apt-abdullah · 2025-08-07T07:05:27Z

Closes #563

spec/std/isa/csr/scountinhibit.yaml

spec/std/isa/csr/sie.yaml

spec/std/isa/csr/scountinhibit.yaml

dhower-qc · 2025-08-08T14:34:13Z

spec/std/isa/csr/scountinhibit.yaml

+      [when="COUNTINHIBIT_EN[3] == true"]
+      When bit is set `hpmcounter3.COUNT` does not increment; when 0, it increments normally.
+
+      [when="COUNTINHIBIT_EN[3] == false"]
+      Since hpmcounter3 is not implemented, this field is read-only zero.


These [when ..] tags are deprecated. Instead, use:

description: - id: csr-field-hpmcounter3.COUNT-set-effect normative: true when: param: name: COUNTINHIBIT_EN index: 3 value: true text: | When bit is set `hpmcounter3.COUNT` does not increment; when 0, `hpmcounter3.COUNT` increments normally.

and similar for the false case

(this depends on #891)

At the moment, the schema doesn’t support this, but I went ahead and used it anyway. Please let me know if any improvements are needed.

You may need to rebase your branch on #891 for the CI to pass when we get to that point.

spec/std/isa/csr/sie.yaml

spec/std/isa/csr/scountinhibit.yaml

ThinkOpenly · 2025-08-08T20:56:20Z

spec/std/isa/csr/sie.yaml

Do we need to define a field(s) for the "other" interrupt enable bits, that are for "platform use"? PR #910 depends on that, since it's defining CSR sieh, the high-order bits of sie.

Tbh I'm not sure, but since spec doesn’t define any standard bits in sieh and their semantics are platform-specific, I believe there's no need to define explicit fields. Instead, we could just model it as a single value field, with a note that these bits are reserved for platform use:

fields: VALUE: location_rv32: 31-0 description: | The base spec doesn’t define any standard bits in sieh, those upper interrupt enables are reserved for platform use.

Let me know if I’m overlooking something!

One complication is that sieh needs to serve as an alias for the high-order bits of sie, although it looks like there is a precedent:

spec/std/isa/csr/Zihpm/hpmcounter26h.yaml: alias: mhpmcounter26h.COUNT[63:32]

So, you can move forward with that approach.

I believe, putting alias: sie[63:32] in sieh.yaml file will be a right thing to do? Let me know if I'm overlooking or something needs to be added in sie.yaml.

I don't see sieh.yaml in the PR. Were you planning on adding that?

It's already in #910. Let me know if I'm supposed to add it in this PR, thanks!

Oh, there is no sieh definition yet, waiting on #910 to be merged. I see. Do you want to wait for #891 and #910, then? :-)

Perfectly fine for me :)

spec/std/isa/csr/scountinhibit.yaml

ThinkOpenly

Note that to realize the layout results (to generate scountinhibit.yaml), you'll need to add a new stanza in /Rakefile. There are examples there already, but ask if you need some help.

spec/std/isa/csr/scountinhibit.layout

sudo-apt-abdullah · 2025-08-26T09:58:40Z

Note that to realize the layout results (to generate scountinhibit.yaml), you'll need to add a new stanza in /Rakefile. There are examples there already, but ask if you need some help.

Thanks for guidance! I've added that as well, please have a look and let me know if something is wrong, thank!

spec/std/isa/csr/scountinhibit.yaml

ThinkOpenly

We're getting close enough to revisit indentation and minor details. :-)

spec/std/isa/csr/scountinhibit.layout

spec/std/isa/csr/sie.yaml

spec/std/isa/csr/scountinhibit.layout

ThinkOpenly · 2025-08-26T14:05:53Z

spec/std/isa/csr/scountinhibit.yaml

+      [when="COUNTINHIBIT_EN[3] == true"]
+      When bit is set `hpmcounter3.COUNT` does not increment; when 0, it increments normally.
+
+      [when="COUNTINHIBIT_EN[3] == false"]
+      Since hpmcounter3 is not implemented, this field is read-only zero.


You may need to rebase your branch on #891 for the CI to pass when we get to that point.

spec/std/isa/csr/scountinhibit.yaml

This is this initial PR; after this merges with main, we should start seeing coverage status checks on subsequent PRs. Initially, this has the following thresholds: - No more than a 1% drop in coverage overall. - At least 90% coverage on any new code in a patch

Should fix the deployment

In (riscv-software-src#686), a new instruction schema was created for types/subtypes. This commit change B/andn instruction to use the new schema. It is also part of effort in (riscv-software-src#655). --------- Signed-off-by: Usman Akinyemi <[email protected]>

…cv-software-src#858) Fixes riscv-software-src#777.

Fixes riscv-software-src#820

…ftware-src#856) PR riscv-software-src#797 refactored a number of things, including encapulating the "Architecture" class in a "Udb" module. `isa_explorer.rb` has a few places where that needs to be accommondated which were missed in riscv-software-src#855.

…src#1004) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.18.8 to 1.18.9. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/sparklemotion/nokogiri/releases">nokogiri's releases</a>.</em></p> <blockquote> <h2>v1.18.9 / 2025-07-20</h2> <h3>Security</h3> <ul> <li>[CRuby] Applied upstream libxml2 patches to address CVE-2025-6021, CVE-2025-6170, CVE-2025-49794, CVE-2025-49795, and CVE-2025-49796. See <a href="https://github.com/sparklemotion/nokogiri/security/advisories/GHSA-353f-x4gh-cqq8">GHSA-353f-x4gh-cqq8</a> for more information.</li> </ul>  <pre><code>5bcfdf7aa8d1056a7ad5e52e1adffc64ef53d12d0724fbc6f458a3af1a4b9e32 nokogiri-1.18.9-aarch64-linux-gnu.gem 55e9e6ca46c4ad1715e313f407d8481d15be1e3b65d9f8e52ba1c124d01676a7 nokogiri-1.18.9-aarch64-linux-musl.gem eea3f1f06463ff6309d3ff5b88033c4948d0da1ab3cc0a3a24f63c4d4a763979 nokogiri-1.18.9-arm64-darwin.gem fe611ae65880e445a9c0f650d52327db239f3488626df4173c05beafd161d46e nokogiri-1.18.9-arm-linux-gnu.gem 935605e14c0ba17da18d203922440bf6c0676c602659278d855d4622d756a324 nokogiri-1.18.9-arm-linux-musl.gem ac5a7d93fd0e3cef388800b037407890882413feccca79eb0272a2715a82fa33 nokogiri-1.18.9.gem 1fe5b7aa4a054eda689a969bb4e03999960a6ea806582d327207d687168bceb5 nokogiri-1.18.9-java.gem 6b4fc1523aa0370c78653e38c94cb50e7f3ab786425de66ba7ad24222c1164a3 nokogiri-1.18.9-x64-mingw-ucrt.gem e0d2deb03d3d7af8016e8c9df5ff4a7d692159cefb135cbb6a4109f265652348 nokogiri-1.18.9-x86_64-darwin.gem b52f5defedc53d14f71eeaaf990da66b077e1918a2e13088b6a96d0230f44360 nokogiri-1.18.9-x86_64-linux-gnu.gem e69359d6240c17e64cc9f43970d54f13bfc7b8cc516b819228f687e953425e69 nokogiri-1.18.9-x86_64-linux-musl.gem </code></pre>  </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md">nokogiri's changelog</a>.</em></p> <blockquote> <h2>v1.18.9 / 2025-07-20</h2> <h3>Security</h3> <ul> <li>[CRuby] Applied upstream libxml2 patches to address CVE-2025-6021, CVE-2025-6170, CVE-2025-49794, CVE-2025-49795, and CVE-2025-49796. See <a href="https://github.com/sparklemotion/nokogiri/security/advisories/GHSA-353f-x4gh-cqq8">GHSA-353f-x4gh-cqq8</a> for more information.</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/sparklemotion/nokogiri/commit/1dcd8ce30365ebd4620a3b823bf806b127eeefc3"><code>1dcd8ce</code></a> version bump to v1.18.9</li> <li><a href="https://github.com/sparklemotion/nokogiri/commit/a05d2b44b930072af70dad12bddbac67f36c6f90"><code>a05d2b4</code></a> Apply upstream patches to address multiple vulnerabilities (<a href="https://redirect.github.com/sparklemotion/nokogiri/issues/3526">#3526</a>)</li> <li><a href="https://github.com/sparklemotion/nokogiri/commit/947a55e87edff3c6d76ffd81f07da728e67c9b82"><code>947a55e</code></a> Apply upstream patches to address multiple vulnerabilities</li> <li>See full diff in <a href="https://github.com/sparklemotion/nokogiri/compare/v1.18.8...v1.18.9">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=nokogiri&package-manager=bundler&previous-version=1.18.8&new-version=1.18.9)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/riscv-software-src/riscv-unified-db/network/alerts). </details> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Derek Hower <[email protected]>

…cv-software-src#1007)

…1010)

…e-src#984) Fixes problem where backticks showed up in red in PDFs: <img width="156" height="23" alt="image" src="https://github.com/user-attachments/assets/5c54e238-5357-42dc-aa35-64bb57b9489a" /> now looks like: <img width="163" height="27" alt="image" src="https://github.com/user-attachments/assets/a92626de-6de1-4df1-bca1-e8f0ae3fef2f" /> --------- Signed-off-by: Derek Hower <[email protected]> Co-authored-by: Paul Clarke <[email protected]>

The mstatus.VS field was incorrectly written with the value of the FS field from a CSR write. Update it to use the VS field as expected. Signed-off-by: Jordan Carlin <[email protected]>

…-src#1005) Added YAML specification for Ssdbltrp extension version 1.0.0. Just definition part :) Related to issue riscv-software-src#212 Signed-off-by: Sukuna0007Abhi <[email protected]>

…re-src#1014) Makes it look like this (template stuff will be replaced in deploy flow): <img width="1385" height="805" alt="image" src="https://github.com/user-attachments/assets/4e5d973a-6b20-4c75-a352-63aa3fdd44de" />

…oftware-src#1027) The ADUE field type() logic was backwards in all environment configuration CSRs. Fixed logic: - When Svadu IS implemented ADUE field is Read-Write (software control) - When Svadu is NOT implemented ADUE field is Read-Only-0 (hardwired) Closes riscv-software-src#1026 Signed-off-by: Sukuna0007Abhi <[email protected]>

The ratified version of the Sstc extension is 1.0.0, not 0.9.0. Discovered while creating a UDB configuration for [CVW](github.com/openhwgroup/cvw). --------- Signed-off-by: Jordan Carlin <[email protected]>

…v-software-src#1017) Removes unnecessary "type" from schema definition when a "const" is declared. This prevents problem where code using the jsonschema makes the type mandatory like here: riscv-software-src#636 fixes riscv-software-src#1015 Signed-off-by: Kevin Broch <[email protected]>

) If ruby code uses the "type" to decide the type, then this turns this optional keyword in json schema into a mandatory one. Remove "type" from JSON schema when "enum" present. fixes riscv-software-src#1016 Signed-off-by: Kevin Broch <[email protected]>

@rpsene

…iscv-software-src#1028) - Change default behavior to always recreate .bundle/config - Users will now always get configuration updates - Add --preserve-config option for backward compatibility - Add --help option for usage information - Fix argument processing conflicts when script is sourced by other tools - Prioritizes reliability over performance concerns - Addresses overly cautious guard that prevented config updates - Uses sir @rpsene's argument parsing approach with improved defaults Fixes riscv-software-src#980 Ready for Review sir @ThinkOpenly sir @dhower-qc sir @christian-herber-nxp --------- Signed-off-by: Sukuna0007Abhi <[email protected]> Signed-off-by: GitHub <[email protected]>

sudo-apt-abdullah · 2025-08-27T11:35:46Z

I forgot to include the generated file initially, but I’ve pushed it now. I also attempted to rebase on PR #891, but things are getting a bit messy and I’m not sure if I did it correctly. Should I undo the rebase and go back to my last commit? I’m fine waiting for PR #891 to merge first.

ThinkOpenly · 2025-08-27T14:58:27Z

I also attempted to rebase on PR #891, but things are getting a bit messy and I’m not sure if I did it correctly. Should I undo the rebase and go back to my last commit? I’m fine waiting for PR #891 to merge first.

Agree it looks messy. It's not quite what I expected. When looking at the commit history, I expected to see the commits from #891 and then your 7 or so commits on top, but they're scattered. It's up to you if you want to wait. I'm not aware of anyone actively waiting for these CSR definitions. #891 may take a while to land, though.

sudo-apt-abdullah · 2025-08-27T15:01:41Z

Agree it looks messy. It's not quite what I expected. When looking at the commit history, I expected to see the commits from #891 and then your 7 or so commits on top, but they're scattered. It's up to you if you want to wait. I'm not aware of anyone actively waiting for these CSR definitions. #891 may take a while to land, though.

I'm fine with waiting for #891 to land :)

sudo-apt-abdullah · 2025-08-28T09:58:54Z

@ThinkOpenly, I messed up something I believe and going to close this PR, and will open a clean PR again for this shortly.

dhower-qc added 6 commits July 3, 2025 13:22

feat(idl): add constraints to IDL

bc76954

feat: add mock spec to udb gem for testing, add Condition classes

60f2054

docs: document schema conditions and idl implications

6928ad8

refactor: move parameters into their own YAML files

19c9d58

feat: wip

345b441

feat: wip

0db0e7c

sudo-apt-abdullah requested review from ThinkOpenly and dhower-qc as code owners August 7, 2025 07:05

sudo-apt-abdullah mentioned this pull request Aug 7, 2025

Add missing S CSRs #563

Open

dhower-qc requested changes Aug 7, 2025

View reviewed changes

spec/std/isa/csr/scountinhibit.yaml Outdated Show resolved Hide resolved

spec/std/isa/csr/scountinhibit.yaml Show resolved Hide resolved

spec/std/isa/csr/sie.yaml Show resolved Hide resolved

dhower-qc requested changes Aug 8, 2025

View reviewed changes

dhower-qc changed the title ~~docs(S csr): sie and scountinhibit - issue #563~~ feat: sie and scountinhibit CSRs Aug 8, 2025

ThinkOpenly reviewed Aug 8, 2025

View reviewed changes

ThinkOpenly mentioned this pull request Aug 8, 2025

Add Smaia/Ssaia (Advanced Interrupt Architecture) support #910

Closed

ThinkOpenly reviewed Aug 8, 2025

View reviewed changes

spec/std/isa/csr/scountinhibit.yaml Show resolved Hide resolved

ThinkOpenly changed the title ~~feat: sie and scountinhibit CSRs~~ feat: add sie and scountinhibit CSRs Aug 8, 2025

ThinkOpenly requested changes Aug 25, 2025

View reviewed changes

spec/std/isa/csr/scountinhibit.layout Outdated Show resolved Hide resolved

spec/std/isa/csr/scountinhibit.layout Outdated Show resolved Hide resolved

ThinkOpenly requested changes Aug 26, 2025

View reviewed changes

spec/std/isa/csr/scountinhibit.yaml Outdated Show resolved Hide resolved

ThinkOpenly requested changes Aug 26, 2025

View reviewed changes

sudo-apt-abdullah force-pushed the issue_563 branch from 208fd14 to 2691617 Compare August 27, 2025 10:20

sudo-apt-abdullah requested a review from adingank-qualcomm as a code owner August 27, 2025 10:20

sudo-apt-abdullah force-pushed the issue_563 branch from 2691617 to 208fd14 Compare August 27, 2025 10:36

dhower-qc and others added 7 commits August 27, 2025 10:40

fix: paths for CTP, isa_explorer, and deploy (riscv-software-src#855)

6de66ce

Should fix the deployment

fix(data): fix cases where GPR register file used instead of FPR (ris…

9eee064

…cv-software-src#858) Fixes riscv-software-src#777.

fix(data): convert more old register names (riscv-software-src#857)

b9d8cc7

Fixes riscv-software-src#820

fix(data): rename operands to match Sail (riscv-software-src#859)

0a33856

dhower-qc and others added 21 commits August 27, 2025 11:10

fix(ci): add github token to artifact download (riscv-software-src#1003)

73cfedb

fix(ci): correct file paths in deployment (riscv-software-src#1006)

db2ea2a

fix(ci): correct isa explorer artifact names in pages deployment (ris…

c750415

…cv-software-src#1007)

fix(ci): actually read the pages html template (riscv-software-src#1008)

94bb0f6

fix(ci): add missing require for index.html step (riscv-software-src#…

af5aaf5

…1010)

fix(ci): correct pages path for isa explorer (riscv-software-src#1012)

5040862

fix(ci): paths from pages (riscv-software-src#1013)

347a2ed

fix(data): support FLI.H on Zfa + [Zfh | Zvfh] (riscv-software-src#957)

eba8189

fix: use VS field when updating mstatus.VS (riscv-software-src#999)

d67d8c8

The mstatus.VS field was incorrectly written with the value of the FS field from a CSR write. Update it to use the VS field as expected. Signed-off-by: Jordan Carlin <[email protected]>

feat: add Ssdbltrp (Double Trap) extension definition (riscv-software…

c865658

…-src#1005) Added YAML specification for Ssdbltrp extension version 1.0.0. Just definition part :) Related to issue riscv-software-src#212 Signed-off-by: Sukuna0007Abhi <[email protected]>

added a new stanza in /Rakefile to generate scountinhibit.yaml

a23fb81

fixed the typo

e98b5c2

fix: ratified version of Sstc is 1.0.0 (riscv-software-src#1001)

9160da8

The ratified version of the Sstc extension is 1.0.0, not 0.9.0. Discovered while creating a UDB configuration for [CVW](github.com/openhwgroup/cvw). --------- Signed-off-by: Jordan Carlin <[email protected]>

fixed indentations and minor issues

d5de362

sudo-apt-abdullah force-pushed the issue_563 branch from 208fd14 to ffc4f01 Compare August 27, 2025 11:15

sudo-apt-abdullah changed the base branch from main to param_dep August 27, 2025 11:23

sudo-apt-abdullah changed the base branch from param_dep to main August 27, 2025 15:02

sudo-apt-abdullah force-pushed the issue_563 branch from ffc4f01 to d5de362 Compare August 27, 2025 17:45

sudo-apt-abdullah closed this Aug 28, 2025

feat: add sie and scountinhibit CSRs #958

feat: add sie and scountinhibit CSRs #958

Uh oh!

Conversation

sudo-apt-abdullah commented Aug 7, 2025 • 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!

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!

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!

sudo-apt-abdullah Aug 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

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!

Uh oh!

ThinkOpenly left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

sudo-apt-abdullah commented Aug 26, 2025

Uh oh!

Uh oh!

ThinkOpenly 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!

sudo-apt-abdullah commented Aug 27, 2025

Uh oh!

ThinkOpenly commented Aug 27, 2025

Uh oh!

sudo-apt-abdullah commented Aug 27, 2025

Uh oh!

sudo-apt-abdullah commented Aug 28, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

21 participants

sudo-apt-abdullah commented Aug 7, 2025 •

edited

Loading

sudo-apt-abdullah Aug 25, 2025 •

edited

Loading