Merge pull request swiftlang#32916 from marcrasi/remove-gen-sig-more-places

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

Author: marcrasi

include/swift/AST/AutoDiff.h

@@ -649,6 +649,29 @@ bool getBuiltinDifferentiableOrLinearFunctionConfig(
 bool getBuiltinDifferentiableOrLinearFunctionConfig(
     StringRef operationName, unsigned &arity, bool &throws);
 
+/// Returns the SIL differentiability witness generic signature given the
+/// original declaration's generic signature and the derivative generic
+/// signature.
+///
+/// In general, the differentiability witness generic signature is equal to the
+/// derivative generic signature.
+///
+/// Edge case, if two conditions are satisfied:
+/// 1. The derivative generic signature is equal to the original generic
+///    signature.
+/// 2. The derivative generic signature has *all concrete* generic parameters
+///    (i.e. all generic parameters are bound to concrete types via same-type
+///    requirements).
+///
+/// Then the differentiability witness generic signature is `nullptr`.
+///
+/// Both the original and derivative declarations are lowered to SIL functions
+/// with a fully concrete type and no generic signature, so the
+/// differentiability witness should similarly have no generic signature.
+GenericSignature
+getDifferentiabilityWitnessGenericSignature(GenericSignature origGenSig,
+                                            GenericSignature derivativeGenSig);
+
 } // end namespace autodiff
 
 } // end namespace swift

lib/AST/AutoDiff.cpp

@@ -372,6 +372,23 @@ bool autodiff::getBuiltinDifferentiableOrLinearFunctionConfig(
   return operationName.empty();
 }
 
