This is an archive of the discontinued LLVM Phabricator instance.

Differential D120412

[NFC][RISCV] Reuse ISD::NodeType in float extension
ClosedPublic

Authored by achieveartificialintelligence on Feb 23 2022, 7:26 AM.

Details

Reviewers
asb
craig.topper
jrtc27
Commits
rG78b5f0fb0523: [NFC][RISCV] Reuse ISD::NodeType in float extension

Diff Detail

Event Timeline

achieveartificialintelligence created this revision.Feb 23 2022, 7:26 AM
Herald added subscribers: VincentWu, luke957, vkmr and 24 others. · View Herald TranscriptFeb 23 2022, 7:26 AM
achieveartificialintelligence requested review of this revision.Feb 23 2022, 7:26 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 23 2022, 7:26 AM
Herald added subscribers: llvm-commits, • pcwang-thead, eopXD, MaskRay. · View Herald Transcript
Harbormaster completed remote builds in B151061: Diff 410820.Feb 23 2022, 8:20 AM
craig.topper added inline comments.Feb 23 2022, 11:34 AM
llvm/lib/Target/RISCV/RISCVISelLowering.cpp
321

I think you should add static here. It will prevent FPLegalNodeTypes from being created as a local variable on the stack which requires initialization code. Making it static will put it in the .rodata section instead.

achieveartificialintelligence updated this revision to Diff 410993.Feb 23 2022, 7:14 PM
achieveartificialintelligence marked an inline comment as done.

Address @craig.topper's comment

Harbormaster completed remote builds in B151181: Diff 410993.Feb 23 2022, 7:56 PM
asb accepted this revision.Feb 24 2022, 3:38 AM

LGTM, thanks.

This revision is now accepted and ready to land.Feb 24 2022, 3:38 AM
This revision was landed with ongoing or failed builds.Feb 24 2022, 3:58 AM
Closed by commit rG78b5f0fb0523: [NFC][RISCV] Reuse ISD::NodeType in float extension (authored by achieveartificialintelligence). · Explain Why
This revision was automatically updated to reflect the committed changes.
achieveartificialintelligence added a commit: rG78b5f0fb0523: [NFC][RISCV] Reuse ISD::NodeType in float extension.

Revision Contents

PathSize
llvm/
lib/
Target/
RISCV/
68 lines

Diff 411068

