Merge branch 'tensorflow' of github.com:apple/swift into parameter-indices

Author: rxwei

docs/SIL.rst

@@ -5555,36 +5555,6 @@ Extracts the original function or an associated function from the given
 ``@differentiable`` function at a specific differentiation order. It must be
 provided with an extractee: ``[original]``, ``[jvp]`` or ``[vjp]``.
 
-.. SWIFT_ENABLE_TENSORFLOW
-
-Graph Program Extraction
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-graph_op
-````````
-::
-
-  sil-instruction ::= 'graph_op' string-literal
-                      '(' (sil-operand (',' sil-operand)*)? ')'
-                      ('{' (sil-graph-op-attr (',' sil-graph-op-attr)*)? '}')?
-                      ':' sil-type (',' sil-type)*
-  sil-graph-op-attr ::= sil-identifier ':' sil-symbolic-value
-  sil-symbolic-value ::= i[0-9]+ int-literal |
-                         f(32|64) float-literal |
-                         sil-type |
-                         '[' (sil-symbolic-value (',' sil-symbolic-value)*)? ']'
-
-  %add = graph_op "tf.Add"(%x : $Tensor<Float>, %y : $Tensor<Float>) \
-    {T: $Float} : $Tensor<Float>
-
-Represents a graph program operation.
-
-``graph_op`` instructions have a name, zero or more operands, zero or more
-attributes (an identifier and SIL constant value), and one or more result
-types.
-
-This instruction is only valid in raw SIL and is rewritten and extracted by the
-graph program extraction passes (debastraction, partitioning, graph lowering).
 
 Assertion configuration
 ~~~~~~~~~~~~~~~~~~~~~~~

include/swift/AST/ASTContext.h

@@ -495,9 +495,6 @@ class ASTContext final {
   /// has been imported.  Otherwise, this returns null.
   StructDecl *getTensorDataTypeDecl() const;
 
-  /// Retrieve the type for Swift._AutoDiffTape.
-  CanType getAutoDiffTapeType() const;
-
   /// Retrieve the type Swift.Never.
   CanType getNeverType() const;
 

include/swift/AST/Attr.def

@@ -418,12 +418,10 @@ DECL_ATTR(differentiating, Differentiating,
 SIMPLE_DECL_ATTR(compilerEvaluable, CompilerEvaluable,
                  OnAccessor | OnFunc | OnConstructor | OnSubscript,
                  /* Not serialized */ 89)
-SIMPLE_DECL_ATTR(TensorFlowGraph, TensorFlowGraph,
-                 OnFunc, 90)
 SIMPLE_DECL_ATTR(_fieldwiseDifferentiable, FieldwiseDifferentiable,
-                 OnNominalType | UserInaccessible, 91)
+                 OnNominalType | UserInaccessible, 90)
 SIMPLE_DECL_ATTR(noDerivative, NoDerivative,
-                 OnVar, 92)
+                 OnVar, 91)
 
 #undef TYPE_ATTR
 #undef DECL_ATTR_ALIAS

include/swift/AST/Builtins.def

@@ -555,25 +555,6 @@ BUILTIN_MISC_OPERATION(WillThrow, "willThrow", "", Special)
 /// poundAssert has type (Builtin.Int1, Builtin.RawPointer) -> ().
 BUILTIN_MISC_OPERATION(PoundAssert, "poundAssert", "", Special)
 
-// SWIFT_ENABLE_TENSORFLOW
-/// tensorflowSend_X has type <T> (T) -> ().  The X in the name is an integer
-/// ID number that allows matching sends and receives.
-BUILTIN_MISC_OPERATION(TensorFlowSend, "tensorflowSend", "", Special)
-
-/// tensorflowReceive_X has type <T> () -> T.  The X in the name is an integer
-/// ID number that allows matching sends and receives.
-BUILTIN_MISC_OPERATION(TensorFlowReceive, "tensorflowReceive", "", Special)
-
-// Automatic differentiation builtins.
-/// autodiffCreateTape has type <T> () -> Builtin.AutoDiffTape<T>.
-BUILTIN_MISC_OPERATION(AutoDiffCreateTape, "autodiffCreateTape", "", Special)
-/// autodiffPushToTape has type <T> (Builtin.AutoDiffTape<T>, T, Builtin.Word) -> ().
-BUILTIN_MISC_OPERATION(AutoDiffPushToTape, "autodiffPushToTape", "", Special)
-/// autodiffPopFromTape has type <T> (Builtin.AutoDiffTape<T>, Builtin.Word) -> T.
-BUILTIN_MISC_OPERATION(AutoDiffPopFromTape, "autodiffPopFromTape", "", Special)
-/// autodiffDestroyTape has type <T> (Builtin.AutoDiffTape<T>) -> ().
-BUILTIN_MISC_OPERATION(AutoDiffDestroyTape, "autodiffDestroyTape", "", Special)
-
 #undef BUILTIN_MISC_OPERATION
 
 /// Builtins for instrumentation added by sanitizers during SILGen.

