Move static function to method on VPInstruction

Author: lukel97

llvm/lib/Transforms/Vectorize/VPlan.h

@@ -1351,6 +1351,28 @@ class VPInstruction : public VPRecipeWithIRFlags,
     }
   }
 
+  /// Returns true if the underlying opcode may read from or write to memory.
+  bool opcodeMayReadOrWriteFromMemory() const {
+    if (Instruction::isBinaryOp(getOpcode()))
+      return false;
+    switch (getOpcode()) {
+    case Instruction::Or:
+    case Instruction::ICmp:
+    case Instruction::Select:
+    case VPInstruction::AnyOf:
+    case VPInstruction::Not:
+    case VPInstruction::CalculateTripCountMinusVF:
+    case VPInstruction::CanonicalIVIncrementForPart:
+    case VPInstruction::ExtractFromEnd:
+    case VPInstruction::FirstOrderRecurrenceSplice:
+    case VPInstruction::LogicalAnd:
+    case VPInstruction::PtrAdd:
+      return false;
+    default:
+      return true;
+    }
+  }
+
   /// Returns true if the recipe only uses the first lane of operand \p Op.
   bool onlyFirstLaneUsed(const VPValue *Op) const override;
 

llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp

@@ -48,32 +48,10 @@ extern cl::opt<unsigned> ForceTargetInstructionCost;
 #define LV_NAME "loop-vectorize"
 #define DEBUG_TYPE LV_NAME
 
-static bool opcodeMayReadOrWriteFromMemory(unsigned Opcode) {
-  if (Instruction::isBinaryOp(Opcode))
-    return false;
-  switch (Opcode) {
-  case Instruction::Or:
-  case Instruction::ICmp:
-  case Instruction::Select:
-  case VPInstruction::AnyOf:
-  case VPInstruction::Not:
-  case VPInstruction::CalculateTripCountMinusVF:
-  case VPInstruction::CanonicalIVIncrementForPart:
-  case VPInstruction::ExtractFromEnd:
-  case VPInstruction::FirstOrderRecurrenceSplice:
-  case VPInstruction::LogicalAnd:
-  case VPInstruction::PtrAdd:
-    return false;
-  default:
-    return true;
-  }
-}
-
 bool VPRecipeBase::mayWriteToMemory() const {
   switch (getVPDefID()) {
   case VPInstructionSC:
-    return opcodeMayReadOrWriteFromMemory(
-        cast<VPInstruction>(this)->getOpcode());
+    return cast<VPInstruction>(this)->opcodeMayReadOrWriteFromMemory();
   case VPInterleaveSC:
     return cast<VPInterleaveRecipe>(this)->getNumStoreOperands() > 0;
   case VPWidenStoreEVLSC:
@@ -121,8 +99,7 @@ bool VPRecipeBase::mayWriteToMemory() const {
 bool VPRecipeBase::mayReadFromMemory() const {
   switch (getVPDefID()) {
   case VPInstructionSC:
-    return opcodeMayReadOrWriteFromMemory(
-        cast<VPInstruction>(this)->getOpcode());
+    return cast<VPInstruction>(this)->opcodeMayReadOrWriteFromMemory();
   case VPWidenLoadEVLSC:
   case VPWidenLoadSC:
     return true;