Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+54 −6
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions spec/std/isa/ext/Za64rs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions spec/std/isa/profile/RVA22S64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 6 additions & 0 deletions spec/std/isa/profile/RVA22U64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
18 changes: 18 additions & 0 deletions spec/std/isa/profile/RVA23S64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
23 changes: 23 additions & 0 deletions spec/std/isa/profile/RVB23S64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 0 additions & 6 deletions spec/std/isa/profile/RVB23U64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ extensions:
# imported from RVA22U64
#########################################################################
$inherits: "profile/RVA22U64.yaml#/extensions"
$remove: Za128rs

#########################################################################
# MANDATORY extensions in RVB23 (and RVA23)
Expand Down Expand Up @@ -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
Expand Down
Loading