Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
14 changes: 9 additions & 5 deletions llvm/lib/Target/DirectX/DXILDataScalarization.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,19 +117,23 @@ DataScalarizerVisitor::lookupReplacementGlobal(Value *CurrOperand) {
return nullptr; // Not found
}

static bool isArrayOfVectors(Type *T) {
// Helper function to check if a type is a vector or an array of vectors
static bool isVectorOrArrayOfVectors(Type *T) {
if (isa<VectorType>(T))
return true;
if (ArrayType *ArrType = dyn_cast<ArrayType>(T))
return isa<VectorType>(ArrType->getElementType());
return isa<VectorType>(ArrType->getElementType()) ||
isVectorOrArrayOfVectors(ArrType->getElementType());
return false;
}

bool DataScalarizerVisitor::visitAllocaInst(AllocaInst &AI) {
if (!isArrayOfVectors(AI.getAllocatedType()))
Type *AllocatedType = AI.getAllocatedType();
if (!isVectorOrArrayOfVectors(AllocatedType))
return false;

ArrayType *ArrType = cast<ArrayType>(AI.getAllocatedType());
IRBuilder<> Builder(&AI);
Type *NewType = equivalentArrayTypeFromVector(ArrType);
Type *NewType = equivalentArrayTypeFromVector(AllocatedType);
AllocaInst *ArrAlloca =
Builder.CreateAlloca(NewType, nullptr, AI.getName() + ".scalarize");
ArrAlloca->setAlignment(AI.getAlign());
Expand Down
20 changes: 19 additions & 1 deletion llvm/test/CodeGen/DirectX/scalarize-alloca.ll
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,32 @@
; RUN: opt -S -passes='dxil-data-scalarization,dxil-flatten-arrays' -mtriple=dxil-pc-shadermodel6.3-library %s | FileCheck %s --check-prefixes=FCHECK,CHECK

; CHECK-LABEL: alloca_2d__vec_test
define void @alloca_2d__vec_test() local_unnamed_addr #2 {
define void @alloca_2d__vec_test() {
; SCHECK: alloca [2 x [4 x i32]], align 16
; FCHECK: alloca [8 x i32], align 16
; CHECK: ret void
%1 = alloca [2 x <4 x i32>], align 16
ret void
}

; CHECK-LABEL: alloca_4d__vec_test
define void @alloca_4d__vec_test() {
; SCHECK: alloca [2 x [2 x [2 x [2 x i32]]]], align 16
; FCHECK: alloca [16 x i32], align 16
; CHECK: ret void
%1 = alloca [2 x [2 x [2 x <2 x i32>]]], align 16
ret void
}

; CHECK-LABEL: alloca_vec_test
define void @alloca_vec_test() {
; SCHECK: alloca [4 x i32], align 16
; FCHECK: alloca [4 x i32], align 16
; CHECK: ret void
%1 = alloca <4 x i32>, align 16
ret void
}

; CHECK-LABEL: alloca_2d_gep_test
define void @alloca_2d_gep_test() {
; SCHECK: [[alloca_val:%.*]] = alloca [2 x [2 x i32]], align 16
Expand Down
Loading