开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 4

_service:tar_scm:llvm.spec Changed

_service:tar_scm:0024-Backport-LoongArch-fix-and-add-some-new-support.patch Added

@@ -0,0 +1,5463 @@
+From 53a624f1fbb2d1f837070b400812e8bddf66fd3d Mon Sep 17 00:00:00 2001
+From: Lu Weining <luweining@loongson.cn>
+Date: Tue, 5 Dec 2023 09:20:48 +0800
+Subject: PATCH 01/12 BinaryFormatLoongArch Define psABI v2.20 relocs for
+ R_LARCH_CALL36(#73345)
+
+R_LARCH_CALL36 was designed for function call on medium code model where
+the 2 instructions (pcaddu18i + jirl) must be adjacent.
+
+(cherry picked from commit c3a9c905fbc486add75e16218fe58a04b7b6c282)
+---
+ llvm/include/llvm/BinaryFormat/ELFRelocs/LoongArch.def      | 6 ++++++
+ .../tools/llvm-readobj/ELF/reloc-types-loongarch64.test     | 2 ++
+ llvm/unittests/Object/ELFTest.cpp                           | 2 ++
+ 3 files changed, 10 insertions(+)
+
+diff --git a/llvm/include/llvm/BinaryFormat/ELFRelocs/LoongArch.def b/llvm/include/llvm/BinaryFormat/ELFRelocs/LoongArch.def
+index 02bce3c71712..c4393432677b 100644
+--- a/llvm/include/llvm/BinaryFormat/ELFRelocs/LoongArch.def
++++ b/llvm/include/llvm/BinaryFormat/ELFRelocs/LoongArch.def
+@@ -118,3 +118,9 @@ ELF_RELOC(R_LARCH_SUB6,        106)
+ ELF_RELOC(R_LARCH_ADD_ULEB128, 107)
+ ELF_RELOC(R_LARCH_SUB_ULEB128, 108)
+ ELF_RELOC(R_LARCH_64_PCREL,    109)
++
++// Relocs added in ELF for the LoongArch™ Architecture v20231102, part of the
++// v2.20 LoongArch ABI specs.
++//
++// Spec addition: https://github.com/loongson/la-abi-specs/pull/4
++ELF_RELOC(R_LARCH_CALL36, 110)
+diff --git a/llvm/test/tools/llvm-readobj/ELF/reloc-types-loongarch64.test b/llvm/test/tools/llvm-readobj/ELF/reloc-types-loongarch64.test
+index e32dc893fa79..88ff7fa405ed 100644
+--- a/llvm/test/tools/llvm-readobj/ELF/reloc-types-loongarch64.test
++++ b/llvm/test/tools/llvm-readobj/ELF/reloc-types-loongarch64.test
+@@ -102,6 +102,7 @@
+ # CHECK: Type: R_LARCH_ADD_ULEB128 (107)
+ # CHECK: Type: R_LARCH_SUB_ULEB128 (108)
+ # CHECK: Type: R_LARCH_64_PCREL (109)
++# CHECK: Type: R_LARCH_CALL36 (110)
+ 
+ --- !ELF
+ FileHeader:
+@@ -211,3 +212,4 @@ Sections:
+       - Type: R_LARCH_ADD_ULEB128
+       - Type: R_LARCH_SUB_ULEB128
+       - Type: R_LARCH_64_PCREL
++      - Type: R_LARCH_CALL36
+diff --git a/llvm/unittests/Object/ELFTest.cpp b/llvm/unittests/Object/ELFTest.cpp
+index 50b1df124a4a..ed851dde4c00 100644
+--- a/llvm/unittests/Object/ELFTest.cpp
++++ b/llvm/unittests/Object/ELFTest.cpp
+@@ -251,6 +251,8 @@ TEST(ELFTest, getELFRelocationTypeNameForLoongArch) {
+             getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_SUB_ULEB128));
+   EXPECT_EQ("R_LARCH_64_PCREL",
+             getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_64_PCREL));
++  EXPECT_EQ("R_LARCH_CALL36",
++            getELFRelocationTypeName(EM_LOONGARCH, R_LARCH_CALL36));
+ }
+ 
+ TEST(ELFTest, getELFRelativeRelocationType) {
+-- 
+2.20.1
+
+
+From a8ed0f26220bbacb2c485a392f79ac4b271d73af Mon Sep 17 00:00:00 2001
+From: wanglei <wanglei@loongson.cn>
+Date: Tue, 2 Jan 2024 10:55:02 +0800
+Subject: PATCH 02/12 LoongArch Emit function call code sequence as
+ `PCADDU18I+JIRL` in medium code model
+
+According to the description of the psABI v2.20:
+https://github.com/loongson/la-abi-specs/releases/tag/v2.20, adjustments
+are made to the function call instructions under the medium code model.
+
+At the same time, AsmParser has already supported parsing the call36 and
+tail36 macro instructions.
+
+(cherry picked from commit 2cf420d5b846a4733ef0ef7c8ed0ae0bfd1c6772)
+---
+ .../AsmParser/LoongArchAsmParser.cpp          | 61 +++++++++++++++++++
+ .../LoongArch/LoongArchExpandPseudoInsts.cpp  | 29 ++++-----
+ .../Target/LoongArch/LoongArchInstrInfo.td    | 23 ++++++-
+ .../Target/LoongArch/LoongArchMCInstLower.cpp |  3 +
+ .../LoongArch/LoongArchTargetMachine.cpp      |  4 +-
+ .../MCTargetDesc/LoongArchBaseInfo.h          |  1 +
+ .../MCTargetDesc/LoongArchELFObjectWriter.cpp |  2 +
+ .../MCTargetDesc/LoongArchFixupKinds.h        |  3 +
+ .../MCTargetDesc/LoongArchMCCodeEmitter.cpp   |  3 +
+ .../MCTargetDesc/LoongArchMCExpr.cpp          |  3 +
+ .../LoongArch/MCTargetDesc/LoongArchMCExpr.h  |  1 +
+ llvm/test/CodeGen/LoongArch/code-models.ll    | 12 ++--
+ .../MC/LoongArch/Basic/Integer/invalid64.s    |  2 +-
+ llvm/test/MC/LoongArch/Macros/macros-call.s   |  9 +++
+ .../MC/LoongArch/Relocations/relocations.s    |  5 ++
+ 15 files changed, 133 insertions(+), 28 deletions(-)
+ create mode 100644 llvm/test/MC/LoongArch/Macros/macros-call.s
+
+diff --git a/llvm/lib/Target/LoongArch/AsmParser/LoongArchAsmParser.cpp b/llvm/lib/Target/LoongArch/AsmParser/LoongArchAsmParser.cpp
+index a132e645c864..f908e5bc63d3 100644
+--- a/llvm/lib/Target/LoongArch/AsmParser/LoongArchAsmParser.cpp
++++ b/llvm/lib/Target/LoongArch/AsmParser/LoongArchAsmParser.cpp
+@@ -122,6 +122,10 @@ class LoongArchAsmParser : public MCTargetAsmParser {
+   // Helper to emit pseudo instruction "li.w/d $rd, $imm".
+   void emitLoadImm(MCInst &Inst, SMLoc IDLoc, MCStreamer &Out);
+ 
++  // Helper to emit pseudo instruction "call36 sym" or "tail36 $rj, sym".
++  void emitFuncCall36(MCInst &Inst, SMLoc IDLoc, MCStreamer &Out,
++                      bool IsTailCall);
++
+ public:
+   enum LoongArchMatchResultTy {
+     Match_Dummy = FIRST_TARGET_MATCH_RESULT_TY,
+@@ -401,6 +405,22 @@ public:
+                      IsValidKind;
+   }
+ 
++  bool isSImm20pcaddu18i() const {
++    if (!isImm())
++      return false;
++
++    int64_t Imm;
++    LoongArchMCExpr::VariantKind VK = LoongArchMCExpr::VK_LoongArch_None;
++    bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK);
++    bool IsValidKind = VK == LoongArchMCExpr::VK_LoongArch_None ||
++                       VK == LoongArchMCExpr::VK_LoongArch_CALL36;
++
++    return IsConstantImm
++               ? isInt<20>(Imm) && IsValidKind
++               : LoongArchAsmParser::classifySymbolRef(getImm(), VK) &&
++                     IsValidKind;
++  }
++
+   bool isSImm21lsl2() const {
+     if (!isImm())
+       return false;
+@@ -1111,6 +1131,35 @@ void LoongArchAsmParser::emitLoadImm(MCInst &Inst, SMLoc IDLoc,
+   }
+ }
+ 
++void LoongArchAsmParser::emitFuncCall36(MCInst &Inst, SMLoc IDLoc,
++                                        MCStreamer &Out, bool IsTailCall) {
++  // call36 sym
++  // expands to:
++  //   pcaddu18i $ra, %call36(sym)
++  //   jirl      $ra, $ra, 0
++  //
++  // tail36 $rj, sym
++  // expands to:
++  //   pcaddu18i $rj, %call36(sym)
++  //   jirl      $r0, $rj, 0
++  unsigned ScratchReg =
++      IsTailCall ? Inst.getOperand(0).getReg() : (unsigned)LoongArch::R1;
++  const MCExpr *Sym =
++      IsTailCall ? Inst.getOperand(1).getExpr() : Inst.getOperand(0).getExpr();
++  const LoongArchMCExpr *LE = LoongArchMCExpr::create(
++      Sym, llvm::LoongArchMCExpr::VK_LoongArch_CALL36, getContext());
++
++  Out.emitInstruction(
++      MCInstBuilder(LoongArch::PCADDU18I).addReg(ScratchReg).addExpr(LE),
++      getSTI());
++  Out.emitInstruction(
++      MCInstBuilder(LoongArch::JIRL)
++          .addReg(IsTailCall ? (unsigned)LoongArch::R0 : ScratchReg)
++          .addReg(ScratchReg)
++          .addImm(0),
++      getSTI());
++}
++
+ bool LoongArchAsmParser::processInstruction(MCInst &Inst, SMLoc IDLoc,
+                                             OperandVector &Operands,
+                                             MCStreamer &Out) {
+@@ -1159,6 +1208,12 @@ bool LoongArchAsmParser::processInstruction(MCInst &Inst, SMLoc IDLoc,
+   case LoongArch::PseudoLI_D:
+     emitLoadImm(Inst, IDLoc, Out);
+     return false;
++  case LoongArch::PseudoCALL36:
++    emitFuncCall36(Inst, IDLoc, Out, /*IsTailCall=*/false);
++    return false;
++  case LoongArch::PseudoTAIL36:
++    emitFuncCall36(Inst, IDLoc, Out, /*IsTailCall=*/true);
++    return false;
+   }
+   Out.emitInstruction(Inst, getSTI());
+   return false;
+@@ -1440,6 +1495,12 @@ bool LoongArchAsmParser::MatchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
+         /*Upper=*/(1 << 19) - 1,
+         "operand must be a symbol with modifier (e.g. %pc_hi20) or an integer "
+         "in the range");
++  case Match_InvalidSImm20pcaddu18i:
++    return generateImmOutOfRangeError(
++        Operands, ErrorInfo, /*Lower=*/-(1 << 19),
++        /*Upper=*/(1 << 19) - 1,
++        "operand must be a symbol with modifier (e.g. %call36) or an integer "
++        "in the range");
+   case Match_InvalidSImm21lsl2:
+     return generateImmOutOfRangeError(
+         Operands, ErrorInfo, /*Lower=*/-(1 << 22), /*Upper=*/(1 << 22) - 4,
+diff --git a/llvm/lib/Target/LoongArch/LoongArchExpandPseudoInsts.cpp b/llvm/lib/Target/LoongArch/LoongArchExpandPseudoInsts.cpp
+index 72c1f1cec198..8eda2dcc1633 100644