Skip to content

Commit 7db9769

Browse files
davemgreendavemgreen
committed
[ARM][AArch64] Replace ".f16(bfloat" with ".bf16(bfloat" in intrinsics. NFC
It looks like these were copied from fp16 tests, and forgot to update the intrinsic types. Also remove some old definitions that are no longer required.
1 parent 72574b8 commit 7db9769

File tree

3 files changed

+71
-135
lines changed

3 files changed

+71
-135
lines changed

‎llvm/test/CodeGen/AArch64/bf16-instructions.ll‎

Lines changed: 34 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,38 +1131,6 @@ define bfloat @test_bitcast_i16tobfloat(i16 %a) #0 {
11311131
ret bfloat %r
11321132
}
11331133

1134-
declare bfloat @llvm.sqrt.f16(bfloat %a) #0
1135-
declare bfloat @llvm.powi.f16.i32(bfloat %a, i32 %b) #0
1136-
declare bfloat @llvm.sin.f16(bfloat %a) #0
1137-
declare bfloat @llvm.cos.f16(bfloat %a) #0
1138-
declare bfloat @llvm.tan.f16(bfloat %a) #0
1139-
declare bfloat @llvm.asin.f16(bfloat %a) #0
1140-
declare bfloat @llvm.acos.f16(bfloat %a) #0
1141-
declare bfloat @llvm.atan.f16(bfloat %a) #0
1142-
declare bfloat @llvm.atan2.f16(bfloat %a, bfloat %b) #0
1143-
declare bfloat @llvm.sinh.f16(bfloat %a) #0
1144-
declare bfloat @llvm.cosh.f16(bfloat %a) #0
1145-
declare bfloat @llvm.tanh.f16(bfloat %a) #0
1146-
declare bfloat @llvm.pow.f16(bfloat %a, bfloat %b) #0
1147-
declare bfloat @llvm.exp.f16(bfloat %a) #0
1148-
declare bfloat @llvm.exp2.f16(bfloat %a) #0
1149-
declare bfloat @llvm.log.f16(bfloat %a) #0
1150-
declare bfloat @llvm.log10.f16(bfloat %a) #0
1151-
declare bfloat @llvm.log2.f16(bfloat %a) #0
1152-
declare bfloat @llvm.fma.f16(bfloat %a, bfloat %b, bfloat %c) #0
1153-
declare bfloat @llvm.fabs.f16(bfloat %a) #0
1154-
declare bfloat @llvm.minnum.f16(bfloat %a, bfloat %b) #0
1155-
declare bfloat @llvm.maxnum.f16(bfloat %a, bfloat %b) #0
1156-
declare bfloat @llvm.copysign.f16(bfloat %a, bfloat %b) #0
1157-
declare bfloat @llvm.floor.f16(bfloat %a) #0
1158-
declare bfloat @llvm.ceil.f16(bfloat %a) #0
1159-
declare bfloat @llvm.trunc.f16(bfloat %a) #0
1160-
declare bfloat @llvm.rint.f16(bfloat %a) #0
1161-
declare bfloat @llvm.nearbyint.f16(bfloat %a) #0
1162-
declare bfloat @llvm.round.f16(bfloat %a) #0
1163-
declare bfloat @llvm.roundeven.f16(bfloat %a) #0
1164-
declare bfloat @llvm.fmuladd.f16(bfloat %a, bfloat %b, bfloat %c) #0
1165-
11661134

11671135
define bfloat @test_sqrt(bfloat %a) #0 {
11681136
; CHECK-CVT-LABEL: test_sqrt:
@@ -1187,7 +1155,7 @@ define bfloat @test_sqrt(bfloat %a) #0 {
11871155
; CHECK-BF16-NEXT: fsqrt s0, s0
11881156
; CHECK-BF16-NEXT: bfcvt h0, s0
11891157
; CHECK-BF16-NEXT: ret
1190-
%r = call bfloat @llvm.sqrt.f16(bfloat %a)
1158+
%r = call bfloat @llvm.sqrt.bf16(bfloat %a)
11911159
ret bfloat %r
11921160
}
11931161

