Merge branch 'main' into fmul_branch

Author: ShashankVM

.github/workflows/deploy.yml

@@ -316,6 +316,38 @@ jobs:
         with:
           name: ac200-crd
           path: gen/proc_crd/pdf/AC200-CRD.pdf
+  build-rvi20-32-crd:
+    if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone Github Repo Action
+        uses: actions/checkout@v4
+      - name: singularity setup
+        uses: ./.github/actions/singularity-setup
+      - name: Generate RVI20-32 CRD
+        run: ./do gen:proc_crd_pdf[RVI20-32]
+      - name: Upload RVI20-32 CRD
+        uses: actions/upload-artifact@v4
+        if: (github.event_name == 'push') && (github.ref_name == 'main')
+        with:
+          name: rvi20-32-crd
+          path: gen/proc_crd/pdf/RVI20-32-CRD.pdf
+  build-rvi20-64-crd:
+    if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone Github Repo Action
+        uses: actions/checkout@v4
+      - name: singularity setup
+        uses: ./.github/actions/singularity-setup
+      - name: Generate RVI20-64 CRD
+        run: ./do gen:proc_crd_pdf[RVI20-64]
+      - name: Upload RVI20-64 CRD
+        uses: actions/upload-artifact@v4
+        if: (github.event_name == 'push') && (github.ref_name == 'main')
+        with:
+          name: rvi20-64-crd
+          path: gen/proc_crd/pdf/RVI20-64-CRD.pdf
   build-mc100-32-crd:
     if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
     runs-on: ubuntu-latest

.github/workflows/pages.yml

@@ -148,6 +148,20 @@ jobs:
           path: _site/pdfs
           github-token: ${{ secrets.GITHUB_TOKEN }}
           run-id: ${{ github.event.workflow_run.id }}
+      - name: Download RVI20-32-CRD
+        uses: actions/download-artifact@v5
+        with:
+          name: RVI20-32-crd
+          path: _site/pdfs
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
+      - name: Download RVI20-64-CRD
+        uses: actions/download-artifact@v5
+        with:
+          name: RVI20-64-crd
+          path: _site/pdfs
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
       - name: Download MC100-32
         uses: actions/download-artifact@v5
         with:

Rakefile

@@ -546,6 +546,8 @@ task "RVI20-32-CTP": "#{$root}/gen/proc_ctp/pdf/RVI20-32-CTP.pdf"
 task "RVI20-64-CTP": "#{$root}/gen/proc_ctp/pdf/RVI20-64-CTP.pdf"
 task "MC100-32-CTP": "#{$root}/gen/proc_ctp/pdf/MC100-32-CTP.pdf"
 task "MC100-32-CTP-HTML": "#{$root}/gen/proc_ctp/pdf/MC100-32-CTP.html"
+task "RVI20-32-CRD": "#{$root}/gen/proc_crd/pdf/RVI20-32-CRD.pdf"
+task "RVI20-64-CRD": "#{$root}/gen/proc_crd/pdf/RVI20-64-CRD.pdf"
 task "MC100-32-CRD": "#{$root}/gen/proc_crd/pdf/MC100-32-CRD.pdf"
 task "MC100-64-CRD": "#{$root}/gen/proc_crd/pdf/MC100-64-CRD.pdf"
 task "MC200-32-CRD": "#{$root}/gen/proc_crd/pdf/MC200-32-CRD.pdf"

bin/setup

@@ -209,55 +209,21 @@ if [[ ! -z "$DEVELOPMENT" && $DEVELOPMENT -eq 1 ]]; then
     fi
 fi
 
