Skip to content

Commit fe7a971

Browse files
author
Yeting Kuo
committed
[RISC-V] Remove experimental for Zicfiss/Zicfilp.
Both of them are ratified. https://wiki.riscv.org/display/HOME/Ratified+Extensions
1 parent 9d34b67 commit fe7a971

18 files changed

+67
-73
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
// CHECK-NEXT: ziccif 1.0 'Ziccif' (Main Memory Supports Instruction Fetch with Atomicity Requirement)
2323
// CHECK-NEXT: zicclsm 1.0 'Zicclsm' (Main Memory Supports Misaligned Loads/Stores)
2424
// CHECK-NEXT: ziccrse 1.0 'Ziccrse' (Main Memory Supports Forward Progress on LR/SC Sequences)
25+
// CHECK-NEXT: zicfilp 1.0 'Zicfilp' (Landing pad)
26+
// CHECK-NEXT: zicfiss 1.0 'Zicfiss' (Shadow stack)
2527
// CHECK-NEXT: zicntr 2.0 'Zicntr' (Base Counters and Timers)
2628
// CHECK-NEXT: zicond 1.0 'Zicond' (Integer Conditional Operations)
2729
// CHECK-NEXT: zicsr 2.0 'zicsr' (CSRs)
@@ -169,8 +171,6 @@
169171
// CHECK-NEXT: xwchc 2.2 'Xwchc' (WCH/QingKe additional compressed opcodes)
170172
// CHECK-EMPTY:
171173
// CHECK-NEXT: Experimental extensions
172-
// CHECK-NEXT: zicfilp 0.4 'Zicfilp' (Landing pad)
173-
// CHECK-NEXT: zicfiss 0.4 'Zicfiss' (Shadow stack)
174174
// CHECK-NEXT: zalasr 0.1 'Zalasr' (Load-Acquire and Store-Release Instructions)
175175
// CHECK-NEXT: smmpm 1.0 'Smmpm' (Machine-level Pointer Masking for M-mode)
176176
// CHECK-NEXT: smnpm 1.0 'Smnpm' (Machine-level Pointer Masking for next lower privilege mode)

‎clang/test/Preprocessor/riscv-target-features.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1642,13 +1642,11 @@
16421642
// RUN: -o - | FileCheck --check-prefix=CHECK-ZFBFMIN-EXT %s
16431643
// CHECK-ZFBFMIN-EXT: __riscv_zfbfmin 1000000{{$}}
16441644

1645-
// RUN: %clang --target=riscv32 -menable-experimental-extensions \
1646-
// RUN: -march=rv32i_zicfilp0p4 -E -dM %s \
1645+
// RUN: %clang --target=riscv32 -march=rv32i_zicfilp1p0 -E -dM %s \
16471646
// RUN: -o - | FileCheck --check-prefix=CHECK-ZICFILP-EXT %s
1648-
// RUN: %clang --target=riscv64 -menable-experimental-extensions \
1649-
// RUN: -march=rv64i_zicfilp0p4 -E -dM %s \
1647+
// RUN: %clang --target=riscv64 -march=rv64i_zicfilp1p0 -E -dM %s \
16501648
// RUN: -o - | FileCheck --check-prefix=CHECK-ZICFILP-EXT %s
1651-
// CHECK-ZICFILP-EXT: __riscv_zicfilp 4000{{$}}
1649+
// CHECK-ZICFILP-EXT: __riscv_zicfilp 1000000{{$}}
16521650

16531651
// RUN: %clang --target=riscv32-unknown-linux-gnu \
16541652
// RUN: -march=rv32iztso1p0 -E -dM %s \
@@ -1674,13 +1672,11 @@
16741672
// RUN: -o - | FileCheck --check-prefix=CHECK-ZVFBFWMA-EXT %s
16751673
// CHECK-ZVFBFWMA-EXT: __riscv_zvfbfwma 1000000{{$}}
16761674

