rebased and resolved comments

Author: jyli0116

llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h

@@ -740,11 +740,9 @@ class CombinerHelper {
 
   // Combine trunc(umin(x, C)) -> truncusat_u(x).
   bool matchTruncUSatU(MachineInstr &MI, MachineInstr &MinMI) const;
-  void applyTruncUSatU(MachineInstr &MI, MachineInstr &MinMI) const;
 
   // Combine truncusat_u(fptoui(x)) -> fptoui_sat(x)
   bool matchTruncUSatUToFPTOUISat(MachineInstr &MI, MachineInstr &SrcMI) const;
-  void applyTruncUSatUToFPTOUISat(MachineInstr &MI, MachineInstr &SrcMI) const;
 
   /// Try to transform \p MI by using all of the above
   /// combine functions. Returns true if changed.

llvm/include/llvm/CodeGen/GlobalISel/GenericMachineInstrs.h

@@ -919,30 +919,6 @@ class GTrunc : public GCastOp {
   };
 };
 
-/// Represents a saturated trunc from a signed input to a signed result.
-class GTruncSSatS : public GCastOp {
-public:
-  static bool classof(const MachineInstr *MI) {
-    return MI->getOpcode() == TargetOpcode::G_TRUNC_SSAT_S;
-  };
-};
-
-/// Represents a saturated trunc from a signed input to an unsigned result.
-class GTruncSSatU : public GCastOp {
-public:
-  static bool classof(const MachineInstr *MI) {
-    return MI->getOpcode() == TargetOpcode::G_TRUNC_SSAT_U;
-  };
-};
-
-/// Represents a saturated trunc from an unsigned input to an unsigned result.
-class GTruncUSatU : public GCastOp {
-public:
-  static bool classof(const MachineInstr *MI) {
-    return MI->getOpcode() == TargetOpcode::G_TRUNC_USAT_U;
-  };
-};
-
 /// Represents a vscale.
 class GVScale : public GenericMachineInstr {
 public:

llvm/include/llvm/CodeGen/GlobalISel/MIPatternMatch.h

@@ -740,18 +740,6 @@ m_GFPTrunc(const SrcTy &Src) {
   return UnaryOp_match<SrcTy, TargetOpcode::G_FPTRUNC>(Src);
 }
 
-template <typename SrcTy>
-inline UnaryOp_match<SrcTy, TargetOpcode::G_FPTOSI>
-m_GFPToSI(const SrcTy &Src) {
-  return UnaryOp_match<SrcTy, TargetOpcode::G_FPTOSI>(Src);
-}
-
-template <typename SrcTy>
-inline UnaryOp_match<SrcTy, TargetOpcode::G_FPTOUI>
-m_GFPToUI(const SrcTy &Src) {
-  return UnaryOp_match<SrcTy, TargetOpcode::G_FPTOUI>(Src);
-}
-
 template <typename SrcTy>
 inline UnaryOp_match<SrcTy, TargetOpcode::G_FABS> m_GFabs(const SrcTy &Src) {
   return UnaryOp_match<SrcTy, TargetOpcode::G_FABS>(Src);

llvm/include/llvm/Target/GlobalISel/Combine.td

@@ -1256,18 +1256,19 @@ def trunc_ssatu : GICombineRule<
   (apply [{ Helper.applyTruncSSatU(*${root}, ${matchinfo}); }])>;
 
 def trunc_usatu : GICombineRule<
-  (defs root:$root, register_matchinfo:$matchinfo),
+  (defs root:$root),
   (match (G_UMIN $min, $x, $y):$Min, 
          (G_TRUNC $dst, $min):$root,
     [{ return Helper.matchTruncUSatU(*${root}, *${Min}); }]),
-  (apply [{ Helper.applyTruncUSatU(*${root}, *${Min}); }])>;
+  (apply (G_TRUNC_USAT_U $dst, $x))>;
 
 def truncusatu_to_fptouisat : GICombineRule<
-  (defs root:$root, register_matchinfo:$matchinfo),
+  (defs root:$root),
   (match (G_FPTOUI $src, $x):$Src,
          (G_TRUNC_USAT_U $dst, $src):$root,
     [{ return Helper.matchTruncUSatUToFPTOUISat(*${root}, *${Src}); }]),
-  (apply [{ Helper.applyTruncUSatUToFPTOUISat(*${root}, *${Src}); }])>;
+  (apply (G_FPTOUI_SAT $dst, $x))
+>;
 
 def truncsat_combines : GICombineGroup<[trunc_ssats, trunc_ssatu, trunc_usatu, truncusatu_to_fptouisat]>;
 

llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp

@@ -6004,41 +6004,20 @@ bool CombinerHelper::matchTruncUSatU(MachineInstr &MI,
   unsigned NumSrcBits = SrcTy.getScalarSizeInBits();
   assert(NumSrcBits > NumDstBits && "Unexpected types for truncate operation");
 
+  if (!LI || !isLegal({TargetOpcode::G_TRUNC_SSAT_U, {DstTy, SrcTy}}))
+    return false;
   APInt UnsignedMax = APInt::getMaxValue(NumDstBits).zext(NumSrcBits);
-  if (LI && isLegal({TargetOpcode::G_TRUNC_SSAT_U, {DstTy, SrcTy}})) {
-    if (mi_match(Min, MRI, m_SpecificICstOrSplat(UnsignedMax)) &&
-        !mi_match(Val, MRI, m_GSMax(m_Reg(), m_Reg())))
-      return true;
-  }
-  return false;
-}
-
-void CombinerHelper::applyTruncUSatU(MachineInstr &MI,
-                                     MachineInstr &MinMI) const {
-  Register Dst = MI.getOperand(0).getReg();
-  Register Src = MinMI.getOperand(1).getReg();
-  Builder.buildTruncUSatU(Dst, Src);
-  MI.eraseFromParent();
+  return mi_match(Min, MRI, m_SpecificICstOrSplat(UnsignedMax)) &&
+         !mi_match(Val, MRI, m_GSMax(m_Reg(), m_Reg()));
 }
 
 bool CombinerHelper::matchTruncUSatUToFPTOUISat(MachineInstr &MI,
                                                 MachineInstr &SrcMI) const {
   LLT DstTy = MRI.getType(MI.getOperand(0).getReg());
   LLT SrcTy = MRI.getType(SrcMI.getOperand(1).getReg());
 
-  if (LI &&
-      isLegalOrBeforeLegalizer({TargetOpcode::G_FPTOUI_SAT, {DstTy, SrcTy}})) {
-    return true;
-  }
-  return false;
-}
-
-void CombinerHelper::applyTruncUSatUToFPTOUISat(MachineInstr &MI,
-                                                MachineInstr &SrcMI) const {
-  Register Dst = MI.getOperand(0).getReg();
-  Register Src = SrcMI.getOperand(1).getReg();
-  Builder.buildFPTOUI_SAT(Dst, Src);
-  MI.eraseFromParent();
+  return LI &&
+         isLegalOrBeforeLegalizer({TargetOpcode::G_FPTOUI_SAT, {DstTy, SrcTy}});
 }
 
 bool CombinerHelper::matchRedundantNegOperands(MachineInstr &MI,

llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp

@@ -1647,11 +1647,6 @@ bool AArch64LegalizerInfo::legalizeIntrinsic(LegalizerHelper &Helper,
   MachineIRBuilder &MIB = Helper.MIRBuilder;
   MachineRegisterInfo &MRI = *MIB.getMRI();
 
-  auto LowerUnaryOp = [&MI, &MIB](unsigned Opcode) {
-    MIB.buildInstr(Opcode, {MI.getOperand(0)}, {MI.getOperand(2)});
-    MI.eraseFromParent();
-    return true;
-  };
   auto LowerUnaryOp = [&MI, &MIB](unsigned Opcode) {
     MIB.buildInstr(Opcode, {MI.getOperand(0)}, {MI.getOperand(2)});
     MI.eraseFromParent();
@@ -1852,11 +1847,11 @@ bool AArch64LegalizerInfo::legalizeIntrinsic(LegalizerHelper &Helper,
   case Intrinsic::aarch64_neon_sdot:
     return LowerTriOp(AArch64::G_SDOT);
   case Intrinsic::aarch64_neon_sqxtn:
-    return LowerUnaryOp(AArch64::G_TRUNC_SSAT_S);
+    return LowerUnaryOp(TargetOpcode::G_TRUNC_SSAT_S);
   case Intrinsic::aarch64_neon_sqxtun:
-    return LowerUnaryOp(AArch64::G_TRUNC_SSAT_U);
+    return LowerUnaryOp(TargetOpcode::G_TRUNC_SSAT_U);
   case Intrinsic::aarch64_neon_uqxtn:
-    return LowerUnaryOp(AArch64::G_TRUNC_USAT_U);
+    return LowerUnaryOp(TargetOpcode::G_TRUNC_USAT_U);
 
   case Intrinsic::vector_reverse:
     // TODO: Add support for vector_reverse