Skip to content

Commit db5fb60

Browse files
tmatheson-armtmatheson-arm
committed
Rename AEK_FP16 to AEK_FULLFP16
1 parent da93655 commit db5fb60

File tree

7 files changed

+217
-207
lines changed

7 files changed

+217
-207
lines changed

‎lldb/test/Shell/Commands/command-disassemble-aarch64-extensions.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ fn:
2323
fmmla z0.d, z1.d, z2.d // AEK_F64MM
2424
cfinv // AEK_FLAGM
2525
fcvt d0, s0 // AEK_FPARMV8
26-
fabs h1, h2 // AEK_FP16
26+
fabs h1, h2 // AEK_FULLFP16
2727
fmlal v0.2s, v1.2h, v2.2h // AEK_FP16FML
2828
bc.eq lbl // AEK_HBC
2929
smmla v1.4s, v16.16b, v31.16b // AEK_I8MM

‎llvm/include/llvm/TargetParser/AArch64TargetParser.h

Lines changed: 46 additions & 47 deletions
Large diffs are not rendered by default.

‎llvm/include/llvm/TargetParser/ARMTargetParser.def

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ ARM_ARCH_EXT_NAME("mp", ARM::AEK_MP, {}, {})
227227
ARM_ARCH_EXT_NAME("simd", ARM::AEK_NEON, {}, {})
228228
ARM_ARCH_EXT_NAME("sec", ARM::AEK_SEC, {}, {})
229229
ARM_ARCH_EXT_NAME("virt", ARM::AEK_VIRT, {}, {})
230-
ARM_ARCH_EXT_NAME("fp16", ARM::AEK_FP16, "+fullfp16", "-fullfp16")
230+
ARM_ARCH_EXT_NAME("fp16", ARM::AEK_FULLFP16, "+fullfp16", "-fullfp16")
231231
ARM_ARCH_EXT_NAME("ras", ARM::AEK_RAS, "+ras", "-ras")
232232
ARM_ARCH_EXT_NAME("os", ARM::AEK_OS, {}, {})
233233
ARM_ARCH_EXT_NAME("iwmmxt", ARM::AEK_IWMMXT, {}, {})
@@ -338,55 +338,55 @@ ARM_CPU_NAME("cortex-m23", ARMV8MBaseline, FK_NONE, false, ARM::AEK_NONE)
338338
ARM_CPU_NAME("cortex-m33", ARMV8MMainline, FK_FPV5_SP_D16, false, ARM::AEK_DSP)
339339
ARM_CPU_NAME("cortex-m35p", ARMV8MMainline, FK_FPV5_SP_D16, false, ARM::AEK_DSP)
340340
ARM_CPU_NAME("cortex-m55", ARMV8_1MMainline, FK_FP_ARMV8_FULLFP16_D16, false,
341-
(ARM::AEK_DSP | ARM::AEK_NEON | ARM::AEK_FPARMV8 | ARM::AEK_FP16))
341+
(ARM::AEK_DSP | ARM::AEK_NEON | ARM::AEK_FPARMV8 | ARM::AEK_FULLFP16))
342342
ARM_CPU_NAME("cortex-m85", ARMV8_1MMainline, FK_FP_ARMV8_FULLFP16_D16, false,
343-
(ARM::AEK_DSP | ARM::AEK_NEON | ARM::AEK_FPARMV8 | ARM::AEK_FP16 |
343+
(ARM::AEK_DSP | ARM::AEK_NEON | ARM::AEK_FPARMV8 | ARM::AEK_FULLFP16 |
344344
ARM::AEK_RAS | ARM::AEK_PACBTI))
345345
ARM_CPU_NAME("cortex-m52", ARMV8_1MMainline, FK_FP_ARMV8_FULLFP16_D16, false,
346-
(ARM::AEK_DSP | ARM::AEK_NEON | ARM::AEK_FPARMV8 | ARM::AEK_FP16 |
346+
(ARM::AEK_DSP | ARM::AEK_NEON | ARM::AEK_FPARMV8 | ARM::AEK_FULLFP16 |
347347
ARM::AEK_RAS | ARM::AEK_PACBTI))
348348
ARM_CPU_NAME("cortex-a32", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
349349
ARM_CPU_NAME("cortex-a35", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
350350
ARM_CPU_NAME("cortex-a53", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
351351
ARM_CPU_NAME("cortex-a55", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
352-
(ARM::AEK_FP16 | ARM::AEK_DOTPROD))
352+
(ARM::AEK_FULLFP16 | ARM::AEK_DOTPROD))
353353
ARM_CPU_NAME("cortex-a57", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
354354
ARM_CPU_NAME("cortex-a72", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
355355
ARM_CPU_NAME("cortex-a73", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
356356
ARM_CPU_NAME("cortex-a75", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
357-
(ARM::AEK_FP16 | ARM::AEK_DOTPROD))
357+
(ARM::AEK_FULLFP16 | ARM::AEK_DOTPROD))
358358
ARM_CPU_NAME("cortex-a76", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
359-
(ARM::AEK_FP16 | ARM::AEK_DOTPROD))
359+
(ARM::AEK_FULLFP16 | ARM::AEK_DOTPROD))
360360
ARM_CPU_NAME("cortex-a76ae", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
361-
(ARM::AEK_FP16 | ARM::AEK_DOTPROD))
361+
(ARM::AEK_FULLFP16 | ARM::AEK_DOTPROD))
362362
ARM_CPU_NAME("cortex-a77", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
363-
(ARM::AEK_FP16 | ARM::AEK_DOTPROD))
363+
(ARM::AEK_FULLFP16 | ARM::AEK_DOTPROD))
364364
ARM_CPU_NAME("cortex-a78", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
365-
(ARM::AEK_FP16 | ARM::AEK_DOTPROD))
365+
(ARM::AEK_FULLFP16 | ARM::AEK_DOTPROD))
366366
ARM_CPU_NAME("cortex-a78ae", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
367367
(ARM::AEK_RAS | ARM::AEK_DOTPROD))
368368
ARM_CPU_NAME("cortex-a78c", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
369-
ARM::AEK_FP16 | ARM::AEK_DOTPROD)
369+
ARM::AEK_FULLFP16 | ARM::AEK_DOTPROD)
370370
ARM_CPU_NAME("cortex-a710", ARMV9A, FK_NEON_FP_ARMV8, false,
371371
(ARM::AEK_DOTPROD | ARM::AEK_FP16FML | ARM::AEK_BF16 |
372372
ARM::AEK_SB | ARM::AEK_I8MM))
373373
ARM_CPU_NAME("cortex-x1", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
374-
(ARM::AEK_FP16 | ARM::AEK_DOTPROD))
374+
(ARM::AEK_FULLFP16 | ARM::AEK_DOTPROD))
375375
ARM_CPU_NAME("cortex-x1c", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
376-
(ARM::AEK_FP16 | ARM::AEK_DOTPROD))
376+
(ARM::AEK_FULLFP16 | ARM::AEK_DOTPROD))
377377
ARM_CPU_NAME("neoverse-n1", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
378-
(ARM::AEK_FP16 | ARM::AEK_DOTPROD))
378+
(ARM::AEK_FULLFP16 | ARM::AEK_DOTPROD))
379379
ARM_CPU_NAME("neoverse-n2", ARMV9A, FK_NEON_FP_ARMV8, false,
380380
(ARM::AEK_BF16 | ARM::AEK_DOTPROD | ARM::AEK_FP16FML |
381381
ARM::AEK_I8MM | ARM::AEK_RAS | ARM::AEK_SB ))
382382
ARM_CPU_NAME("neoverse-v1", ARMV8_4A, FK_CRYPTO_NEON_FP_ARMV8, false,
383-
(ARM::AEK_RAS | ARM::AEK_FP16 | ARM::AEK_BF16 | ARM::AEK_DOTPROD))
383+
(ARM::AEK_RAS | ARM::AEK_FULLFP16 | ARM::AEK_BF16 | ARM::AEK_DOTPROD))
384384
ARM_CPU_NAME("cyclone", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
385385
ARM_CPU_NAME("exynos-m3", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
386386
ARM_CPU_NAME("exynos-m4", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
387-
(ARM::AEK_FP16 | ARM::AEK_DOTPROD))
387+
(ARM::AEK_FULLFP16 | ARM::AEK_DOTPROD))
388388
ARM_CPU_NAME("exynos-m5", ARMV8_2A, FK_CRYPTO_NEON_FP_ARMV8, false,
389-
(ARM::AEK_FP16 | ARM::AEK_DOTPROD))
389+
(ARM::AEK_FULLFP16 | ARM::AEK_DOTPROD))
390390
ARM_CPU_NAME("kryo", ARMV8A, FK_CRYPTO_NEON_FP_ARMV8, false, ARM::AEK_CRC)
391391
// Non-standard Arch names.
392392
ARM_CPU_NAME("iwmmxt", IWMMXT, FK_NONE, true, ARM::AEK_NONE)

