Merge branch 'main' into dhower-qc/issue159

Signed-off-by: Derek Hower <[email protected]>

Author: dhower-qc

.gitignore

@@ -6,6 +6,9 @@
 .yardoc
 .stamps
 .venv
+.asciidoctor
+diag-ditaa-*
+arch/manual/isa/**/riscv-isa-manual
 gen
 node_modules
 _site

arch/csr/menvcfg.yaml

@@ -246,7 +246,9 @@ menvcfg:
       definedBy: Zicbom
       type: RW-R
       sw_write(csr_value): |
-        if (csr_value.CBIE == 0 || csr_value.CBIE == 1 || csr_value.CBIE == 3) {
+        if ((csr_value.CBIE == 0) ||
+            (ALLOW_CBO_INVAL_UPGRADE_TO_FLUSH && (csr_value.CBIE == 1)) ||
+            (csr_value.CBIE == 3)) {
           return csr_value.CBIE;
         } else {
           return CSR[menvcfg].CBIE;

arch/ext/Zicbom.yaml

@@ -14,4 +14,13 @@ Zicbom:
         The observable size of a cache block, in bytes
       also_defined_in: [Zicboz, Zicbop]
       schema:
-        type: integer
+        type: integer
+    ALLOW_CBO_INVAL_UPGRADE_TO_FLUSH:
+      description: |
+        When true, an implementation can (when `menvcfg.CBIE` == `01`) upgrade a `cbo.inval`
+        instruction to a `cbo.flush`.
+
+        When false, an implementation does not support the upgrade, and the value '01' cannot be
+        written to `menvcfg.CBIE`.
+      schema:
+        type: boolean

arch/isa/globals.isa

@@ -89,7 +89,7 @@ enum PmaAttribute {
 
 enum Pbmt {
   PMA 0   # Use underlying PMA
-  NV  1   # Non-cacheable, idempotent, weakly-ordered (RVWMO), main memory
+  NC  1   # Non-cacheable, idempotent, weakly-ordered (RVWMO), main memory
   IO  2   # Non-cacheable, non-idempotent, strongly (channel 0) ordered, I/O
 }
 

backends/profile_doc/tasks.rake

@@ -81,7 +81,7 @@ end
 
 namespace :gen do
   desc "Create a specification PDF for +profile_family+"
-  task :profile_pdf, [:profile_family] => ["gen:arch"] do |_t, args|
+  task :profile_pdf, [:profile_family] => ["#{$root}/.stamps/arch-gen-_64.stamp"] do |_t, args|
     family_name = args[:profile_family]
     raise ArgumentError, "Missing required option +profile_family+" if family_name.nil?
 
@@ -92,7 +92,7 @@ namespace :gen do
   end
 
   desc "Create a specification HTML for +profile_family+"
-  task :profile_html, [:profile_family] => ["gen:arch"] do |_t, args|
+  task :profile_html, [:profile_family] => ["#{$root}/.stamps/arch-gen-_64.stamp"] do |_t, args|
     family_name = args[:profile_family]
     raise ArgumentError, "Missing required option +profile_family+" if family_name.nil?
 

cfgs/generic_rv64/params.yaml

@@ -517,3 +517,5 @@ params:
   MSTATUS_VS_WRITEABLE: true
   MSTATUS_VS_LEGAL_VALUES: [0,1,2,3]
   HW_MSTATUS_VS_DIRTY_UPDATE: precise
+  ALLOW_CBO_INVAL_UPGRADE_TO_FLUSH: true
+