1677-
// RUN: %clang -target riscv32 -menable-experimental-extensions \
1678-
// RUN: -march=rv32izicfiss0p4 -E -dM %s \
1675+
// RUN: %clang -target riscv32 -march=rv32izicfiss1p0 -E -dM %s \
16791676
// RUN: -o - | FileCheck --check-prefix=CHECK-ZICFISS-EXT %s
1680-
// RUN: %clang -target riscv64 -menable-experimental-extensions \
1681-
// RUN: -march=rv64izicfiss0p4 -E -dM %s \
1677+
// RUN: %clang -target riscv64 -march=rv64izicfiss1p0 -E -dM %s \
16821678
// RUN: -o - | FileCheck --check-prefix=CHECK-ZICFISS-EXT %s
1683-
// CHECK-ZICFISS-EXT: __riscv_zicfiss 4000{{$}}
1679+
// CHECK-ZICFISS-EXT: __riscv_zicfiss 1000000{{$}}
16841680

16851681
// RUN: %clang --target=riscv32 -menable-experimental-extensions \
16861682
// RUN: -march=rv32i_ssnpm1p0 -E -dM %s \

‎llvm/lib/Target/RISCV/RISCVFeatures.td

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -150,20 +150,18 @@ def HasStdExtZimop : Predicate<"Subtarget->hasStdExtZimop()">,
150150
AssemblerPredicate<(all_of FeatureStdExtZimop),
151151
"'Zimop' (May-Be-Operations)">;
152152

153-
def FeatureStdExtZicfilp
154-
: RISCVExperimentalExtension<"zicfilp", 0, 4,
155-
"'Zicfilp' (Landing pad)",
156-
[FeatureStdExtZicsr]>;
153+
def FeatureStdExtZicfilp : RISCVExtension<"zicfilp", 1, 0,
154+
"'Zicfilp' (Landing pad)",
155+
[FeatureStdExtZicsr]>;
157156
def HasStdExtZicfilp : Predicate<"Subtarget->hasStdExtZicfilp()">,
158157
AssemblerPredicate<(all_of FeatureStdExtZicfilp),
159158
"'Zicfilp' (Landing pad)">;
160159
def NoStdExtZicfilp : Predicate<"!Subtarget->hasStdExtZicfilp()">,
161160
AssemblerPredicate<(all_of (not FeatureStdExtZicfilp))>;
162161

163162
def FeatureStdExtZicfiss
164-
: RISCVExperimentalExtension<"zicfiss", 0, 4,
165-
"'Zicfiss' (Shadow stack)",
166-
[FeatureStdExtZicsr, FeatureStdExtZimop]>;
163+
: RISCVExtension<"zicfiss", 1, 0, "'Zicfiss' (Shadow stack)",
164+
[FeatureStdExtZicsr, FeatureStdExtZimop]>;
167165
def HasStdExtZicfiss : Predicate<"Subtarget->hasStdExtZicfiss()">,
168166
AssemblerPredicate<(all_of FeatureStdExtZicfiss),
169167
"'Zicfiss' (Shadow stack)">;

