Skip to content

Optimizer: re-implement the RedundantLoadElimination pass in Swift #67395

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 13 commits into from
Jul 21, 2023
Merged

Optimizer: re-implement the RedundantLoadElimination pass in Swift #67395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
40d41d4
MemoryBehavior: be more accurate with destructor side effects of a `s…
eeckstein Jul 19, 2023
2e9de24
Swift Optimizer: add the SSAUpdater utility
eeckstein Jul 19, 2023
2baaf48
Swift SIL: add a few new create functions in Builder
eeckstein Jul 19, 2023
ee3d702
Swift SIL: add `NominalTypeDecl.isStructWithUnreferenceableStorage`
eeckstein Jul 19, 2023
ff913d2
Swift Optimizer: add the `FunctionPassContext.swiftArrayDecl` API
eeckstein Jul 19, 2023
f623a87
Swift Optimizer: add `LoadInst.set(ownership:)`
eeckstein Jul 19, 2023
80778de
AccessUtils: use the begin_apply result instead of the begin_apply in…
eeckstein Jul 21, 2023
8739bef
AccessUtils: let two tail-access bases with the same reference root b…
eeckstein Jul 19, 2023
ab2202c
AliasAnalysis: look through `begin_cow_mutation` and `end_cow_mutatio…
eeckstein Jul 20, 2023
8677146
Swift Optimizer: move `StoreInst.split` into OpUtils.swift
eeckstein Jul 19, 2023
4d20423
Optimizer: re-implement the RedundantLoadElimination pass in Swift
eeckstein Jul 19, 2023
2384a0c
Optimizer: remove the now unused LSLocation utilities
eeckstein Jul 19, 2023
29246fd
AliasAnalysis: add complexity budget for the getMemEffectsFunction
eeckstein Jul 20, 2023
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
5 changes: 3 additions & 2 deletions SwiftCompilerSources/Sources/Optimizer/Analysis/AliasAnalysis.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ struct AliasAnalysis {
static func register() {
BridgedAliasAnalysis.registerAnalysis(
// getMemEffectsFn
{ (bridgedCtxt: BridgedPassContext, bridgedVal: BridgedValue, bridgedInst: BridgedInstruction) -> swift.MemoryBehavior in
{ (bridgedCtxt: BridgedPassContext, bridgedVal: BridgedValue, bridgedInst: BridgedInstruction, complexityBudget: Int) -> swift.MemoryBehavior in
let context = FunctionPassContext(_bridged: bridgedCtxt)
let inst = bridgedInst.instruction
let val = bridgedVal.value
Expand All @@ -47,7 +47,8 @@ struct AliasAnalysis {
case let builtin as BuiltinInst:
return getMemoryEffect(ofBuiltin: builtin, for: val, path: path, context).bridged
default:
if val.at(path).isEscaping(using: EscapesToInstructionVisitor(target: inst, isAddress: true), context) {
if val.at(path).isEscaping(using: EscapesToInstructionVisitor(target: inst, isAddress: true),
complexityBudget: complexityBudget, context) {
return .MayReadWrite
}
return .None
Expand Down
1 change: 1 addition & 0 deletions SwiftCompilerSources/Sources/Optimizer/FunctionPasses/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ swift_compiler_sources(Optimizer
ObjCBridgingOptimization.swift
MergeCondFails.swift
NamedReturnValueOptimization.swift
RedundantLoadElimination.swift
ReleaseDevirtualizer.swift
SimplificationPasses.swift
StackPromotion.swift
Expand Down
23 changes: 1 addition & 22 deletions SwiftCompilerSources/Sources/Optimizer/FunctionPasses/DeadStoreElimination.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ private func tryEliminate(store: StoreInst, _ context: FunctionPassContext) {
case .dead:
// The new individual stores are inserted right after the current store and
// will be optimized in the following loop iterations.
store.split(context)
store.trySplit(context)
}
}
}
Expand Down Expand Up @@ -158,27 +158,6 @@ private extension StoreInst {
}
}

func split(_ context: FunctionPassContext) {
let builder = Builder(after: self, context)
let type = source.type
if type.isStruct {
for idx in 0..<type.getNominalFields(in: parentFunction).count {
let srcField = builder.createStructExtract(struct: source, fieldIndex: idx)
let destFieldAddr = builder.createStructElementAddr(structAddress: destination, fieldIndex: idx)
builder.createStore(source: srcField, destination: destFieldAddr, ownership: storeOwnership)
}
} else if type.isTuple {
for idx in 0..<type.tupleElements.count {
let srcField = builder.createTupleExtract(tuple: source, elementIndex: idx)
let destFieldAddr = builder.createTupleElementAddr(tupleAddress: destination, elementIndex: idx)
builder.createStore(source: srcField, destination: destFieldAddr, ownership: storeOwnership)
}
} else {
fatalError("a materializable projection path should only contain struct and tuple projections")
}
context.erase(instruction: self)
}

var hasValidOwnershipForDeadStoreElimination: Bool {
switch storeOwnership {
case .unqualified, .trivial:
Expand Down
Loading