‎llvm/include/llvm/TargetParser/ARMTargetParser.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ enum ArchExtKind : uint64_t {
4141
AEK_SEC = 1 << 8,
4242
AEK_VIRT = 1 << 9,
4343
AEK_DSP = 1 << 10,
44-
AEK_FP16 = 1 << 11,
44+
AEK_FULLFP16 = 1 << 11,
4545
AEK_RAS = 1 << 12,
4646
AEK_DOTPROD = 1 << 13,
4747
AEK_SHA2 = 1 << 14,

‎llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12934,7 +12934,7 @@ bool ARMAsmParser::enableArchExtFeature(StringRef Name, SMLoc &ExtLoc) {
1293412934
{ARM::AEK_SEC, {Feature_HasV6KBit}, {ARM::FeatureTrustZone}},
1293512935
// FIXME: Only available in A-class, isel not predicated
1293612936
{ARM::AEK_VIRT, {Feature_HasV7Bit}, {ARM::FeatureVirtualization}},
12937-
{ARM::AEK_FP16,
12937+
{ARM::AEK_FULLFP16,
1293812938
{Feature_HasV8_2aBit},
1293912939
{ARM::FeatureFPARMv8, ARM::FeatureFullFP16}},
1294012940
{ARM::AEK_RAS, {Feature_HasV8Bit}, {ARM::FeatureRAS}},

‎llvm/lib/TargetParser/AArch64TargetParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ void AArch64::ExtensionSet::enable(ArchExtKind E) {
187187
// architecture version.
188188
if (BaseArch) {
189189
// +fp16 implies +fp16fml for v8.4A+, but not v9.0-A+
190-
if (E == AEK_FP16 && BaseArch->is_superset(ARMV8_4A) &&
190+
if (E == AEK_FULLFP16 && BaseArch->is_superset(ARMV8_4A) &&
191191
!BaseArch->is_superset(ARMV9A))
192192
enable(AEK_FP16FML);
193193

0 commit comments

Comments
 (0)