+GenericSignature autodiff::getDifferentiabilityWitnessGenericSignature(
+    GenericSignature origGenSig, GenericSignature derivativeGenSig) {
+  // If there is no derivative generic signature, return the original generic
+  // signature.
+  if (!derivativeGenSig)
+    return origGenSig;
+  // If derivative generic signature has all concrete generic parameters and is
+  // equal to the original generic signature, return `nullptr`.
+  auto derivativeCanGenSig = derivativeGenSig.getCanonicalSignature();
+  auto origCanGenSig = origGenSig.getCanonicalSignature();
+  if (origCanGenSig == derivativeCanGenSig &&
+      derivativeCanGenSig->areAllParamsConcrete())
+    return GenericSignature();
+  // Otherwise, return the derivative generic signature.
+  return derivativeGenSig;
+}
+
 Type TangentSpace::getType() const {
   switch (kind) {
   case Kind::TangentVector:

lib/SILGen/SILGen.cpp

@@ -933,43 +933,6 @@ void SILGenModule::postEmitFunction(SILDeclRef constant,
   emitDifferentiabilityWitnessesForFunction(constant, F);
 }
 
-/// Returns the SIL differentiability witness generic signature given the
-/// original declaration's generic signature and the derivative generic
-/// signature.
-///
-/// In general, the differentiability witness generic signature is equal to the
-/// derivative generic signature.
-///
-/// Edge case, if two conditions are satisfied:
-/// 1. The derivative generic signature is equal to the original generic
-///    signature.
-/// 2. The derivative generic signature has *all concrete* generic parameters
-///    (i.e. all generic parameters are bound to concrete types via same-type
-///    requirements).
-///
-/// Then the differentiability witness generic signature is `nullptr`.
-///
-/// Both the original and derivative declarations are lowered to SIL functions
-/// with a fully concrete type and no generic signature, so the
-/// differentiability witness should similarly have no generic signature.
-static GenericSignature
-getDifferentiabilityWitnessGenericSignature(GenericSignature origGenSig,
-                                            GenericSignature derivativeGenSig) {
-  // If there is no derivative generic signature, return the original generic
-  // signature.
-  if (!derivativeGenSig)
-    return origGenSig;
-  // If derivative generic signature has all concrete generic parameters and is
-  // equal to the original generic signature, return `nullptr`.
-  auto derivativeCanGenSig = derivativeGenSig.getCanonicalSignature();
-  auto origCanGenSig = origGenSig.getCanonicalSignature();
-  if (origCanGenSig == derivativeCanGenSig &&
-      derivativeCanGenSig->areAllParamsConcrete())
-    return GenericSignature();
-  // Otherwise, return the derivative generic signature.
-  return derivativeGenSig;
-}
-
 void SILGenModule::emitDifferentiabilityWitnessesForFunction(
     SILDeclRef constant, SILFunction *F) {
   // Visit `@derivative` attributes and generate SIL differentiability
@@ -990,9 +953,10 @@ void SILGenModule::emitDifferentiabilityWitnessesForFunction(
               diffAttr->getDerivativeGenericSignature()) &&
              "Type-checking should resolve derivative generic signatures for "
              "all original SIL functions with generic signatures");
-      auto witnessGenSig = getDifferentiabilityWitnessGenericSignature(
-          AFD->getGenericSignature(),
-          diffAttr->getDerivativeGenericSignature());
+      auto witnessGenSig =
+          autodiff::getDifferentiabilityWitnessGenericSignature(
+              AFD->getGenericSignature(),
+              diffAttr->getDerivativeGenericSignature());
       AutoDiffConfig config(diffAttr->getParameterIndices(), resultIndices,
                             witnessGenSig);
       emitDifferentiabilityWitness(AFD, F, config, /*jvp*/ nullptr,
@@ -1013,8 +977,9 @@ void SILGenModule::emitDifferentiabilityWitnessesForFunction(
       auto origDeclRef =
           SILDeclRef(origAFD).asForeign(requiresForeignEntryPoint(origAFD));
       auto *origFn = getFunction(origDeclRef, NotForDefinition);
-      auto witnessGenSig = getDifferentiabilityWitnessGenericSignature(
-          origAFD->getGenericSignature(), AFD->getGenericSignature());
+      auto witnessGenSig =
+          autodiff::getDifferentiabilityWitnessGenericSignature(
+              origAFD->getGenericSignature(), AFD->getGenericSignature());
       auto *resultIndices = IndexSubset::get(getASTContext(), 1, {0});
       AutoDiffConfig config(derivAttr->getParameterIndices(), resultIndices,
                             witnessGenSig);

lib/SILOptimizer/Differentiation/Common.cpp

@@ -452,8 +452,11 @@ findMinimalDerivativeConfiguration(AbstractFunctionDecl *original,
          silParameterIndices->getNumIndices() <
              minimalConfig->parameterIndices->getNumIndices())) {
       minimalASTParameterIndices = config.parameterIndices;
-      minimalConfig = AutoDiffConfig(silParameterIndices, config.resultIndices,
-                                     config.derivativeGenericSignature);
+      minimalConfig =
+          AutoDiffConfig(silParameterIndices, config.resultIndices,
+                         autodiff::getDifferentiabilityWitnessGenericSignature(
+                             original->getGenericSignature(),
+                             config.derivativeGenericSignature));
     }
   }
   return minimalConfig;

lib/TBDGen/TBDGen.cpp

@@ -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{
+      loweredParamIndices, config.resultIndices,
+      autodiff::getDifferentiabilityWitnessGenericSignature(
+          original->getGenericSignature(), config.derivativeGenericSignature)};
   std::string linearMapName =
       mangler.mangleAutoDiffLinearMapHelper(declRef.mangle(), kind, silConfig);
   addSymbol(linearMapName);
@@ -542,7 +544,9 @@ void TBDGenVisitor::addAutoDiffDerivativeFunction(
     GenericSignature derivativeGenericSignature,
     AutoDiffDerivativeFunctionKind kind) {
   auto *assocFnId = AutoDiffDerivativeFunctionIdentifier::get(
-      kind, parameterIndices, derivativeGenericSignature,
+      kind, parameterIndices,
+      autodiff::getDifferentiabilityWitnessGenericSignature(
+          original->getGenericSignature(), derivativeGenericSignature),
       original->getASTContext());
   auto declRef =
       SILDeclRef(original).asForeign(requiresForeignEntryPoint(original));
@@ -569,8 +573,10 @@ void TBDGenVisitor::addDifferentiabilityWitness(
       original->getInterfaceType()->castTo<AnyFunctionType>());
 
   auto originalMangledName = declRef.mangle();
-  AutoDiffConfig config{silParamIndices, resultIndices,
-                        derivativeGenericSignature};
+  AutoDiffConfig config{
+      silParamIndices, resultIndices,
+      autodiff::getDifferentiabilityWitnessGenericSignature(
+          original->getGenericSignature(), derivativeGenericSignature)};
   SILDifferentiabilityWitnessKey key(originalMangledName, config);
 
   Mangle::ASTMangler mangler;

test/AutoDiff/SILOptimizer/Inputs/differentiation_diagnostics_other_file.swift

@@ -41,3 +41,14 @@ class Class: Differentiable {
     set {}
   }
 }
+
+struct S: Differentiable {
+  var value: Float
+}
+
+extension Array where Element == S {
+  @differentiable
+  func sum() -> Float {
+    return 0
+  }
+}

test/AutoDiff/SILOptimizer/differentiation_diagnostics_cross_file.swift

@@ -57,3 +57,10 @@ func classRequirementSetters(_ x: inout Class, _ newValue: Float) {
   x.property = newValue
   x[] = newValue
 }
+
+// Test cross-file lookup of a derivative function with all-concrete derivative generic signature.
+@differentiable
+func allConcreteDerivativeGenericSignature(_ a: [S]) -> Float {
+  // No error expected.
+  return a.sum()
+}

test/AutoDiff/TBD/derivative_symbols.swift

@@ -19,7 +19,7 @@ public func topLevelDerivative<T: Differentiable>(_ x: T) -> (
   fatalError()
 }
 
-struct Struct: Differentiable {
+public struct Struct: Differentiable {
   var stored: Float
 
   // Test property.
@@ -54,3 +54,10 @@ struct Struct: Differentiable {
     fatalError()
   }
 }
+
+extension Array where Element == Struct {
+  @differentiable
+  public func sum() -> Float {
+    return 0
+  }
+}