Skip to content

Commit

Permalink
[LV][VPlan] Add initial support for CSA vectorization
Browse files Browse the repository at this point in the history
This patch adds initial support for CSA vectorization LLVM. This new class
can be characterized by vectorization of assignment to a scalar in a loop,
such that the assignment is conditional from the perspective of its use.
An assignment is conditional in a loop if a value may or may not be assigned
in the loop body.

For example:

```
int t = init_val;
for (int i = 0; i < N; i++) {
  if (cond[i])
    t = a[i];
}
s = t; // use t
```

Using pseudo-LLVM code this can be vectorized as

```
vector.ph:
  ...
  %t = %init_val
  %init.mask = <all-false-vec>
  %init.data = <poison-vec> ; uninitialized
vector.body:
  ...
  %mask.phi = phi [%init.mask, %vector.ph], [%new.mask, %vector.body]
  %data.phi = phi [%data.mask, %vector.ph], [%new.mask, %vector.body]
  %cond.vec = <widened-cmp> ...
  %a.vec    = <widened-load> %a, %i
  %b        = <any-lane-active> %cond.vec
  %new.mask = select %b, %cond.vec, %mask.phi
  %new.data = select %b, %a.vec, %data.phi
  ...
middle.block:
  %s = <extract-last-active-lane> %new.mask, %new.data
```

On each iteration, we track whether any lane in the widened condition was active,
and if it was take the current mask and data as the new mask and data vector.
Then at the end of the loop, the scalar can be extracted only once.

This transformation works the same way for integer, pointer, and floating point
conditional assignment, since the transformation does not require inspection
of the data being assigned.

In the vectorization of a CSA, we will be introducing recipes into the vector
preheader, the vector body, and the middle block. Recipes that are introduced
into the preheader and middle block are executed only one time, and recipes
that are in the vector body will be possibly executed multiple times. The more
times that the vector body is executed, the less of an impact the preheader
and middle block cost have on the overall cost of a CSA.

A detailed explanation of the concept can be found [here](https://discourse.llvm.org/t/vectorization-of-conditional-scalar-assignment-csa/80964).

This patch is further tested in llvm/llvm-test-suite#155.

This patch contains only the non-EVL related code. The is based on the larger
patch of llvm#106560, which contained both EVL and non-EVL related parts.
  • Loading branch information
michaelmaitland committed Jan 13, 2025
1 parent 7c165f7 commit 49c8989
Show file tree
Hide file tree
Showing 19 changed files with 3,914 additions and 23 deletions.
66 changes: 65 additions & 1 deletion llvm/include/llvm/Analysis/IVDescriptors.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
//
//===----------------------------------------------------------------------===//
//
// This file "describes" induction and recurrence variables.
// This file "describes" induction, recurrence, and conditional scalar
// assignment variables.
//
//===----------------------------------------------------------------------===//

Expand Down Expand Up @@ -423,6 +424,69 @@ class InductionDescriptor {
SmallVector<Instruction *, 2> RedundantCasts;
};

/// A Conditional Scalar Assignment is an assignment from an initial
/// scalar that may or may not occur.
class ConditionalScalarAssignmentDescriptor {
/// If the conditional assignment occurs inside a loop, then Phi chooses
/// the value of the assignment from the entry block or the loop body block.
PHINode *Phi = nullptr;

/// The initial value of the ConditionalScalarAssignment. If the condition
/// guarding the assignment is not met, then the assignment retains this
/// value.
Value *InitScalar = nullptr;

/// The Instruction that conditionally assigned to inside the loop.
SelectInst *Assignment = nullptr;

/// Create a ConditionalScalarAssignmentDescriptor that models a valid
/// conditional scalar assignment with its members initialized correctly.
ConditionalScalarAssignmentDescriptor(PHINode *Phi, SelectInst *Assignment,
Value *InitScalar)
: Phi(Phi), InitScalar(InitScalar), Assignment(Assignment) {}

public:
/// Create a ConditionalScalarAssignmentDescriptor that models an invalid
/// ConditionalScalarAssignment.
ConditionalScalarAssignmentDescriptor() = default;

/// If Phi is the root of a ConditionalScalarAssignment, set
/// ConditionalScalarAssignmentDesc as the ConditionalScalarAssignment rooted
/// by Phi. Otherwise, return a false, leaving ConditionalScalarAssignmentDesc
/// unmodified.
static bool
isConditionalScalarAssignmentPhi(PHINode *Phi, Loop *TheLoop,
ConditionalScalarAssignmentDescriptor &Desc);

operator bool() const { return isValid(); }

/// Returns whether SI is the Assignment in ConditionalScalarAssignment
static bool isConditionalScalarAssignmentSelect(
ConditionalScalarAssignmentDescriptor Desc, SelectInst *SI) {
return Desc.getAssignment() == SI;
}

/// Return whether this ConditionalScalarAssignmentDescriptor models a valid
/// ConditionalScalarAssignment.
bool isValid() const { return Phi && InitScalar && Assignment; }

/// Return the PHI that roots this ConditionalScalarAssignment.
PHINode *getPhi() const { return Phi; }

/// Return the initial value of the ConditionalScalarAssignment. This is the
/// value if the conditional assignment does not occur.
Value *getInitScalar() const { return InitScalar; }

/// The Instruction that is used after the loop
SelectInst *getAssignment() const { return Assignment; }

/// Return the condition that this ConditionalScalarAssignment is conditional
/// upon.
Value *getCond() const {
return Assignment ? Assignment->getCondition() : nullptr;
}
};

} // end namespace llvm

