Skip to content

SILGen: Skip emitting distributed thunks for skipped functions #68917

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
Oct 2, 2023
Merged

SILGen: Skip emitting distributed thunks for skipped functions #68917

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
8 changes: 5 additions & 3 deletions lib/SILGen/SILGen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1389,9 +1389,11 @@ void SILGenModule::emitAbstractFuncDecl(AbstractFunctionDecl *AFD) {
}

if (auto thunkDecl = AFD->getDistributedThunk()) {
auto thunk = SILDeclRef(thunkDecl).asDistributed();
emitFunctionDefinition(SILDeclRef(thunkDecl).asDistributed(),
getFunction(thunk, ForDefinition));
if (!thunkDecl->isBodySkipped()) {
auto thunk = SILDeclRef(thunkDecl).asDistributed();
emitFunctionDefinition(SILDeclRef(thunkDecl).asDistributed(),
getFunction(thunk, ForDefinition));
}
}

if (AFD->isBackDeployed(M.getASTContext())) {
Expand Down
33 changes: 33 additions & 0 deletions test/Distributed/SIL/distributed_thunk_skip_function_bodies.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// RUN: %target-swift-emit-silgen %s -enable-experimental-distributed -disable-availability-checking -debug-forbid-typecheck-prefix NEVER_TYPECHECK -experimental-skip-non-inlinable-function-bodies | %FileCheck %s --check-prefixes=CHECK,CHECK-SKIP-NONINLINE
// RUN: %target-swift-emit-silgen %s -enable-experimental-distributed -disable-availability-checking -debug-forbid-typecheck-prefix NEVER_TYPECHECK -debug-forbid-typecheck-prefix SKIP_ALL_NO_TYPECHECK -experimental-skip-all-function-bodies | %FileCheck %s --check-prefixes=CHECK,CHECK-SKIP-ALL

// REQUIRES: concurrency
// REQUIRES: distributed

import Distributed

public distributed actor DA {
public typealias ActorSystem = LocalTestingDistributedActorSystem
}

@inline(never)
public func blackHole<T>(_ t: T) { }

extension DA {

// CHECK-NOT: s38distributed_thunk_skip_function_bodies2DAC10publicFuncyyYaKFTE
public distributed func publicFunc() {
let NEVER_TYPECHECK = 1
blackHole(NEVER_TYPECHECK)
}

// CHECK-SKIP-ALL-NOT: s38distributed_thunk_skip_function_bodies2DAC13inlinableFuncyyF

// CHECK-SKIP-NONINLINE-LABEL: sil [serialized] [distributed] [ossa] @$s38distributed_thunk_skip_function_bodies2DAC13inlinableFuncyyF : $@convention(method) (@guaranteed DA) -> () {
// CHECK-SKIP-NONINLINE: function_ref @$s38distributed_thunk_skip_function_bodies9blackHoleyyxlF
// CHECK-SKIP-NONINLINE: } // end sil function '$s38distributed_thunk_skip_function_bodies2DAC13inlinableFuncyyF'
@inlinable public distributed func inlinableFunc() {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does an @inlinable distributed func even make sense? I'm sort of surprised this is allowed.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that's okay because we inject an implicit if/else that either dispatches remove or goes though the local logic so inlining shouldn't break thunking but it would be good to add a test for that to make sure.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah it should be fine to inline distributed thunks, they're the if-remote-do-this code

let SKIP_ALL_NO_TYPECHECK = 1
blackHole(SKIP_ALL_NO_TYPECHECK)
}
}