---

yaml
---
r: 338943
b: refs/heads/rxwei-patch-1
c: ad37ed6
h: refs/heads/master
i:
  338941: fb31473
  338939: 709d0f9
  338935: b6e2678
  338927: 89655ea
  338911: 9afab6d
  338879: b801442
  338815: 9ff3ff2
  338687: d79809c
  338431: c7386a4
  337919: 2b4ffa2

Author: rxwei

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 1b52456dedc23a1410b55f129e11ee5e60c391fd
+refs/heads/rxwei-patch-1: ad37ed689ff436bf8d2447a8ff6a9a16931d8e5f
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/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;
 

branches/rxwei-patch-1/include/swift/AST/Builtins.def

@@ -564,16 +564,6 @@ BUILTIN_MISC_OPERATION(TensorFlowSend, "tensorflowSend", "", Special)
 /// 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.

branches/rxwei-patch-1/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

branches/rxwei-patch-1/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.

branches/rxwei-patch-1/include/swift/Runtime/RuntimeFunctions.def

@@ -150,9 +150,6 @@ struct ASTContext::Implementation {
   /// The declaration of TensorFlow.TensorDataType.
   StructDecl *TensorDataTypeDecl = nullptr;
 
-  /// The declaration of Swift._AutoDiffTape<T>.
-  ClassDecl *AutoDiffTapeDecl = nullptr;
-
 #define KNOWN_STDLIB_TYPE_DECL(NAME, DECL_CLASS, NUM_GENERIC_PARAMS) \
   /** The declaration of Swift.NAME. */ \
   DECL_CLASS *NAME##Decl = nullptr;
@@ -872,12 +869,6 @@ StructDecl *ASTContext::getTensorDataTypeDecl() const {
   return nullptr;
 }
 
-CanType ASTContext::getAutoDiffTapeType() const {
-  if (auto adtDecl = get_AutoDiffTapeDecl())
-    return adtDecl->getDeclaredType()->getCanonicalType();
-  return CanType();
-}
-
 CanType ASTContext::getNeverType() const {
   auto neverDecl = getNeverDecl();
   if (!neverDecl)

branches/rxwei-patch-1/lib/AST/ASTContext.cpp

@@ -990,46 +990,6 @@ static ValueDecl *getTensorFlowReceive(ASTContext &Context, Identifier Id) {
   return builder.build(Id);
 }
 
-static ValueDecl *getAutoDiffCreateTape(ASTContext &Context, Identifier Id) {
-  // <T> () -> (Swift._AutoDiffTape<T>)
-  BuiltinGenericSignatureBuilder builder(Context, 1);
-  auto *tapeDecl = Context.get_AutoDiffTapeDecl();
-  builder.setResult(makeBoundGenericType(tapeDecl, makeGenericParam()));
-  return builder.build(Id);
-}
-
-static ValueDecl *getAutoDiffPushToTape(ASTContext &Context, Identifier Id) {
-  // <T> (Swift._AutoDiffTape<T>, T, Builtin.Word) -> ()
-  BuiltinGenericSignatureBuilder builder(Context, 1);
-  auto *tapeDecl = Context.get_AutoDiffTapeDecl();
-  auto T = makeGenericParam();
-  builder.addParameter(makeBoundGenericType(tapeDecl, T));
-  builder.addParameter(T);
-  builder.addParameter(makeConcrete(BuiltinIntegerType::getWordType(Context)));
-  builder.setResult(makeConcrete(Context.TheEmptyTupleType));
-  return builder.build(Id);
-}
-
-static ValueDecl *getAutoDiffPopFromTape(ASTContext &Context, Identifier Id) {
-  // <T> (Swift._AutoDiffTape<T>, Builtin.Word) -> (T)
-  BuiltinGenericSignatureBuilder builder(Context, 1);
-  auto *tapeDecl = Context.get_AutoDiffTapeDecl();
-  auto T = makeGenericParam();
-  builder.addParameter(makeBoundGenericType(tapeDecl, T));
-  builder.addParameter(makeConcrete(BuiltinIntegerType::getWordType(Context)));
-  builder.setResult(T);
-  return builder.build(Id);
-}
-
-static ValueDecl *getAutoDiffDestroyTape(ASTContext &Context, Identifier Id) {
-  // <T> (Swift._AutoDiffTape<T>) -> ()
-  BuiltinGenericSignatureBuilder builder(Context, 1);
-  auto *tapeDecl = Context.get_AutoDiffTapeDecl();
-  builder.addParameter(makeBoundGenericType(tapeDecl, makeGenericParam()));
-  builder.setResult(makeConcrete(Context.TheEmptyTupleType));
-  return builder.build(Id);
-}
-
 static ValueDecl *getAutoDiffApplyAssociatedFunction(
     ASTContext &Context, Identifier Id, AutoDiffAssociatedFunctionKind kind,
     unsigned arity, unsigned order, bool rethrows) {
@@ -2113,14 +2073,6 @@ ValueDecl *swift::getBuiltinValueDecl(ASTContext &Context, Identifier Id) {
     return getTensorFlowSend(Context, Id);
   case BuiltinValueKind::TensorFlowReceive:
     return getTensorFlowReceive(Context, Id);
-  case BuiltinValueKind::AutoDiffCreateTape:
-    return getAutoDiffCreateTape(Context, Id);
-  case BuiltinValueKind::AutoDiffPushToTape:
-    return getAutoDiffPushToTape(Context, Id);
-  case BuiltinValueKind::AutoDiffPopFromTape:
-    return getAutoDiffPopFromTape(Context, Id);
-  case BuiltinValueKind::AutoDiffDestroyTape:
-    return getAutoDiffDestroyTape(Context, Id);
   case BuiltinValueKind::AutoDiffApply:
     llvm_unreachable("Handled above");
 

branches/rxwei-patch-1/lib/AST/Builtins.cpp

@@ -1007,64 +1007,5 @@ if (Builtin.ID == BuiltinValueKind::id) { \
     return;
   }
 
-  // SWIFT_ENABLE_TENSORFLOW
-  // OpaqueValue *swift_autoDiffCreateTape(Metadata *type);
-  if (Builtin.ID == BuiltinValueKind::AutoDiffCreateTape) {
-    auto valueTy =
-      getLoweredTypeAndTypeInfo(
-        IGF.IGM, substitutions.getReplacementTypes().front());
-    auto *metadata =
-      IGF.emitTypeMetadataRef(valueTy.first.getASTType());
-    out.add(IGF.Builder.CreateCall(IGF.IGM.getAutoDiffCreateTapeFn(),
-                                   { metadata }));
-    return;
-  }
-
-  // void swift_autoDiffDestroyTape(OpaqueValue *tape);
-  if (Builtin.ID == BuiltinValueKind::AutoDiffDestroyTape) {
-    auto tape = args.claimNext();
-    IGF.Builder.CreateCall(IGF.IGM.getAutoDiffDestroyTapeFn(), { tape });
-    return;
-  }
-
-  // void swift_autoDiffPushToTape(OpaqueValue *tape, OpaqueValue *value);
-  if (Builtin.ID == BuiltinValueKind::AutoDiffPushToTape) {
-    auto tape = args.claimNext();
-    auto value = args.claimNext();
-    // `id` argument may be discarded. It is used as a marker in SIL.
-    (void)args.claimAll();
-
-    // Create stack allocation and store value in it.
-    auto alloca = IGF.createAlloca(value->getType(),
-                                   IGF.IGM.getPointerAlignment());
-    IGF.Builder.CreateStore(value, alloca);
-    // Cast alloca to OpaqueValue * and call builtin.
-    auto pointer = IGF.Builder.CreatePointerCast(alloca.getAddress(),
-                                                 IGF.IGM.OpaquePtrTy);
-    IGF.Builder.CreateCall(IGF.IGM.getAutoDiffPushToTapeFn(),
-                           { tape, pointer });
-    return;
-  }
-
-  // OpaqueValue *swift_autoDiffPopFromTape(OpaqueValue *tape);
-  if (Builtin.ID == BuiltinValueKind::AutoDiffPopFromTape) {
-    auto tape = args.claimNext();
-    // `id` argument may be discarded. It is used as a marker in SIL.
-    (void)args.claimAll();
-
-    auto valueTy = getLoweredTypeAndTypeInfo(
-      IGF.IGM, substitutions.getReplacementTypes().front());
-    auto pointerTy = valueTy.second.getStorageType()->getPointerTo();
-
-    // Pop alloca from tape and cast to pointer type.
-    auto alloca = IGF.Builder.CreateCall(IGF.IGM.getAutoDiffPopFromTapeFn(),
-                                         { tape });
-    auto pointer = IGF.Builder.CreatePointerCast(alloca, pointerTy);
-    // Load value from pointer.
-    auto value = IGF.Builder.CreateLoad(pointer, IGF.IGM.getPointerAlignment());
-    out.add(value);
-    return;
-  }
-
   llvm_unreachable("IRGen unimplemented for this builtin!");
 }

branches/rxwei-patch-1/lib/IRGen/GenBuiltin.cpp

@@ -1061,10 +1061,6 @@ CONSTANT_OWNERSHIP_BUILTIN(Any, MustBeLive, PoundAssert)
 // SWIFT_ENABLE_TENSORFLOW
 CONSTANT_OWNERSHIP_BUILTIN(Any, MustBeLive, TensorFlowSend)
 CONSTANT_OWNERSHIP_BUILTIN(Any, MustBeLive, TensorFlowReceive)
-CONSTANT_OWNERSHIP_BUILTIN(Any, MustBeLive, AutoDiffCreateTape)
-CONSTANT_OWNERSHIP_BUILTIN(Any, MustBeLive, AutoDiffPushToTape)
-CONSTANT_OWNERSHIP_BUILTIN(Any, MustBeLive, AutoDiffPopFromTape)
-CONSTANT_OWNERSHIP_BUILTIN(Any, MustBeLive, AutoDiffDestroyTape)
 #undef CONSTANT_OWNERSHIP_BUILTIN
 
 // Builtins that should be lowered to SIL instructions so we should never see

branches/rxwei-patch-1/lib/SIL/OperandOwnership.cpp

@@ -1485,80 +1485,10 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
     }
   }
 
-  // SWIFT_ENABLE_TENSORFLOW
-  static bool isAutoDiffBuiltinInst(BuiltinInst *BI) {
-    auto id = BI->getBuiltinInfo().ID;
-    return id == BuiltinValueKind::AutoDiffCreateTape ||
-      id == BuiltinValueKind::AutoDiffDestroyTape ||
-      id == BuiltinValueKind::AutoDiffPushToTape ||
-      id == BuiltinValueKind::AutoDiffPopFromTape;
-  }
-
-  // SWIFT_ENABLE_TENSORFLOW
-  void checkAutoDiffBuiltinInst(BuiltinInst *BI) {
-    auto &ctx = M->getASTContext();
-    auto id = BI->getBuiltinInfo().ID;
-    require(BI->getSubstitutions().getReplacementTypes().size() == 1,
-            "autodiff builtin should have a single type parameter");
-
-    auto name = getBuiltinName(id);
-    auto resultErrorMsg = "unexpected result type for '" + name + "'";
-    auto operandErrorMsg = "unexpected operand type for '" + name + "'";
-
-    auto canGenericParam = BI->getSubstitutions().getReplacementTypes()[0]
-      ->getCanonicalType();
-    auto tapeType = SILType::getPrimitiveObjectType(
-      BoundGenericType::get(ctx.get_AutoDiffTapeDecl(), Type(), canGenericParam)
-        ->getCanonicalType());
-    if (id == BuiltinValueKind::AutoDiffCreateTape) {
-      require(BI->getNumOperands() == 0,
-              "'" + name + "' should have no arguments");
-      requireSameType(BI->getType(), tapeType, resultErrorMsg);
-      return;
-    }
-
-    auto voidType = SILType::getPrimitiveObjectType(TupleType::getEmpty(ctx));
-    if (id == BuiltinValueKind::AutoDiffDestroyTape) {
-      require(BI->getNumOperands() == 1,
-              "'" + name + "' should have one argument");
-      requireSameType(BI->getType(), voidType, resultErrorMsg);
-      requireSameType(BI->getOperand(0)->getType(), tapeType, operandErrorMsg);
-      return;
-    }
-
-    auto genericParam = SILType::getPrimitiveObjectType(canGenericParam);
-    auto wordType = SILType::getPrimitiveObjectType(
-      BuiltinIntegerType::getWordType(ctx)->getCanonicalType());
-    if (id == BuiltinValueKind::AutoDiffPushToTape) {
-      require(BI->getNumOperands() == 3,
-              "'" + name + "' should have three arguments");
-      requireSameType(BI->getType(), voidType, resultErrorMsg);
-      requireSameType(BI->getOperand(0)->getType(), tapeType, operandErrorMsg);
-      requireSameType(BI->getOperand(1)->getType(), genericParam,
-                      operandErrorMsg);
-      requireSameType(BI->getOperand(2)->getType(), wordType, operandErrorMsg);
-      return;
-    }
-    if (id == BuiltinValueKind::AutoDiffPopFromTape) {
-      require(BI->getNumOperands() == 2,
-              "'" + name + "' should have two arguments");
-      requireSameType(BI->getType(), genericParam, resultErrorMsg);
-      requireSameType(BI->getOperand(0)->getType(), tapeType, operandErrorMsg);
-      requireSameType(BI->getOperand(1)->getType(), wordType, operandErrorMsg);
-      return;
-    }
-  }
-
-
   void checkBuiltinInst(BuiltinInst *BI) {
     // Check for special constraints on llvm intrinsics.
     if (BI->getIntrinsicInfo().ID != llvm::Intrinsic::not_intrinsic)
       verifyLLVMIntrinsic(BI, BI->getIntrinsicInfo().ID);
-
-    // SWIFT_ENABLE_TENSORFLOW
-    // Verify autodiff builtins.
-    if (isAutoDiffBuiltinInst(BI))
-      checkAutoDiffBuiltinInst(BI);
   }
 
   void checkFunctionRefBaseInst(FunctionRefBaseInst *FRI) {

branches/rxwei-patch-1/lib/SIL/SILVerifier.cpp

@@ -498,10 +498,6 @@ CONSTANT_OWNERSHIP_BUILTIN(Any, PoundAssert)
 // SWIFT_ENABLE_TENSORFLOW
 CONSTANT_OWNERSHIP_BUILTIN(Any, TensorFlowSend)
 CONSTANT_OWNERSHIP_BUILTIN(Any, TensorFlowReceive)
-CONSTANT_OWNERSHIP_BUILTIN(Any, AutoDiffCreateTape)
-CONSTANT_OWNERSHIP_BUILTIN(Any, AutoDiffPushToTape)
-CONSTANT_OWNERSHIP_BUILTIN(Any, AutoDiffPopFromTape)
-CONSTANT_OWNERSHIP_BUILTIN(Any, AutoDiffDestroyTape)
 
 #undef CONSTANT_OWNERSHIP_BUILTIN
 

branches/rxwei-patch-1/lib/SIL/ValueOwnership.cpp

@@ -157,10 +157,6 @@ static bool isBarrier(SILInstruction *inst) {
     // SWIFT_ENABLE_TENSORFLOW
     case BuiltinValueKind::TensorFlowSend:
     case BuiltinValueKind::TensorFlowReceive:
-    case BuiltinValueKind::AutoDiffCreateTape:
-    case BuiltinValueKind::AutoDiffPushToTape:
-    case BuiltinValueKind::AutoDiffPopFromTape:
-    case BuiltinValueKind::AutoDiffDestroyTape:
       return true;
 
 #define BUILTIN_SANITIZER_OPERATION(Id, Name, Attrs) BUILTIN_NO_BARRIER(Id)

branches/rxwei-patch-1/lib/SILOptimizer/Transforms/AccessEnforcementReleaseSinking.cpp

@@ -765,10 +765,3 @@ public struct AnyDerivative : Differentiable & AdditiveArithmetic {
     return AnyDerivative(_box: _box._tangentVector(from: cotangent._box))
   }
 }
-
-//===----------------------------------------------------------------------===//
-// Builtins
-//===----------------------------------------------------------------------===//
-
-@usableFromInline @_fixed_layout
-class _AutoDiffTape<Element> {}