Skip to content

[ownership] Update SROA to support OSSA. #33260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 3, 2020
Merged

[ownership] Update SROA to support OSSA. #33260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 13 additions & 33 deletions lib/SILOptimizer/Transforms/SILSROA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ class SROAMemoryUseAnalyzer {
private:
SILValue createAgg(SILBuilder &B, SILLocation Loc, SILType Ty,
ArrayRef<SILValue> Elements);
SILValue createAggProjection(SILBuilder &B, SILLocation Loc,
SILValue Operand, unsigned EltNo);
unsigned getEltNoForProjection(SILInstruction *Inst);
void createAllocas(llvm::SmallVector<AllocStackInst *, 4> &NewAllocations);
};
Expand All @@ -87,24 +85,6 @@ SROAMemoryUseAnalyzer::createAgg(SILBuilder &B, SILLocation Loc,
return B.createStruct(Loc, Ty, Elements);
}

SILValue
SROAMemoryUseAnalyzer::createAggProjection(SILBuilder &B, SILLocation Loc,
SILValue Operand,
unsigned EltNo) {
if (TT)
return B.createTupleExtract(Loc, Operand, EltNo);

assert(SD && "SD should not be null since either it or TT must be set at "
"this point.");

auto Properties = SD->getStoredProperties();
unsigned Counter = 0;
for (auto *D : Properties)
if (Counter++ == EltNo)
return B.createStructExtract(Loc, Operand, D);
llvm_unreachable("Unknown field.");
}

