Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions llvm/lib/Target/DirectX/DXILLegalizePass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,50 @@ legalizeGetHighLowi64Bytes(Instruction &I,
}
}

static void
legalizeLoadStoreOnArrayAllocas(Instruction &I,
SmallVectorImpl<Instruction *> &ToRemove,
DenseMap<Value *, Value *> &) {

Value *PtrOp;
[[maybe_unused]] Type *LoadStoreTy;
if (auto *LI = dyn_cast<LoadInst>(&I)) {
PtrOp = LI->getPointerOperand();
LoadStoreTy = LI->getType();
} else if (auto *SI = dyn_cast<StoreInst>(&I)) {
PtrOp = SI->getPointerOperand();
LoadStoreTy = SI->getValueOperand()->getType();
} else
return;

assert(LoadStoreTy->isSingleValueType() &&
"Expected load/store type to be a single-valued type");

auto *AllocaPtrOp = dyn_cast<AllocaInst>(PtrOp);
if (!AllocaPtrOp)
return;

Type *Ty = AllocaPtrOp->getAllocatedType();
if (!isa<ArrayType>(Ty))
return;
assert(!isa<ArrayType>(Ty->getArrayElementType()) &&
"Expected allocated type of AllocaInst to be a flat ArrayType");

IRBuilder<> Builder(&I);
Value *Zero = Builder.getInt32(0);
Value *GEP = Builder.CreateInBoundsGEP(Ty, AllocaPtrOp, {Zero, Zero});

Value *NewLoadStore = nullptr;
if (auto *LI = dyn_cast<LoadInst>(&I))
NewLoadStore = Builder.CreateLoad(LI->getType(), GEP, LI->getName());
else if (auto *SI = dyn_cast<StoreInst>(&I))
NewLoadStore =
Builder.CreateStore(SI->getValueOperand(), GEP, SI->isVolatile());

ToRemove.push_back(&I);
I.replaceAllUsesWith(NewLoadStore);
}

namespace {
class DXILLegalizationPipeline {

Expand Down Expand Up @@ -605,6 +649,7 @@ class DXILLegalizationPipeline {
LegalizationPipeline[Stage1].push_back(legalizeMemCpy);
LegalizationPipeline[Stage1].push_back(removeMemSet);
LegalizationPipeline[Stage1].push_back(updateFnegToFsub);
LegalizationPipeline[Stage1].push_back(legalizeLoadStoreOnArrayAllocas);
// Note: legalizeGetHighLowi64Bytes and
// downcastI64toI32InsertExtractElements both modify extractelement, so they
// must run staggered stages. legalizeGetHighLowi64Bytes runs first b\c it
Expand Down
23 changes: 23 additions & 0 deletions llvm/test/CodeGen/DirectX/legalize-load-store-array-alloca.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
; RUN: opt -S -passes='dxil-legalize' -mtriple=dxil-pc-shadermodel6.3-library %s | FileCheck %s

define float @load() {
; CHECK-LABEL: define float @load
; CHECK-NEXT: [[ALLOCA:%.*]] = alloca [2 x float], align 4
; CHECK-NEXT: [[GEP:%.*]] = getelementptr inbounds [2 x float], ptr [[ALLOCA]], i32 0, i32 0
; CHECK-NEXT: [[LOAD:%.*]] = load float, ptr [[GEP]], align 4
; CHECK-NEXT: ret float [[LOAD]]
%a = alloca [2 x float], align 4
%b = load float, ptr %a, align 4
ret float %b
}

define void @store() {
; CHECK-LABEL: define void @store
; CHECK-NEXT: [[ALLOCA:%.*]] = alloca [3 x i32], align 4
; CHECK-NEXT: [[GEP:%.*]] = getelementptr inbounds [3 x i32], ptr [[ALLOCA]], i32 0, i32 0
; CHECK-NEXT: store i32 0, ptr [[GEP]], align 4
; CHECK-NEXT: ret void
%a = alloca [3 x i32], align 4
store i32 0, ptr %a, align 4
ret void
}
Loading