maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Get the address space within getVectorPtrTy 

getVectorPtrTy is private to VectorBlockGenerator, and all uses query
the address space from the passed-in pointer prior to calling it.

Reviewed By: efriedma

Differential Revision: https://reviews.llvm.org/D89745
This commit is contained in:
Christopher Tetreault 2020-10-20 11:32:28 -07:00
parent d5c022d846
commit 2eac8ce820
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
polly/include/polly/CodeGen/BlockGenerators.h
View File

@ -662,7 +662,7 @@ private:
Value *getVectorValue(ScopStmt &Stmt, Value *Old, ValueMapT &VectorMap,
VectorValueMapT &ScalarMaps, Loop *L);
Type *getVectorPtrTy(const Value *V, int Width, unsigned AddrSpace);
Type *getVectorPtrTy(const Value *V, int Width);
/// Load a vector from a set of adjacent scalars
///

19
polly/lib/CodeGen/BlockGenerators.cpp
View File

@ -1037,10 +1037,9 @@ Value *VectorBlockGenerator::getVectorValue(ScopStmt &Stmt, Value *Old,
return Vector;
}
Type *VectorBlockGenerator::getVectorPtrTy(const Value *Val, int Width,
unsigned AddrSpace) {
PointerType *PointerTy = dyn_cast<PointerType>(Val->getType());
assert(PointerTy && "PointerType expected");
Type *VectorBlockGenerator::getVectorPtrTy(const Value *Val, int Width) {
auto *PointerTy = cast<PointerType>(Val->getType());
unsigned AddrSpace = PointerTy->getAddressSpace();
Type *ScalarType = PointerTy->getElementType();
auto *FVTy = FixedVectorType::get(ScalarType, Width);
@ -1053,8 +1052,7 @@ Value *VectorBlockGenerator::generateStrideOneLoad(
__isl_keep isl_id_to_ast_expr *NewAccesses, bool NegativeStride = false) {
unsigned VectorWidth = getVectorWidth();
auto *Pointer = Load->getPointerOperand();
auto AS = Pointer->getType()->getPointerAddressSpace();
Type *VectorPtrType = getVectorPtrTy(Pointer, VectorWidth, AS);
Type *VectorPtrType = getVectorPtrTy(Pointer, VectorWidth);
unsigned Offset = NegativeStride ? VectorWidth - 1 : 0;
Value *NewPointer = generateLocationAccessed(Stmt, Load, ScalarMaps[Offset],
@ -1083,8 +1081,7 @@ Value *VectorBlockGenerator::generateStrideZeroLoad(
ScopStmt &Stmt, LoadInst *Load, ValueMapT &BBMap,
__isl_keep isl_id_to_ast_expr *NewAccesses) {
auto *Pointer = Load->getPointerOperand();
auto AS = Pointer->getType()->getPointerAddressSpace();
Type *VectorPtrType = getVectorPtrTy(Pointer, 1, AS);
Type *VectorPtrType = getVectorPtrTy(Pointer, 1);
Value *NewPointer =
generateLocationAccessed(Stmt, Load, BBMap, VLTS[0], NewAccesses);
Value *VectorPtr = Builder.CreateBitCast(NewPointer, VectorPtrType,
@ -1204,8 +1201,7 @@ void VectorBlockGenerator::copyStore(
extractScalarValues(Store, VectorMap, ScalarMaps);
if (Access.isStrideOne(isl::manage_copy(Schedule))) {
auto AS = Pointer->getType()->getPointerAddressSpace();
Type *VectorPtrType = getVectorPtrTy(Pointer, getVectorWidth(), AS);
Type *VectorPtrType = getVectorPtrTy(Pointer, getVectorWidth());
Value *NewPointer = generateLocationAccessed(Stmt, Store, ScalarMaps[0],
VLTS[0], NewAccesses);
@ -1343,8 +1339,7 @@ void VectorBlockGenerator::generateScalarVectorLoads(
continue;
auto *Address = getOrCreateAlloca(*MA);
auto AS = Address->getType()->getPointerAddressSpace();
Type *VectorPtrType = getVectorPtrTy(Address, 1, AS);
Type *VectorPtrType = getVectorPtrTy(Address, 1);
Value *VectorPtr = Builder.CreateBitCast(Address, VectorPtrType,
Address->getName() + "_p_vec_p");
auto *Val = Builder.CreateLoad(VectorPtr, Address->getName() + ".reload");