[llvm] [RISCV][GISel] Add ZFA FP legalization and full tests for 9 insn (PR #118723)
Luke Quinn via llvm-commits
llvm-commits at lists.llvm.org
Thu Dec 5 06:50:38 PST 2024
https://github.com/lquinn2015 updated https://github.com/llvm/llvm-project/pull/118723
>From b320f162cdbe330b46d73e074fd690fd05d75cd9 Mon Sep 17 00:00:00 2001
From: Luke Quinn <quic_lquinn at quicinc.com>
Date: Wed, 4 Dec 2024 17:38:14 -0800
Subject: [PATCH] [RISCV][GISel] Add ZFA 9 insn F_(min/max)imum added to GIsel
---
.../Target/RISCV/GISel/RISCVLegalizerInfo.cpp | 9 ++-
.../CodeGen/RISCV/GlobalISel/double-zfa.ll | 79 ++++++++++++++++++
.../CodeGen/RISCV/GlobalISel/float-zfa.ll | 80 +++++++++++++++++++
.../test/CodeGen/RISCV/GlobalISel/half-zfa.ll | 78 ++++++++++++++++++
.../GlobalISel/legalizer-info-validation.mir | 1 +
5 files changed, 246 insertions(+), 1 deletion(-)
create mode 100644 llvm/test/CodeGen/RISCV/GlobalISel/double-zfa.ll
create mode 100644 llvm/test/CodeGen/RISCV/GlobalISel/float-zfa.ll
create mode 100644 llvm/test/CodeGen/RISCV/GlobalISel/half-zfa.ll
diff --git a/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp b/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp
index 456ca9894e6a7d..4f297e28d77695 100644
--- a/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp
+++ b/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp
@@ -582,12 +582,19 @@ RISCVLegalizerInfo::RISCVLegalizerInfo(const RISCVSubtarget &ST)
.libcallFor(ST.is64Bit(), {{s32, s128}, {s64, s128}});
// FIXME: We can do custom inline expansion like SelectionDAG.
- // FIXME: Legal with Zfa.
getActionDefinitionsBuilder({G_FCEIL, G_FFLOOR, G_FRINT, G_FNEARBYINT,
G_INTRINSIC_TRUNC, G_INTRINSIC_ROUND,
G_INTRINSIC_ROUNDEVEN})
+ .legalFor(ST.hasStdExtZfa() /*ST.hasStdExtF()*/, {s32})
+ .legalFor(ST.hasStdExtZfa() && ST.hasStdExtD(), {s64})
+ .legalFor(ST.hasStdExtZfa() && ST.hasStdExtZfh(), {s16})
.libcallFor({s32, s64});
+ getActionDefinitionsBuilder({G_FMAXIMUM, G_FMINIMUM})
+ .legalFor(ST.hasStdExtZfa() /*ST.hasStdExtF()*/, {s32})
+ .legalFor(ST.hasStdExtZfa() && ST.hasStdExtD(), {s64})
+ .legalFor(ST.hasStdExtZfa() && ST.hasStdExtZfh(), {s16});
+
getActionDefinitionsBuilder({G_FCOS, G_FSIN, G_FTAN, G_FPOW, G_FLOG, G_FLOG2,
G_FLOG10, G_FEXP, G_FEXP2, G_FEXP10, G_FACOS,
G_FASIN, G_FATAN, G_FATAN2, G_FCOSH, G_FSINH,
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/double-zfa.ll b/llvm/test/CodeGen/RISCV/GlobalISel/double-zfa.ll
new file mode 100644
index 00000000000000..53184c885e9886
--- /dev/null
+++ b/llvm/test/CodeGen/RISCV/GlobalISel/double-zfa.ll
@@ -0,0 +1,79 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
+
+; RUN: llc -mtriple=riscv32 -mattr=+zfa,d -global-isel < %s \
+; RUN: | FileCheck %s --check-prefixes=CHECK-ZFA-f64
+; RUN: llc -mtriple=riscv64 -mattr=+zfa,d -global-isel < %s \
+; RUN: | FileCheck %s --check-prefixes=CHECK-ZFA-f64
+
+
+define double @fceil(double %a) {
+; CHECK-ZFA-f64-LABEL: fceil:
+; CHECK-ZFA-f64: # %bb.0:
+; CHECK-ZFA-f64-NEXT: fround.d fa0, fa0, rup
+; CHECK-ZFA-f64-NEXT: ret
+ %b = call double @llvm.ceil.f64(double %a)
+ ret double %b
+}
+
+define double @ffloor(double %a) {
+; CHECK-ZFA-f64-LABEL: ffloor:
+; CHECK-ZFA-f64: # %bb.0:
+; CHECK-ZFA-f64-NEXT: fround.d fa0, fa0, rdn
+; CHECK-ZFA-f64-NEXT: ret
+ %b = call double @llvm.floor.f64(double %a)
+ ret double %b
+}
+
+define double @frint(double %a) {
+; CHECK-ZFA-f64-LABEL: frint:
+; CHECK-ZFA-f64: # %bb.0:
+; CHECK-ZFA-f64-NEXT: froundnx.d fa0, fa0
+; CHECK-ZFA-f64-NEXT: ret
+ %b = call double @llvm.rint.f64(double %a)
+ ret double %b
+}
+
+define double @fnearbyint(double %a) {
+; CHECK-ZFA-f64-LABEL: fnearbyint:
+; CHECK-ZFA-f64: # %bb.0:
+; CHECK-ZFA-f64-NEXT: fround.d fa0, fa0
+; CHECK-ZFA-f64-NEXT: ret
+ %b = call double @llvm.nearbyint.f64(double %a)
+ ret double %b
+}
+
+define double @fround(double %a) {
+; CHECK-ZFA-f64-LABEL: fround:
+; CHECK-ZFA-f64: # %bb.0:
+; CHECK-ZFA-f64-NEXT: fround.d fa0, fa0, rmm
+; CHECK-ZFA-f64-NEXT: ret
+ %b = call double @llvm.round.f64(double %a)
+ ret double %b
+}
+
+define double @froundeven(double %a) {
+; CHECK-ZFA-f64-LABEL: froundeven:
+; CHECK-ZFA-f64: # %bb.0:
+; CHECK-ZFA-f64-NEXT: fround.d fa0, fa0, rne
+; CHECK-ZFA-f64-NEXT: ret
+ %b = call double @llvm.roundeven.f64(double %a)
+ ret double %b
+}
+
+define double @fmaximum(double %a, double %b) {
+; CHECK-ZFA-f64-LABEL: fmaximum:
+; CHECK-ZFA-f64: # %bb.0:
+; CHECK-ZFA-f64-NEXT: fmaxm.d fa0, fa0, fa1
+; CHECK-ZFA-f64-NEXT: ret
+ %c = call double @llvm.maximum.f64(double %a, double %b)
+ ret double %c
+}
+
+define double @fminimum(double %a, double %b) {
+; CHECK-ZFA-f64-LABEL: fminimum:
+; CHECK-ZFA-f64: # %bb.0:
+; CHECK-ZFA-f64-NEXT: fminm.d fa0, fa0, fa1
+; CHECK-ZFA-f64-NEXT: ret
+ %c = call double @llvm.minimum.f64(double %a, double %b)
+ ret double %c
+}
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/float-zfa.ll b/llvm/test/CodeGen/RISCV/GlobalISel/float-zfa.ll
new file mode 100644
index 00000000000000..697628455f75a0
--- /dev/null
+++ b/llvm/test/CodeGen/RISCV/GlobalISel/float-zfa.ll
@@ -0,0 +1,80 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
+
+; RUN: llc -mtriple=riscv32 -mattr=+zfa -global-isel < %s \
+; RUN: | FileCheck %s --check-prefixes=CHECK-ZFA-f32
+; RUN: llc -mtriple=riscv64 -mattr=+zfa -global-isel < %s \
+; RUN: | FileCheck %s --check-prefixes=CHECK-ZFA-f32
+
+
+define float @fceil(float %a) {
+; CHECK-ZFA-f32-LABEL: fceil:
+; CHECK-ZFA-f32: # %bb.0:
+; CHECK-ZFA-f32-NEXT: fround.s fa0, fa0, rup
+; CHECK-ZFA-f32-NEXT: ret
+ %b = call float @llvm.ceil.f32(float %a)
+ ret float %b
+}
+
+define float @ffloor(float %a) {
+; CHECK-ZFA-f32-LABEL: ffloor:
+; CHECK-ZFA-f32: # %bb.0:
+; CHECK-ZFA-f32-NEXT: fround.s fa0, fa0, rdn
+; CHECK-ZFA-f32-NEXT: ret
+ %b = call float @llvm.floor.f32(float %a)
+ ret float %b
+}
+
+define float @frint(float %a) {
+; CHECK-ZFA-f32-LABEL: frint:
+; CHECK-ZFA-f32: # %bb.0:
+; CHECK-ZFA-f32-NEXT: froundnx.s fa0, fa0
+; CHECK-ZFA-f32-NEXT: ret
+ %b = call float @llvm.rint.f32(float %a)
+ ret float %b
+}
+
+define float @fnearbyint(float %a) {
+; CHECK-ZFA-f32-LABEL: fnearbyint:
+; CHECK-ZFA-f32: # %bb.0:
+; CHECK-ZFA-f32-NEXT: fround.s fa0, fa0
+; CHECK-ZFA-f32-NEXT: ret
+ %b = call float @llvm.nearbyint.f32(float %a)
+ ret float %b
+}
+
+define float @fround(float %a) {
+; CHECK-ZFA-f32-LABEL: fround:
+; CHECK-ZFA-f32: # %bb.0:
+; CHECK-ZFA-f32-NEXT: fround.s fa0, fa0, rmm
+; CHECK-ZFA-f32-NEXT: ret
+ %b = call float @llvm.round.f32(float %a)
+ ret float %b
+}
+
+
+define float @froundeven(float %a) {
+; CHECK-ZFA-f32-LABEL: froundeven:
+; CHECK-ZFA-f32: # %bb.0:
+; CHECK-ZFA-f32-NEXT: fround.s fa0, fa0, rne
+; CHECK-ZFA-f32-NEXT: ret
+ %b = call float @llvm.roundeven.f32(float %a)
+ ret float %b
+}
+
+define float @fmaximum(float %a, float %b) {
+; CHECK-ZFA-f32-LABEL: fmaximum:
+; CHECK-ZFA-f32: # %bb.0:
+; CHECK-ZFA-f32-NEXT: fmaxm.s fa0, fa0, fa1
+; CHECK-ZFA-f32-NEXT: ret
+ %c = call float @llvm.maximum.f32(float %a, float %b)
+ ret float %c
+}
+
+define float @fminimum(float %a, float %b) {
+; CHECK-ZFA-f32-LABEL: fminimum:
+; CHECK-ZFA-f32: # %bb.0:
+; CHECK-ZFA-f32-NEXT: fminm.s fa0, fa0, fa1
+; CHECK-ZFA-f32-NEXT: ret
+ %c = call float @llvm.minimum.f32(float %a, float %b)
+ ret float %c
+}
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/half-zfa.ll b/llvm/test/CodeGen/RISCV/GlobalISel/half-zfa.ll
new file mode 100644
index 00000000000000..7d31cf536d3d20
--- /dev/null
+++ b/llvm/test/CodeGen/RISCV/GlobalISel/half-zfa.ll
@@ -0,0 +1,78 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
+
+; RUN: llc -mtriple=riscv32 -mattr=+zfa,+zfh -global-isel < %s \
+; RUN: | FileCheck %s --check-prefixes=CHECK-ZFA-f16
+; RUN: llc -mtriple=riscv64 -mattr=+zfa,+zfh -global-isel < %s \
+; RUN: | FileCheck %s --check-prefixes=CHECK-ZFA-f16
+
+
+define half @fceil(half %a) {
+; CHECK-ZFA-f16-LABEL: fceil:
+; CHECK-ZFA-f16: # %bb.0:
+; CHECK-ZFA-f16-NEXT: fround.h fa0, fa0, rup
+; CHECK-ZFA-f16-NEXT: ret
+ %b = call half @llvm.ceil.f16(half %a)
+ ret half %b
+}
+
+define half @ffloor(half %a) {
+; CHECK-ZFA-f16-LABEL: ffloor:
+; CHECK-ZFA-f16: # %bb.0:
+; CHECK-ZFA-f16-NEXT: fround.h fa0, fa0, rdn
+; CHECK-ZFA-f16-NEXT: ret
+ %b = call half @llvm.floor.f16(half %a)
+ ret half %b
+}
+
+define half @frint(half %a) {
+; CHECK-ZFA-f16-LABEL: frint:
+; CHECK-ZFA-f16: # %bb.0:
+; CHECK-ZFA-f16-NEXT: froundnx.h fa0, fa0
+; CHECK-ZFA-f16-NEXT: ret
+ %b = call half @llvm.rint.f16(half %a)
+ ret half %b
+}
+
+define half @fnearbyint(half %a) {
+; CHECK-ZFA-f16-LABEL: fnearbyint:
+; CHECK-ZFA-f16: # %bb.0:
+; CHECK-ZFA-f16-NEXT: fround.h fa0, fa0
+; CHECK-ZFA-f16-NEXT: ret
+ %b = call half @llvm.nearbyint.f16(half %a)
+ ret half %b
+}
+
+define half @fround(half %a) {
+; CHECK-ZFA-f16-LABEL: fround:
+; CHECK-ZFA-f16: # %bb.0:
+; CHECK-ZFA-f16-NEXT: fround.h fa0, fa0, rmm
+; CHECK-ZFA-f16-NEXT: ret
+ %b = call half @llvm.round.f16(half %a)
+ ret half %b
+}
+
+define half @froundeven(half %a) {
+; CHECK-ZFA-f16-LABEL: froundeven:
+; CHECK-ZFA-f16: # %bb.0:
+; CHECK-ZFA-f16-NEXT: fround.h fa0, fa0, rne
+; CHECK-ZFA-f16-NEXT: ret
+ %b = call half @llvm.roundeven.f16(half %a)
+ ret half %b
+}
+define half @fmaximum(half %a, half %b) {
+; CHECK-ZFA-f16-LABEL: fmaximum:
+; CHECK-ZFA-f16: # %bb.0:
+; CHECK-ZFA-f16-NEXT: fmaxm.h fa0, fa0, fa1
+; CHECK-ZFA-f16-NEXT: ret
+ %c = call half @llvm.maximum.f16(half %a, half %b)
+ ret half %c
+}
+
+define half @fminimum(half %a, half %b) {
+; CHECK-ZFA-f16-LABEL: fminimum:
+; CHECK-ZFA-f16: # %bb.0:
+; CHECK-ZFA-f16-NEXT: fminm.h fa0, fa0, fa1
+; CHECK-ZFA-f16-NEXT: ret
+ %c = call half @llvm.minimum.f16(half %a, half %b)
+ ret half %c
+}
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer-info-validation.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer-info-validation.mir
index a05d0f605df1dc..fb28a260c82718 100644
--- a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer-info-validation.mir
+++ b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer-info-validation.mir
@@ -579,6 +579,7 @@
# DEBUG-NEXT: .. type index coverage check SKIPPED: no rules defined
# DEBUG-NEXT: .. imm index coverage check SKIPPED: no rules defined
# DEBUG-NEXT: G_FMINIMUM (opcode {{[0-9]+}}): 1 type index
+# DEBUG-NEXT: .. opcode 212 is aliased to 213
# DEBUG-NEXT: .. type index coverage check SKIPPED: no rules defined
# DEBUG-NEXT: .. imm index coverage check SKIPPED: no rules defined
# DEBUG-NEXT: G_FMAXIMUM (opcode {{[0-9]+}}): 1 type index
More information about the llvm-commits
mailing list