include/swift/AST/DiagnosticsSIL.def

@@ -248,59 +248,6 @@ NOTE(constexpr_called_from, none, "when called from here", ())
 NOTE(constexpr_not_evaluable, none,
      "expression not evaluable as constant here", ())
 
-// SWIFT_ENABLE_TENSORFLOW
-// TensorFlow Support Diagnostics.
-ERROR(tf_internal_error, none,
-      "internal error: %0", (StringRef))
-ERROR(tfop_invalid_tfop, none,
-      "#tfop invalid: %0", (StringRef))
-ERROR(tfop_incorrect_definition, none,
-      "tfop function doesn't align with TensorFlow op definition:\n%0",
-      (StringRef))
-ERROR(tfop_value_no_send_receive, none,
-      "value cannot be used by non-TensorFlow API", ())
-ERROR(tf_multiple_device, none,
-      "device configuration specified multiple times", ())
-NOTE(tf_multiple_device_prev, none,
-      "previous configuration is specified here", ())
-ERROR(tf_lowering_error, none,
-      "internal error generating TensorFlow graph:\n%0", (StringRef))
-ERROR(tf_lowering_unknown_op, none,
-      "op named '%0' is not registered in TensorFlow", (StringRef))
-ERROR(tf_convention_tf_host_code_not_allowed, none,
-      "host code is not allowed in a TensorFlow function", ())
-ERROR(tf_no_captures_in_tf_functions, none,
-      "TensorFlow functions cannot capture values", ())
-
-WARNING(tf_value_implicitly_copied_to_accel, none,
-        "%0 implicitly copied to the accelerator, use .toAccelerator() to make "
-        "transfer explicit",
-        (StringRef))
-WARNING(tf_value_implicitly_copied_to_accel_always, none,
-        "%0 always cause a copy to the accelerator, use .toAccelerator() to make "
-        "transfer explicit",
-        (StringRef))
-
-WARNING(tf_value_implicitly_copied_to_host, none,
-        "value implicitly copied to the host, use .toHost() to make "
-        "transfer explicit",
-        ())
-
-NOTE(tf_value_used_here, none,
-     "value used here", ())
-ERROR(tf_op_misuse, none,
-      "%0", (StringRef))
-NOTE(tf_op_misuse_note, none,
-     "%0", (StringRef))
-
-ERROR(tf_op_result_generic,none,
-      "cannot extract TensorFlow result into type %0, because %0 contains "
-      "unbound generic parameters", (Type))
-ERROR(tf_op_result_not_value_or_aggregate,none,
-      "cannot extract TensorFlow result into type %0, because %0 is not a "
-      "TensorFlow value type or an aggregate of TensorFlow value types",
-      (Type))
-
 // Control flow diagnostics.
 ERROR(missing_return,none,
       "missing return in a %select{function|closure}1 expected to return %0",

include/swift/AST/DiagnosticsSema.def

@@ -736,10 +736,6 @@ NOTE(object_literal_resolve_import,none,
      "import %0 to use '%1' as the default %2 literal type",
      (StringRef, StringRef, StringRef))
 
-// SWIFT_ENABLE_TENSORFLOW
-// TensorFlow op literal
-ERROR(invalid_tfop,none, "%0", (StringRef))
-
 ERROR(use_local_before_declaration,none,
       "use of local variable %0 before its declaration", (DeclName))
 ERROR(unsupported_existential_type,none,
@@ -2781,21 +2777,6 @@ ERROR(compiler_evaluable_forbidden_type,none,
 ERROR(compiler_evaluable_ref_non_compiler_evaluable,none,
       "@compilerEvaluable functions may not reference non-@compilerEvaluable functions", ())
 
-// @TensorFlowGraph attribute
-ERROR(tf_graph_attr_top_level_only,none,
-      "@TensorFlowGraph can only be applied to top-level functions", ())
-ERROR(tf_graph_deprecated_please_remove,none,
-      "@TensorFlowGraph has no effect and is deprecated. Please remove.", ())
-ERROR(tf_graph_attr_function_tensorflow_value_only,none,
-      "@TensorFlowGraph can only be applied to functions whose parameters and "
-      "return values are TensorFlow values or aggregates of TensorFlow "
-      "values", ())
-ERROR(tf_graph_attr_no_generic_functions,none,
-      "@TensorFlowGraph cannot be applied to generic functions", ())
-ERROR(tf_graph_attr_no_functions_with_captures,none,
-      "@TensorFlowGraph cannot be applied to functions that capture values",
-      ())
-
 // @noDerivative attribute
 ERROR(noderivative_only_on_stored_properties_in_differentiable_structs,none,
       "'@noDerivative' is only allowed on stored properties in structure types "

include/swift/AST/Expr.h

@@ -1154,13 +1154,6 @@ class ObjectLiteralExpr final
     return static_cast<LiteralKind>(Bits.ObjectLiteralExpr.LitKind);
   }
 
-  // SWIFT_ENABLE_TENSORFLOW
-  /// Return true if this object literal is the #tfop(...) op descriptor for
-  /// TensorFlow.
-  bool isTFOp() const {
-    return getLiteralKind() == LiteralKind::tfop;
-  }
-
   Expr *getArg() const { return Arg; }
   void setArg(Expr *arg) { Arg = arg; }
 

include/swift/AST/KnownProtocols.def

@@ -85,7 +85,6 @@ PROTOCOL(TensorArrayProtocol)
 PROTOCOL(TensorGroup)
 PROTOCOL_(TensorFlowDataTypeCompatible)
 PROTOCOL(TensorProtocol)
-PROTOCOL(TensorSendableReceivable)
 PROTOCOL(VectorNumeric)
 // TODO(TF-213): Remove underscore `Differentiable` protocols.
 PROTOCOL(__Differentiable)
@@ -111,8 +110,6 @@ EXPRESSIBLE_BY_LITERAL_PROTOCOL(ExpressibleByUnicodeScalarLiteral, "UnicodeScala
 EXPRESSIBLE_BY_LITERAL_PROTOCOL_(ExpressibleByColorLiteral, "_ColorLiteralType", true)
 EXPRESSIBLE_BY_LITERAL_PROTOCOL_(ExpressibleByImageLiteral, "_ImageLiteralType", true)
 EXPRESSIBLE_BY_LITERAL_PROTOCOL_(ExpressibleByFileReferenceLiteral, "_FileReferenceLiteralType", true)
-// SWIFT_ENABLE_TENSORFLOW
-EXPRESSIBLE_BY_LITERAL_PROTOCOL_(ExpressibleByTensorFlowOp, "_ExpressibleByTensorFlowOp", true)
 
 BUILTIN_EXPRESSIBLE_BY_LITERAL_PROTOCOL_(ExpressibleByBuiltinBooleanLiteral)
 BUILTIN_EXPRESSIBLE_BY_LITERAL_PROTOCOL_(ExpressibleByBuiltinExtendedGraphemeClusterLiteral)

include/swift/AST/KnownStdlibTypes.def

@@ -82,7 +82,4 @@ KNOWN_STDLIB_TYPE_DECL(KeyedEncodingContainer, NominalTypeDecl, 1)
 KNOWN_STDLIB_TYPE_DECL(KeyedDecodingContainer, NominalTypeDecl, 1)
 KNOWN_STDLIB_TYPE_DECL(RangeReplaceableCollection, ProtocolDecl, 1)
 
-// SWIFT_ENABLE_TENSORFLOW
-KNOWN_STDLIB_TYPE_DECL(_AutoDiffTape, ClassDecl, 1)
-
 #undef KNOWN_STDLIB_TYPE_DECL

include/swift/AST/Types.h

@@ -2661,10 +2661,6 @@ enum class SILFunctionTypeRepresentation : uint8_t {
 
   /// A closure invocation function that has not been bound to a context.
   Closure,
-
-  // SWIFT_ENABLE_TENSORFLOW
-  /// A TensorFlow function pointer.
-  TensorFlow,
 };
 
 /// Can this calling convention result in a function being called indirectly
@@ -2676,8 +2672,6 @@ inline bool canBeCalledIndirectly(SILFunctionTypeRepresentation rep) {
   case SILFunctionTypeRepresentation::CFunctionPointer:
   case SILFunctionTypeRepresentation::Block:
   case SILFunctionTypeRepresentation::Closure:
-  // SWIFT_ENABLE_TENSORFLOW
-  case SILFunctionTypeRepresentation::TensorFlow:
     return false;
   case SILFunctionTypeRepresentation::ObjCMethod:
   case SILFunctionTypeRepresentation::Method:
@@ -2702,8 +2696,6 @@ getSILFunctionLanguage(SILFunctionTypeRepresentation rep) {
   case SILFunctionTypeRepresentation::Method:
   case SILFunctionTypeRepresentation::WitnessMethod:
   case SILFunctionTypeRepresentation::Closure:
-  // SWIFT_ENABLE_TENSORFLOW
-  case SILFunctionTypeRepresentation::TensorFlow:
     return SILFunctionLanguage::Swift;
   }
 
@@ -2935,8 +2927,6 @@ class AnyFunctionType : public TypeBase {
       case SILFunctionTypeRepresentation::Thin:
       case SILFunctionTypeRepresentation::CFunctionPointer:
       case SILFunctionTypeRepresentation::Closure:
-      // SWIFT_ENABLE_TENSORFLOW
-      case SILFunctionTypeRepresentation::TensorFlow:
         return false;
       case SILFunctionTypeRepresentation::ObjCMethod:
       case SILFunctionTypeRepresentation::Method:
@@ -2959,8 +2949,6 @@ class AnyFunctionType : public TypeBase {
       case SILFunctionTypeRepresentation::WitnessMethod:
       case SILFunctionTypeRepresentation::CFunctionPointer:
       case SILFunctionTypeRepresentation::Closure:
-      // SWIFT_ENABLE_TENSORFLOW
-      case SILFunctionTypeRepresentation::TensorFlow:
         return false;
       }
 
@@ -3808,8 +3796,6 @@ class SILFunctionType final : public TypeBase, public llvm::FoldingSetNode,
       case Representation::Thin:
       case Representation::CFunctionPointer:
       case Representation::Closure:
-      // SWIFT_ENABLE_TENSORFLOW
-      case Representation::TensorFlow:
         return false;
       case Representation::ObjCMethod:
       case Representation::Method:
@@ -3832,8 +3818,6 @@ class SILFunctionType final : public TypeBase, public llvm::FoldingSetNode,
       case Representation::Method:
       case Representation::WitnessMethod:
       case Representation::Closure:
-      // SWIFT_ENABLE_TENSORFLOW
-      case Representation::TensorFlow:
         return false;
       }
 

include/swift/Runtime/AutoDiff.h

@@ -1320,31 +1320,6 @@ FUNCTION(IntToFloat64, swift_intToFloat64, SwiftCC,
          ARGS(SizeTy->getPointerTo(), SizeTy),
          ATTRS(NoUnwind, ReadOnly))
 
-// SWIFT_ENABLE_TENSORFLOW
-// OpaqueValue *swift_autodiffCreateTape();
-FUNCTION(AutoDiffCreateTape, swift_autodiffCreateTape, C_CC,
-         RETURNS(OpaquePtrTy),
-         ARGS(TypeMetadataPtrTy),
-         ATTRS(NoUnwind))
-
-// void swift_autodiffDestroyTape(OpaqueValue *tape);
-FUNCTION(AutoDiffDestroyTape, swift_autodiffDestroyTape, C_CC,
-         RETURNS(VoidTy),
-         ARGS(OpaquePtrTy),
-         ATTRS(NoUnwind))
-
-// void swift_autodiffPushToTape(OpaqueValue *tape, OpaqueValue *value);
-FUNCTION(AutoDiffPushToTape, swift_autodiffPushToTape, C_CC,
-         RETURNS(VoidTy),
-         ARGS(OpaquePtrTy, OpaquePtrTy),
-         ATTRS(NoUnwind))
-
-// OpaqueValue *swift_autodiffPopFromTape(OpaqueValue *tape);
-FUNCTION(AutoDiffPopFromTape, swift_autodiffPopFromTape, C_CC,
-         RETURNS(OpaquePtrTy),
-         ARGS(OpaquePtrTy),
-         ATTRS(NoUnwind))
-
 // SWIFT_ENABLE_TENSORFLOW
 //===----------------------------------------------------------------------===//
 // - MARK: Runtime functions issued by IRGen in dynamic compilation mode.

include/swift/Runtime/RuntimeFunctions.def

@@ -196,8 +196,6 @@ class ApplySite {
     case SILFunctionTypeRepresentation::ObjCMethod:
     case SILFunctionTypeRepresentation::WitnessMethod:
     case SILFunctionTypeRepresentation::Closure:
-    // SWIFT_ENABLE_TENSORFLOW
-    case SILFunctionTypeRepresentation::TensorFlow:
       return true;
     case SILFunctionTypeRepresentation::Block:
     case SILFunctionTypeRepresentation::Thick:

include/swift/SIL/ApplySite.h

@@ -42,10 +42,6 @@ namespace swift {
   /// Run all SIL passes for -Onone on module \p M.
   void runSILPassesForOnone(SILModule &M);
 
-  // SWIFT_ENABLE_TENSORFLOW
-  /// Run the partioning pass for TensorFlow operations.
-  void runSILTFPartitionPass(SILModule &M);
-
   /// Run the SIL ownership eliminator pass on \p M.
   bool runSILOwnershipEliminatorPass(SILModule &M);