‎llvm/test/CodeGen/RISCV/attributes.ll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
; RUN: llc -mtriple=riscv32 -mattr=+a,zacas %s -o - | FileCheck --check-prefix=RV32ZACAS %s
124124
; RUN: llc -mtriple=riscv32 -mattr=+experimental-zalasr %s -o - | FileCheck --check-prefix=RV32ZALASR %s
125125
; RUN: llc -mtriple=riscv32 -mattr=+zama16b %s -o - | FileCheck --check-prefixes=CHECK,RV32ZAMA16B %s
126-
; RUN: llc -mtriple=riscv32 -mattr=+experimental-zicfilp %s -o - | FileCheck --check-prefix=RV32ZICFILP %s
126+
; RUN: llc -mtriple=riscv32 -mattr=+zicfilp %s -o - | FileCheck --check-prefix=RV32ZICFILP %s
127127
; RUN: llc -mtriple=riscv32 -mattr=+a,+zabha %s -o - | FileCheck --check-prefix=RV32ZABHA %s
128128
; RUN: llc -mtriple=riscv32 -mattr=+experimental-ssnpm %s -o - | FileCheck --check-prefix=RV32SSNPM %s
129129
; RUN: llc -mtriple=riscv32 -mattr=+experimental-smnpm %s -o - | FileCheck --check-prefix=RV32SMNPM %s
@@ -261,7 +261,7 @@
261261
; RUN: llc -mtriple=riscv64 -mattr=+zvfbfwma %s -o - | FileCheck --check-prefixes=CHECK,RV64ZVFBFWMA %s
262262
; RUN: llc -mtriple=riscv64 -mattr=+a,zacas %s -o - | FileCheck --check-prefix=RV64ZACAS %s
263263
; RUN: llc -mtriple=riscv64 -mattr=+experimental-zalasr %s -o - | FileCheck --check-prefix=RV64ZALASR %s
264-
; RUN: llc -mtriple=riscv64 -mattr=+experimental-zicfilp %s -o - | FileCheck --check-prefix=RV64ZICFILP %s
264+
; RUN: llc -mtriple=riscv64 -mattr=+zicfilp %s -o - | FileCheck --check-prefix=RV64ZICFILP %s
265265
; RUN: llc -mtriple=riscv64 -mattr=+a,+zabha %s -o - | FileCheck --check-prefix=RV64ZABHA %s
266266
; RUN: llc -mtriple=riscv64 -mattr=+experimental-ssnpm %s -o - | FileCheck --check-prefix=RV64SSNPM %s
267267
; RUN: llc -mtriple=riscv64 -mattr=+experimental-smnpm %s -o - | FileCheck --check-prefix=RV64SMNPM %s
@@ -407,7 +407,7 @@
407407
; RV32ZACAS: .attribute 5, "rv32i2p1_a2p1_zacas1p0"
408408
; RV32ZALASR: .attribute 5, "rv32i2p1_zalasr0p1"
409409
; RV32ZAMA16B: .attribute 5, "rv32i2p1_zama16b1p0"
410-
; RV32ZICFILP: .attribute 5, "rv32i2p1_zicfilp0p4_zicsr2p0"
410+
; RV32ZICFILP: .attribute 5, "rv32i2p1_zicfilp1p0_zicsr2p0"
411411
; RV32ZABHA: .attribute 5, "rv32i2p1_a2p1_zabha1p0"
412412
; RV32SSNPM: .attribute 5, "rv32i2p1_ssnpm1p0"
413413
; RV32SMNPM: .attribute 5, "rv32i2p1_smnpm1p0"
@@ -543,7 +543,7 @@
543543
; RV64ZVFBFWMA: .attribute 5, "rv64i2p1_f2p2_zicsr2p0_zfbfmin1p0_zve32f1p0_zve32x1p0_zvfbfmin1p0_zvfbfwma1p0_zvl32b1p0"
544544
; RV64ZACAS: .attribute 5, "rv64i2p1_a2p1_zacas1p0"
545545
; RV64ZALASR: .attribute 5, "rv64i2p1_zalasr0p1"
546-
; RV64ZICFILP: .attribute 5, "rv64i2p1_zicfilp0p4_zicsr2p0"
546+
; RV64ZICFILP: .attribute 5, "rv64i2p1_zicfilp1p0_zicsr2p0"
547547
; RV64ZABHA: .attribute 5, "rv64i2p1_a2p1_zabha1p0"
548548
; RV64SSNPM: .attribute 5, "rv64i2p1_ssnpm1p0"
549549
; RV64SMNPM: .attribute 5, "rv64i2p1_smnpm1p0"

‎llvm/test/CodeGen/RISCV/jumptable-swguarded.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
2-
; RUN: llc -mtriple riscv32 -mattr=+experimental-zicfilp < %s | FileCheck %s
3-
; RUN: llc -mtriple riscv64 -mattr=+experimental-zicfilp < %s | FileCheck %s
2+
; RUN: llc -mtriple riscv32 -mattr=+zicfilp < %s | FileCheck %s
3+
; RUN: llc -mtriple riscv64 -mattr=+zicfilp < %s | FileCheck %s
44
; RUN: llc -mtriple riscv32 < %s | FileCheck %s --check-prefix=NO-ZICFILP
55
; RUN: llc -mtriple riscv64 < %s | FileCheck %s --check-prefix=NO-ZICFILP
66

‎llvm/test/CodeGen/RISCV/shadowcallstack.ll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
; RUN: | FileCheck %s --check-prefix=RV32
44
; RUN: llc -mtriple=riscv64 -verify-machineinstrs < %s \
55
; RUN: | FileCheck %s --check-prefix=RV64
6-
; RUN: llc -mtriple=riscv32 -mattr=+experimental-zicfiss < %s \
6+
; RUN: llc -mtriple=riscv32 -mattr=+zicfiss < %s \
77
; RUN: -verify-machineinstrs | FileCheck %s --check-prefix=RV32-ZICFISS
8-
; RUN: llc -mtriple=riscv64 -mattr=+experimental-zicfiss < %s \
8+
; RUN: llc -mtriple=riscv64 -mattr=+zicfiss < %s \
99
; RUN: -verify-machineinstrs | FileCheck %s --check-prefix=RV64-ZICFISS
10-
; RUN: llc -mtriple=riscv32 -mattr=+experimental-zicfiss,forced-sw-shadow-stack \
10+
; RUN: llc -mtriple=riscv32 -mattr=+zicfiss,forced-sw-shadow-stack \
1111
; RUN: -verify-machineinstrs < %s | FileCheck %s --check-prefix=RV32
12-
; RUN: llc -mtriple=riscv64 -mattr=+experimental-zicfiss,forced-sw-shadow-stack \
12+
; RUN: llc -mtriple=riscv64 -mattr=+zicfiss,forced-sw-shadow-stack \
1313
; RUN: -verify-machineinstrs < %s | FileCheck %s --check-prefix=RV64
1414