@@ -1220,7 +1188,7 @@ define bfloat @test_powi(bfloat %a, i32 %b) #0 {
12201188
; CHECK-BF16-NEXT: bfcvt h0, s0
12211189
; CHECK-BF16-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
12221190
; CHECK-BF16-NEXT: ret
1223-
%r = call bfloat @llvm.powi.f16.i32(bfloat %a, i32 %b)
1191+
%r = call bfloat @llvm.powi.bf16.i32(bfloat %a, i32 %b)
12241192
ret bfloat %r
12251193
}
12261194

@@ -1254,7 +1222,7 @@ define bfloat @test_sin(bfloat %a) #0 {
12541222
; CHECK-BF16-NEXT: bfcvt h0, s0
12551223
; CHECK-BF16-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
12561224
; CHECK-BF16-NEXT: ret
1257-
%r = call bfloat @llvm.sin.f16(bfloat %a)
1225+
%r = call bfloat @llvm.sin.bf16(bfloat %a)
12581226
ret bfloat %r
12591227
}
12601228

@@ -1287,7 +1255,7 @@ define bfloat @test_cos(bfloat %a) #0 {
12871255
; CHECK-BF16-NEXT: bfcvt h0, s0
12881256
; CHECK-BF16-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
12891257
; CHECK-BF16-NEXT: ret
1290-
%r = call bfloat @llvm.cos.f16(bfloat %a)
1258+
%r = call bfloat @llvm.cos.bf16(bfloat %a)
12911259
ret bfloat %r
12921260
}
12931261

@@ -1320,7 +1288,7 @@ define bfloat @test_tan(bfloat %a) #0 {
13201288
; CHECK-BF16-NEXT: bfcvt h0, s0
13211289
; CHECK-BF16-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
13221290
; CHECK-BF16-NEXT: ret
1323-
%r = call bfloat @llvm.tan.f16(bfloat %a)
1291+
%r = call bfloat @llvm.tan.bf16(bfloat %a)
13241292
ret bfloat %r
13251293
}
13261294

@@ -1353,7 +1321,7 @@ define bfloat @test_acos(bfloat %a) #0 {
13531321
; CHECK-BF16-NEXT: bfcvt h0, s0
13541322
; CHECK-BF16-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
13551323
; CHECK-BF16-NEXT: ret
1356-
%r = call bfloat @llvm.acos.f16(bfloat %a)
1324+
%r = call bfloat @llvm.acos.bf16(bfloat %a)
13571325
ret bfloat %r
13581326
}
13591327

@@ -1386,7 +1354,7 @@ define bfloat @test_asin(bfloat %a) #0 {
13861354
; CHECK-BF16-NEXT: bfcvt h0, s0
13871355
; CHECK-BF16-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
13881356
; CHECK-BF16-NEXT: ret
1389-
%r = call bfloat @llvm.asin.f16(bfloat %a)
1357+
%r = call bfloat @llvm.asin.bf16(bfloat %a)
13901358
ret bfloat %r
13911359
}
13921360

@@ -1419,7 +1387,7 @@ define bfloat @test_atan(bfloat %a) #0 {
14191387
; CHECK-BF16-NEXT: bfcvt h0, s0
14201388
; CHECK-BF16-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
14211389
; CHECK-BF16-NEXT: ret
1422-
%r = call bfloat @llvm.atan.f16(bfloat %a)
1390+
%r = call bfloat @llvm.atan.bf16(bfloat %a)
14231391
ret bfloat %r
14241392
}
14251393

