diff --git a/spec/std/isa/ext/Za64rs.yaml b/spec/std/isa/ext/Za64rs.yaml index ce24a5980a..f31566e561 100644 --- a/spec/std/isa/ext/Za64rs.yaml +++ b/spec/std/isa/ext/Za64rs.yaml @@ -17,6 +17,7 @@ description: | [NOTE] The minimum reservation set size is effectively determined by the size of atomic accesses in the A extension. +conflicts: Za128rs versions: - version: "1.0.0" state: ratified diff --git a/spec/std/isa/profile/RVA22S64.yaml b/spec/std/isa/profile/RVA22S64.yaml index 24f540e214..4924a32893 100644 --- a/spec/std/isa/profile/RVA22S64.yaml +++ b/spec/std/isa/profile/RVA22S64.yaml @@ -20,6 +20,12 @@ extensions: $inherits: - "profile/RVA20S64.yaml#/extensions" - "profile/RVA22U64.yaml#/extensions" + $remove: + - Za128rs + - Zfh + - V + - Zkn + - Zks S: presence: mandatory version: "= 1.12" diff --git a/spec/std/isa/profile/RVA22U64.yaml b/spec/std/isa/profile/RVA22U64.yaml index f84c532d7e..03c3545b6e 100644 --- a/spec/std/isa/profile/RVA22U64.yaml +++ b/spec/std/isa/profile/RVA22U64.yaml @@ -18,6 +18,12 @@ introduction: | terms of the amount of software that targets this profile. extensions: $inherits: "profile/RVA20U64.yaml#/extensions" + $remove: Za128rs + 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" diff --git a/spec/std/isa/profile/RVA23S64.yaml b/spec/std/isa/profile/RVA23S64.yaml index 641a59c149..04d2494b66 100644 --- a/spec/std/isa/profile/RVA23S64.yaml +++ b/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) diff --git a/spec/std/isa/profile/RVB23S64.yaml b/spec/std/isa/profile/RVB23S64.yaml index 0ad6d5ba7d..3518fc946e 100644 --- a/spec/std/isa/profile/RVB23S64.yaml +++ b/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) diff --git a/spec/std/isa/profile/RVB23U64.yaml b/spec/std/isa/profile/RVB23U64.yaml index b57fb74ab6..00a256165a 100644 --- a/spec/std/isa/profile/RVB23U64.yaml +++ b/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