Fix signed comparision rt calls.

Author: jacobly0

llvm/include/llvm/IR/RuntimeLibcalls.def

@@ -85,6 +85,10 @@ HANDLE_LIBCALL(CMP_I16_0, nullptr)
 HANDLE_LIBCALL(CMP_I24_0, nullptr)
 HANDLE_LIBCALL(CMP_I32_0, nullptr)
 HANDLE_LIBCALL(CMP_I64_0, nullptr)
+HANDLE_LIBCALL(SCMP_I16, nullptr)
+HANDLE_LIBCALL(SCMP_I24, nullptr)
+HANDLE_LIBCALL(SCMP_I32, nullptr)
+HANDLE_LIBCALL(SCMP_I64, nullptr)
 HANDLE_LIBCALL(SCMP, nullptr)
 HANDLE_LIBCALL(ADD_I32, nullptr)
 HANDLE_LIBCALL(ADD_I32_I8, nullptr)

llvm/lib/Target/Z80/GISel/Z80CallLowering.cpp

@@ -17,10 +17,11 @@
 #include "Z80CallingConv.h"
 #include "Z80ISelLowering.h"
 #include "Z80MachineFunctionInfo.h"
+#include "Z80RegisterInfo.h"
 #include "Z80Subtarget.h"
 #include "llvm/CodeGen/Analysis.h"
-#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
 #include "llvm/CodeGen/GlobalISel/MIPatternMatch.h"
+#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Target/TargetMachine.h"
 using namespace llvm;
