fix(data): profiles: clean up after multiple inheritance (#1230)

Most profiles don't automatically incorporate optional extensions from
"ancestors", so more extensions need to be removed after profile
inheritance.

For example, in UDB, profile RVA23S64 inherits from both RVB23S64 and
RVA23U64. However, in the profiles documentation it (roughly) inherits
from only RVA23U64, and then only "all the mandatory unprivileged
extensions". So, the optional extensions need to be handled more
explicitly, and many need to be removed.

Fixes #1195

---------

Signed-off-by: Paul A. Clarke <[email protected]>

Author: ThinkOpenly

spec/std/isa/ext/Za64rs.yaml

@@ -21,6 +21,9 @@ versions:
   - version: "1.0.0"
     state: ratified
     ratification_date: null
+    implies:
+      - name: Za128rs
+        version: "1.0.0"
     param_constraints:
       LRSC_RESERVATION_STRATEGY:
         schema:

spec/std/isa/profile/RVA22S64.yaml

@@ -20,6 +20,11 @@ extensions:
   $inherits:
     - "profile/RVA20S64.yaml#/extensions"
     - "profile/RVA22U64.yaml#/extensions"
+  $remove:
+    - Zfh
+    - V
+    - Zkn
+    - Zks
   S:
     presence: mandatory
     version: "= 1.12"

spec/std/isa/profile/RVA22U64.yaml

@@ -18,6 +18,11 @@ introduction: |
   terms of the amount of software that targets this profile.
 extensions:
   $inherits: "profile/RVA20U64.yaml#/extensions"
+  Za64rs:
+    presence: mandatory
+    version: "~>1.0"
+    note: |
+      Reservation sets are contiguous, naturally aligned, and a maximum of 64 bytes
   Zihpm:
     presence: mandatory
     version: "= 2.0"

spec/std/isa/profile/RVA23S64.yaml

@@ -23,6 +23,24 @@ extensions:
   $inherits:
     - "profile/RVB23S64.yaml#/extensions"
     - "profile/RVA23U64.yaml#/extensions"
+  $remove:
+    - Zfh
+    - Zkn
+    - Zks
+    - Zvkng
+    - Zvksg
+    - Zabha
+    - Zacas
+    - Ziccamoc
+    - Zvbc
+    - Zama16b
+    - Zbc
+    - Zicfilp
+    - Zicfiss
+    - Zvfh
+    - Zfbfmin
+    - Zvfbfmin
+    - Zvfbfwma
 
   #########################################################################
   # MANDATORY extensions in RVA23S64 (that were optional in RVB23S64)

spec/std/isa/profile/RVB23S64.yaml

@@ -23,6 +23,29 @@ extensions:
   $inherits:
     - "profile/RVA22S64.yaml#/extensions"
     - "profile/RVB23U64.yaml#/extensions"
+  $remove:
+    - V
+    - Zvfhmin
+    - Zvbb
+    - Zvkt
+    - Supm
+    - Zvkng
+    - Zvksg
+    - Zvkg
+    - Zvknc
+    - Zvksc
+    - Zabha
+    - Zacas
+    - Ziccamoc
+    - Zvbc
+    - Zama16b
+    - Zbc
+    - Zicfilp
+    - Zicfiss
+    - Zvfh
+    - Zfbfmin
+    - Zvfbfmin
+    - Zvfbfwma
 
   #########################################################################
   # MANDATORY extensions in RVB23 (and RVA23)

spec/std/isa/profile/RVB23U64.yaml

@@ -21,7 +21,6 @@ extensions:
   # imported from RVA22U64
   #########################################################################
   $inherits: "profile/RVA22U64.yaml#/extensions"
-  $remove: Za128rs
 
   #########################################################################
   # MANDATORY extensions in RVB23 (and RVA23)
@@ -61,11 +60,6 @@ extensions:
     version: "~>1.0"
     note: |
       Wait-on-reservation-set (WRS) instructions
-  Za64rs:
-    presence: mandatory
-    version: "~>1.0"
-    note: |
-      Reservation sets are contiguous, naturally aligned, and a maximum of 64 bytes
 
   #########################################################################
   # OPTIONAL LOCALIZED extensions