@@ -1458,7 +1426,7 @@ define bfloat @test_atan2(bfloat %a, bfloat %b) #0 {
14581426
; CHECK-BF16-NEXT: bfcvt h0, s0
14591427
; CHECK-BF16-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
14601428
; CHECK-BF16-NEXT: ret
1461-
%r = call bfloat @llvm.atan2.f16(bfloat %a, bfloat %b)
1429+
%r = call bfloat @llvm.atan2.bf16(bfloat %a, bfloat %b)
14621430
ret bfloat %r
14631431
}
14641432

@@ -1491,7 +1459,7 @@ define bfloat @test_cosh(bfloat %a) #0 {
14911459
; CHECK-BF16-NEXT: bfcvt h0, s0
14921460
; CHECK-BF16-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
14931461
; CHECK-BF16-NEXT: ret
1494-
%r = call bfloat @llvm.cosh.f16(bfloat %a)
1462+
%r = call bfloat @llvm.cosh.bf16(bfloat %a)
14951463
ret bfloat %r
14961464
}
14971465

@@ -1524,7 +1492,7 @@ define bfloat @test_sinh(bfloat %a) #0 {
15241492
; CHECK-BF16-NEXT: bfcvt h0, s0
15251493
; CHECK-BF16-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
15261494
; CHECK-BF16-NEXT: ret
1527-
%r = call bfloat @llvm.sinh.f16(bfloat %a)
1495+
%r = call bfloat @llvm.sinh.bf16(bfloat %a)
15281496
ret bfloat %r
15291497
}
15301498

@@ -1557,7 +1525,7 @@ define bfloat @test_tanh(bfloat %a) #0 {
15571525
; CHECK-BF16-NEXT: bfcvt h0, s0
15581526
; CHECK-BF16-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
15591527
; CHECK-BF16-NEXT: ret
1560-
%r = call bfloat @llvm.tanh.f16(bfloat %a)
1528+
%r = call bfloat @llvm.tanh.bf16(bfloat %a)
15611529
ret bfloat %r
15621530
}
15631531

@@ -1596,7 +1564,7 @@ define bfloat @test_pow(bfloat %a, bfloat %b) #0 {
15961564
; CHECK-BF16-NEXT: bfcvt h0, s0
15971565
; CHECK-BF16-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
15981566
; CHECK-BF16-NEXT: ret
1599-
%r = call bfloat @llvm.pow.f16(bfloat %a, bfloat %b)
1567+
%r = call bfloat @llvm.pow.bf16(bfloat %a, bfloat %b)
16001568
ret bfloat %r
16011569
}
16021570

@@ -1629,7 +1597,7 @@ define bfloat @test_exp(bfloat %a) #0 {
16291597
; CHECK-BF16-NEXT: bfcvt h0, s0
16301598
; CHECK-BF16-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
16311599
; CHECK-BF16-NEXT: ret
1632-
%r = call bfloat @llvm.exp.f16(bfloat %a)
1600+
%r = call bfloat @llvm.exp.bf16(bfloat %a)
16331601
ret bfloat %r
16341602
}
16351603

@@ -1662,7 +1630,7 @@ define bfloat @test_exp2(bfloat %a) #0 {
16621630
; CHECK-BF16-NEXT: bfcvt h0, s0
16631631
; CHECK-BF16-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
16641632
; CHECK-BF16-NEXT: ret
1665-
%r = call bfloat @llvm.exp2.f16(bfloat %a)
1633+
%r = call bfloat @llvm.exp2.bf16(bfloat %a)
16661634
ret bfloat %r
16671635
}
16681636

@@ -1695,7 +1663,7 @@ define bfloat @test_log(bfloat %a) #0 {
16951663
; CHECK-BF16-NEXT: bfcvt h0, s0
16961664
; CHECK-BF16-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
16971665
; CHECK-BF16-NEXT: ret
1698-
%r = call bfloat @llvm.log.f16(bfloat %a)
1666+
%r = call bfloat @llvm.log.bf16(bfloat %a)
16991667
ret bfloat %r
17001668
}
17011669

