[VPlan] Separate out logic to manage IR flags to VPIRFlags (NFC). #140621
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -577,8 +577,8 @@ class VPSingleDefRecipe : public VPRecipeBase, public VPValue { | |||||
| #endif | ||||||
| }; | ||||||
|
|
||||||
| /// Class to record and manage LLVM IR flags. | ||||||
| class VPIRFlags { | ||||||
| enum class OperationType : unsigned char { | ||||||
| Cmp, | ||||||
| OverflowingBinOp, | ||||||
|
|
@@ -637,23 +637,10 @@ class VPRecipeWithIRFlags : public VPSingleDefRecipe { | |||||
| unsigned AllFlags; | ||||||
| }; | ||||||
|
|
||||||
| public: | ||||||
| VPIRFlags() : OpType(OperationType::Other), AllFlags(0) {} | ||||||
|
There was a problem hiding this comment. Would be good to document the interface here and below. |
||||||
|
|
||||||
| VPIRFlags(Instruction &I) { | ||||||
| if (auto *Op = dyn_cast<CmpInst>(&I)) { | ||||||
| OpType = OperationType::Cmp; | ||||||
| CmpPredicate = Op->getPredicate(); | ||||||
|
|
@@ -681,63 +668,27 @@ class VPRecipeWithIRFlags : public VPSingleDefRecipe { | |||||
| } | ||||||
| } | ||||||
|
|
||||||
| VPIRFlags(CmpInst::Predicate Pred) | ||||||
| : OpType(OperationType::Cmp), CmpPredicate(Pred) {} | ||||||
|
|
||||||
| VPIRFlags(WrapFlagsTy WrapFlags) | ||||||
| : OpType(OperationType::OverflowingBinOp), WrapFlags(WrapFlags) {} | ||||||
|
|
||||||
| VPIRFlags(FastMathFlags FMFs) : OpType(OperationType::FPMathOp), FMFs(FMFs) {} | ||||||
|
|
||||||
| VPIRFlags(DisjointFlagsTy DisjointFlags) | ||||||
| : OpType(OperationType::DisjointOp), DisjointFlags(DisjointFlags) {} | ||||||
|
|
||||||
| VPIRFlags(NonNegFlagsTy NonNegFlags) | ||||||
| : OpType(OperationType::NonNegOp), NonNegFlags(NonNegFlags) {} | ||||||
|
|
||||||
| VPIRFlags(GEPNoWrapFlags GEPFlags) | ||||||
| : OpType(OperationType::GEPOp), GEPFlags(GEPFlags) {} | ||||||
|
|
||||||
| public: | ||||||
| void transferFlags(VPIRFlags &Other) { | ||||||
|
There was a problem hiding this comment. Now Used only by recipe |
||||||
| OpType = Other.OpType; | ||||||
| AllFlags = Other.AllFlags; | ||||||
| } | ||||||
|
|
||||||
| /// Drop all poison-generating flags. | ||||||
|
|
@@ -851,11 +802,60 @@ class VPRecipeWithIRFlags : public VPSingleDefRecipe { | |||||
| return DisjointFlags.IsDisjoint; | ||||||
| } | ||||||
|
|
||||||
| #if !defined(NDEBUG) | ||||||
| /// Returns true if the set flags are valid for \p Opcode. | ||||||
| bool flagsValidForOpcode(unsigned Opcode) const; | ||||||
| #endif | ||||||
|
|
||||||
| #if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP) | ||||||
| void printFlags(raw_ostream &O) const; | ||||||
| #endif | ||||||
| }; | ||||||
|
|
||||||
| /// A pure-virtual common base class for recipes defining a single VPValue and | ||||||
| /// using IR flags. | ||||||
| struct VPRecipeWithIRFlags : public VPSingleDefRecipe, public VPIRFlags { | ||||||
|
There was a problem hiding this comment. This retains existing name, but perhaps |
||||||
| VPRecipeWithIRFlags(const unsigned char SC, ArrayRef<VPValue *> Operands, | ||||||
| DebugLoc DL = {}) | ||||||
| : VPSingleDefRecipe(SC, Operands, DL), VPIRFlags() {} | ||||||
|
|
||||||
| VPRecipeWithIRFlags(const unsigned char SC, ArrayRef<VPValue *> Operands, | ||||||
| Instruction &I) | ||||||
| : VPSingleDefRecipe(SC, Operands, &I, I.getDebugLoc()), VPIRFlags(I) {} | ||||||
|
|
||||||
| VPRecipeWithIRFlags(const unsigned char SC, ArrayRef<VPValue *> Operands, | ||||||
| const VPIRFlags &Flags, DebugLoc DL = {}) | ||||||
| : VPSingleDefRecipe(SC, Operands, DL), VPIRFlags(Flags) {} | ||||||
|
|
||||||
| static inline bool classof(const VPRecipeBase *R) { | ||||||
| return R->getVPDefID() == VPRecipeBase::VPInstructionSC || | ||||||
| R->getVPDefID() == VPRecipeBase::VPWidenSC || | ||||||
| R->getVPDefID() == VPRecipeBase::VPWidenGEPSC || | ||||||
| R->getVPDefID() == VPRecipeBase::VPWidenCallSC || | ||||||
| R->getVPDefID() == VPRecipeBase::VPWidenCastSC || | ||||||
| R->getVPDefID() == VPRecipeBase::VPWidenIntrinsicSC || | ||||||
| R->getVPDefID() == VPRecipeBase::VPReductionSC || | ||||||
| R->getVPDefID() == VPRecipeBase::VPReductionEVLSC || | ||||||
| R->getVPDefID() == VPRecipeBase::VPReplicateSC || | ||||||
| R->getVPDefID() == VPRecipeBase::VPVectorEndPointerSC || | ||||||
| R->getVPDefID() == VPRecipeBase::VPVectorPointerSC || | ||||||
| R->getVPDefID() == VPRecipeBase::VPExtendedReductionSC || | ||||||
| R->getVPDefID() == VPRecipeBase::VPMulAccumulateReductionSC; | ||||||
| } | ||||||
|
|
||||||
| static inline bool classof(const VPUser *U) { | ||||||
| auto *R = dyn_cast<VPRecipeBase>(U); | ||||||
| return R && classof(R); | ||||||
| } | ||||||
|
|
||||||
| static inline bool classof(const VPValue *V) { | ||||||
| auto *R = dyn_cast_or_null<VPRecipeBase>(V->getDefiningRecipe()); | ||||||
| return R && classof(R); | ||||||
| } | ||||||
|
|
||||||
| void execute(VPTransformState &State) override = 0; | ||||||
| }; | ||||||
|
|
||||||
| /// Helper to access the operand that contains the unroll part for this recipe | ||||||
| /// after unrolling. | ||||||
| template <unsigned PartOpIdx> class VPUnrollPartAccessor { | ||||||
|
|
@@ -958,54 +958,21 @@ class VPInstruction : public VPRecipeWithIRFlags, | |||||
| /// value for lane \p Lane. | ||||||
| Value *generatePerLane(VPTransformState &State, const VPLane &Lane); | ||||||
|
|
||||||
| public: | ||||||
| VPInstruction(unsigned Opcode, ArrayRef<VPValue *> Operands, DebugLoc DL = {}, | ||||||
| const Twine &Name = "") | ||||||
| : VPRecipeWithIRFlags(VPDef::VPInstructionSC, Operands, DL), | ||||||
| Opcode(Opcode), Name(Name.str()) {} | ||||||
|
|
||||||
| VPInstruction(unsigned Opcode, ArrayRef<VPValue *> Operands, | ||||||
| const VPIRFlags &Flags, DebugLoc DL = {}, | ||||||
| const Twine &Name = ""); | ||||||
|
|
||||||
| VP_CLASSOF_IMPL(VPDef::VPInstructionSC) | ||||||
|
|
||||||
| VPInstruction *clone() override { | ||||||
| SmallVector<VPValue *, 2> Operands(operands()); | ||||||
| return new VPInstruction(Opcode, Operands, *this, getDebugLoc(), Name); | ||||||
|
There was a problem hiding this comment. would this
Suggested change
also work? Additional instances below. |
||||||
| } | ||||||
|
|
||||||
| unsigned getOpcode() const { return Opcode; } | ||||||
|
|
@@ -1082,13 +1049,9 @@ class VPInstructionWithType : public VPInstruction { | |||||
|
|
||||||
| public: | ||||||
| VPInstructionWithType(unsigned Opcode, ArrayRef<VPValue *> Operands, | ||||||
| Type *ResultTy, const VPIRFlags &Flags, DebugLoc DL, | ||||||
| const Twine &Name = "") | ||||||
| : VPInstruction(Opcode, Operands, Flags, DL, Name), ResultTy(ResultTy) {} | ||||||
lukel97 marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
|
|
||||||
| static inline bool classof(const VPRecipeBase *R) { | ||||||
| // VPInstructionWithType are VPInstructions with specific opcodes requiring | ||||||
|
|
@@ -1113,8 +1076,9 @@ class VPInstructionWithType : public VPInstruction { | |||||
|
|
||||||
| VPInstruction *clone() override { | ||||||
| SmallVector<VPValue *, 2> Operands(operands()); | ||||||
| auto *New = | ||||||
| new VPInstructionWithType(getOpcode(), Operands, getResultType(), *this, | ||||||
lukel97 marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| getDebugLoc(), getName()); | ||||||
| New->setUnderlyingValue(getUnderlyingValue()); | ||||||
| return New; | ||||||
| } | ||||||
|
|
@@ -1373,15 +1337,12 @@ class VPWidenCastRecipe : public VPRecipeWithIRFlags, public VPIRMetadata { | |||||
| } | ||||||
|
|
||||||
| VPWidenCastRecipe(Instruction::CastOps Opcode, VPValue *Op, Type *ResultTy, | ||||||
| const VPIRFlags &Flags = {}, DebugLoc DL = {}) | ||||||
|
There was a problem hiding this comment. I presume changing the bool to VPIRFlags is to bring it inline with VPInstructionWithType, so we can replace it in #129712? |
||||||
| : VPRecipeWithIRFlags(VPDef::VPWidenCastSC, Op, Flags, DL), | ||||||
| VPIRMetadata(), Opcode(Opcode), ResultTy(ResultTy) { | ||||||
| assert(flagsValidForOpcode(Opcode) && | ||||||
| "Set flags not supported for the provided opcode"); | ||||||
| } | ||||||
|
|
||||||
| ~VPWidenCastRecipe() override = default; | ||||||
|
|
||||||
|
|
||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit, also above between lines 162,163