https://github.com/arichardson updated https://github.com/llvm/llvm-project/pull/241449
>From 778379f8cfc2fc762e6f48c66cc72a58ae0bee88 Mon Sep 17 00:00:00 2001 From: Alex Richardson <[email protected]> Date: Wed, 11 Nov 2026 11:07:13 -0800 Subject: [PATCH] [nspr] initial commit --- .../Target/CSKY/AsmParser/CSKYAsmParser.cpp | 35 +++---------------- llvm/lib/Target/CSKY/CSKYRegisterInfo.td | 7 ++-- 2 files changed, 10 insertions(+), 32 deletions(-) diff --git a/llvm/lib/Target/CSKY/AsmParser/CSKYAsmParser.cpp b/llvm/lib/Target/CSKY/AsmParser/CSKYAsmParser.cpp index 9508d8e532a7ba..942c3250d9a199 100644 --- a/llvm/lib/Target/CSKY/AsmParser/CSKYAsmParser.cpp +++ b/llvm/lib/Target/CSKY/AsmParser/CSKYAsmParser.cpp @@ -51,7 +51,6 @@ struct CSKYOperand; class CSKYAsmParser : public MCTargetAsmParser { const CSKYMCOptions &CLOpts; - const MCRegisterInfo *MRI; unsigned validateTargetOperandClass(MCParsedAsmOperand &Op, unsigned Kind) override; @@ -129,9 +128,6 @@ class CSKYAsmParser : public MCTargetAsmParser { MCAsmParserExtension::Initialize(Parser); - // Cache the MCRegisterInfo. - MRI = getContext().getRegisterInfo(); - setAvailableFeatures(ComputeAvailableFeatures(STI.getFeatureBits())); if (CLOpts.add_build_attributes) getTargetStreamer().emitTargetAttributes(STI, /*HardFloatABI=*/false); @@ -639,11 +635,6 @@ struct CSKYOperand : public MCParsedAsmOperand { #define GET_MNEMONIC_SPELL_CHECKER #include "CSKYGenAsmMatcher.inc" -static MCRegister convertFPR32ToFPR64(MCRegister Reg) { - assert(Reg >= CSKY::F0_32 && Reg <= CSKY::F31_32 && "Invalid register"); - return Reg - CSKY::F0_32 + CSKY::F0_64; -} - static std::string CSKYMnemonicSpellCheck(StringRef S, const FeatureBitset &FBS, unsigned VariantID = 0); @@ -1618,27 +1609,11 @@ unsigned CSKYAsmParser::validateTargetOperandClass(MCParsedAsmOperand &AsmOp, MCRegister Reg = Op.getReg(); - if (getCSKYMCRegisterClass(CSKY::FPR32RegClassID).contains(Reg)) { - // As the parser couldn't differentiate an FPR64 from an FPR32, coerce the - // register from FPR32 to FPR64 if necessary. - if (Kind == MCK_FPR64 || Kind == MCK_sFPR64) { - Op.Reg.RegNum = convertFPR32ToFPR64(Reg); - if (Kind == MCK_sFPR64 && - (Op.Reg.RegNum < CSKY::F0_64 || Op.Reg.RegNum > CSKY::F15_64)) - return Match_InvalidRegOutOfRange; - if (Kind == MCK_FPR64 && - (Op.Reg.RegNum < CSKY::F0_64 || Op.Reg.RegNum > CSKY::F31_64)) - return Match_InvalidRegOutOfRange; - return Match_Success; - } - } - - if (getCSKYMCRegisterClass(CSKY::GPRRegClassID).contains(Reg)) { - if (Kind == MCK_GPRPair) { - Op.Reg.RegNum = MRI->getEncodingValue(Reg) + CSKY::R0_R1; - return Match_Success; - } - } + // FPR32 registers are coerced to FPR64/sFPR64 by the generated matcher, so + // this only sees fr16-fr31 used as an sFPR64 operand. + if (Kind == MCK_sFPR64 && + getCSKYMCRegisterClass(CSKY::FPR32RegClassID).contains(Reg)) + return Match_InvalidRegOutOfRange; return Match_InvalidOperand; } diff --git a/llvm/lib/Target/CSKY/CSKYRegisterInfo.td b/llvm/lib/Target/CSKY/CSKYRegisterInfo.td index d12532a3c5c19b..4f029c08b08c43 100644 --- a/llvm/lib/Target/CSKY/CSKYRegisterInfo.td +++ b/llvm/lib/Target/CSKY/CSKYRegisterInfo.td @@ -22,8 +22,8 @@ let Namespace = "CSKY" in { } // Because CSKYFReg64 register have AsmName and AltNames that alias with their - // 32-bit sub-register, CSKYAsmParser will need to coerce a register number - // from a CSKYFReg32 to the equivalent CSKYFReg64 when appropriate. + // 32-bit sub-register, the 64-bit register classes use CoerceFromRegClass to + // accept the parsed CSKYFReg32 register. def sub32_0 : SubRegIndex<32, 0>; def sub32_32 : SubRegIndex<32, 32>; def sub64_0 : SubRegIndex<64, 0>; @@ -179,6 +179,7 @@ def GPRSP : RegisterClass<"CSKY", [i32], 32, (add R14)> { def GPRPair : RegisterClass<"CSKY", [untyped], 32, (add GPRTuple)> { let Size = 64; + let CoerceFromRegClass = GPR; } def CARRY : RegisterClass<"CSKY", [i32], 32, (add C)> { @@ -193,12 +194,14 @@ def FPR32 : RegisterClass<"CSKY", [f32], 32, def sFPR32 : RegisterClass<"CSKY", [f32], 32, (add (sequence "F%u_32", 0, 15))>; +let CoerceFromRegClass = FPR32 in { def FPR64 : RegisterClass<"CSKY", [f64], 32, (add (sequence "F%u_64", 0, 31))>; def sFPR64 : RegisterClass<"CSKY", [f64], 32, (add (sequence "F%u_64", 0, 15))>; def sFPR64_V : RegisterClass<"CSKY", [v2f32], 32, (add sFPR64)>; +} def FPR128 : RegisterClass<"CSKY", [v16i8, v8i16, v4i32, v2i64, v4f32, v2f64, v8f16], 128, _______________________________________________ llvm-branch-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