@@ -793,7 +794,7 @@ bool Z80CallLowering::lowerReturn(MachineIRBuilder &MIRBuilder,
     const Function &F = MF.getFunction();
     MachineRegisterInfo &MRI = MF.getRegInfo();
     const DataLayout &DL = MF.getDataLayout();
-    const Z80TargetLowering &TLI = *getTLI<Z80TargetLowering>();
+    const auto &TLI = *getTLI<Z80TargetLowering>();
 
     SmallVector<EVT, 4> SplitEVTs;
     ComputeValueVTs(TLI, DL, RetTy, SplitEVTs);
@@ -818,3 +819,19 @@ bool Z80CallLowering::lowerReturn(MachineIRBuilder &MIRBuilder,
   MIRBuilder.insertInstr(MIB);
   return true;
 }
+
+MachineInstrBuilder
+Z80CallLowering::buildSCMP(MachineIRBuilder &MIRBuilder) const {
+  MachineFunction &MF = MIRBuilder.getMF();
+  const auto &STI = MF.getSubtarget<Z80Subtarget>();
+  const auto &TLI = *getTLI<Z80TargetLowering>();
+  const Z80RegisterInfo &TRI = *STI.getRegisterInfo();
+  bool Is24Bit = STI.is24Bit();
+  return MIRBuilder.buildInstr(Is24Bit ? Z80::CALL24CC : Z80::CALL16CC)
+      .addExternalSymbol(TLI.getLibcallName(RTLIB::SCMP))
+      .addImm(Z80::COND_PE)
+      .addDef(Z80::F, RegState::Implicit)
+      .addUse(Z80::F, RegState::ImplicitKill)
+      .addRegMask(
+          TRI.getCallPreservedMask(MF, TLI.getLibcallCallingConv(RTLIB::SCMP)));
+}

llvm/lib/Target/Z80/GISel/Z80CallLowering.h

@@ -16,6 +16,7 @@
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/CodeGen/GlobalISel/CallLowering.h"
+#include "llvm/CodeGen/MachineInstrBuilder.h"
 
 namespace llvm {
 
@@ -36,6 +37,8 @@ class Z80CallLowering : public CallLowering {
                    ArrayRef<Register> VRegs,
                    FunctionLoweringInfo &FLI) const override;
 
+  MachineInstrBuilder buildSCMP(MachineIRBuilder &MIRBuilder) const;
+
 private:
   bool
   doCallerAndCalleePassArgsTheSameWay(CallLoweringInfo &Info,

llvm/lib/Target/Z80/GISel/Z80InstructionSelector.cpp

@@ -11,6 +11,7 @@
 /// \todo This should be generated by TableGen.
 //===----------------------------------------------------------------------===//
 
+#include "GISel/Z80CallLowering.h"
 #include "MCTargetDesc/Z80MCTargetDesc.h"
 #include "Z80.h"
 #include "Z80MachineFunctionInfo.h"
@@ -1062,7 +1063,8 @@ Z80::CondCode
 Z80InstructionSelector::foldCompare(MachineInstr &I, MachineIRBuilder &MIB,
                                     MachineRegisterInfo &MRI) const {
   assert(I.getOpcode() == TargetOpcode::G_ICMP && "unexpected instruction");
-  const Function &F = MIB.getMF().getFunction();
+  MachineFunction &MF = MIB.getMF();
+  const Function &F = MF.getFunction();
   bool OptSize = F.hasOptSize();
 
   auto Pred = CmpInst::Predicate(I.getOperand(1).getPredicate());
@@ -1216,21 +1218,8 @@ Z80InstructionSelector::foldCompare(MachineInstr &I, MachineIRBuilder &MIB,
   auto Cmp = MIB.buildInstr(Opc, {}, Ops);
   if (!constrainSelectedInstRegOperands(*Cmp, TII, TRI, RBI))
     return Z80::COND_INVALID;
-  if (IsSigned && OptSize) {
-    LLT s8 = LLT::scalar(8);
-    Type *Int8Ty = Type::getInt8Ty(F.getContext());
-    Register FlagsReg = MIB.buildCopy(s8, Register(Z80::F)).getReg(0);
-    CallLowering::ArgInfo FlagsArg(FlagsReg, Int8Ty,
-                                   CallLowering::ArgInfo::NoArgIndex);
-    Register SignedFlagsReg = MRI.createGenericVirtualRegister(s8);
-    CallLowering::ArgInfo SignedFlagsArg(SignedFlagsReg, Int8Ty,
-                                         CallLowering::ArgInfo::NoArgIndex);
-    createLibcall(MIB, RTLIB::SCMP, SignedFlagsArg, FlagsArg);
-    MIB.buildCopy(Register(Z80::F), SignedFlagsReg);
-    if (!RBI.constrainGenericRegister(FlagsReg, Z80::F8RegClass, MRI) ||
-        !RBI.constrainGenericRegister(SignedFlagsReg, Z80::F8RegClass, MRI))
-      return Z80::COND_INVALID;
-  }
+  if (IsSigned && OptSize)
+    STI.getCallLowering()->buildSCMP(MIB);
   return CC;
 }
 

llvm/lib/Target/Z80/GISel/Z80LegalizerInfo.cpp

@@ -497,10 +497,10 @@ Z80LegalizerInfo::legalizeCompare(LegalizerHelper &Helper,
       ZeroRHS = *C == 0;
     switch (OpSize) {
     case 32:
-      Libcall = ZeroRHS ? RTLIB::CMP_I32_0 : RTLIB::CMP_I32;
+      Libcall = ZeroRHS ? RTLIB::CMP_I32_0 : IsSigned ? RTLIB::SCMP_I32 : RTLIB::CMP_I32;
       break;
     case 64:
-      Libcall = ZeroRHS ? RTLIB::CMP_I64_0 : RTLIB::CMP_I64;
+      Libcall = ZeroRHS ? RTLIB::CMP_I64_0 : IsSigned ? RTLIB::SCMP_I64 : RTLIB::CMP_I64;
       break;
     default:
       llvm_unreachable("Unexpected type");
@@ -530,14 +530,9 @@ Z80LegalizerInfo::legalizeCompare(LegalizerHelper &Helper,
     CallLowering::ArgInfo Args[2] = {{LHSReg, Ty, 0}, {RHSReg, Ty, 1}};
     createLibcall(MIRBuilder, Libcall, FlagsArg,
                   makeArrayRef(Args, 2 - ZeroRHS));
-    if (IsSigned && !ZeroRHS) {
-      Register SignedFlagsReg = MRI.createGenericVirtualRegister(s8);
-      CallLowering::ArgInfo SignedFlagsArg(SignedFlagsReg, Int8Ty,
-                                           CallLowering::ArgInfo::NoArgIndex);
-      createLibcall(MIRBuilder, RTLIB::SCMP, SignedFlagsArg, FlagsArg);
-      FlagsReg = SignedFlagsReg;
-    }
     MIRBuilder.buildCopy(Register(Z80::F), FlagsReg);
+    if (IsSigned && !ZeroRHS)
+      Subtarget.getCallLowering()->buildSCMP(MIRBuilder);
   } else
     MIRBuilder.buildInstr(Z80::RCF);
   MIRBuilder.buildInstr(Z80::SetCC, {DstReg}, {int64_t(CC)});

llvm/lib/Target/Z80/Z80ISelLowering.cpp

@@ -92,6 +92,8 @@ Z80TargetLowering::Z80TargetLowering(const Z80TargetMachine &TM,
   setLibcall(RTLIB::CMP_I24_0,        "_icmpzero", CallingConv::Z80_LibCall_F );
   setLibcall(RTLIB::CMP_I32_0,        "_lcmpzero", CallingConv::Z80_LibCall_F );
   setLibcall(RTLIB::CMP_I64_0,        "_llcmpzero",CallingConv::Z80_LibCall_F );
+  setLibcall(RTLIB::SCMP_I32,         "_lcmps",    CallingConv::Z80_LibCall_F );
+  setLibcall(RTLIB::SCMP_I64,         "_llcmps",   CallingConv::Z80_LibCall_F );
   setLibcall(RTLIB::SCMP,             "_setflag",  CallingConv::Z80_LibCall_F );
   setLibcall(RTLIB::NEG_I16,          "_sneg",     CallingConv::Z80_LibCall   );
   setLibcall(RTLIB::NEG_I24,          "_ineg",     CallingConv::Z80_LibCall   );

llvm/lib/Target/Z80/Z80Subtarget.cpp

@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "Z80Subtarget.h"
-#include "GISel/Z80CallLowering.h"
 #include "GISel/Z80InlineAsmLowering.h"
 #include "GISel/Z80LegalizerInfo.h"
 #include "GISel/Z80RegisterBankInfo.h"

llvm/lib/Target/Z80/Z80Subtarget.h

@@ -14,6 +14,10 @@
 #ifndef LLVM_LIB_TARGET_Z80_Z80SUBTARGET_H
 #define LLVM_LIB_TARGET_Z80_Z80SUBTARGET_H
 
+#include "GISel/Z80CallLowering.h"
+#include "GISel/Z80InlineAsmLowering.h"
+#include "GISel/Z80LegalizerInfo.h"
+#include "GISel/Z80RegisterBankInfo.h"
 #include "Z80FrameLowering.h"
 #include "Z80ISelLowering.h"
 #include "Z80InstrInfo.h"
@@ -62,11 +66,11 @@ class Z80Subtarget final : public Z80GenSubtargetInfo {
   Z80FrameLowering FrameLowering;
 
   /// GlobalISel related APIs.
-  std::unique_ptr<CallLowering> CallLoweringInfo;
-  std::unique_ptr<InlineAsmLowering> InlineAsmLoweringInfo;
+  std::unique_ptr<Z80CallLowering> CallLoweringInfo;
+  std::unique_ptr<Z80InlineAsmLowering> InlineAsmLoweringInfo;
   std::unique_ptr<InstructionSelector> InstSelector;
-  std::unique_ptr<LegalizerInfo> Legalizer;
-  std::unique_ptr<RegisterBankInfo> RegBankInfo;
+  std::unique_ptr<Z80LegalizerInfo> Legalizer;
+  std::unique_ptr<Z80RegisterBankInfo> RegBankInfo;
 
 public:
   /// This constructor initializes the data members to match that
@@ -90,10 +94,10 @@ class Z80Subtarget final : public Z80GenSubtargetInfo {
   void ParseSubtargetFeatures(StringRef CPU, StringRef TuneCPU, StringRef FS);
 
   /// Methods used by Global ISel
-  const CallLowering *getCallLowering() const override {
+  const Z80CallLowering *getCallLowering() const override {
     return CallLoweringInfo.get();
   }
-  const InlineAsmLowering *getInlineAsmLowering() const override {
+  const Z80InlineAsmLowering *getInlineAsmLowering() const override {
     return InlineAsmLoweringInfo.get();
   }
   InstructionSelector *getInstructionSelector() const override {