#endif // LLVM_ANALYSIS_IVDESCRIPTORS_H
9 changes: 9 additions & 0 deletions llvm/include/llvm/Analysis/TargetTransformInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -1854,6 +1854,10 @@ class TargetTransformInfo {
: EVLParamStrategy(EVLParamStrategy), OpStrategy(OpStrategy) {}
};

/// \returns true if the loop vectorizer should vectorize conditional
/// scalar assignments for the target.
bool enableConditionalScalarAssignmentVectorization() const;

/// \returns How the target needs this vector-predicated operation to be
/// transformed.
VPLegalization getVPLegalizationStrategy(const VPIntrinsic &PI) const;
Expand Down Expand Up @@ -2309,6 +2313,7 @@ class TargetTransformInfo::Concept {
SmallVectorImpl<Use *> &OpsToSink) const = 0;

virtual bool isVectorShiftByScalarCheap(Type *Ty) const = 0;
virtual bool enableConditionalScalarAssignmentVectorization() const = 0;
virtual VPLegalization
getVPLegalizationStrategy(const VPIntrinsic &PI) const = 0;
virtual bool hasArmWideBranch(bool Thumb) const = 0;
Expand Down Expand Up @@ -3135,6 +3140,10 @@ class TargetTransformInfo::Model final : public TargetTransformInfo::Concept {
return Impl.isVectorShiftByScalarCheap(Ty);
}

bool enableConditionalScalarAssignmentVectorization() const override {
return Impl.enableConditionalScalarAssignmentVectorization();
}