unsigned SROAMemoryUseAnalyzer::getEltNoForProjection(SILInstruction *Inst) {
if (TT)
return cast<TupleElementAddrInst>(Inst)->getFieldNo();
Expand Down Expand Up @@ -249,9 +229,10 @@ void SROAMemoryUseAnalyzer::chopUpAlloca(std::vector<AllocStackInst *> &Worklist
for (auto *LI : Loads) {
SILBuilderWithScope B(LI);
llvm::SmallVector<SILValue, 4> Elements;
for (auto *NewAI : NewAllocations)
Elements.push_back(B.createLoad(LI->getLoc(), NewAI,
LoadOwnershipQualifier::Unqualified));
for (auto *NewAI : NewAllocations) {
Elements.push_back(B.emitLoadValueOperation(LI->getLoc(), NewAI,
LI->getOwnershipQualifier()));
}
SILValue Agg = createAgg(B, LI->getLoc(), LI->getType().getObjectType(),
Elements);
LI->replaceAllUsesWith(Agg);
Expand All @@ -260,12 +241,15 @@ void SROAMemoryUseAnalyzer::chopUpAlloca(std::vector<AllocStackInst *> &Worklist

// Change any aggregate stores into extracts + field stores.
for (auto *SI : Stores) {
SILBuilderWithScope B(SI);
for (unsigned EltNo : indices(NewAllocations))
B.createStore(SI->getLoc(),
createAggProjection(B, SI->getLoc(), SI->getSrc(), EltNo),
NewAllocations[EltNo],
StoreOwnershipQualifier::Unqualified);
SILBuilderWithScope builder(SI);
SmallVector<SILValue, 8> destructured;
builder.emitDestructureValueOperation(SI->getLoc(), SI->getSrc(),
destructured);
for (unsigned eltNo : indices(NewAllocations)) {
builder.emitStoreValueOperation(SI->getLoc(), destructured[eltNo],
NewAllocations[eltNo],
StoreOwnershipQualifier::Init);
}
SI->eraseFromParent();
}

Expand Down Expand Up @@ -356,10 +340,6 @@ class SILSROA : public SILFunctionTransform {
void run() override {
SILFunction *F = getFunction();

// FIXME: We should be able to handle ownership.
if (F->hasOwnership())
return;

LLVM_DEBUG(llvm::dbgs() << "***** SROA on function: " << F->getName()
<< " *****\n");

Expand Down
28 changes: 14 additions & 14 deletions test/SILOptimizer/sroa.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ sil @use_int32 : $@convention(thin) (Builtin.Int32) -> ()
// CHECK: [[VAR_2:%[0-9]+]] = alloc_stack $Builtin.Int32
// CHECK: [[VAR_3:%[0-9]+]] = alloc_stack $Builtin.Int64
// CHECK: [[VAR_4:%[0-9]+]] = struct_extract [[VAR_0]] : $S1, #S1.x
// CHECK: store [[VAR_4]] to [[VAR_1]] : $*Builtin.Int1
// CHECK: [[VAR_6:%[0-9]+]] = struct_extract [[VAR_0]] : $S1, #S1.y
// CHECK: store [[VAR_6]] to [[VAR_2]] : $*Builtin.Int32
// CHECK: [[VAR_8:%[0-9]+]] = struct_extract [[VAR_0]] : $S1, #S1.z
// CHECK: store [[VAR_4]] to [[VAR_1]] : $*Builtin.Int1
// CHECK: store [[VAR_6]] to [[VAR_2]] : $*Builtin.Int32
// CHECK: store [[VAR_8]] to [[VAR_3]] : $*Builtin.Int64
// CHECK: [[VAR_10:%[0-9]+]] = function_ref @use_int32 : $@convention(thin) (Builtin.Int32) -> ()
// CHECK: [[VAR_11:%[0-9]+]] = load [[VAR_2]] : $*Builtin.Int32
Expand Down Expand Up @@ -91,13 +91,13 @@ struct S2 {
// CHECK: [[VAR_4:%[0-9]+]] = alloc_stack $Builtin.Int32
// CHECK: [[VAR_5:%[0-9]+]] = alloc_stack $Builtin.Int64
// CHECK: [[VAR_6:%[0-9]+]] = struct_extract [[VAR_0]] : $S2, #S2.alpha
// CHECK: store [[VAR_6]] to [[VAR_2]] : $*Builtin.FPIEEE32
// CHECK: [[VAR_8:%[0-9]+]] = struct_extract [[VAR_0]] : $S2, #S2.beta
// CHECK: store [[VAR_6]] to [[VAR_2]] : $*Builtin.FPIEEE32
// CHECK: [[VAR_9:%[0-9]+]] = struct_extract [[VAR_8]] : $S1, #S1.x
// CHECK: store [[VAR_9]] to [[VAR_3]] : $*Builtin.Int1
// CHECK: [[VAR_11:%[0-9]+]] = struct_extract [[VAR_8]] : $S1, #S1.y
// CHECK: store [[VAR_11]] to [[VAR_4]] : $*Builtin.Int32
// CHECK: [[VAR_13:%[0-9]+]] = struct_extract [[VAR_8]] : $S1, #S1.z
// CHECK: store [[VAR_9]] to [[VAR_3]] : $*Builtin.Int1
// CHECK: store [[VAR_11]] to [[VAR_4]] : $*Builtin.Int32
// CHECK: store [[VAR_13]] to [[VAR_5]] : $*Builtin.Int64
// CHECK: [[VAR_15:%[0-9]+]] = load [[VAR_3]] : $*Builtin.Int1
// CHECK: [[VAR_16:%[0-9]+]] = load [[VAR_4]] : $*Builtin.Int32
Expand Down Expand Up @@ -159,13 +159,13 @@ struct S3 {
// CHECK: [[VAR_4:%[0-9]+]] = alloc_stack $Builtin.Int16
// CHECK: [[VAR_5:%[0-9]+]] = alloc_stack $Builtin.FPIEEE32
// CHECK: [[VAR_6:%[0-9]+]] = struct_extract [[VAR_0]] : $S3, #S3.gamma
// CHECK: [[VAR_13:%[0-9]+]] = struct_extract [[VAR_0]] : $S3, #S3.delta
// CHECK: [[VAR_7:%[0-9]+]] = tuple_extract [[VAR_6]] : $(Builtin.Int32, Builtin.Int64, Builtin.Int16), 0
// CHECK: store [[VAR_7]] to [[VAR_2]] : $*Builtin.Int32
// CHECK: [[VAR_9:%[0-9]+]] = tuple_extract [[VAR_6]] : $(Builtin.Int32, Builtin.Int64, Builtin.Int16), 1
// CHECK: store [[VAR_9]] to [[VAR_3]] : $*Builtin.Int64
// CHECK: [[VAR_11:%[0-9]+]] = tuple_extract [[VAR_6]] : $(Builtin.Int32, Builtin.Int64, Builtin.Int16), 2
// CHECK: store [[VAR_7]] to [[VAR_2]] : $*Builtin.Int32
// CHECK: store [[VAR_9]] to [[VAR_3]] : $*Builtin.Int64
// CHECK: store [[VAR_11]] to [[VAR_4]] : $*Builtin.Int16
// CHECK: [[VAR_13:%[0-9]+]] = struct_extract [[VAR_0]] : $S3, #S3.delta
// CHECK: store [[VAR_13]] to [[VAR_5]] : $*Builtin.FPIEEE32
// CHECK: [[VAR_15:%[0-9]+]] = function_ref @use_tup : $@convention(thin) ((Builtin.Int32, Builtin.Int64, Builtin.Int16)) -> ()
// CHECK: [[VAR_16:%[0-9]+]] = load [[VAR_2]] : $*Builtin.Int32
Expand Down Expand Up @@ -219,10 +219,10 @@ bb0(%0 : $S3, %1 : $Builtin.Int64):
// CHECK: [[VAR_2:%[0-9]+]] = alloc_stack $Builtin.Int32
// CHECK: [[VAR_3:%[0-9]+]] = alloc_stack $Builtin.Int64
// CHECK: [[VAR_4:%[0-9]+]] = tuple_extract [[VAR_0]] : $(Builtin.Int1, Builtin.Int32, Builtin.Int64), 0
// CHECK: store [[VAR_4]] to [[VAR_1]] : $*Builtin.Int1
// CHECK: [[VAR_6:%[0-9]+]] = tuple_extract [[VAR_0]] : $(Builtin.Int1, Builtin.Int32, Builtin.Int64), 1
// CHECK: store [[VAR_6]] to [[VAR_2]] : $*Builtin.Int32
// CHECK: [[VAR_8:%[0-9]+]] = tuple_extract [[VAR_0]] : $(Builtin.Int1, Builtin.Int32, Builtin.Int64), 2
// CHECK: store [[VAR_4]] to [[VAR_1]] : $*Builtin.Int1
// CHECK: store [[VAR_6]] to [[VAR_2]] : $*Builtin.Int32
// CHECK: store [[VAR_8]] to [[VAR_3]] : $*Builtin.Int64
// CHECK: [[VAR_10:%[0-9]+]] = function_ref @use_int32 : $@convention(thin) (Builtin.Int32) -> ()
// CHECK: [[VAR_11:%[0-9]+]] = load [[VAR_2]] : $*Builtin.Int32
Expand Down Expand Up @@ -267,11 +267,11 @@ sil @use_str4 : $@convention(thin) (S4) -> ()
// CHECK: [[VAR_3:%[0-9]+]] = alloc_stack $Builtin.Int32
// CHECK: [[VAR_4:%[0-9]+]] = alloc_stack $Builtin.Int16
// CHECK: [[VAR_5:%[0-9]+]] = tuple_extract [[VAR_0]] : $(S4, Builtin.Int16), 0
// CHECK: [[VAR_10:%[0-9]+]] = tuple_extract [[VAR_0]] : $(S4, Builtin.Int16), 1
// CHECK: [[VAR_6:%[0-9]+]] = struct_extract [[VAR_5]] : $S4, #S4.aleph
// CHECK: store [[VAR_6]] to [[VAR_2]] : $*Builtin.Int64
// CHECK: [[VAR_8:%[0-9]+]] = struct_extract [[VAR_5]] : $S4, #S4.bet
// CHECK: store [[VAR_6]] to [[VAR_2]] : $*Builtin.Int64
// CHECK: store [[VAR_8]] to [[VAR_3]] : $*Builtin.Int32
// CHECK: [[VAR_10:%[0-9]+]] = tuple_extract [[VAR_0]] : $(S4, Builtin.Int16), 1
// CHECK: store [[VAR_10]] to [[VAR_4]] : $*Builtin.Int16
// CHECK: [[VAR_12:%[0-9]+]] = function_ref @use_str4 : $@convention(thin) (S4) -> ()
// CHECK: [[VAR_13:%[0-9]+]] = load [[VAR_2]] : $*Builtin.Int64
Expand Down Expand Up @@ -325,11 +325,11 @@ sil @use_int16 : $@convention(thin) (Builtin.Int16) -> ()
// CHECK: [[VAR_3:%[0-9]+]] = alloc_stack $Builtin.Int32
// CHECK: [[VAR_4:%[0-9]+]] = alloc_stack $Builtin.Int16
// CHECK: [[VAR_5:%[0-9]+]] = tuple_extract [[VAR_0]] : $((Builtin.Int64, Builtin.Int32), Builtin.Int16), 0
// CHECK: [[VAR_10:%[0-9]+]] = tuple_extract [[VAR_0]] : $((Builtin.Int64, Builtin.Int32), Builtin.Int16), 1
// CHECK: [[VAR_6:%[0-9]+]] = tuple_extract [[VAR_5]] : $(Builtin.Int64, Builtin.Int32), 0
// CHECK: store [[VAR_6]] to [[VAR_2]] : $*Builtin.Int64
// CHECK: [[VAR_8:%[0-9]+]] = tuple_extract [[VAR_5]] : $(Builtin.Int64, Builtin.Int32), 1
// CHECK: store [[VAR_6]] to [[VAR_2]] : $*Builtin.Int64
// CHECK: store [[VAR_8]] to [[VAR_3]] : $*Builtin.Int32
// CHECK: [[VAR_10:%[0-9]+]] = tuple_extract [[VAR_0]] : $((Builtin.Int64, Builtin.Int32), Builtin.Int16), 1
// CHECK: store [[VAR_10]] to [[VAR_4]] : $*Builtin.Int16
// CHECK: [[VAR_12:%[0-9]+]] = load [[VAR_2]] : $*Builtin.Int64
// CHECK: [[VAR_13:%[0-9]+]] = load [[VAR_3]] : $*Builtin.Int32
Expand Down
Loading