Merge pull request #253 from riscv-software-src/250-use-$mref-to-inherit-from-one-profile-to-another-or-one-profile-to-a-certificate

250 use $mref to inherit from one profile to another or one profile to a certificate

Author: dhower-qc

Rakefile

@@ -287,13 +287,54 @@ task :regress do
   ENV["VERSIONS"] = "all"
   Rake::Task["gen:html_manual"].invoke
   Rake::Task["gen:html"].invoke("generic_rv64")
-  Rake::Task["gen:cert_model_pdf"].invoke("MockCertificateModel")
-  Rake::Task["gen:cert_model_pdf"].invoke("MC100")
-  Rake::Task["gen:profile"].invoke("MockProfileRelease")
-  Rake::Task["gen:profile"].invoke("RVA20")
-  Rake::Task["gen:profile"].invoke("RVA22")
-  Rake::Task["gen:profile"].invoke("RVI20")
+  Rake::Task["#{$root}/gen/certificate_doc/pdf/MockCertificateModel.pdf"].invoke
+  Rake::Task["#{$root}/gen/certificate_doc/pdf/MC100.pdf"].invoke
+  Rake::Task["#{$root}/gen/profile_doc/pdf/MockProfileRelease.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
 
   puts
   puts "Regression test PASSED"
 end
+
+desc <<~DESC
+  Generate all certificates and profile PDFs.
+DESC
+task :cert_profile_pdfs do
+  puts "==================================="
+  puts "cert_profile_pdfs: Generating MC100"
+  puts "                   1st target"
+  puts "==================================="
+  Rake::Task["#{$root}/gen/certificate_doc/pdf/MC100.pdf"].invoke
+
+  puts "=================================================="
+  puts "cert_profile_pdfs: Generating MockCertificateModel"
+  puts "                   2nd target"
+  puts "=================================================="
+  Rake::Task["#{$root}/gen/certificate_doc/pdf/MockCertificateModel.pdf"].invoke
+
+  puts "==================================="
+  puts "cert_profile_pdfs: Generating RVA20"
+  puts "                   3rd target"
+  puts "==================================="
+  Rake::Task["#{$root}/gen/profile_doc/pdf/RVA20.pdf"].invoke
+
+  puts "==================================="
+  puts "cert_profile_pdfs: Generating RVA22"
+  puts "                   4th target"
+  puts "==================================="
+  Rake::Task["#{$root}/gen/profile_doc/pdf/RVA22.pdf"].invoke
+
+  puts "==================================="
+  puts "cert_profile_pdfs: Generating RVI20"
+  puts "                   5th target"
+  puts "==================================="
+  Rake::Task["#{$root}/gen/profile_doc/pdf/RVI20.pdf"].invoke
+
+  puts "==================================="
+  puts "cert_profile_pdfs: Generating MockProfileRelease"
+  puts "                   6th target"
+  puts "==================================="
+  Rake::Task["#{$root}/gen/profile_doc/pdf/MockProfileRelease.pdf"].invoke
+end

arch/certificate_model/MC100.yaml

@@ -87,55 +87,55 @@ MC100:
 
 # XXX - Remove version information since specifying priv/unpriv ISA manual should imply this.
   extensions:
-  - name: I
-    version: "~> 2.1"
-    presence: mandatory
-  - name: C
-    version: "~> 2.2"
-    presence: mandatory
-  - name: M
-    version: "~> 2.0"
-    presence: mandatory
-  - name: Zicsr
-    version: "~> 2.0"
-    presence: mandatory
-  - name: Zicntr
-    version: "~> 2.0"
-    presence: mandatory
-    parameters:
-        TIME_CSR_IMPLEMENTED: {} # Unconstrained
-  - name: Sm
-    version: "~> 1.11.0"
-    presence: mandatory
-    parameters:
-        MTVEC_BASE_ALIGNMENT_DIRECT: {} # Unconstrained
-        MTVEC_BASE_ALIGNMENT_VECTORED: {} # Unconstrained
-        ARCH_ID: {} # Unconstrained
-        IMP_ID: {} # Unconstrained
-        VENDOR_ID_BANK: {} # Unconstrained
-        VENDOR_ID_OFFSET: {} # Unconstrained
-        MISA_CSR_IMPLEMENTED: {} # Unconstrained
-        MTVAL_WIDTH: {} # Unconstrained
-        MTVEC_MODES: {} # Unconstrained
-        PHYS_ADDR_WIDTH: {} # Unconstrained
-        MISALIGNED_LDST: {} # Unconstrained
-        MISALIGNED_LDST_EXCEPTION_PRIORITY : {} # Unconstrained
-        MISALIGNED_MAX_ATOMICITY_GRANULE_SIZE: {} # Unconstrained
-        MISALIGNED_SPLIT_STRATEGY:
-          schema:
-            const: by_byte
-        PRECISE_SYNCHRONOUS_EXCEPTIONS:
-          schema:
-            const: true
-        TRAP_ON_ECALL_FROM_M:
-          schema:
-            const: true
-        TRAP_ON_EBREAK:
-          schema:
-            const: true
-        M_MODE_ENDIANESS:
-          schema:
-            const: little
-        XLEN:
-          schema:
-            const: 32
+    I:
+      version: "~> 2.1"
+      presence: mandatory
+    C:
+      version: "~> 2.2"
+      presence: mandatory
+    M:
+      version: "~> 2.0"
+      presence: mandatory
+    Zicsr:
+      version: "~> 2.0"
+      presence: mandatory
+    Zicntr:
+      version: "~> 2.0"
+      presence: mandatory
+      parameters:
+          TIME_CSR_IMPLEMENTED: {} # Unconstrained
+    Sm:
+      version: "~> 1.11.0"
+      presence: mandatory
+      parameters:
+          MTVEC_BASE_ALIGNMENT_DIRECT: {} # Unconstrained
+          MTVEC_BASE_ALIGNMENT_VECTORED: {} # Unconstrained
+          ARCH_ID: {} # Unconstrained
+          IMP_ID: {} # Unconstrained
+          VENDOR_ID_BANK: {} # Unconstrained
+          VENDOR_ID_OFFSET: {} # Unconstrained
+          MISA_CSR_IMPLEMENTED: {} # Unconstrained
+          MTVAL_WIDTH: {} # Unconstrained
+          MTVEC_MODES: {} # Unconstrained
+          PHYS_ADDR_WIDTH: {} # Unconstrained
+          MISALIGNED_LDST: {} # Unconstrained
+          MISALIGNED_LDST_EXCEPTION_PRIORITY : {} # Unconstrained
+          MISALIGNED_MAX_ATOMICITY_GRANULE_SIZE: {} # Unconstrained
+          MISALIGNED_SPLIT_STRATEGY:
+            schema:
+              const: by_byte
+          PRECISE_SYNCHRONOUS_EXCEPTIONS:
+            schema:
+              const: true
+          TRAP_ON_ECALL_FROM_M:
+            schema:
+              const: true
+          TRAP_ON_EBREAK:
+            schema:
+              const: true
+          M_MODE_ENDIANESS:
+            schema:
+              const: little
+          XLEN:
+            schema:
+              const: 32