Merge branch 'main' into fixDefined

Author: AFOliveira

.github/workflows/pages.yml

@@ -71,14 +71,22 @@ jobs:
         run: ./do gen:profile[RVI20]
       - name: Copy RVI20 Profile Release PDF
         run: cp gen/profile_doc/pdf/RVA20.pdf _site/pdfs/RVI20.pdf
-      - name: Create MC100 PDF Spec
-        run: ./do gen:cert_model_pdf[MC100]
-      - name: Copy MC100 PDF
-        run: cp gen/certificate_doc/pdf/MC100.pdf _site/pdfs/MC100.pdf
-      - name: Create MC100 HTML Spec
-        run: ./do gen:cert_model_html[MC100]
-      - name: Copy MC100 HTML
-        run: cp gen/certificate_doc/html/MC100.html _site/htmls/MC100.html
+      - name: Create MC100-32 PDF Spec
+        run: ./do gen:cert_model_pdf[MC100-32]
+      - name: Copy MC100-32 PDF
+        run: cp gen/certificate_doc/pdf/MC100-32.pdf _site/pdfs/MC100-32.pdf
+      - name: Create MC100-32 HTML Spec
+        run: ./do gen:cert_model_html[MC100-32]
+      - name: Copy MC100-32 HTML
+        run: cp gen/certificate_doc/html/MC100-32.html _site/htmls/MC100-32.html
+      - name: Create MC100-64 PDF Spec
+        run: ./do gen:cert_model_pdf[MC100-64]
+      - name: Copy MC100-64 PDF
+        run: cp gen/certificate_doc/pdf/MC100-64.pdf _site/pdfs/MC100-64.pdf
+      - name: Create MC100-64 HTML Spec
+        run: ./do gen:cert_model_html[MC100-64]
+      - name: Copy MC100-64 HTML
+        run: cp gen/certificate_doc/html/MC100-64.html _site/htmls/MC100-64.html
       - name: Copy manual html
         run: cp -R gen/manual/isa/top/all/html _site/manual
       - name: Setup Pages

.gitignore

@@ -14,3 +14,4 @@ gen
 node_modules
 _site
 images
+*.log

.pre-commit-config.yaml

@@ -1,5 +1,7 @@
 ---
 exclude: ^docs/ruby/ # All generated code
+default_language_version:
+  python: python3.12
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -55,3 +57,13 @@ repos:
       #   alias: check-jsonschema-manual-version
       #   files: ^arch/manual/.*\.(yaml|yml)$
       #   args: ["--schemafile", "schemas/manual_version_schema.json"]
+
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 24.8.0
+    hooks:
+      - id: black
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.19.1
+    hooks:
+      - id: pyupgrade

.vscode/launch.json