@@ -1728,7 +1696,7 @@ define bfloat @test_log10(bfloat %a) #0 {
17281696
; CHECK-BF16-NEXT: bfcvt h0, s0
17291697
; CHECK-BF16-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
17301698
; CHECK-BF16-NEXT: ret
1731-
%r = call bfloat @llvm.log10.f16(bfloat %a)
1699+
%r = call bfloat @llvm.log10.bf16(bfloat %a)
17321700
ret bfloat %r
17331701
}
17341702

@@ -1761,7 +1729,7 @@ define bfloat @test_log2(bfloat %a) #0 {
17611729
; CHECK-BF16-NEXT: bfcvt h0, s0
17621730
; CHECK-BF16-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
17631731
; CHECK-BF16-NEXT: ret
1764-
%r = call bfloat @llvm.log2.f16(bfloat %a)
1732+
%r = call bfloat @llvm.log2.bf16(bfloat %a)
17651733
ret bfloat %r
17661734
}
17671735

@@ -1796,7 +1764,7 @@ define bfloat @test_fma(bfloat %a, bfloat %b, bfloat %c) #0 {
17961764
; CHECK-BF16-NEXT: fmadd s0, s0, s1, s2
17971765
; CHECK-BF16-NEXT: bfcvt h0, s0
17981766
; CHECK-BF16-NEXT: ret
1799-
%r = call bfloat @llvm.fma.f16(bfloat %a, bfloat %b, bfloat %c)
1767+
%r = call bfloat @llvm.fma.bf16(bfloat %a, bfloat %b, bfloat %c)
18001768
ret bfloat %r
18011769
}
18021770

@@ -1809,7 +1777,7 @@ define bfloat @test_fabs(bfloat %a) #0 {
18091777
; CHECK-NEXT: fmov s0, w8
18101778
; CHECK-NEXT: // kill: def $h0 killed $h0 killed $s0
18111779
; CHECK-NEXT: ret
1812-
%r = call bfloat @llvm.fabs.f16(bfloat %a)
1780+
%r = call bfloat @llvm.fabs.bf16(bfloat %a)
18131781
ret bfloat %r
18141782
}
18151783

@@ -1840,7 +1808,7 @@ define bfloat @test_minnum(bfloat %a, bfloat %b) #0 {
18401808
; CHECK-BF16-NEXT: fminnm s0, s0, s1
18411809
; CHECK-BF16-NEXT: bfcvt h0, s0
18421810
; CHECK-BF16-NEXT: ret
1843-
%r = call bfloat @llvm.minnum.f16(bfloat %a, bfloat %b)
1811+
%r = call bfloat @llvm.minnum.bf16(bfloat %a, bfloat %b)
18441812
ret bfloat %r
18451813
}
18461814

@@ -1871,7 +1839,7 @@ define bfloat @test_maxnum(bfloat %a, bfloat %b) #0 {
18711839
; CHECK-BF16-NEXT: fmaxnm s0, s0, s1
18721840
; CHECK-BF16-NEXT: bfcvt h0, s0
18731841
; CHECK-BF16-NEXT: ret
1874-
%r = call bfloat @llvm.maxnum.f16(bfloat %a, bfloat %b)
1842+
%r = call bfloat @llvm.maxnum.bf16(bfloat %a, bfloat %b)
18751843
ret bfloat %r
18761844
}
18771845

@@ -1909,7 +1877,7 @@ define bfloat @test_copysign(bfloat %a, bfloat %b) #0 {
19091877
; CHECK-GI-NEXT: bif v0.16b, v1.16b, v2.16b
19101878
; CHECK-GI-NEXT: // kill: def $h0 killed $h0 killed $q0
19111879
; CHECK-GI-NEXT: ret
1912-
%r = call bfloat @llvm.copysign.f16(bfloat %a, bfloat %b)
1880+
%r = call bfloat @llvm.copysign.bf16(bfloat %a, bfloat %b)
19131881
ret bfloat %r
19141882
}
19151883

