Skip to content

[AutoDiff] remove all-concrete gen sig from more places #32916

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 1 commit into from
Jul 22, 2020

Conversation

marcrasi
Copy link

#32803 removed all-concrete derivative generic signatures from some places. There were a few remaining places where it wasn't removed, causing problems:

  • TBDGen created symbols with derivative generic signature when but the real symbols had no derivative generic signature. The included test exposes the "symbol in generated IR file but not in TBD file".
  • Derivative witness lookup found witnesses with derivative generic signature, causing diagnoseUnsatisfiedRequirements to think that a requirement is unsatisfied when the requirement actually doesn't exist. The included test causes a.sum() to have an incorrect diagnostic "unsatisfied requirement Element == S".

This PR fixes both places.

(Discovered while testing the recent merge into tensorflow.)

@marcrasi marcrasi requested a review from dan-zheng July 16, 2020 00:35
Copy link
Contributor

@dan-zheng dan-zheng left a comment

Choose a reason for hiding this comment

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

Nice, thanks!

@marcrasi
Copy link
Author

@swift-ci please test and merge

@dan-zheng dan-zheng requested a review from rxwei July 16, 2020 00:42
@marcrasi
Copy link
Author

@swift-ci please test and merge

@dan-zheng
Copy link
Contributor

@swift-ci Please test Linux

@@ -530,8 +530,10 @@ void TBDGenVisitor::addAutoDiffLinearMapFunction(AbstractFunctionDecl *original,
config.parameterIndices,
original->getInterfaceType()->castTo<AnyFunctionType>());
Mangle::ASTMangler mangler;
AutoDiffConfig silConfig{loweredParamIndices, config.resultIndices,
config.derivativeGenericSignature};
AutoDiffConfig silConfig{
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you create a new SILDeclRef-like abstraction that can allow this logic to be shared between TBDGen and SIL?

Copy link
Contributor

Choose a reason for hiding this comment

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

SILDeclRef already stores an (optional) AutoDiffDerivativeFunctionIdentifier, which has almost the same contents as AutoDiffConfig.

We could look into using that with TBDGenVisitor::addSymbol(SILDeclRef) instead of calling TBDGenVisitor::addSymbol(StringRef name) here with manually mangled names.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, that's what I meant. TBDGen should not duplicate any logic from SILGen/IRGen, except for the top-level visiting of decls. Mangling and visibility should be computed by shared code, or else you'll hit frequent issues where the two are out of sync.

Copy link
Contributor

Choose a reason for hiding this comment

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

Got it, thanks! I filed SR-13269 to track this issue so we can look into it later, if that's okay.

@marcrasi marcrasi merged commit 493b4a8 into swiftlang:master Jul 22, 2020
@marcrasi marcrasi deleted the remove-gen-sig-more-places branch July 22, 2020 05:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants