Skip to content

Commit 5545b25

Browse files
authored
[RISCV] Make Zfh imply Zfhmin. (#75576)
According to spec, the Zfhmin extension is a subset of the Zfh extension.
1 parent 433498c commit 5545b25

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

llvm/lib/Support/RISCVISAInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ static const char *ImpliedExtsZcmt[] = {"zca"};
10101010
static const char *ImpliedExtsZdinx[] = {"zfinx"};
10111011
static const char *ImpliedExtsZfa[] = {"f"};
10121012
static const char *ImpliedExtsZfbfmin[] = {"f"};
1013-
static const char *ImpliedExtsZfh[] = {"f"};
1013+
static const char *ImpliedExtsZfh[] = {"zfhmin"};
10141014
static const char *ImpliedExtsZfhmin[] = {"f"};
10151015
static const char *ImpliedExtsZfinx[] = {"zicsr"};
10161016
static const char *ImpliedExtsZhinx[] = {"zfinx"};

llvm/test/CodeGen/RISCV/attributes.ll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,14 @@
193193
; RV32ZIHINTPAUSE: .attribute 5, "rv32i2p1_zihintpause2p0"
194194
; RV32ZIHINTNTL: .attribute 5, "rv32i2p1_zihintntl1p0"
195195
; RV32ZFHMIN: .attribute 5, "rv32i2p1_f2p2_zicsr2p0_zfhmin1p0"
196-
; RV32ZFH: .attribute 5, "rv32i2p1_f2p2_zicsr2p0_zfh1p0"
196+
; RV32ZFH: .attribute 5, "rv32i2p1_f2p2_zicsr2p0_zfh1p0_zfhmin1p0"
197197
; RV32ZBA: .attribute 5, "rv32i2p1_zba1p0"
198198
; RV32ZBB: .attribute 5, "rv32i2p1_zbb1p0"
199199
; RV32ZBC: .attribute 5, "rv32i2p1_zbc1p0"
200200
; RV32ZBS: .attribute 5, "rv32i2p1_zbs1p0"
201201
; RV32V: .attribute 5, "rv32i2p1_f2p2_d2p2_v1p0_zicsr2p0_zve32f1p0_zve32x1p0_zve64d1p0_zve64f1p0_zve64x1p0_zvl128b1p0_zvl32b1p0_zvl64b1p0"
202202
; RV32H: .attribute 5, "rv32i2p1_h1p0"
203-
; RV32COMBINED: .attribute 5, "rv32i2p1_f2p2_d2p2_v1p0_zicsr2p0_zfh1p0_zbb1p0_zve32f1p0_zve32x1p0_zve64d1p0_zve64f1p0_zve64x1p0_zvl128b1p0_zvl32b1p0_zvl64b1p0"
203+
; RV32COMBINED: .attribute 5, "rv32i2p1_f2p2_d2p2_v1p0_zicsr2p0_zfh1p0_zfhmin1p0_zbb1p0_zve32f1p0_zve32x1p0_zve64d1p0_zve64f1p0_zve64x1p0_zvl128b1p0_zvl32b1p0_zvl64b1p0"
204204
; RV32ZBKB: .attribute 5, "rv32i2p1_zbkb1p0"
205205
; RV32ZBKC: .attribute 5, "rv32i2p1_zbkc1p0"
206206
; RV32ZBKX: .attribute 5, "rv32i2p1_zbkx1p0"
@@ -283,14 +283,14 @@
283283
; RV64ZIHINTPAUSE: .attribute 5, "rv64i2p1_zihintpause2p0"
284284
; RV64ZIHINTNTL: .attribute 5, "rv64i2p1_zihintntl1p0"
285285
; RV64ZFHMIN: .attribute 5, "rv64i2p1_f2p2_zicsr2p0_zfhmin1p0"
286-
; RV64ZFH: .attribute 5, "rv64i2p1_f2p2_zicsr2p0_zfh1p0"
286+
; RV64ZFH: .attribute 5, "rv64i2p1_f2p2_zicsr2p0_zfh1p0_zfhmin1p0"
287287
; RV64ZBA: .attribute 5, "rv64i2p1_zba1p0"
288288
; RV64ZBB: .attribute 5, "rv64i2p1_zbb1p0"
289289
; RV64ZBC: .attribute 5, "rv64i2p1_zbc1p0"
290290
; RV64ZBS: .attribute 5, "rv64i2p1_zbs1p0"
291291
; RV64V: .attribute 5, "rv64i2p1_f2p2_d2p2_v1p0_zicsr2p0_zve32f1p0_zve32x1p0_zve64d1p0_zve64f1p0_zve64x1p0_zvl128b1p0_zvl32b1p0_zvl64b1p0"
292292
; RV64H: .attribute 5, "rv64i2p1_h1p0"
293-
; RV64COMBINED: .attribute 5, "rv64i2p1_f2p2_d2p2_v1p0_zicsr2p0_zfh1p0_zbb1p0_zve32f1p0_zve32x1p0_zve64d1p0_zve64f1p0_zve64x1p0_zvl128b1p0_zvl32b1p0_zvl64b1p0"
293+
; RV64COMBINED: .attribute 5, "rv64i2p1_f2p2_d2p2_v1p0_zicsr2p0_zfh1p0_zfhmin1p0_zbb1p0_zve32f1p0_zve32x1p0_zve64d1p0_zve64f1p0_zve64x1p0_zvl128b1p0_zvl32b1p0_zvl64b1p0"
294294
; RV64ZBKB: .attribute 5, "rv64i2p1_zbkb1p0"
295295
; RV64ZBKC: .attribute 5, "rv64i2p1_zbkc1p0"
296296
; RV64ZBKX: .attribute 5, "rv64i2p1_zbkx1p0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
# CHECK: attribute 5, "rv32i2p1_f2p2_zicsr2p0_zfhmin1p0"
167167

168168
.attribute arch, "rv32ifzfh1p0"
169-
# CHECK: attribute 5, "rv32i2p1_f2p2_zicsr2p0_zfh1p0"
169+
# CHECK: attribute 5, "rv32i2p1_f2p2_zicsr2p0_zfh1p0_zfhmin1p0"
170170

171171
.attribute arch, "rv32izfinx"
172172
# CHECK: attribute 5, "rv32i2p1_zicsr2p0_zfinx1p0"

0 commit comments

Comments
 (0)