llvm/lib/Target/RISCV/RISCVISelLowering.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 312 Lines • ▼ Show 20 Lines if (Subtarget.hasStdExtZbt()) {
if (Subtarget.is64Bit()) { if (Subtarget.is64Bit()) {
setOperationAction(ISD::FSHL, MVT::i32, Custom); setOperationAction(ISD::FSHL, MVT::i32, Custom);
setOperationAction(ISD::FSHR, MVT::i32, Custom); setOperationAction(ISD::FSHR, MVT::i32, Custom);
} }
} else { } else {
setOperationAction(ISD::SELECT, XLenVT, Custom); setOperationAction(ISD::SELECT, XLenVT, Custom);
} }
static constexpr ISD::NodeType FPLegalNodeTypes[] = {
craig.topperUnsubmitted
Done
ReplyInline Actions

I think you should add static here. It will prevent FPLegalNodeTypes from being created as a local variable on the stack which requires initialization code. Making it static will put it in the .rodata section instead.

craig.topper: I think you should add `static` here. It will prevent `FPLegalNodeTypes` from being created as…
ISD::FMINNUM, ISD::FMAXNUM, ISD::LRINT,
ISD::LLRINT, ISD::LROUND, ISD::LLROUND,
ISD::STRICT_LRINT, ISD::STRICT_LLRINT, ISD::STRICT_LROUND,
ISD::STRICT_LLROUND, ISD::STRICT_FMA, ISD::STRICT_FADD,
ISD::STRICT_FSUB, ISD::STRICT_FMUL, ISD::STRICT_FDIV,
ISD::STRICT_FSQRT, ISD::STRICT_FSETCC, ISD::STRICT_FSETCCS};
static const ISD::CondCode FPCCToExpand[] = { static const ISD::CondCode FPCCToExpand[] = {
ISD::SETOGT, ISD::SETOGE, ISD::SETONE, ISD::SETUEQ, ISD::SETUGT, ISD::SETOGT, ISD::SETOGE, ISD::SETONE, ISD::SETUEQ, ISD::SETUGT,
ISD::SETUGE, ISD::SETULT, ISD::SETULE, ISD::SETUNE, ISD::SETGT, ISD::SETUGE, ISD::SETULT, ISD::SETULE, ISD::SETUNE, ISD::SETGT,
ISD::SETGE, ISD::SETNE, ISD::SETO, ISD::SETUO}; ISD::SETGE, ISD::SETNE, ISD::SETO, ISD::SETUO};
static const ISD::NodeType FPOpToExpand[] = { static const ISD::NodeType FPOpToExpand[] = {
ISD::FSIN, ISD::FCOS, ISD::FSINCOS, ISD::FPOW, ISD::FSIN, ISD::FCOS, ISD::FSINCOS, ISD::FPOW,
ISD::FREM, ISD::FP16_TO_FP, ISD::FP_TO_FP16}; ISD::FREM, ISD::FP16_TO_FP, ISD::FP_TO_FP16};
if (Subtarget.hasStdExtZfh()) if (Subtarget.hasStdExtZfh())
setOperationAction(ISD::BITCAST, MVT::i16, Custom); setOperationAction(ISD::BITCAST, MVT::i16, Custom);
if (Subtarget.hasStdExtZfh()) { if (Subtarget.hasStdExtZfh()) {
setOperationAction(ISD::FMINNUM, MVT::f16, Legal); for (auto NT : FPLegalNodeTypes)
setOperationAction(ISD::FMAXNUM, MVT::f16, Legal); setOperationAction(NT, MVT::f16, Legal);
setOperationAction(ISD::LRINT, MVT::f16, Legal);
setOperationAction(ISD::LLRINT, MVT::f16, Legal);
setOperationAction(ISD::LROUND, MVT::f16, Legal);
setOperationAction(ISD::LLROUND, MVT::f16, Legal);
setOperationAction(ISD::STRICT_LRINT, MVT::f16, Legal);
setOperationAction(ISD::STRICT_LLRINT, MVT::f16, Legal);
setOperationAction(ISD::STRICT_LROUND, MVT::f16, Legal);
setOperationAction(ISD::STRICT_LLROUND, MVT::f16, Legal);
setOperationAction(ISD::STRICT_FADD, MVT::f16, Legal);
setOperationAction(ISD::STRICT_FMA, MVT::f16, Legal);
setOperationAction(ISD::STRICT_FSUB, MVT::f16, Legal);
setOperationAction(ISD::STRICT_FMUL, MVT::f16, Legal);
setOperationAction(ISD::STRICT_FDIV, MVT::f16, Legal);
setOperationAction(ISD::STRICT_FP_ROUND, MVT::f16, Legal); setOperationAction(ISD::STRICT_FP_ROUND, MVT::f16, Legal);
setOperationAction(ISD::STRICT_FP_EXTEND, MVT::f32, Legal); setOperationAction(ISD::STRICT_FP_EXTEND, MVT::f32, Legal);
setOperationAction(ISD::STRICT_FSQRT, MVT::f16, Legal);
setOperationAction(ISD::STRICT_FSETCC, MVT::f16, Legal);
setOperationAction(ISD::STRICT_FSETCCS, MVT::f16, Legal);
for (auto CC : FPCCToExpand) for (auto CC : FPCCToExpand)
setCondCodeAction(CC, MVT::f16, Expand); setCondCodeAction(CC, MVT::f16, Expand);
setOperationAction(ISD::SELECT_CC, MVT::f16, Expand); setOperationAction(ISD::SELECT_CC, MVT::f16, Expand);
setOperationAction(ISD::SELECT, MVT::f16, Custom); setOperationAction(ISD::SELECT, MVT::f16, Custom);
setOperationAction(ISD::BR_CC, MVT::f16, Expand); setOperationAction(ISD::BR_CC, MVT::f16, Expand);
setOperationAction(ISD::FREM, MVT::f16, Promote); setOperationAction(ISD::FREM, MVT::f16, Promote);
setOperationAction(ISD::FCEIL, MVT::f16, Promote); setOperationAction(ISD::FCEIL, MVT::f16, Promote);
Show All 18 Lines if (Subtarget.hasStdExtZfh()) {
// complete support for all operations in LegalizeDAG. // complete support for all operations in LegalizeDAG.
// We need to custom promote this. // We need to custom promote this.
if (Subtarget.is64Bit()) if (Subtarget.is64Bit())
setOperationAction(ISD::FPOWI, MVT::i32, Custom); setOperationAction(ISD::FPOWI, MVT::i32, Custom);
} }
if (Subtarget.hasStdExtF()) { if (Subtarget.hasStdExtF()) {
setOperationAction(ISD::FMINNUM, MVT::f32, Legal); for (auto NT : FPLegalNodeTypes)
setOperationAction(ISD::FMAXNUM, MVT::f32, Legal); setOperationAction(NT, MVT::f32, Legal);
setOperationAction(ISD::LRINT, MVT::f32, Legal);
setOperationAction(ISD::LLRINT, MVT::f32, Legal);
setOperationAction(ISD::LROUND, MVT::f32, Legal);
setOperationAction(ISD::LLROUND, MVT::f32, Legal);
setOperationAction(ISD::STRICT_LRINT, MVT::f32, Legal);
setOperationAction(ISD::STRICT_LLRINT, MVT::f32, Legal);
setOperationAction(ISD::STRICT_LROUND, MVT::f32, Legal);
setOperationAction(ISD::STRICT_LLROUND, MVT::f32, Legal);
setOperationAction(ISD::STRICT_FADD, MVT::f32, Legal);
setOperationAction(ISD::STRICT_FMA, MVT::f32, Legal);
setOperationAction(ISD::STRICT_FSUB, MVT::f32, Legal);
setOperationAction(ISD::STRICT_FMUL, MVT::f32, Legal);
setOperationAction(ISD::STRICT_FDIV, MVT::f32, Legal);
setOperationAction(ISD::STRICT_FSQRT, MVT::f32, Legal);
setOperationAction(ISD::STRICT_FSETCC, MVT::f32, Legal);
setOperationAction(ISD::STRICT_FSETCCS, MVT::f32, Legal);
for (auto CC : FPCCToExpand) for (auto CC : FPCCToExpand)
setCondCodeAction(CC, MVT::f32, Expand); setCondCodeAction(CC, MVT::f32, Expand);
setOperationAction(ISD::SELECT_CC, MVT::f32, Expand); setOperationAction(ISD::SELECT_CC, MVT::f32, Expand);
setOperationAction(ISD::SELECT, MVT::f32, Custom); setOperationAction(ISD::SELECT, MVT::f32, Custom);
setOperationAction(ISD::BR_CC, MVT::f32, Expand); setOperationAction(ISD::BR_CC, MVT::f32, Expand);
for (auto Op : FPOpToExpand) for (auto Op : FPOpToExpand)
setOperationAction(Op, MVT::f32, Expand); setOperationAction(Op, MVT::f32, Expand);
setLoadExtAction(ISD::EXTLOAD, MVT::f32, MVT::f16, Expand); setLoadExtAction(ISD::EXTLOAD, MVT::f32, MVT::f16, Expand);
setTruncStoreAction(MVT::f32, MVT::f16, Expand); setTruncStoreAction(MVT::f32, MVT::f16, Expand);
} }
if (Subtarget.hasStdExtF() && Subtarget.is64Bit()) if (Subtarget.hasStdExtF() && Subtarget.is64Bit())
setOperationAction(ISD::BITCAST, MVT::i32, Custom); setOperationAction(ISD::BITCAST, MVT::i32, Custom);
if (Subtarget.hasStdExtD()) { if (Subtarget.hasStdExtD()) {
setOperationAction(ISD::FMINNUM, MVT::f64, Legal); for (auto NT : FPLegalNodeTypes)
setOperationAction(ISD::FMAXNUM, MVT::f64, Legal); setOperationAction(NT, MVT::f64, Legal);
setOperationAction(ISD::LRINT, MVT::f64, Legal);
setOperationAction(ISD::LLRINT, MVT::f64, Legal);
setOperationAction(ISD::LROUND, MVT::f64, Legal);
setOperationAction(ISD::LLROUND, MVT::f64, Legal);
setOperationAction(ISD::STRICT_LRINT, MVT::f64, Legal);
setOperationAction(ISD::STRICT_LLRINT, MVT::f64, Legal);
setOperationAction(ISD::STRICT_LROUND, MVT::f64, Legal);
setOperationAction(ISD::STRICT_LLROUND, MVT::f64, Legal);
setOperationAction(ISD::STRICT_FMA, MVT::f64, Legal);
setOperationAction(ISD::STRICT_FADD, MVT::f64, Legal);
setOperationAction(ISD::STRICT_FSUB, MVT::f64, Legal);
setOperationAction(ISD::STRICT_FMUL, MVT::f64, Legal);
setOperationAction(ISD::STRICT_FDIV, MVT::f64, Legal);
setOperationAction(ISD::STRICT_FP_ROUND, MVT::f32, Legal); setOperationAction(ISD::STRICT_FP_ROUND, MVT::f32, Legal);
setOperationAction(ISD::STRICT_FP_EXTEND, MVT::f64, Legal); setOperationAction(ISD::STRICT_FP_EXTEND, MVT::f64, Legal);
setOperationAction(ISD::STRICT_FSQRT, MVT::f64, Legal);
setOperationAction(ISD::STRICT_FSETCC, MVT::f64, Legal);
setOperationAction(ISD::STRICT_FSETCCS, MVT::f64, Legal);
for (auto CC : FPCCToExpand) for (auto CC : FPCCToExpand)
setCondCodeAction(CC, MVT::f64, Expand); setCondCodeAction(CC, MVT::f64, Expand);
setOperationAction(ISD::SELECT_CC, MVT::f64, Expand); setOperationAction(ISD::SELECT_CC, MVT::f64, Expand);
setOperationAction(ISD::SELECT, MVT::f64, Custom); setOperationAction(ISD::SELECT, MVT::f64, Custom);
setOperationAction(ISD::BR_CC, MVT::f64, Expand); setOperationAction(ISD::BR_CC, MVT::f64, Expand);
setLoadExtAction(ISD::EXTLOAD, MVT::f64, MVT::f32, Expand); setLoadExtAction(ISD::EXTLOAD, MVT::f64, MVT::f32, Expand);
setTruncStoreAction(MVT::f64, MVT::f32, Expand); setTruncStoreAction(MVT::f64, MVT::f32, Expand);
for (auto Op : FPOpToExpand) for (auto Op : FPOpToExpand)
▲ Show 20 Lines • Show All 11,036 Lines • Show Last 20 Lines