Skip to content

Commit 20662e3

Browse files
author
Elena Demikhovsky
committedOct 19, 2015
Removed parameter "Consecutive" from isLegalMaskedLoad() / isLegalMaskedStore().
Originally I planned to use the same interface for masked gather/scatter and set isConsecutive to "false" in this case. Now I'm implementing masked gather/scatter and see that the interface is inconvenient. I want to add interfaces isLegalMaskedGather() / isLegalMaskedScatter() instead of using the "Consecutive" parameter in the existing interfaces. Differential Revision: http://reviews.llvm.org/D13850 llvm-svn: 250686
1 parent 5292083 commit 20662e3

File tree

7 files changed

+32
-38
lines changed

7 files changed

+32
-38
lines changed
 

‎llvm/include/llvm/Analysis/TargetTransformInfo.h

+11-12
Original file line numberDiff line numberDiff line change
@@ -310,12 +310,11 @@ class TargetTransformInfo {
310310
bool HasBaseReg, int64_t Scale,
311311
unsigned AddrSpace = 0) const;
312312

313-
/// \brief Return true if the target works with masked instruction
314-
/// AVX2 allows masks for consecutive load and store for i32 and i64 elements.
315-
/// AVX-512 architecture will also allow masks for non-consecutive memory
316-
/// accesses.
317-
bool isLegalMaskedStore(Type *DataType, int Consecutive) const;
318-
bool isLegalMaskedLoad(Type *DataType, int Consecutive) const;
313+
/// \brief Return true if the target supports masked load/store
314+
/// AVX2 and AVX-512 targets allow masks for consecutive load and store for
315+
/// 32 and 64 bit elements.
316+
bool isLegalMaskedStore(Type *DataType) const;
317+
bool isLegalMaskedLoad(Type *DataType) const;
319318

