Skip to content

Commit 7544d3a

Browse files
authored
[RISCV] Mark RVB23U64 and RVB23S64 as non-experimental (#113918)
The specification was recently ratified <https://github.com/riscv/riscv-profiles/blob/main/src/rvb23-profile.adoc>.
1 parent 335e68d commit 7544d3a

File tree

7 files changed

+14
-13
lines changed

7 files changed

+14
-13
lines changed

clang/test/Driver/print-supported-extensions-riscv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,12 @@
193193
// CHECK-NEXT: rva22u64
194194
// CHECK-NEXT: rva23s64
195195
// CHECK-NEXT: rva23u64
196+
// CHECK-NEXT: rvb23s64
197+
// CHECK-NEXT: rvb23u64
196198
// CHECK-NEXT: rvi20u32
197199
// CHECK-NEXT: rvi20u64
198200
// CHECK-EMPTY:
199201
// CHECK-NEXT: Experimental Profiles
200-
// CHECK-NEXT: rvb23s64
201-
// CHECK-NEXT: rvb23u64
202202
// CHECK-NEXT: rvm23u32
203203
// CHECK-EMPTY:
204204
// CHECK-NEXT: Use -march to specify the target's extension.

clang/test/Driver/riscv-profiles.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
// RVA23S64: "-target-feature" "+svnapot"
208208
// RVA23S64: "-target-feature" "+svpbmt"
209209

210-
// RUN: %clang --target=riscv64 -### -c %s 2>&1 -march=rvb23u64 -menable-experimental-extensions \
210+
// RUN: %clang --target=riscv64 -### -c %s 2>&1 -march=rvb23u64 \
211211
// RUN: | FileCheck -check-prefix=RVB23U64 %s
212212
// RVB23U64: "-target-feature" "+m"
213213
// RVB23U64: "-target-feature" "+a"
@@ -239,7 +239,7 @@
239239
// RVB23U64: "-target-feature" "+zbs"
240240
// RVB23U64: "-target-feature" "+zkt"
241241

242-
// RUN: %clang --target=riscv64 -### -c %s 2>&1 -march=rvb23s64 -menable-experimental-extensions \
242+
// RUN: %clang --target=riscv64 -### -c %s 2>&1 -march=rvb23s64 \
243243
// RUN: | FileCheck -check-prefix=RVB23S64 %s
244244
// RVB23S64: "-target-feature" "+m"
245245
// RVB23S64: "-target-feature" "+a"

llvm/docs/RISCVUsage.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ ISA naming string. Currently supported profiles:
8484
* ``rva22s64``
8585
* ``rva23u64``
8686
* ``rva23s64``
87+
* ``rvb23u64``
88+
* ``rvb23s64``
8789

8890
Note that you can also append additional extension names to be enabled, e.g.
8991
``rva20u64_zicond`` will enable the ``zicond`` extension in addition to those
@@ -93,8 +95,6 @@ Profiles that are not yet ratified cannot be used unless
9395
``-menable-experimental-extensions`` (or equivalent for other tools) is
9496
specified. This applies to the following profiles:
9597

96-
* ``rvb23u64``
97-
* ``rvb23s64``
9898
* ``rvm23u32``
9999

100100
.. _riscv-extensions:

llvm/docs/ReleaseNotes.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ Changes to the RISC-V Backend
184184
* The `Smmpm`, `Smnpm`, `Ssnpm`, `Supm`, and `Sspm` pointer masking extensions
185185
are no longer marked as experimental.
186186
* The `Sha` extension is now supported.
187-
* The RVA23U64 and RVA23S64 profiles are no longer marked as experimental.
187+
* The RVA23U64, RVA23S64, RVB23U64, and RVB23S64 profiles are no longer marked
188+
as experimental.
188189

189190
Changes to the WebAssembly Backend
190191
----------------------------------

llvm/lib/Target/RISCV/RISCVProfiles.td

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,6 @@ def RVA22U64 : RISCVProfile<"rva22u64", RVA22U64Features>;
163163
def RVA22S64 : RISCVProfile<"rva22s64", RVA22S64Features>;
164164
def RVA23U64 : RISCVProfile<"rva23u64", RVA23U64Features>;
165165
def RVA23S64 : RISCVProfile<"rva23s64", RVA23S64Features>;
166-
def RVB23U64 : RISCVExperimentalProfile<"rvb23u64", RVB23U64Features>;
167-
def RVB23S64 : RISCVExperimentalProfile<"rvb23s64", RVB23S64Features>;
166+
def RVB23U64 : RISCVProfile<"rvb23u64", RVB23U64Features>;
167+
def RVB23S64 : RISCVProfile<"rvb23s64", RVB23S64Features>;
168168
def RVM23U32 : RISCVExperimentalProfile<"rvm23u32", RVM23U32Features>;

llvm/test/CodeGen/RISCV/attributes.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,8 @@
293293
; RUN: llc -mtriple=riscv64 -mattr=+rva22s64 %s -o - | FileCheck --check-prefix=RVA22S64 %s
294294
; RUN: llc -mtriple=riscv64 -mattr=+rva23u64 %s -o - | FileCheck --check-prefix=RVA23U64 %s
295295
; RUN: llc -mtriple=riscv64 -mattr=+rva23s64 %s -o - | FileCheck --check-prefix=RVA23S64 %s
296-
; RUN: llc -mtriple=riscv64 -mattr=+experimental-rvb23u64 %s -o - | FileCheck --check-prefix=RVB23U64 %s
297-
; RUN: llc -mtriple=riscv64 -mattr=+experimental-rvb23s64 %s -o - | FileCheck --check-prefix=RVB23S64 %s
296+
; RUN: llc -mtriple=riscv64 -mattr=+rvb23u64 %s -o - | FileCheck --check-prefix=RVB23U64 %s
297+
; RUN: llc -mtriple=riscv64 -mattr=+rvb23s64 %s -o - | FileCheck --check-prefix=RVB23S64 %s
298298
; RUN: llc -mtriple=riscv32 -mattr=+experimental-rvm23u32 %s -o - | FileCheck --check-prefix=RVM23U32 %s
299299

300300
; CHECK: .attribute 4, 16

llvm/unittests/TargetParser/RISCVISAInfoTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,12 +1138,12 @@ Supported Profiles
11381138
rva22u64
11391139
rva23s64
11401140
rva23u64
1141+
rvb23s64
1142+
rvb23u64
11411143
rvi20u32
11421144
rvi20u64
11431145
11441146
Experimental Profiles
1145-
rvb23s64
1146-
rvb23u64
11471147
rvm23u32
11481148
11491149
Use -march to specify the target's extension.

0 commit comments

Comments
 (0)