1515
define void @f1() shadowcallstack {

‎llvm/test/CodeGen/RISCV/zicfilp-indirect-branch.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 3
22
; RUN: llc -mtriple=riscv64 -stop-after=finalize-isel < %s | FileCheck %s
3-
; RUN: llc -mtriple=riscv64 -mattr=+experimental-zicfilp -stop-after=finalize-isel < %s | FileCheck -check-prefixes=ZICFILP %s
3+
; RUN: llc -mtriple=riscv64 -mattr=+zicfilp -stop-after=finalize-isel < %s | FileCheck -check-prefixes=ZICFILP %s
44

55
@brind.arr = internal unnamed_addr constant [2 x ptr] [ptr blockaddress(@brind, %5), ptr blockaddress(@brind, %8)], align 8
66
@x = dso_local global i32 0, align 4

‎llvm/test/MC/RISCV/attribute-arch-invalid.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55

66
## Version strings are required for experimental extensions
77

8-
.attribute arch, "rv32izicfilp"
9-
# CHECK: error: invalid arch name 'rv32izicfilp', experimental extension requires explicit version number `zicfilp`
8+
.attribute arch, "rv32izalasr"
9+
# CHECK: error: invalid arch name 'rv32izalasr', experimental extension requires explicit version number `zalasr`

‎llvm/test/MC/RISCV/attribute-arch.s

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -408,11 +408,11 @@
408408
.attribute arch, "rv32i_xcvbi"
409409
# CHECK: attribute 5, "rv32i2p1_xcvbi1p0"
410410

411-
.attribute arch, "rv32i_zicfilp0p4"
412-
# CHECK: attribute 5, "rv32i2p1_zicfilp0p4_zicsr2p0"
411+
.attribute arch, "rv32i_zicfilp1p0"
412+
# CHECK: attribute 5, "rv32i2p1_zicfilp1p0_zicsr2p0"
413413

414-
.attribute arch, "rv32i_zicfiss0p4"
415-
# CHECK: .attribute 5, "rv32i2p1_zicfiss0p4_zicsr2p0_zimop1p0"
414+
.attribute arch, "rv32i_zicfiss1p0"
415+
# CHECK: .attribute 5, "rv32i2p1_zicfiss1p0_zicsr2p0_zimop1p0"
416416

417417
.attribute arch, "rv64i_xsfvfwmaccqqq"
418418
# CHECK: attribute 5, "rv64i2p1_f2p2_zicsr2p0_zve32f1p0_zve32x1p0_zvfbfmin1p0_zvl32b1p0_xsfvfwmaccqqq1p0"

‎llvm/test/MC/RISCV/compressed-zicfiss.s

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zicfiss,+zcmop -riscv-no-aliases -show-encoding \
1+
# RUN: llvm-mc %s -triple=riscv32 -mattr=+zicfiss,+zcmop -riscv-no-aliases -show-encoding \
22
# RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
3-
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zicfiss,+zcmop < %s \
4-
# RUN: | llvm-objdump --mattr=+experimental-zicfiss,+zcmop -M no-aliases -d -r - \
3+
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+zicfiss,+zcmop < %s \
4+
# RUN: | llvm-objdump --mattr=+zicfiss,+zcmop -M no-aliases -d -r - \
55
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
6-
# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zicfiss,+zcmop -riscv-no-aliases -show-encoding \
6+
# RUN: llvm-mc %s -triple=riscv64 -mattr=+zicfiss,+zcmop -riscv-no-aliases -show-encoding \
77
# RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
8-
# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zicfiss,+zcmop < %s \
9-
# RUN: | llvm-objdump --mattr=+experimental-zicfiss,+zcmop -M no-aliases -d -r - \
8+
# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+zicfiss,+zcmop < %s \
9+
# RUN: | llvm-objdump --mattr=+zicfiss,+zcmop -M no-aliases -d -r - \
1010
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
1111
#
1212
# RUN: not llvm-mc -triple riscv32 -riscv-no-aliases -show-encoding < %s 2>&1 \

‎llvm/test/MC/RISCV/option-arch.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# RUN: llvm-mc -triple riscv32 -mattr=+experimental -show-encoding < %s \
22
# RUN: | FileCheck -check-prefixes=CHECK %s
33
# RUN: llvm-mc -triple riscv32 -mattr=+experimental -filetype=obj < %s \
4-
# RUN: | llvm-objdump --triple=riscv32 --mattr=+c,+m,+a,+f,+zba,+experimental-zicfiss -d -M no-aliases - \
4+
# RUN: | llvm-objdump --triple=riscv32 --mattr=+c,+m,+a,+f,+zba,+zicfiss -d -M no-aliases - \
55
# RUN: | FileCheck -check-prefixes=CHECK-INST %s
66

77
# Test '.option arch, +' and '.option arch, -' directive

‎llvm/test/MC/RISCV/rv32zicfiss-invalid.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# RUN: not llvm-mc %s -triple=riscv32 -mattr=+experimental-zicfiss,+c -riscv-no-aliases -show-encoding \
1+
# RUN: not llvm-mc %s -triple=riscv32 -mattr=+zicfiss,+c -riscv-no-aliases -show-encoding \
22
# RUN: 2>&1 | FileCheck -check-prefixes=CHECK-ERR %s
33

44
# CHECK-ERR: error: invalid operand for instruction

‎llvm/test/MC/RISCV/rv64zicfiss-invalid.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# RUN: not llvm-mc %s -triple=riscv64 -mattr=+experimental-zicfiss,+c -riscv-no-aliases -show-encoding \
1+
# RUN: not llvm-mc %s -triple=riscv64 -mattr=+zicfiss,+c -riscv-no-aliases -show-encoding \
22
# RUN: 2>&1 | FileCheck -check-prefixes=CHECK-ERR %s
33

44
# CHECK-ERR: error: invalid operand for instruction

‎llvm/test/MC/RISCV/tail-call.s

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
# RUN: llvm-mc -triple riscv64 < %s -show-encoding \
1313
# RUN: | FileCheck -check-prefix=FIXUP %s
1414

15-
# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+experimental-zicfilp < %s \
15+
# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+zicfilp < %s \
1616
# RUN: | llvm-objdump -d - | FileCheck --check-prefix=INSTR-ZICFILP %s
17-
# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+experimental-zicfilp < %s \
17+
# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+zicfilp < %s \
1818
# RUN: | llvm-readobj -r - | FileCheck -check-prefix=RELOC %s
19-
# RUN: llvm-mc -triple riscv32 -mattr=+experimental-zicfilp < %s -show-encoding \
19+
# RUN: llvm-mc -triple riscv32 -mattr=+zicfilp < %s -show-encoding \
2020
# RUN: | FileCheck -check-prefix=FIXUP %s
2121

22-
# RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+experimental-zicfilp < %s \
22+
# RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+zicfilp < %s \
2323
# RUN: | llvm-objdump -d - | FileCheck --check-prefix=INSTR-ZICFILP %s
24-
# RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+experimental-zicfilp < %s \
24+
# RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+zicfilp < %s \
2525
# RUN: | llvm-readobj -r - | FileCheck -check-prefix=RELOC %s
26-
# RUN: llvm-mc -triple riscv64 -mattr=+experimental-zicfilp < %s -show-encoding \
26+
# RUN: llvm-mc -triple riscv64 -mattr=+zicfilp < %s -show-encoding \
2727
# RUN: | FileCheck -check-prefix=FIXUP %s
2828

2929
.long foo

‎llvm/test/MC/RISCV/zicfilp-invalid.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# RUN: not llvm-mc -triple riscv32 -mattr=+experimental-zicfilp -riscv-no-aliases -show-encoding < %s 2>&1 \
1+
# RUN: not llvm-mc -triple riscv32 -mattr=+zicfilp -riscv-no-aliases -show-encoding < %s 2>&1 \
22
# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s
3-
# RUN: not llvm-mc -triple riscv64 -mattr=+experimental-zicfilp -riscv-no-aliases -show-encoding < %s 2>&1 \
3+
# RUN: not llvm-mc -triple riscv64 -mattr=+zicfilp -riscv-no-aliases -show-encoding < %s 2>&1 \
44
# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s
55

66
# CHECK-NO-EXT: immediate must be an integer in the range [0, 1048575]

‎llvm/test/MC/RISCV/zicfilp-valid.s

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zicfilp -riscv-no-aliases -show-encoding \
1+
# RUN: llvm-mc %s -triple=riscv32 -mattr=+zicfilp -riscv-no-aliases -show-encoding \
22
# RUN: | FileCheck -check-prefixes=CHECK-ASM %s
3-
# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zicfilp -riscv-no-aliases -show-encoding \
3+
# RUN: llvm-mc %s -triple=riscv64 -mattr=+zicfilp -riscv-no-aliases -show-encoding \
44
# RUN: | FileCheck -check-prefixes=CHECK-ASM %s
5-
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zicfilp < %s \
6-
# RUN: | llvm-objdump --mattr=+experimental-zicfilp --no-print-imm-hex -d -r - \
5+
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+zicfilp < %s \
6+
# RUN: | llvm-objdump --mattr=+zicfilp --no-print-imm-hex -d -r - \
77
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
8-
# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zicfilp < %s \
9-
# RUN: | llvm-objdump --mattr=+experimental-zicfilp --no-print-imm-hex -d -r - \
8+
# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+zicfilp < %s \
9+
# RUN: | llvm-objdump --mattr=+zicfilp --no-print-imm-hex -d -r - \
1010
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
1111
#
1212
# RUN: not llvm-mc -triple riscv32 -riscv-no-aliases -show-encoding < %s 2>&1 \

‎llvm/test/MC/RISCV/zicfiss-valid.s

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# RUN: llvm-mc %s -triple=riscv32 -mattr=+a,+experimental-zicfiss -riscv-no-aliases -show-encoding \
1+
# RUN: llvm-mc %s -triple=riscv32 -mattr=+a,+zicfiss -riscv-no-aliases -show-encoding \
22
# RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
3-
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+a,+experimental-zicfiss < %s \
4-
# RUN: | llvm-objdump --mattr=+a,+experimental-zicfiss -M no-aliases -d -r - \
3+
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+a,+zicfiss < %s \
4+
# RUN: | llvm-objdump --mattr=+a,+zicfiss -M no-aliases -d -r - \
55
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
6-
# RUN: llvm-mc %s -triple=riscv64 -defsym=RV64=1 -mattr=+a,+experimental-zicfiss -riscv-no-aliases -show-encoding \
6+
# RUN: llvm-mc %s -triple=riscv64 -defsym=RV64=1 -mattr=+a,+zicfiss -riscv-no-aliases -show-encoding \
77
# RUN: | FileCheck -check-prefixes=CHECK-ASM-RV64,CHECK-ASM,CHECK-ASM-AND-OBJ-RV64,CHECK-ASM-AND-OBJ %s
8-
# RUN: llvm-mc -filetype=obj -triple=riscv64 -defsym=RV64=1 -mattr=+a,+experimental-zicfiss < %s \
9-
# RUN: | llvm-objdump --mattr=+a,+experimental-zicfiss -M no-aliases -d -r - \
8+
# RUN: llvm-mc -filetype=obj -triple=riscv64 -defsym=RV64=1 -mattr=+a,+zicfiss < %s \
9+
# RUN: | llvm-objdump --mattr=+a,+zicfiss -M no-aliases -d -r - \
1010
# RUN: | FileCheck --check-prefixes=CHECK-ASM-AND-OBJ-RV64,CHECK-ASM-AND-OBJ %s
1111
#
1212
# RUN: not llvm-mc -triple riscv32 -riscv-no-aliases -show-encoding < %s 2>&1 \

‎llvm/unittests/TargetParser/RISCVISAInfoTest.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -879,6 +879,8 @@ R"(All available -march extensions for RISC-V
879879
ziccif 1.0
880880
zicclsm 1.0
881881
ziccrse 1.0
882+
zicfilp 1.0
883+
zicfiss 1.0
882884
zicntr 2.0
883885
zicond 1.0
884886
zicsr 2.0
@@ -1026,9 +1028,7 @@ R"(All available -march extensions for RISC-V
10261028
xwchc 2.2
10271029
10281030
Experimental extensions
1029-
zicfilp 0.4 This is a long dummy description
1030-
zicfiss 0.4
1031-
zalasr 0.1
1031+
zalasr 0.1 This is a long dummy description
10321032
smmpm 1.0
10331033
smnpm 1.0
10341034
ssnpm 1.0
@@ -1057,7 +1057,7 @@ For example, clang -march=rv32i_v1p0)";
10571057