320319
/// \brief Return the cost of the scaling factor used in the addressing
321320
/// mode represented by AM for this target, for a load/store
@@ -568,8 +567,8 @@ class TargetTransformInfo::Concept {
568567
int64_t BaseOffset, bool HasBaseReg,
569568
int64_t Scale,
570569
unsigned AddrSpace) = 0;
571-
virtual bool isLegalMaskedStore(Type *DataType, int Consecutive) = 0;
572-
virtual bool isLegalMaskedLoad(Type *DataType, int Consecutive) = 0;
570+
virtual bool isLegalMaskedStore(Type *DataType) = 0;
571+
virtual bool isLegalMaskedLoad(Type *DataType) = 0;
573572
virtual int getScalingFactorCost(Type *Ty, GlobalValue *BaseGV,
574573
int64_t BaseOffset, bool HasBaseReg,
575574
int64_t Scale, unsigned AddrSpace) = 0;
@@ -693,11 +692,11 @@ class TargetTransformInfo::Model final : public TargetTransformInfo::Concept {
693692
return Impl.isLegalAddressingMode(Ty, BaseGV, BaseOffset, HasBaseReg,
694693
Scale, AddrSpace);
695694
}
696-
bool isLegalMaskedStore(Type *DataType, int Consecutive) override {
697-
return Impl.isLegalMaskedStore(DataType, Consecutive);
695+
bool isLegalMaskedStore(Type *DataType) override {
696+
return Impl.isLegalMaskedStore(DataType);
698697
}
699-
bool isLegalMaskedLoad(Type *DataType, int Consecutive) override {
700-
return Impl.isLegalMaskedLoad(DataType, Consecutive);
698+
bool isLegalMaskedLoad(Type *DataType) override {
699+
return Impl.isLegalMaskedLoad(DataType);
701700
}
702701
int getScalingFactorCost(Type *Ty, GlobalValue *BaseGV, int64_t BaseOffset,
703702
bool HasBaseReg, int64_t Scale,

‎llvm/include/llvm/Analysis/TargetTransformInfoImpl.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,9 @@ class TargetTransformInfoImplBase {
209209
return !BaseGV && BaseOffset == 0 && (Scale == 0 || Scale == 1);
210210
}
211211

212-
bool isLegalMaskedStore(Type *DataType, int Consecutive) { return false; }
212+
bool isLegalMaskedStore(Type *DataType) { return false; }
213213

214-
bool isLegalMaskedLoad(Type *DataType, int Consecutive) { return false; }
214+
bool isLegalMaskedLoad(Type *DataType) { return false; }
215215

216216
int getScalingFactorCost(Type *Ty, GlobalValue *BaseGV, int64_t BaseOffset,
217217
bool HasBaseReg, int64_t Scale, unsigned AddrSpace) {

‎llvm/lib/Analysis/TargetTransformInfo.cpp

+4-6
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,12 @@ bool TargetTransformInfo::isLegalAddressingMode(Type *Ty, GlobalValue *BaseGV,
113113
Scale, AddrSpace);
114114
}
115115

116-
bool TargetTransformInfo::isLegalMaskedStore(Type *DataType,
117-
int Consecutive) const {
118-
return TTIImpl->isLegalMaskedStore(DataType, Consecutive);
116+
bool TargetTransformInfo::isLegalMaskedStore(Type *DataType) const {
117+
return TTIImpl->isLegalMaskedStore(DataType);
119118
}
120119

121-
bool TargetTransformInfo::isLegalMaskedLoad(Type *DataType,
122-
int Consecutive) const {
123-
return TTIImpl->isLegalMaskedLoad(DataType, Consecutive);
120+
bool TargetTransformInfo::isLegalMaskedLoad(Type *DataType) const {
121+
return TTIImpl->isLegalMaskedLoad(DataType);
124122
}
125123

126124
int TargetTransformInfo::getScalingFactorCost(Type *Ty, GlobalValue *BaseGV,

‎llvm/lib/CodeGen/CodeGenPrepare.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1384,15 +1384,15 @@ bool CodeGenPrepare::optimizeCallInst(CallInst *CI, bool& ModifiedDT) {
13841384
}
13851385
case Intrinsic::masked_load: {
13861386
// Scalarize unsupported vector masked load
1387-
if (!TTI->isLegalMaskedLoad(CI->getType(), 1)) {
1387+
if (!TTI->isLegalMaskedLoad(CI->getType())) {
13881388
ScalarizeMaskedLoad(CI);
13891389
ModifiedDT = true;
13901390
return true;
13911391
}
13921392
return false;
13931393
}
13941394
case Intrinsic::masked_store: {
1395-
if (!TTI->isLegalMaskedStore(CI->getArgOperand(0)->getType(), 1)) {
1395+
if (!TTI->isLegalMaskedStore(CI->getArgOperand(0)->getType())) {
13961396
ScalarizeMaskedStore(CI);
13971397
ModifiedDT = true;
13981398
return true;

‎llvm/lib/Target/X86/X86TargetTransformInfo.cpp

+9-12
Original file line numberDiff line numberDiff line change
@@ -899,8 +899,8 @@ int X86TTIImpl::getMaskedMemoryOpCost(unsigned Opcode, Type *SrcTy,
899899
unsigned NumElem = SrcVTy->getVectorNumElements();
900900
VectorType *MaskTy =
901901
VectorType::get(Type::getInt8Ty(getGlobalContext()), NumElem);
902-
if ((Opcode == Instruction::Load && !isLegalMaskedLoad(SrcVTy, 1)) ||
903-
(Opcode == Instruction::Store && !isLegalMaskedStore(SrcVTy, 1)) ||
902+
if ((Opcode == Instruction::Load && !isLegalMaskedLoad(SrcVTy)) ||
903+
(Opcode == Instruction::Store && !isLegalMaskedStore(SrcVTy)) ||
904904
!isPowerOf2_32(NumElem)) {
905905
// Scalarization
906906
int MaskSplitCost = getScalarizationOverhead(MaskTy, false, true);
@@ -1189,19 +1189,16 @@ int X86TTIImpl::getIntImmCost(Intrinsic::ID IID, unsigned Idx, const APInt &Imm,
11891189
return X86TTIImpl::getIntImmCost(Imm, Ty);
11901190
}
11911191

1192-
bool X86TTIImpl::isLegalMaskedLoad(Type *DataTy, int Consecutive) {
1193-
int DataWidth = DataTy->getPrimitiveSizeInBits();
1192+
bool X86TTIImpl::isLegalMaskedLoad(Type *DataTy) {
1193+
Type *ScalarTy = DataTy->getScalarType();
1194+
int DataWidth = ScalarTy->isPointerTy() ? DL.getPointerSizeInBits() :
1195+
ScalarTy->getPrimitiveSizeInBits();
11941196

1195-
// Todo: AVX512 allows gather/scatter, works with strided and random as well
1196-
if ((DataWidth < 32) || (Consecutive == 0))
1197-
return false;
1198-
if (ST->hasAVX512() || ST->hasAVX2())
1199-
return true;
1200-
return false;
1197+
return (DataWidth >= 32 && ST->hasAVX2());
12011198
}
12021199

1203-
bool X86TTIImpl::isLegalMaskedStore(Type *DataType, int Consecutive) {
1204-
return isLegalMaskedLoad(DataType, Consecutive);
1200+
bool X86TTIImpl::isLegalMaskedStore(Type *DataType) {
1201+
return isLegalMaskedLoad(DataType);
12051202
}
12061203

12071204
bool X86TTIImpl::areInlineCompatible(const Function *Caller,

‎llvm/lib/Target/X86/X86TargetTransformInfo.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ class X86TTIImpl : public BasicTTIImplBase<X86TTIImpl> {
8888
int getIntImmCost(unsigned Opcode, unsigned Idx, const APInt &Imm, Type *Ty);
8989
int getIntImmCost(Intrinsic::ID IID, unsigned Idx, const APInt &Imm,
9090
Type *Ty);
91-
bool isLegalMaskedLoad(Type *DataType, int Consecutive);
92-
bool isLegalMaskedStore(Type *DataType, int Consecutive);
91+
bool isLegalMaskedLoad(Type *DataType);
92+
bool isLegalMaskedStore(Type *DataType);
9393
bool areInlineCompatible(const Function *Caller,
9494
const Function *Callee) const;
9595

‎llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1226,12 +1226,12 @@ class LoopVectorizationLegality {
12261226
/// Returns true if the target machine supports masked store operation
12271227
/// for the given \p DataType and kind of access to \p Ptr.
12281228
bool isLegalMaskedStore(Type *DataType, Value *Ptr) {
1229-
return TTI->isLegalMaskedStore(DataType, isConsecutivePtr(Ptr));
1229+
return isConsecutivePtr(Ptr) && TTI->isLegalMaskedStore(DataType);
12301230
}
12311231
/// Returns true if the target machine supports masked load operation
12321232
/// for the given \p DataType and kind of access to \p Ptr.
12331233
bool isLegalMaskedLoad(Type *DataType, Value *Ptr) {
1234-
return TTI->isLegalMaskedLoad(DataType, isConsecutivePtr(Ptr));
1234+
return isConsecutivePtr(Ptr) && TTI->isLegalMaskedLoad(DataType);
12351235
}
12361236
/// Returns true if vector representation of the instruction \p I
12371237
/// requires mask.

0 commit comments

Comments
 (0)
Please sign in to comment.