[llvm-branch-commits] [llvm] MSP430: Mark more generic libgcc functions as available (PR #210962)
Matt Arsenault via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Tue Jul 21 05:27:39 PDT 2026
https://github.com/arsenm created https://github.com/llvm/llvm-project/pull/210962
The generic soft-float, conversion, comparison and integer helper routines
(__addsf3, __divli's __divsi3, __ashlsi3, ...) exist in the MSP430 libgcc
port alongside the preferred __mspabi_* variants. They were previously removed
to force selection of the __mspabi_* names, back when only one implementation
per libcall could be recorded.
Stop hiding them: only __lshrsi3 stays excluded, since the MSP430 libgcc port
provides the 32-bit logical right shift solely under __mspabi_srll and never
defines a generic __lshrsi3.
Co-authored-by: Claude (Claude-Opus-4.8) <noreply at anthropic.com>
>From 7e524a8b4eabc69448deb9a2ead3e3aaa95e8066 Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault at amd.com>
Date: Tue, 21 Jul 2026 13:43:07 +0200
Subject: [PATCH] MSP430: Mark more generic libgcc functions as available
The generic soft-float, conversion, comparison and integer helper routines
(__addsf3, __divli's __divsi3, __ashlsi3, ...) exist in the MSP430 libgcc
port alongside the preferred __mspabi_* variants. They were previously removed
to force selection of the __mspabi_* names, back when only one implementation
per libcall could be recorded.
Stop hiding them: only __lshrsi3 stays excluded, since the MSP430 libgcc port
provides the 32-bit logical right shift solely under __mspabi_srll and never
defines a generic __lshrsi3.
Co-authored-by: Claude (Claude-Opus-4.8) <noreply at anthropic.com>
---
llvm/include/llvm/IR/RuntimeLibcalls.td | 15 ++---
llvm/lib/Target/MSP430/MSP430Subtarget.cpp | 67 ++++++++++++++++++++++
2 files changed, 71 insertions(+), 11 deletions(-)
diff --git a/llvm/include/llvm/IR/RuntimeLibcalls.td b/llvm/include/llvm/IR/RuntimeLibcalls.td
index 802188be31d09..a991125eac020 100644
--- a/llvm/include/llvm/IR/RuntimeLibcalls.td
+++ b/llvm/include/llvm/IR/RuntimeLibcalls.td
@@ -2842,18 +2842,11 @@ def __mspabi_mpyll : RuntimeLibcallImpl<MUL_I64>;
def isMSP430 : RuntimeLibcallAvailability<"TT.getArch() == Triple::msp430">;
+// msp430 libgcc provides the 32-bit logical right shift only under
+// the __mspabi_srll name. Everything else in the default list
+// coexists in msp430 libgcc alongside its __mspabi_* variant.
defvar MSP430DefaultOptOut = [
- __addsf3, __divsf3, __extendsfdf2, __truncdfsf2, __fixsfsi,
- __fixsfdi, __fixunssfsi, __mulsf3, __eqsf2, __gesf2, __gtsf2,
- __divhi3, __divsi3, __ashlsi3, __floatsidf, __floatsisf,
- __ashrsi3, __modhi3, __udivsi3, __fixdfsi, __fixunssfdi,
- __udivhi3, __umodsi3, __nesf2, __lesf2, __floatundisf,
- __fixdfdi, __fixunsdfsi, __modsi3, __floatunsisf,
- __fixunsdfdi, __ltsf2, __floatdisf, __floatdidf,
- __lshrsi3, __subsf3, __umodhi3, __floatunsidf,
- __floatundidf, __gtdf2, __eqdf2, __gedf2, __ltdf2, __ledf2,
- __adddf3, __divdf3, __divdi3, __moddi3,
- __muldf3, __subdf3, __udivdi3, __umoddi3
+ __lshrsi3
];
// EABI Libcalls - EABI Section 6.2
diff --git a/llvm/lib/Target/MSP430/MSP430Subtarget.cpp b/llvm/lib/Target/MSP430/MSP430Subtarget.cpp
index 386f2a0fa8f47..7e575864f4027 100644
--- a/llvm/lib/Target/MSP430/MSP430Subtarget.cpp
+++ b/llvm/lib/Target/MSP430/MSP430Subtarget.cpp
@@ -131,4 +131,71 @@ void MSP430Subtarget::initLibcallLoweringInfo(LibcallLoweringInfo &Info) const {
Info.setLibcallImpl(LC.Op, LC.Impl);
}
}
+
+ // The generic soft-float/integer helper routines (__addsf3, __divli, ...)
+ // exist in msp430 libgcc alongside the __mspabi_* variants, so both are
+ // available. The __mspabi_* variants are the one that should be used.
+ static const struct {
+ const RTLIB::Libcall Op;
+ const RTLIB::LibcallImpl Impl;
+ } EABISelected[] = {
+ // Floating point conversions - EABI Table 6.
+ {RTLIB::FPROUND_F64_F32, RTLIB::impl___mspabi_cvtdf},
+ {RTLIB::FPEXT_F32_F64, RTLIB::impl___mspabi_cvtfd},
+ {RTLIB::FPTOSINT_F64_I32, RTLIB::impl___mspabi_fixdli},
+ {RTLIB::FPTOSINT_F64_I64, RTLIB::impl___mspabi_fixdlli},
+ {RTLIB::FPTOUINT_F64_I32, RTLIB::impl___mspabi_fixdul},
+ {RTLIB::FPTOUINT_F64_I64, RTLIB::impl___mspabi_fixdull},
+ {RTLIB::FPTOSINT_F32_I32, RTLIB::impl___mspabi_fixfli},
+ {RTLIB::FPTOSINT_F32_I64, RTLIB::impl___mspabi_fixflli},
+ {RTLIB::FPTOUINT_F32_I32, RTLIB::impl___mspabi_fixful},
+ {RTLIB::FPTOUINT_F32_I64, RTLIB::impl___mspabi_fixfull},
+ {RTLIB::SINTTOFP_I32_F64, RTLIB::impl___mspabi_fltlid},
+ {RTLIB::SINTTOFP_I64_F64, RTLIB::impl___mspabi_fltllid},
+ {RTLIB::UINTTOFP_I32_F64, RTLIB::impl___mspabi_fltuld},
+ {RTLIB::UINTTOFP_I64_F64, RTLIB::impl___mspabi_fltulld},
+ {RTLIB::SINTTOFP_I32_F32, RTLIB::impl___mspabi_fltlif},
+ {RTLIB::SINTTOFP_I64_F32, RTLIB::impl___mspabi_fltllif},
+ {RTLIB::UINTTOFP_I32_F32, RTLIB::impl___mspabi_fltulf},
+ {RTLIB::UINTTOFP_I64_F32, RTLIB::impl___mspabi_fltullf},
+ // Floating point comparisons - EABI Table 7.
+ {RTLIB::OEQ_F64, RTLIB::impl___mspabi_cmpd__oeq},
+ {RTLIB::OGE_F64, RTLIB::impl___mspabi_cmpd__oge},
+ {RTLIB::OLT_F64, RTLIB::impl___mspabi_cmpd__olt},
+ {RTLIB::OLE_F64, RTLIB::impl___mspabi_cmpd__ole},
+ {RTLIB::OGT_F64, RTLIB::impl___mspabi_cmpd__ogt},
+ {RTLIB::OEQ_F32, RTLIB::impl___mspabi_cmpf__oeq},
+ {RTLIB::UNE_F32, RTLIB::impl___mspabi_cmpf__une},
+ {RTLIB::OGE_F32, RTLIB::impl___mspabi_cmpf__oge},
+ {RTLIB::OLT_F32, RTLIB::impl___mspabi_cmpf__olt},
+ {RTLIB::OLE_F32, RTLIB::impl___mspabi_cmpf__ole},
+ {RTLIB::OGT_F32, RTLIB::impl___mspabi_cmpf__ogt},
+ // Floating point arithmetic - EABI Table 8.
+ {RTLIB::ADD_F64, RTLIB::impl___mspabi_addd},
+ {RTLIB::SUB_F64, RTLIB::impl___mspabi_subd},
+ {RTLIB::MUL_F64, RTLIB::impl___mspabi_mpyd},
+ {RTLIB::DIV_F64, RTLIB::impl___mspabi_divd},
+ {RTLIB::ADD_F32, RTLIB::impl___mspabi_addf},
+ {RTLIB::SUB_F32, RTLIB::impl___mspabi_subf},
+ {RTLIB::MUL_F32, RTLIB::impl___mspabi_mpyf},
+ {RTLIB::DIV_F32, RTLIB::impl___mspabi_divf},
+ // Universal Integer Operations - EABI Table 9.
+ {RTLIB::SDIV_I16, RTLIB::impl___mspabi_divi},
+ {RTLIB::SDIV_I32, RTLIB::impl___mspabi_divli},
+ {RTLIB::SDIV_I64, RTLIB::impl___mspabi_divlli},
+ {RTLIB::UDIV_I16, RTLIB::impl___mspabi_divu},
+ {RTLIB::UDIV_I32, RTLIB::impl___mspabi_divul},
+ {RTLIB::UDIV_I64, RTLIB::impl___mspabi_divull},
+ {RTLIB::SREM_I16, RTLIB::impl___mspabi_remi},
+ {RTLIB::SREM_I32, RTLIB::impl___mspabi_remli},
+ {RTLIB::SREM_I64, RTLIB::impl___mspabi_remlli},
+ {RTLIB::UREM_I16, RTLIB::impl___mspabi_remu},
+ {RTLIB::UREM_I32, RTLIB::impl___mspabi_remul},
+ {RTLIB::UREM_I64, RTLIB::impl___mspabi_remull},
+ // Bitwise Operations - EABI Table 10.
+ {RTLIB::SHL_I32, RTLIB::impl___mspabi_slll},
+ {RTLIB::SRA_I32, RTLIB::impl___mspabi_sral},
+ };
+ for (const auto &LC : EABISelected)
+ Info.setLibcallImpl(LC.Op, LC.Impl);
}
More information about the llvm-branch-commits
mailing list