@@ -1946,7 +1914,7 @@ define bfloat @test_copysign_f32(bfloat %a, float %b) #0 {
19461914
; CHECK-GI-NEXT: // kill: def $h0 killed $h0 killed $q0
19471915
; CHECK-GI-NEXT: ret
19481916
%tb = fptrunc float %b to bfloat
1949-
%r = call bfloat @llvm.copysign.f16(bfloat %a, bfloat %tb)
1917+
%r = call bfloat @llvm.copysign.bf16(bfloat %a, bfloat %tb)
19501918
ret bfloat %r
19511919
}
19521920

@@ -1984,7 +1952,7 @@ define bfloat @test_copysign_f64(bfloat %a, double %b) #0 {
19841952
; CHECK-GI-NEXT: // kill: def $h0 killed $h0 killed $q0
19851953
; CHECK-GI-NEXT: ret
19861954
%tb = fptrunc double %b to bfloat
1987-
%r = call bfloat @llvm.copysign.f16(bfloat %a, bfloat %tb)
1955+
%r = call bfloat @llvm.copysign.bf16(bfloat %a, bfloat %tb)
19881956
ret bfloat %r
19891957
}
19901958

@@ -2026,7 +1994,7 @@ define float @test_copysign_extended(bfloat %a, bfloat %b) #0 {
20261994
; CHECK-GI-NEXT: shll v0.4s, v0.4h, #16
20271995
; CHECK-GI-NEXT: // kill: def $s0 killed $s0 killed $q0
20281996
; CHECK-GI-NEXT: ret
2029-
%r = call bfloat @llvm.copysign.f16(bfloat %a, bfloat %b)
1997+
%r = call bfloat @llvm.copysign.bf16(bfloat %a, bfloat %b)
20301998
%xr = fpext bfloat %r to float
20311999
ret float %xr
20322000
}
@@ -2054,7 +2022,7 @@ define bfloat @test_floor(bfloat %a) #0 {
20542022
; CHECK-BF16-NEXT: frintm s0, s0
20552023
; CHECK-BF16-NEXT: bfcvt h0, s0
20562024
; CHECK-BF16-NEXT: ret
2057-
%r = call bfloat @llvm.floor.f16(bfloat %a)
2025+
%r = call bfloat @llvm.floor.bf16(bfloat %a)
20582026
ret bfloat %r
20592027
}
20602028

@@ -2081,7 +2049,7 @@ define bfloat @test_ceil(bfloat %a) #0 {
20812049
; CHECK-BF16-NEXT: frintp s0, s0
20822050
; CHECK-BF16-NEXT: bfcvt h0, s0
20832051
; CHECK-BF16-NEXT: ret
2084-
%r = call bfloat @llvm.ceil.f16(bfloat %a)
2052+
%r = call bfloat @llvm.ceil.bf16(bfloat %a)
20852053
ret bfloat %r
20862054
}
20872055

@@ -2108,7 +2076,7 @@ define bfloat @test_trunc(bfloat %a) #0 {
21082076
; CHECK-BF16-NEXT: frintz s0, s0
21092077
; CHECK-BF16-NEXT: bfcvt h0, s0
21102078
; CHECK-BF16-NEXT: ret
2111-
%r = call bfloat @llvm.trunc.f16(bfloat %a)
2079+
%r = call bfloat @llvm.trunc.bf16(bfloat %a)
21122080
ret bfloat %r
21132081
}
21142082

@@ -2135,7 +2103,7 @@ define bfloat @test_rint(bfloat %a) #0 {
21352103
; CHECK-BF16-NEXT: frintx s0, s0
21362104
; CHECK-BF16-NEXT: bfcvt h0, s0
21372105
; CHECK-BF16-NEXT: ret
2138-
%r = call bfloat @llvm.rint.f16(bfloat %a)
2106+
%r = call bfloat @llvm.rint.bf16(bfloat %a)
21392107
ret bfloat %r
21402108
}
21412109