10581058
StringMap<StringRef> DummyMap;
10591059
DummyMap["i"] = "This is a long dummy description";
1060-
DummyMap["experimental-zicfilp"] = "This is a long dummy description";
1060+
DummyMap["experimental-zalasr"] = "This is a long dummy description";
10611061

10621062
outs().flush();
10631063
testing::internal::CaptureStdout();
@@ -1079,16 +1079,16 @@ R"(Extensions enabled for the given RISC-V target
10791079
i 2.1 'I' (Base Integer Instruction Set)
10801080
10811081
Experimental extensions
1082-
zicfilp 0.4 'Zicfilp' (Landing pad)
1082+
zalasr 0.1 'Zalasr' (Load-Acquire and Store-Release Instructions)
10831083
1084-
ISA String: rv64i2p1_zicfilp0p4_zicsr2p0
1084+
ISA String: rv64i2p1_zalasr0p1
10851085
)";
10861086
// clang-format on
10871087

10881088
StringMap<StringRef> DescMap;
10891089
DescMap["i"] = "'I' (Base Integer Instruction Set)";
1090-
DescMap["experimental-zicfilp"] = "'Zicfilp' (Landing pad)";
1091-
std::set<StringRef> EnabledExtensions = {"i", "experimental-zicfilp"};
1090+
DescMap["experimental-zalasr"] = "'Zalasr' (Load-Acquire and Store-Release Instructions)";
1091+
std::set<StringRef> EnabledExtensions = {"i", "experimental-zalasr"};
10921092

10931093
outs().flush();
10941094
testing::internal::CaptureStdout();

0 commit comments

Comments
 (0)