-if [ "${CONTAINER_TYPE}" == "devcontainer" ]; then
-    BUNDLE="bundle"
-    RUBY="bundle exec ruby"
-    RAKE="bundle exec rake"
-    NPM="npm"
-    NPX="npx"
-    NODE="node"
-    PYTHON="/opt/venv/bin/python3"
-    PIP="/opt/venv/bin/pip"
-    BASH="bash"
-    GPP="g++"
-    GDB="gdb"
-    CLANG_FORMAT="clang-format"
-    CLANG_TIDY="clang-tidy"
-    MAKE="make"
-elif [ "${CONTAINER_TYPE}" == "docker" -o "${CONTAINER_TYPE}" == "podman" ]; then
-    BUNDLE="${CONTAINER_BASE} bundle"
-    RUBY="${CONTAINER_BASE} bundle exec ruby"
-    RAKE="${CONTAINER_BASE} bundle exec rake"
-    NPM="${CONTAINER_BASE} npm"
-    NPX="${CONTAINER_BASE} npx"
-    NODE="${CONTAINER_BASE} node"
-    PYTHON="${CONTAINER_BASE} /opt/venv/bin/python3"
-    PIP="${CONTAINER_BASE} /opt/venv/bin/pip"
-    BASH="${CONTAINER_BASE} bash"
-    GPP="${CONTAINER_BASE} g++"
-    GDB="${CONTAINER_BASE} gdb"
-    CLANG_FORMAT="${CONTAINER_BASE} clang-format"
-    CLANG_TIDY="${CONTAINER_BASE} clang-tidy"
-    MAKE="${CONTAINER_BASE} make"
-elif [ "${CONTAINER_TYPE}" == "singularity" ]; then
-    BUNDLE="singularity run ${HOME_OPT} ${CONTAINER_PATH} bundle"
-    RUBY="singularity run ${HOME_OPT} ${CONTAINER_PATH} bundle exec ruby"
-    RAKE="singularity run ${HOME_OPT} ${CONTAINER_PATH} bundle exec rake"
-    NPM="singularity run ${HOME_OPT} ${CONTAINER_PATH} npm"
-    NPX="singularity run ${HOME_OPT} ${CONTAINER_PATH} npx"
-    NODE="singularity run ${HOME_OPT} ${CONTAINER_PATH} node"
-    PYTHON="singularity run ${HOME_OPT} ${CONTAINER_PATH} /opt/venv/bin/python3"
-    PIP="singularity run ${HOME_OPT} ${CONTAINER_PATH} /opt/venv/bin/pip"
-    BASH="singularity run ${HOME_OPT} ${CONTAINER_PATH} bash"
-    GPP="singularity run ${HOME_OPT} ${CONTAINER_PATH} g++"
-    GDB="singularity run ${HOME_OPT} ${CONTAINER_PATH} gdb"
-    CLANG_FORMAT="singularity run ${HOME_OPT} ${CONTAINER_PATH} clang-format"
-    CLANG_TIDY="singularity run ${HOME_OPT} ${CONTAINER_PATH} clang-tidy"
-    MAKE="singularity run ${HOME_OPT} ${CONTAINER_PATH} make"
-else
-    echo "Bad container type: ${CONTAINER_TYPE}" 1>&2
-    exit 1
-fi
+# Set executables
+BUNDLE="${RUN} bundle"
+RUBY="${RUN} bundle exec ruby"
+RAKE="${RUN} bundle exec rake"
+NPM="${RUN} npm"
+NPX="${RUN} npx"
+NODE="${RUN} node"
+PYTHON="${RUN} /opt/venv/bin/python3"
+PIP="${RUN} /opt/venv/bin/pip"
+BASH="${RUN} bash"
+GPP="${RUN} g++"
+GDB="${RUN} gdb"
+CLANG_FORMAT="${RUN} clang-format"
+CLANG_TIDY="${RUN} clang-tidy"
+MAKE="${RUN} make"
 
 git config --local commit.template ${ROOT}/.gitmessage
 

spec/std/isa/ext/Svade.yaml

@@ -7,7 +7,7 @@ $schema: "ext_schema.json#"
 kind: extension
 name: Svade
 long_name: Exception on PTE A/D Bits
-type: unprivileged
+type: privileged
 description: |
   The Svade extension indicates that hardware does *not* update the A/D bits of a page table
   during a page walk. Rather, encountering a PTE with the A bit clear or the D bit clear when

spec/std/isa/ext/Svadu.yaml

@@ -7,7 +7,7 @@ $schema: "ext_schema.json#"
 kind: extension
 name: Svadu
 long_name: Hardware Updating of PTE A/D Bits
-type: unprivileged
+type: privileged
 description: |
   The Svadu extension adds support and CSR controls for hardware updating of PTE
   A/D bits. The A and D bits are managed by these extensions as follows:

tools/scripts/pages.html.erb

@@ -98,14 +98,16 @@
         <div class="col">
           <h3>CSC CRDs (Certification Requirements Documents)</h3>
           <ul>
-            <li><a href="<%= ENV["PAGES_URL"] %>/pdfs/AC100-CRD.pdf">AC100 CRD (based on RVB23)</a></li>
-            <li><a href="<%= ENV["PAGES_URL"] %>/pdfs/AC200-CRD.pdf">AC200 CRD (based on RVA23)</a></li>
+            <li><a href="<%= ENV["PAGES_URL"] %>/pdfs/RVI20-32-CRD.pdf">RVI20-32 CRD</a></li>
+            <li><a href="<%= ENV["PAGES_URL"] %>/pdfs/RVI20-64-CRD.pdf">RVI20-64 CRD</a></li>
             <li><a href="<%= ENV["PAGES_URL"] %>/pdfs/MC100-32-CRD.pdf">MC100-32 CRD</a></li>
             <li><a href="<%= ENV["PAGES_URL"] %>/pdfs/MC100-64-CRD.pdf">MC100-64 CRD</a></li>
             <li><a href="<%= ENV["PAGES_URL"] %>/pdfs/MC200-32-CRD.pdf">MC200-32 CRD</a></li>
             <li><a href="<%= ENV["PAGES_URL"] %>/pdfs/MC200-64-CRD.pdf">MC200-64 CRD</a></li>
             <li><a href="<%= ENV["PAGES_URL"] %>/pdfs/MC300-32-CRD.pdf">MC300-32 CRD</a></li>
             <li><a href="<%= ENV["PAGES_URL"] %>/pdfs/MC300-64-CRD.pdf">MC300-64 CRD</a></li>
+            <li><a href="<%= ENV["PAGES_URL"] %>/pdfs/AC100-CRD.pdf">AC100 CRD (based on RVB23)</a></li>
+            <li><a href="<%= ENV["PAGES_URL"] %>/pdfs/AC200-CRD.pdf">AC200 CRD (based on RVA23)</a></li>
           </ul>
         </div>
       </div>