@@ -3,7 +3,25 @@
   "configurations": [
     {
       "type": "rdbg",
-      "name": "RVA20 Profile",
+      "name": "MC100-32",
+      "request": "launch",
+      "command": "bundle exec rake",
+      "script": "gen:cert_model_pdf[MC100-32]",
+      "args": [],
+      "askParameters": false
+    },
+    {
+      "type": "rdbg",
+      "name": "MC200-32",
+      "request": "launch",
+      "command": "bundle exec rake",
+      "script": "gen:cert_model_pdf[MC200-32]",
+      "args": [],
+      "askParameters": false
+    },
+    {
+      "type": "rdbg",
+      "name": "RVA20",
       "request": "launch",
       "command": "bundle exec rake",
       "script": "gen:profile[RVA20]",

README.adoc

@@ -11,7 +11,8 @@ The following artifacts have been generated from the top of the `main` branch:
 * https://riscv-software-src.github.io/riscv-unified-db/pdfs/RVI20.pdf[RVI20 Profile Release]
 * https://riscv-software-src.github.io/riscv-unified-db/pdfs/RVA20.pdf[RVA20 Profile Release]
 * https://riscv-software-src.github.io/riscv-unified-db/pdfs/RVA22.pdf[RVA22 Profile Release]
-* https://riscv-software-src.github.io/riscv-unified-db/pdfs/MC100.pdf[MC100 Certification Requirements Document]
+* https://riscv-software-src.github.io/riscv-unified-db/pdfs/MC100-32.pdf[MC100-32 Certification Requirements Document]
+* https://riscv-software-src.github.io/riscv-unified-db/pdfs/MC100-64.pdf[MC100-64 Certification Requirements Document]
 
 == Overview
 

Rakefile

@@ -327,68 +327,63 @@ namespace :test do
   DESC
   task :nightly do
     Rake::Task["regress"].invoke
-
-    Rake::Task["#{$root}/gen/certificate_doc/pdf/MC100.pdf"].invoke
-    Rake::Task["#{$root}/gen/profile_doc/pdf/RVA20.pdf"].invoke
-    Rake::Task["#{$root}/gen/profile_doc/pdf/RVA22.pdf"].invoke
-    Rake::Task["#{$root}/gen/profile_doc/pdf/RVI20.pdf"].invoke
-
+    Rake::Task["portfolios"].invoke
     puts
     puts "Nightly regression test PASSED"
   end
 end
 
 desc <<~DESC
-  Generate all portfolio-based PDFs (certificates and profiles).
+  Generate all portfolio-based PDF artifacts (certificates and profiles)
 DESC
-task :portfolio_pdfs do
-  puts ""
-  puts "==================================="
-  puts "Generating MC100"
-  puts "==================================="
-  puts ""
-  Rake::Task["#{$root}/gen/certificate_doc/pdf/MC100.pdf"].invoke
-
-  puts ""
-  puts "=================================================="
-  puts "Generating MockCertificateModel"
-  puts "=================================================="
-  puts ""
+task :portfolios do
+  portfolio_start_msg("MockCertificateModel")
   Rake::Task["#{$root}/gen/certificate_doc/pdf/MockCertificateModel.pdf"].invoke
-
-  puts ""
-  puts "==================================="
-  puts "Generating RVA20"
-  puts "==================================="
-  puts ""
+  portfolio_start_msg("MockProfileRelease")
+  Rake::Task["#{$root}/gen/profile_doc/pdf/MockProfileRelease.pdf"].invoke
+  portfolio_start_msg("MC100-32")
+  Rake::Task["#{$root}/gen/certificate_doc/pdf/MC100-32.pdf"].invoke
+  portfolio_start_msg("MC100-64")
+  Rake::Task["#{$root}/gen/certificate_doc/pdf/MC100-64.pdf"].invoke
+  portfolio_start_msg("MC200-32")
+  Rake::Task["#{$root}/gen/certificate_doc/pdf/MC200-32.pdf"].invoke
+  portfolio_start_msg("MC200-64")
+  Rake::Task["#{$root}/gen/certificate_doc/pdf/MC200-64.pdf"].invoke
+  portfolio_start_msg("MC300-32")
+  Rake::Task["#{$root}/gen/certificate_doc/pdf/MC300-32.pdf"].invoke
+  portfolio_start_msg("MC300-64")
+  Rake::Task["#{$root}/gen/certificate_doc/pdf/MC300-64.pdf"].invoke
+  portfolio_start_msg("RVI20")
+  Rake::Task["#{$root}/gen/profile_doc/pdf/RVI20.pdf"].invoke
+  portfolio_start_msg("RVA20")
   Rake::Task["#{$root}/gen/profile_doc/pdf/RVA20.pdf"].invoke
-
-  puts ""
-  puts "==================================="
-  puts "Generating RVA22"
-  puts "==================================="
-  puts ""
+  portfolio_start_msg("RVA22")
   Rake::Task["#{$root}/gen/profile_doc/pdf/RVA22.pdf"].invoke
+  portfolio_start_msg("RVA23")
+  Rake::Task["#{$root}/gen/profile_doc/pdf/RVA23.pdf"].invoke
+  portfolio_start_msg("RVB23")
+  Rake::Task["#{$root}/gen/profile_doc/pdf/RVB23.pdf"].invoke
+end
 
+def portfolio_start_msg(name)
   puts ""
-  puts "==================================="
-  puts "Generating RVI20"
-  puts "==================================="
-  puts ""
-  Rake::Task["#{$root}/gen/profile_doc/pdf/RVI20.pdf"].invoke
-
-  puts ""
-  puts "==================================="
-  puts "Generating MockProfileRelease"
-  puts "==================================="
+  puts "================================================================================================="
+  puts "#{name}"
+  puts "================================================================================================="
   puts ""
-  Rake::Task["#{$root}/gen/profile_doc/pdf/MockProfileRelease.pdf"].invoke
 end
 
 # Shortcut targets for building profiles and certificates.
-task MC100: "#{$root}/gen/certificate_doc/pdf/MC100.pdf"
-task MockCertificateModel: "#{$root}/gen/certificate_doc/pdf/MockCertificateModel.pdf"
-task RVI20: "#{$root}/gen/profile_doc/pdf/RVI20.pdf"
-task RVA20: "#{$root}/gen/profile_doc/pdf/RVA20.pdf"
-task RVA22: "#{$root}/gen/profile_doc/pdf/RVA22.pdf"
-task MockProfileRelease: "#{$root}/gen/profile_doc/pdf/MockProfileRelease.pdf"
+task "MockCertificateModel": "#{$root}/gen/certificate_doc/pdf/MockCertificateModel.pdf"
+task "MC100-32": "#{$root}/gen/certificate_doc/pdf/MC100-32.pdf"
+task "MC100-64": "#{$root}/gen/certificate_doc/pdf/MC100-64.pdf"
+task "MC200-32": "#{$root}/gen/certificate_doc/pdf/MC200-32.pdf"
+task "MC200-64": "#{$root}/gen/certificate_doc/pdf/MC200-64.pdf"
+task "MC300-32": "#{$root}/gen/certificate_doc/pdf/MC300-32.pdf"
+task "MC300-64": "#{$root}/gen/certificate_doc/pdf/MC300-64.pdf"
+task "MockProfileRelease": "#{$root}/gen/profile_doc/pdf/MockProfileRelease.pdf"
+task "RVI20": "#{$root}/gen/profile_doc/pdf/RVI20.pdf"
+task "RVA20": "#{$root}/gen/profile_doc/pdf/RVA20.pdf"
+task "RVA22": "#{$root}/gen/profile_doc/pdf/RVA22.pdf"
+task "RVA23": "#{$root}/gen/profile_doc/pdf/RVA23.pdf"
+task "RVB23": "#{$root}/gen/profile_doc/pdf/RVB23.pdf"

arch/certificate_class/MC.yaml

@@ -1,38 +1,13 @@
 # yaml-language-server: $schema=../../schemas/cert_class_schema.json
 
 $schema: cert_class_schema.json#
-kind: certificate class
+kind: Processor CRD
+processor_kind: Microcontroller
 name: MC
-long_name: Microcontroller Certificate Class
+long_name: Microcontroller Class CRD
 
 introduction: |
-  This certification class specifies requirements for microcontrollers.
-  It targets microcontrollers running low-level software on an RTOS or bare-metal.
-  This CRD is not intended for the smallest possible microcontrollers but rather for applications
-  benefiting from a standardized microcontroller.
-  See the https://docs.google.com/document/d/133SZKc18tLsQcT1o6gEmBUkjwrtg2ow63me54RQ1jiY[RISC-V CRDs]
-  document for information relevant to all RISC-V CRDs.
-
-naming_scheme: |
-  The MC (M = Microcontroller, C = Certificate) has the following naming scheme (suffixes after MC
-  are optional but in the below order):
-
-    MC<model>[v<version>]
-
-  Where:
-
-  * Left & right square braces denote optional.
-  * \<model> is a 3 digit integer. It is changed only when mandatory extensions are added to a CRD.
-  ** The one's digit is incremented when a small mandatory extension is added (e.g., Zicond)
-  ** The ten's digit is incremented when a medium mandatory extension is added (e.g., PMP)
-  ** The hundreds's digit is incremented when a large mandatory extension is added (e.g., V or H)
-  * \<version> is a semantic version (see semver.org) formatted as <major>[.<minor>.[patch]]. If \<version> is omitted, the reference applies equally to all versions.
-  ** A <major> release indicates support for a new optional extension.
-  ** A <minor> release indicates one or more of the following changes to the certification tests associated with the CRD.
-  *** Fix test bug or increase test coverage
-  *** Add more allowed parameter values
-  *** Support new extension version
-  ** A <patch> release indicates just CRD specification changes without any difference in functional behavior
+  The MC (Microcontroller Class) targets processors running low-level software on an RTOS or bare-metal.
 
 mandatory_priv_modes:
   - M

arch/certificate_class/MockCertificateClass.yaml

@@ -1,16 +1,13 @@
 # yaml-language-server: $schema=../../schemas/cert_class_schema.json
 
 $schema: cert_class_schema.json#
-kind: certificate class
+kind: Processor CRD
+processor_kind: Apps Processor
 name: MockCertificateClass
 long_name: Mock Certificate Class Long Name
 
 introduction: |
   Here's the Mock Certificate Class introduction.
 
-naming_scheme: |
-  Here's the Mock Certificate Class naming scheme.
-  A Mock certificate class or model can have any name as long as it can be a hash key.
-
 mandatory_priv_modes:
   - M

arch/certificate_model/MC100.yaml renamed to arch/certificate_model/MC100-32.yaml

@@ -2,8 +2,8 @@
 
 $schema: cert_model_schema.json#
 kind: certificate model
-name: MC100
-long_name: Basic Microcontroller Certificate
+name: MC100-32
+long_name: Basic 32-bit Microcontroller Certificate
 class:
   $ref: certificate_class/MC.yaml#
 
@@ -67,18 +67,17 @@ revision_history:
     changes:
       - Initial version
 
-description: |
-  MC100 can be though of as minimal 32-bit RISC-V processors with M-mode support:
+introduction: |
+  The MC100 Processor CRD (Certification Requirements Document) defines the requirements
+  a processor implementation must meet in order to be eligible for the associated MC100 certificate.
+  MC100 is a basic RISC-V processor with minimal M-mode support and has 32-bit and 64-bit variants.
 
-  * The Unprivileged ISA is RV32I with a few extensions suitable for a basic microcontroller
-  * The M-mode features are those listed as mandatory in the associated RISC-V Privileged ISA manual
+  MC100 is not intended for the smallest possible microcontrollers but rather for applications
+  benefiting from a minimal but standardized microcontroller. It consists of:
 
-  Key features not included in MC100 (i.e., OUT OF SCOPE):
-
-  * Interrupt Controller (e.g., CLIC, CLINT, PLIC)
-  * Features for modes other than M-mode
-  * PMP
-  * Debug & trace (TBD)
+  * Unprivileged ISA: RV32I for MC100-32 and RV64I for MC100-64 with a few extensions suitable
+  for a basic microcontroller.
+  * Privileged ISA: Only the M-mode features listed as mandatory in the RISC-V Privileged ISA manual
 
 # Specification versions
 tsc_profile: null # None for MC100

arch/certificate_model/MC100-64.yaml

@@ -0,0 +1,20 @@
+# yaml-language-server: $schema=../../schemas/cert_model_schema.json
+
+$schema: cert_model_schema.json#
+kind: certificate model
+name: MC100-64
+long_name: Basic 64-bit Microcontroller Certificate
+class:
+  $ref: certificate_class/MC.yaml#
+
+$inherits: "certificate_model/MC100-32.yaml#"
+
+# XLEN used by rakefile
+base: 64
+
+extensions:
+  Sm:
+    parameters:
+      XLEN:
+        schema:
+          const: 64