[llvm] [RISCV][GISel] Attempt to simplify how we handle type legality for F and D extensions. (PR #72174)
Craig Topper via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 13 17:06:56 PST 2023
https://github.com/topperc updated https://github.com/llvm/llvm-project/pull/72174
>From 1fe2e81c6a2c398aefe2edcd7432d7d29029d1b5 Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper at sifive.com>
Date: Mon, 13 Nov 2023 15:53:45 -0800
Subject: [PATCH 1/2] [RISCV][GISel] Attempt to simplify how we handle type
legality for F and D extensions.
Add helper that creates a lambda similar to typeIs, but containing
the predicate check for hasStdExtF and hasStdD. We can use this
with legalIf and all to reduce the number of manual lambdas we need to write.
---
.../Target/RISCV/GISel/RISCVLegalizerInfo.cpp | 48 +++++++------------
1 file changed, 16 insertions(+), 32 deletions(-)
diff --git a/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp b/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp
index c6654873118f98f..ffe35e39b9f3a91 100644
--- a/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp
+++ b/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp
@@ -23,6 +23,15 @@
using namespace llvm;
using namespace LegalityPredicates;
+static LegalityPredicate typeIsLegalScalarFP(unsigned TypeIdx,
+ const RISCVSubtarget &ST) {
+ return [=, &ST](const LegalityQuery &Query) {
+ return Query.Types[TypeIdx].isScalar() &&
+ ((ST.hasStdExtF() && Query.Types[TypeIdx].getSizeInBits() == 32) ||
+ (ST.hasStdExtD() && Query.Types[TypeIdx].getSizeInBits() == 64));
+ };
+}
+
RISCVLegalizerInfo::RISCVLegalizerInfo(const RISCVSubtarget &ST) {
const unsigned XLen = ST.getXLen();
const LLT sXLen = LLT::scalar(XLen);
@@ -212,51 +221,26 @@ RISCVLegalizerInfo::RISCVLegalizerInfo(const RISCVSubtarget &ST) {
getActionDefinitionsBuilder({G_FADD, G_FSUB, G_FMUL, G_FDIV, G_FMA, G_FNEG,
G_FABS, G_FSQRT, G_FMAXNUM, G_FMINNUM})
- .legalIf([=, &ST](const LegalityQuery &Query) -> bool {
- return (ST.hasStdExtF() && typeIs(0, s32)(Query)) ||
- (ST.hasStdExtD() && typeIs(0, s64)(Query));
- });
+ .legalIf(typeIsLegalScalarFP(0, ST));
getActionDefinitionsBuilder(G_FPTRUNC).legalIf(
- [=, &ST](const LegalityQuery &Query) -> bool {
- return (ST.hasStdExtD() && typeIs(0, s32)(Query) &&
- typeIs(1, s64)(Query));
- });
+ all(typeIsLegalScalarFP(0, ST), typeIsLegalScalarFP(1, ST)));
getActionDefinitionsBuilder(G_FPEXT).legalIf(
- [=, &ST](const LegalityQuery &Query) -> bool {
- return (ST.hasStdExtD() && typeIs(0, s64)(Query) &&
- typeIs(1, s32)(Query));
- });
+ all(typeIsLegalScalarFP(0, ST), typeIsLegalScalarFP(1, ST)));
getActionDefinitionsBuilder(G_FCMP)
- .legalIf([=, &ST](const LegalityQuery &Query) -> bool {
- return typeIs(0, sXLen)(Query) &&
- ((ST.hasStdExtF() && typeIs(1, s32)(Query)) ||
- (ST.hasStdExtD() && typeIs(1, s64)(Query)));
- })
+ .legalIf(all(typeIs(0, sXLen), typeIsLegalScalarFP(1, ST)))
.clampScalar(0, sXLen, sXLen);
- getActionDefinitionsBuilder(G_FCONSTANT)
- .legalIf([=, &ST](const LegalityQuery &Query) -> bool {
- return (ST.hasStdExtF() && typeIs(0, s32)(Query)) ||
- (ST.hasStdExtD() && typeIs(0, s64)(Query));
- });
+ getActionDefinitionsBuilder(G_FCONSTANT).legalIf(typeIsLegalScalarFP(0, ST));
getActionDefinitionsBuilder({G_FPTOSI, G_FPTOUI})
- .legalIf([=, &ST](const LegalityQuery &Query) -> bool {
- return typeInSet(0, {s32, sXLen})(Query) &&
- ((ST.hasStdExtF() && typeIs(1, s32)(Query)) ||
- (ST.hasStdExtD() && typeIs(1, s64)(Query)));
- })
+ .legalIf(all(typeInSet(0, {s32, sXLen}), typeIsLegalScalarFP(1, ST)))
.widenScalarToNextPow2(0)
.clampScalar(0, s32, sXLen);
getActionDefinitionsBuilder({G_SITOFP, G_UITOFP})
- .legalIf([=, &ST](const LegalityQuery &Query) -> bool {
- return ((ST.hasStdExtF() && typeIs(0, s32)(Query)) ||
- (ST.hasStdExtD() && typeIs(0, s64)(Query))) &&
- typeInSet(1, {s32, sXLen})(Query);
- })
+ .legalIf(all(typeIsLegalScalarFP(0, ST), typeInSet(1, {s32, sXLen})))
.widenScalarToNextPow2(1)
.clampScalar(1, s32, sXLen);
>From 2c4f468f4861f330c32363eeb490d484e4b141bd Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper at sifive.com>
Date: Mon, 13 Nov 2023 17:05:22 -0800
Subject: [PATCH 2/2] Address review comments.
---
.../Target/RISCV/GISel/RISCVLegalizerInfo.cpp | 24 ++++++++++++-------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp b/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp
index ffe35e39b9f3a91..7deade986c59025 100644
--- a/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp
+++ b/llvm/lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp
@@ -23,7 +23,9 @@
using namespace llvm;
using namespace LegalityPredicates;
-static LegalityPredicate typeIsLegalScalarFP(unsigned TypeIdx,
+// Is this type supported by scalar FP arithmetic operations given the current
+// subtarget.
+static LegalityPredicate typeIsScalarFPArith(unsigned TypeIdx,
const RISCVSubtarget &ST) {
return [=, &ST](const LegalityQuery &Query) {
return Query.Types[TypeIdx].isScalar() &&
@@ -221,26 +223,32 @@ RISCVLegalizerInfo::RISCVLegalizerInfo(const RISCVSubtarget &ST) {
getActionDefinitionsBuilder({G_FADD, G_FSUB, G_FMUL, G_FDIV, G_FMA, G_FNEG,
G_FABS, G_FSQRT, G_FMAXNUM, G_FMINNUM})
- .legalIf(typeIsLegalScalarFP(0, ST));
+ .legalIf(typeIsScalarFPArith(0, ST));
getActionDefinitionsBuilder(G_FPTRUNC).legalIf(
- all(typeIsLegalScalarFP(0, ST), typeIsLegalScalarFP(1, ST)));
+ [=, &ST](const LegalityQuery &Query) -> bool {
+ return (ST.hasStdExtD() && typeIs(0, s32)(Query) &&
+ typeIs(1, s64)(Query));
+ });
getActionDefinitionsBuilder(G_FPEXT).legalIf(
- all(typeIsLegalScalarFP(0, ST), typeIsLegalScalarFP(1, ST)));
+ [=, &ST](const LegalityQuery &Query) -> bool {
+ return (ST.hasStdExtD() && typeIs(0, s64)(Query) &&
+ typeIs(1, s32)(Query));
+ });
getActionDefinitionsBuilder(G_FCMP)
- .legalIf(all(typeIs(0, sXLen), typeIsLegalScalarFP(1, ST)))
+ .legalIf(all(typeIs(0, sXLen), typeIsScalarFPArith(1, ST)))
.clampScalar(0, sXLen, sXLen);
- getActionDefinitionsBuilder(G_FCONSTANT).legalIf(typeIsLegalScalarFP(0, ST));
+ getActionDefinitionsBuilder(G_FCONSTANT).legalIf(typeIsScalarFPArith(0, ST));
getActionDefinitionsBuilder({G_FPTOSI, G_FPTOUI})
- .legalIf(all(typeInSet(0, {s32, sXLen}), typeIsLegalScalarFP(1, ST)))
+ .legalIf(all(typeInSet(0, {s32, sXLen}), typeIsScalarFPArith(1, ST)))
.widenScalarToNextPow2(0)
.clampScalar(0, s32, sXLen);
getActionDefinitionsBuilder({G_SITOFP, G_UITOFP})
- .legalIf(all(typeIsLegalScalarFP(0, ST), typeInSet(1, {s32, sXLen})))
+ .legalIf(all(typeIsScalarFPArith(0, ST), typeInSet(1, {s32, sXLen})))
.widenScalarToNextPow2(1)
.clampScalar(1, s32, sXLen);
More information about the llvm-commits
mailing list