@@ -2162,7 +2130,7 @@ define bfloat @test_nearbyint(bfloat %a) #0 {
21622130
; CHECK-BF16-NEXT: frinti s0, s0
21632131
; CHECK-BF16-NEXT: bfcvt h0, s0
21642132
; CHECK-BF16-NEXT: ret
2165-
%r = call bfloat @llvm.nearbyint.f16(bfloat %a)
2133+
%r = call bfloat @llvm.nearbyint.bf16(bfloat %a)
21662134
ret bfloat %r
21672135
}
21682136

@@ -2189,7 +2157,7 @@ define bfloat @test_round(bfloat %a) #0 {
21892157
; CHECK-BF16-NEXT: frinta s0, s0
21902158
; CHECK-BF16-NEXT: bfcvt h0, s0
21912159
; CHECK-BF16-NEXT: ret
2192-
%r = call bfloat @llvm.round.f16(bfloat %a)
2160+
%r = call bfloat @llvm.round.bf16(bfloat %a)
21932161
ret bfloat %r
21942162
}
21952163

@@ -2216,7 +2184,7 @@ define bfloat @test_roundeven(bfloat %a) #0 {
22162184
; CHECK-BF16-NEXT: frintn s0, s0
22172185
; CHECK-BF16-NEXT: bfcvt h0, s0
22182186
; CHECK-BF16-NEXT: ret
2219-
%r = call bfloat @llvm.roundeven.f16(bfloat %a)
2187+
%r = call bfloat @llvm.roundeven.bf16(bfloat %a)
22202188
ret bfloat %r
22212189
}
22222190

@@ -2262,7 +2230,7 @@ define bfloat @test_fmuladd(bfloat %a, bfloat %b, bfloat %c) #0 {
22622230
; CHECK-BF16-NEXT: fadd s0, s0, s1
22632231
; CHECK-BF16-NEXT: bfcvt h0, s0
22642232
; CHECK-BF16-NEXT: ret
2265-
%r = call bfloat @llvm.fmuladd.f16(bfloat %a, bfloat %b, bfloat %c)
2233+
%r = call bfloat @llvm.fmuladd.bf16(bfloat %a, bfloat %b, bfloat %c)
22662234
ret bfloat %r
22672235
}
22682236

‎llvm/test/CodeGen/Generic/bfloat-op.ll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ define void @test_fabs(ptr %p1, ptr %p2) {
6666
; ALL-ABS-NOT: __gnu
6767
; ALL-ABS-NOT: __aeabi
6868
%a = load bfloat, ptr %p1
69-
%r = call bfloat @llvm.fabs.f16(bfloat %a)
69+
%r = call bfloat @llvm.fabs.bf16(bfloat %a)
7070
store bfloat %r, ptr %p2
7171
ret void
7272
}
@@ -80,7 +80,7 @@ define void @test_copysign(ptr %p1, ptr %p2, ptr %p3) {
8080
; BAD-COPYSIGN: __truncsfbf2
8181
%a = load bfloat, ptr %p1
8282
%b = load bfloat, ptr %p2
83-
%r = call bfloat @llvm.copysign.f16(bfloat %a, bfloat %b)
83+
%r = call bfloat @llvm.copysign.bf16(bfloat %a, bfloat %b)
8484
store bfloat %r, ptr %p3
8585
ret void
8686
}
@@ -98,7 +98,7 @@ define void @test_fma(ptr %p1, ptr %p2, ptr %p3, ptr %p4) {
9898
%a = load bfloat, ptr %p1
9999
%b = load bfloat, ptr %p2
100100
%c = load bfloat, ptr %p3
101-
%r = call bfloat @llvm.fma.f16(bfloat %a, bfloat %b, bfloat %c)
101+
%r = call bfloat @llvm.fma.bf16(bfloat %a, bfloat %b, bfloat %c)
102102
store bfloat %r, ptr %p4
103103
ret void
104104
}

0 commit comments

Comments
 (0)