VPLegalization
getVPLegalizationStrategy(const VPIntrinsic &PI) const override {
return Impl.getVPLegalizationStrategy(PI);
Expand Down
2 changes: 2 additions & 0 deletions llvm/include/llvm/Analysis/TargetTransformInfoImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -1030,6 +1030,8 @@ class TargetTransformInfoImplBase {

bool isVectorShiftByScalarCheap(Type *Ty) const { return false; }

bool enableConditionalScalarAssignmentVectorization() const { return false; }

TargetTransformInfo::VPLegalization
getVPLegalizationStrategy(const VPIntrinsic &PI) const {
return TargetTransformInfo::VPLegalization(
Expand Down
27 changes: 27 additions & 0 deletions llvm/include/llvm/Transforms/Vectorize/LoopVectorizationLegality.h
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,12 @@ class LoopVectorizationLegality {
/// induction descriptor.
using InductionList = MapVector<PHINode *, InductionDescriptor>;

/// ConditionalScalarAssignmentList contains the
/// ConditionalScalarAssignmentDescriptors for all the conditional scalar
/// assignments that were found in the loop, rooted by their phis.
using ConditionalScalarAssignmentList =
MapVector<PHINode *, ConditionalScalarAssignmentDescriptor>;

/// RecurrenceSet contains the phi nodes that are recurrences other than
/// inductions and reductions.
using RecurrenceSet = SmallPtrSet<const PHINode *, 8>;
Expand Down Expand Up @@ -321,6 +327,18 @@ class LoopVectorizationLegality {
/// Returns True if V is a Phi node of an induction variable in this loop.
bool isInductionPhi(const Value *V) const;

/// Returns the conditional scalar assignments found in the loop.
const ConditionalScalarAssignmentList &
getConditionalScalarAssignments() const {
return ConditionalScalarAssignments;
}

/// Returns true if Phi is the root of a conditional scalar assignments in the
/// loop.
bool isConditionalScalarAssignmentPhi(PHINode *Phi) const {
return ConditionalScalarAssignments.count(Phi) != 0;
}

/// Returns a pointer to the induction descriptor, if \p Phi is an integer or
/// floating point induction.
const InductionDescriptor *getIntOrFpInductionDescriptor(PHINode *Phi) const;
Expand Down Expand Up @@ -554,6 +572,12 @@ class LoopVectorizationLegality {
void addInductionPhi(PHINode *Phi, const InductionDescriptor &ID,
SmallPtrSetImpl<Value *> &AllowedExit);

/// Updates the vetorization state by adding \p Phi to the
/// ConditionalScalarAssignment list.
void addConditionalScalarAssignmentPhi(
PHINode *Phi, const ConditionalScalarAssignmentDescriptor &Desc,
SmallPtrSetImpl<Value *> &AllowedExit);

/// The loop that we evaluate.
Loop *TheLoop;

Expand Down Expand Up @@ -598,6 +622,9 @@ class LoopVectorizationLegality {
/// variables can be pointers.
InductionList Inductions;

/// Holds the conditional scalar assignments
ConditionalScalarAssignmentList ConditionalScalarAssignments;

/// Holds all the casts that participate in the update chain of the induction
/// variables, and that have been proven to be redundant (possibly under a
/// runtime guard). These casts can be ignored when creating the vectorized
Expand Down
60 changes: 59 additions & 1 deletion llvm/lib/Analysis/IVDescriptors.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
//
//===----------------------------------------------------------------------===//
//
// This file "describes" induction and recurrence variables.
// This file "describes" induction, recurrence, and conditional scalar
// assignment variables.
//
//===----------------------------------------------------------------------===//

Expand Down Expand Up @@ -1570,3 +1571,60 @@ bool InductionDescriptor::isInductionPHI(
D = InductionDescriptor(StartValue, IK_PtrInduction, Step);
return true;
}

/// Return ConditionalScalarAssignmentDescriptor that describes a
/// ConditionalScalarAssignment that matches one of these patterns:
/// phi loop_inv, (select cmp, value, phi)
/// phi loop_inv, (select cmp, phi, value)
/// phi (select cmp, value, phi), loop_inv
/// phi (select cmp, phi, value), loop_inv
/// If the ConditionalScalarAssignment does not match any of these paterns,
/// return a ConditionalScalarAssignmentDescriptor that describes an
/// InvalidConditionalScalarAssignment.
bool ConditionalScalarAssignmentDescriptor::isConditionalScalarAssignmentPhi(
PHINode *Phi, Loop *TheLoop, ConditionalScalarAssignmentDescriptor &Desc) {

// Must be a scalar.
Type *Type = Phi->getType();
if (!Type->isIntegerTy() && !Type->isFloatingPointTy() &&
!Type->isPointerTy())
return false;

// Match phi loop_inv, (select cmp, value, phi)
// or phi loop_inv, (select cmp, phi, value)
// or phi (select cmp, value, phi), loop_inv
// or phi (select cmp, phi, value), loop_inv
if (Phi->getNumIncomingValues() != 2)
return false;
auto SelectInstIt = find_if(Phi->incoming_values(), [&Phi](const Use &U) {
return match(U.get(), m_Select(m_Value(), m_Specific(Phi), m_Value())) ||
match(U.get(), m_Select(m_Value(), m_Value(), m_Specific(Phi)));
});
if (SelectInstIt == Phi->incoming_values().end())
return false;
auto LoopInvIt = find_if(Phi->incoming_values(), [&](Use &U) {
return U.get() != *SelectInstIt && TheLoop->isLoopInvariant(U.get());
});
if (LoopInvIt == Phi->incoming_values().end())
return false;

// Phi or Sel must be used only outside the loop,
// excluding if Phi use Sel or Sel use Phi
auto IsOnlyUsedOutsideLoop = [&](Value *V, Value *Ignore) {
return all_of(V->users(), [Ignore, TheLoop](User *U) {
if (U == Ignore)
return true;
if (auto *I = dyn_cast<Instruction>(U))
return !TheLoop->contains(I);
return true;
});
};
SelectInst *Select = cast<SelectInst>(SelectInstIt->get());
Value *LoopInv = LoopInvIt->get();
if (!IsOnlyUsedOutsideLoop(Phi, Select) ||
!IsOnlyUsedOutsideLoop(Select, Phi))
return false;

Desc = ConditionalScalarAssignmentDescriptor(Phi, Select, LoopInv);
return true;
}
5 changes: 5 additions & 0 deletions llvm/lib/Analysis/TargetTransformInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1374,6 +1374,11 @@ bool TargetTransformInfo::preferEpilogueVectorization() const {
return TTIImpl->preferEpilogueVectorization();
}

bool TargetTransformInfo::enableConditionalScalarAssignmentVectorization()
const {
return TTIImpl->enableConditionalScalarAssignmentVectorization();
}

TargetTransformInfo::VPLegalization
TargetTransformInfo::getVPLegalizationStrategy(const VPIntrinsic &VPI) const {
return TTIImpl->getVPLegalizationStrategy(VPI);
Expand Down
5 changes: 5 additions & 0 deletions llvm/lib/Target/RISCV/RISCVTargetTransformInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2433,6 +2433,11 @@ bool RISCVTTIImpl::isLegalMaskedExpandLoad(Type *DataTy, Align Alignment) {
return true;
}

bool RISCVTTIImpl::enableConditionalScalarAssignmentVectorization() const {
return ST->hasVInstructions() &&
ST->getProcFamily() == RISCVSubtarget::SiFive7;
}

bool RISCVTTIImpl::isLegalMaskedCompressStore(Type *DataTy, Align Alignment) {
auto *VTy = dyn_cast<VectorType>(DataTy);
if (!VTy || VTy->isScalableTy())
Expand Down
4 changes: 4 additions & 0 deletions llvm/lib/Target/RISCV/RISCVTargetTransformInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,10 @@ class RISCVTTIImpl : public BasicTTIImplBase<RISCVTTIImpl> {
return TLI->isVScaleKnownToBeAPowerOfTwo();
}

/// \returns true if the loop vectorizer should vectorize conditional
/// scalar assignments for the target.
bool enableConditionalScalarAssignmentVectorization() const;

/// \returns How the target needs this vector-predicated operation to be
/// transformed.
TargetTransformInfo::VPLegalization
Expand Down
41 changes: 37 additions & 4 deletions llvm/lib/Transforms/Vectorize/LoopVectorizationLegality.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ static cl::opt<bool> EnableHistogramVectorization(
"enable-histogram-loop-vectorization", cl::init(false), cl::Hidden,
cl::desc("Enables autovectorization of some loops containing histograms"));

static cl::opt<bool> EnableConditionalScalarAssignment(
"enable-csa-vectorization", cl::init(false), cl::Hidden,
cl::desc("Control whether loop vectorization is enabled"));

/// Maximum vectorization interleave count.
static const unsigned MaxInterleaveFactor = 16;

Expand Down Expand Up @@ -749,6 +753,18 @@ bool LoopVectorizationLegality::setupOuterLoopInductions() {
return llvm::all_of(Header->phis(), IsSupportedPhi);
}

void LoopVectorizationLegality::addConditionalScalarAssignmentPhi(
PHINode *Phi, const ConditionalScalarAssignmentDescriptor &Desc,
SmallPtrSetImpl<Value *> &AllowedExit) {
assert(Desc.isValid() &&
"Expected Valid ConditionalScalarAssignmentDescriptor");
LLVM_DEBUG(
dbgs() << "LV: found legal conditional scalar assignment opportunity"
<< *Phi << "\n");
AllowedExit.insert(Phi);
ConditionalScalarAssignments.insert({Phi, Desc});
}

/// Checks if a function is scalarizable according to the TLI, in
/// the sense that it should be vectorized and then expanded in
/// multiple scalar calls. This is represented in the
Expand Down Expand Up @@ -878,14 +894,27 @@ bool LoopVectorizationLegality::canVectorizeInstrs() {
continue;
}

// As a last resort, coerce the PHI to a AddRec expression
// and re-try classifying it a an induction PHI.
// Try to coerce the PHI to a AddRec expression and re-try classifying
// it a an induction PHI.
if (InductionDescriptor::isInductionPHI(Phi, TheLoop, PSE, ID, true) &&
!IsDisallowedStridedPointerInduction(ID)) {
addInductionPhi(Phi, ID, AllowedExit);
continue;
}

// Check if the PHI can be classified as a conditional scalar assignment
// PHI.
if (EnableConditionalScalarAssignment ||
(TTI->enableConditionalScalarAssignmentVectorization() &&
EnableConditionalScalarAssignment.getNumOccurrences() == 0)) {
ConditionalScalarAssignmentDescriptor Desc;
if (ConditionalScalarAssignmentDescriptor::
isConditionalScalarAssignmentPhi(Phi, TheLoop, Desc)) {
addConditionalScalarAssignmentPhi(Phi, Desc, AllowedExit);
continue;
}
}

reportVectorizationFailure("Found an unidentified PHI",
"value that could not be identified as "
"reduction is used outside the loop",
Expand Down Expand Up @@ -1883,11 +1912,15 @@ bool LoopVectorizationLegality::canFoldTailByMasking() const {
for (const auto &Reduction : getReductionVars())
ReductionLiveOuts.insert(Reduction.second.getLoopExitInstr());

SmallPtrSet<const Value *, 8> CSALiveOuts;
for (const auto &CSA : getConditionalScalarAssignments())
CSALiveOuts.insert(CSA.second.getAssignment());

// TODO: handle non-reduction outside users when tail is folded by masking.
for (auto *AE : AllowedExit) {
// Check that all users of allowed exit values are inside the loop or
// are the live-out of a reduction.
if (ReductionLiveOuts.count(AE))
// are the live-out of a reduction or conditional scalar assignment.
if (ReductionLiveOuts.count(AE) || CSALiveOuts.count(AE))
continue;
for (User *U : AE->users()) {
Instruction *UI = cast<Instruction>(U);
Expand Down
24 changes: 22 additions & 2 deletions llvm/lib/Transforms/Vectorize/LoopVectorizationPlanner.h
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ class VPBuilder {
new VPInstruction(Opcode, Operands, WrapFlags, DL, Name));
}

VPValue *createNot(VPValue *Operand, DebugLoc DL = {},
const Twine &Name = "") {
VPInstruction *createNot(VPValue *Operand, DebugLoc DL = {},
const Twine &Name = "") {
return createInstruction(VPInstruction::Not, {Operand}, DL, Name);
}

Expand Down Expand Up @@ -261,6 +261,26 @@ class VPBuilder {
FPBinOp ? FPBinOp->getFastMathFlags() : FastMathFlags()));
}

VPInstruction *createConditionalScalarAssignmentMaskPhi(VPValue *InitMask,
DebugLoc DL,
const Twine &Name) {
return createInstruction(VPInstruction::ConditionalScalarAssignmentMaskPhi,
{InitMask}, DL, Name);
}

VPInstruction *createAnyOf(VPValue *Cond, DebugLoc DL, const Twine &Name) {
return createInstruction(VPInstruction::AnyOf, {Cond}, DL, Name);
}

VPInstruction *createConditionalScalarAssignmentMaskSel(VPValue *Cond,
VPValue *MaskPhi,
VPValue *AnyOf,
DebugLoc DL,
const Twine &Name) {
return createInstruction(VPInstruction::ConditionalScalarAssignmentMaskSel,
{Cond, MaskPhi, AnyOf}, DL, Name);
}

//===--------------------------------------------------------------------===//
// RAII helpers.
//===--------------------------------------------------------------------===//
Expand Down
Loading

0 comments on commit 49c8989

Please sign in to comment.