-
Notifications
You must be signed in to change notification settings - Fork 10.5k
[AutoDiff] Fix several issues related to captured arguments #41401
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.
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
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
test/AutoDiff/compiler_crashers_fixed/sr15205-diff-capture.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
// RUN: %target-swift-frontend -emit-sil -verify %s | ||
|
||
// SR-15205: fix assertions related to captured arguments, they should | ||
// treated as constants | ||
|
||
import _Differentiation | ||
|
||
func outerFunc(value: inout Float) -> (Float, (Float) -> (Float, Float)) { | ||
|
||
@differentiable(reverse, wrt: param) | ||
func innerFunc(param: Float, other: Float) -> Float { | ||
value += param * other | ||
return value * param * 2.0 | ||
} | ||
|
||
let valAndPullback = valueWithPullback(at: value, 2.0, of: innerFunc) | ||
return (value + valAndPullback.value, valAndPullback.pullback) | ||
} | ||
|
||
func outerFunc2(value: inout Float) -> (Float, (Float) -> Float) { | ||
|
||
@differentiable(reverse, wrt: param) | ||
func innerFunc(param: Float, other: Float) -> Float { | ||
value += param * other | ||
return value * param * 2.0 | ||
} | ||
|
||
@differentiable(reverse) | ||
func curriedFunc(param: Float) -> Float { | ||
return innerFunc(param: param, other: 3.0) | ||
} | ||
|
||
let valAndPullback = valueWithPullback(at: value, of: curriedFunc) | ||
return (value + valAndPullback.value, valAndPullback.pullback) | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about adding a
numCaptures
parameter toautodiff::getLoweredParameterIndices
and make sure we allocate the right capacity in the first place?Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are few workarounds of similar kind sprinkled over the code, so we'd need to eliminate them as well (see https://github.com/apple/swift/blob/main/lib/SILOptimizer/Mandatory/Differentiation.cpp#L518 as an example). Just setting
numCaptures
seems not work in general as we need to know how the captured arguments will be lowered.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah it's not a perfect solution. Since captured arguments are always at the end of a SIL function, we could get the number of captures from
CaptureInfo
. Tuple captures won't be splat in SIL arguments, so we might be able to assume the number of captures inCaptureInfo
is the number of captures in the SIL function, but I'm not sure entirely.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Me too :) I'm planning to resolve the TODO afterwards, after checking all possibilities and fixing
getLoweredParameterIndices
properly. There is a tentative patch for this, but it needs more testing and checking.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM as is since similar workarounds already exist, but it would be really nice to fix
getLoweredParameterIndices
. Let me know if you want to take a stab at that or rather merge this first.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok sounds good.