use MemoryVT instead of custom c++ predicate

Author: pawan-nirpal-031

llvm/lib/Target/X86/GISel/X86InstructionSelector.cpp

@@ -77,8 +77,6 @@ class X86InstructionSelector : public InstructionSelector {
   unsigned getPtrLoadStoreOp(const LLT &Ty, const RegisterBank &RB,
                              unsigned Opc) const;
 
-  bool checkMemoryOpSize(const MachineInstr &MI, LLT Sz) const;
-
   bool selectLoadStoreOp(MachineInstr &I, MachineRegisterInfo &MRI,
                          MachineFunction &MF) const;
   bool selectFrameIndexOrGep(MachineInstr &I, MachineRegisterInfo &MRI,
@@ -357,13 +355,6 @@ bool X86InstructionSelector::selectCopy(MachineInstr &I,
   return true;
 }
 
-bool X86InstructionSelector::checkMemoryOpSize(const MachineInstr &MI,
-                                               LLT Sz) const {
-  assert(MI.hasOneMemOperand() &&
-         "Expected load/store to have only one mem op!");
-  return (*MI.memoperands_begin())->getMemoryType() == Sz;
-}
-
 bool X86InstructionSelector::select(MachineInstr &I) {
   assert(I.getParent() && "Instruction should be in a basic block!");
   assert(I.getParent()->getParent() && "Instruction should be in a function!");

llvm/lib/Target/X86/X86InstrFragments.td

@@ -842,19 +842,22 @@ def X86fldf80 : PatFrag<(ops node:$ptr), (X86fld node:$ptr), [{
 def X86fild16 : PatFrag<(ops node:$ptr), (X86fild node:$ptr), [{
   return cast<MemIntrinsicSDNode>(N)->getMemoryVT() == MVT::i16;
 }]> {
-  let GISelPredicateCode = [{ return checkMemoryOpSize(MI, LLT::scalar(16)); }];
+  let IsStore = true;
+  let MemoryVT = i16;
 }
 
 def X86fild32 : PatFrag<(ops node:$ptr), (X86fild node:$ptr), [{
   return cast<MemIntrinsicSDNode>(N)->getMemoryVT() == MVT::i32;
 }]> {
-  let GISelPredicateCode = [{ return checkMemoryOpSize(MI, LLT::scalar(32)); }];
+  let IsStore = true;
+  let MemoryVT = i32;
 }
 
 def X86fild64 : PatFrag<(ops node:$ptr), (X86fild node:$ptr), [{
   return cast<MemIntrinsicSDNode>(N)->getMemoryVT() == MVT::i64;
 }]> {
-  let GISelPredicateCode = [{ return checkMemoryOpSize(MI, LLT::scalar(64)); }];
+  let IsStore = true;
+  let MemoryVT = i64;
 }
 
 def X86fist32 : PatFrag<(ops node:$val, node:$ptr),
@@ -871,21 +874,24 @@ def X86fp_to_i16mem : PatFrag<(ops node:$val, node:$ptr),
                               (X86fp_to_mem node:$val, node:$ptr), [{
   return cast<MemIntrinsicSDNode>(N)->getMemoryVT() == MVT::i16;
 }]> {
-  let GISelPredicateCode = [{ return checkMemoryOpSize(MI, LLT::scalar(16)); }];
+  let IsStore = true;
+  let MemoryVT = i16;
 }
 
 def X86fp_to_i32mem : PatFrag<(ops node:$val, node:$ptr),
                               (X86fp_to_mem node:$val, node:$ptr), [{
   return cast<MemIntrinsicSDNode>(N)->getMemoryVT() == MVT::i32;
 }]> {
-  let GISelPredicateCode = [{ return checkMemoryOpSize(MI, LLT::scalar(32)); }];
+  let IsStore = true;
+  let MemoryVT = i32;
 }
 
 def X86fp_to_i64mem : PatFrag<(ops node:$val, node:$ptr),
                               (X86fp_to_mem node:$val, node:$ptr), [{
   return cast<MemIntrinsicSDNode>(N)->getMemoryVT() == MVT::i64;
 }]> {
-  let GISelPredicateCode = [{ return checkMemoryOpSize(MI, LLT::scalar(64)); }];
+  let IsStore = true;
+  let MemoryVT = i64;
 }
 
 //===----------------------------------------------------------------------===//