---

yaml
---
r: 311295
b: refs/heads/tensorflow-merge
c: f738d23
h: refs/heads/master
i:
  311293: d547a11
  311291: 43dc3f4
  311287: fd23282
  311279: 3a1d5e0
  311263: b5a60c1
  311231: 28636ac
  311167: 6f1eff1
  311039: 54c8d39
  310783: 1d190a0
  310271: 3367229
  309247: fc77328
  307199: fae99bb
  303103: 0224212
  294911: 1f1cc10

Author: lattner

[refs]

@@ -1379,7 +1379,7 @@ refs/heads/chase-my-tail: 8bb91443a9e81bbfac92a2621a0af887a1da8dbf
 refs/heads/consider-outer-alternatives: 708bac749ec60a22a79e2eefbe734f9488a7370d
 refs/heads/revert-25740-oops-i-linked-it-again: fdd41aeb682fc488572bdc1cf71b2ff6997ba576
 refs/heads/swift-5.1-branch-06-12-2019: e63b7b2d3b93c48232d386099d0ec525d21d8f8d
-refs/heads/tensorflow-merge: da93d3e5a7d92853001c6b5674960d5fa93a415b
+refs/heads/tensorflow-merge: f738d231e6e37f24218610c50e3907bdae700746
 refs/heads/update-checkout-sha-info: 5832743c5c2a842976c42a508a4c6dcceefb0aef
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-12-a: 228f0448d9bb909aacbba4afcb7c600a405d15da
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-14-a: 922861a77b5fc2bf46bc917da70ceb15eef76836

branches/tensorflow-merge/include/swift/SIL/SILConstants.h

@@ -45,7 +45,13 @@ enum class UnknownReason {
   TooManyInstructions,
 
   /// A control flow loop was found.
-  Loop
+  Loop,
+
+  /// Integer overflow detected.
+  Overflow,
+
+  /// Unspecified trap detected.
+  Trap,
 };
 
 

branches/tensorflow-merge/include/swift/SIL/SILModule.h

@@ -268,6 +268,8 @@ class SILModule {
   SILModule(const SILModule&) = delete;
   void operator=(const SILModule&) = delete;
 
+  // SWIFT_ENABLE_TENSORFLOW
+public:
   /// Method which returns the SerializedSILLoader, creating the loader if it
   /// has not been created yet.
   SerializedSILLoader *getSILLoader();

branches/tensorflow-merge/lib/SIL/SILConstants.cpp

@@ -35,11 +35,7 @@ void SymbolicValue::print(llvm::raw_ostream &os, unsigned indent) const {
   case RK_UninitMemory: os << "uninit\n"; return;
   case RK_Unknown: {
     std::pair<SILNode *, UnknownReason> unknown = getUnknownValue();
-    switch (unknown.second) {
-    case UnknownReason::Default: os << "unknown: "; break;
-    case UnknownReason::TooManyInstructions: os << "unknown(toobig): "; break;
-    case UnknownReason::Loop: os << "unknown(loop): "; break;
-    }
+    os << "unknown(" << (int)unknown.second << "): ";
     unknown.first->dump();
     return;
   }
@@ -446,14 +442,21 @@ void SymbolicValue::emitUnknownDiagnosticNotes(SILLocation fallbackLoc) {
   case UnknownReason::Loop:
     error = "control flow loop found";
     break;
+  case UnknownReason::Overflow:
+    error = "integer overflow detected";
+    break;
+  case UnknownReason::Trap:
+    error = "trap detected";
+    break;
   }
 
   auto &module = badInst->getModule();
 
   auto loc = skipInternalLocations(badInst->getDebugLocation()).getLocation();
   if (loc.isNull()) {
     // If we have important clarifying information, make sure to emit it.
-    if (unknown.second != UnknownReason::Default)
+    if (unknown.second == UnknownReason::Default ||
+        fallbackLoc.isNull())
       return;
     loc = fallbackLoc;
   }

branches/tensorflow-merge/lib/SILOptimizer/Mandatory/TFConstExpr.cpp

@@ -43,8 +43,30 @@ evaluateAndCacheCall(SILFunction &fn, SubstitutionMap substitutionMap,
 // ConstantFolding.h/cpp files should be subsumed by this, as this is a more
 // general framework.
 
+
+// We have a list of functions that we hackily special case.  In order to keep
+// this localized, we use this classifier function.  This should be replaced
+// with an attribute put on the standard library that captures this info.
+enum class WellKnownFunction {
+  Unknown,
+  StringInitEmpty,  // String.init()
+  AssertionFailure, // _assertionFailure(_:_:file:line:flags:)
+};
+
+
+static WellKnownFunction classifyFunction(StringRef mangledName) {
+  if (mangledName == "$SS2SycfC")
+    return WellKnownFunction::StringInitEmpty;
+
+  if (mangledName.contains("_assertionFailure"))
+    return WellKnownFunction::AssertionFailure;
+  return WellKnownFunction::Unknown;
+}
+
+
+
 //===----------------------------------------------------------------------===//
-// MemoryValue implementation.
+// AddressValue implementation.
 //===----------------------------------------------------------------------===//
 
 namespace {
@@ -253,6 +275,10 @@ namespace {
 
     AddressValue computeSingleStoreAddressValue(SILValue addr);
     llvm::Optional<SymbolicValue> computeCallResult(ApplyInst *apply);
+
+    llvm::Optional<SymbolicValue>
+    computeOpaqueCallResult(ApplyInst *apply, SILFunction *callee);
+
     SymbolicValue computeLoadResult(SILValue addr);
     llvm::Optional<SymbolicValue> computeFSStore(SymbolicValue storedCst,
                                                  SILValue dest);
@@ -268,20 +294,9 @@ Type ConstExprFunctionState::simplifyType(Type ty) {
   return substitutionMap.empty() ? ty : ty.subst(substitutionMap);
 }
 
-/// Lazily initialize the specified SIL Loader.
-static SerializedSILLoader &
-initLoader(std::unique_ptr<SerializedSILLoader> &silLoader, SILModule &module) {
-  if (!silLoader)
-    silLoader = SerializedSILLoader::create(module.getASTContext(),
-                                            &module, nullptr);
-  return *silLoader;
-}
-
-
 // TODO: refactor this out somewhere sharable between autodiff and this code.
 static void lookupOrLinkWitnessTable(ProtocolConformanceRef confRef,
-                                     SILModule &module,
-                         std::unique_ptr<SerializedSILLoader> &silLoader) {
+                                     SILModule &module) {
   // Cannot resolve abstract conformances.
   if (!confRef.isConcrete())
     return;
@@ -295,7 +310,8 @@ static void lookupOrLinkWitnessTable(ProtocolConformanceRef confRef,
     conf->getDeclContext()->getAsNominalTypeOrNominalTypeExtensionContext();
   auto linkage = getSILLinkage(getDeclLinkage(decl), NotForDefinition);
   auto *newTable = module.createWitnessTableDeclaration(conf, linkage);
-  newTable = initLoader(silLoader, module).lookupWitnessTable(newTable);
+  newTable = module.getSILLoader()->lookupWitnessTable(newTable);
+
   // Update linkage for witness methods.
   // FIXME: Figure out why witnesses have shared linkage by default.
   for (auto &entry : newTable->getEntries())
@@ -374,8 +390,7 @@ SymbolicValue ConstExprFunctionState::computeConstantValue(SILValue value) {
       module.lookUpFunctionInWitnessTable(conf, wmi->getMember()).first;
     if (!fn) {
       // If that failed, try force loading it, and try again.
-      lookupOrLinkWitnessTable(conf, wmi->getModule(),
-                               evaluator.getSILLoader());
+      lookupOrLinkWitnessTable(conf, wmi->getModule());
       fn = module.lookUpFunctionInWitnessTable(conf, wmi->getMember()).first;
     }
 
@@ -416,7 +431,27 @@ ConstExprFunctionState::computeConstantValueBuiltin(BuiltinInst *inst) {
     return SymbolicValue::getUnknown(SILValue(inst), UnknownReason::Default);
   };
 
-  // Unary operations first.
+  // Nullary operations.
+  if (inst->getNumOperands() == 0) {
+    switch (builtin.ID) {
+    default: break;
+    case BuiltinValueKind::AssertConf: {
+      // assert_configuration builtin gets replaces with debug/release/etc
+      // constants.
+      auto config = inst->getModule().getOptions().AssertConfig;
+      // Don't replace assert_configuration if we're not supposed to.
+      if (config == SILOptions::DisableReplacement)
+        break;
+      auto resultBitWidth =
+        inst->getType().castTo<BuiltinIntegerType>()->getGreatestWidth();
+      auto result = APInt(resultBitWidth, config);
+      return SymbolicValue::getInteger(result, evaluator.getAllocator());
+    }
+    }
+  }
+
+
+  // Unary operations.
   if (inst->getNumOperands() == 1) {
     auto operand = getConstantValue(inst->getOperand(0));
     // TODO: Could add a "value used here" sort of diagnostic.
@@ -451,6 +486,10 @@ ConstExprFunctionState::computeConstantValueBuiltin(BuiltinInst *inst) {
       if (builtin.ID == BuiltinValueKind::UToSCheckedTrunc)
         overflowed |= result.isSignBitSet();
 
+      if (overflowed)
+        return SymbolicValue::getUnknown(SILValue(inst),
+                                         UnknownReason::Overflow);
+
       auto &allocator = evaluator.getAllocator();
       // Build the Symbolic value result for our truncated value.
       return SymbolicValue::getAggregate({
@@ -663,14 +702,20 @@ ConstExprFunctionState::computeConstantValueBuiltin(BuiltinInst *inst) {
       [&](const std::function<APInt(const APInt &, const APInt &, bool &)> &fn)
             -> SymbolicValue {
       if (operand0.getKind() != SymbolicValue::Integer ||
-          operand1.getKind() != SymbolicValue::Integer)
+          operand1.getKind() != SymbolicValue::Integer ||
+          operand2.getKind() != SymbolicValue::Integer)
         return unknownResult();
 
-      // TODO: We can/should diagnose statically detectable integer overflow
-      // errors and subsume the ConstantFolding.cpp mandatory SIL pass.
       auto l = operand0.getIntegerValue(), r = operand1.getIntegerValue();
       bool overflowed = false;
       auto result = fn(l, r, overflowed);
+
+      // Return a statically diagnosed overflow if the operation is supposed to
+      // trap on overflow.
+      if (overflowed && !operand2.getIntegerValue().isNullValue())
+        return SymbolicValue::getUnknown(SILValue(inst),
+                                         UnknownReason::Overflow);
+
       auto &allocator = evaluator.getAllocator();
       // Build the Symbolic value result for our normal and overflow bit.
       return SymbolicValue::getAggregate({
@@ -714,6 +759,34 @@ ConstExprFunctionState::computeConstantValueBuiltin(BuiltinInst *inst) {
   return unknownResult();
 }
 
+// Handle calls to opaque callees, either by handling them and returning None or
+// by returning with a Unknown indicating a failure.
+llvm::Optional<SymbolicValue>
+ConstExprFunctionState::computeOpaqueCallResult(ApplyInst *apply,
+                                                SILFunction *callee) {
+  // This is a termination point like fatalError.
+  if (callee->hasSemanticsAttr("arc.programtermination_point")) {
+    // TODO: Actually get the message out of fatalError.  We can literally get
+    // its string and file/line/col info and propagate it up!
+    return SymbolicValue::getUnknown((SILInstruction*)apply,
+                                     UnknownReason::Trap);
+  }
+  
+  if (classifyFunction(callee->getName()) ==
+      WellKnownFunction::AssertionFailure) {
+    // TODO: Actually get the message out of fatalError.  We can literally get
+    // its string and file/line/col info and propagate it up!
+    return SymbolicValue::getUnknown((SILInstruction*)apply,
+                                     UnknownReason::Trap);
+  }
+
+  DEBUG(llvm::errs() << "ConstExpr Opaque Callee: " << *callee << "\n");
+  return SymbolicValue::getUnknown((SILInstruction*)apply,
+                                   UnknownReason::Default);
+}
+
+
+// TODO: Refactor this to someplace common, this is defined in Devirtualize.cpp.
 SubstitutionMap
 getWitnessMethodSubstitutions(SILModule &Module, ApplySite AI, SILFunction *F,
                               ProtocolConformanceRef CRef);
@@ -726,48 +799,45 @@ llvm::Optional<SymbolicValue>
 ConstExprFunctionState::computeCallResult(ApplyInst *apply) {
   auto conventions = apply->getSubstCalleeConv();
 
-  // The many failure paths through this function invoke this to return their
-  // failure information.
-  auto failure = [&](UnknownReason reason) -> SymbolicValue {
-    auto unknown = SymbolicValue::getUnknown((SILInstruction*)apply, reason);
-    // Remember that this call produced unknown as well as any indirect results.
-    calculatedValues[apply] = unknown;
-
-    for (unsigned i = 0, e = conventions.getNumIndirectSILResults();
-         i != e; ++i) {
-      auto resultOperand = apply->getOperand(i+1);
-      assert(resultOperand->getType().isAddress() &&
-             "Indirect results should be by-address");
-      calculatedValues[resultOperand] = unknown;
-    }
-    return unknown;
-  };
-
   // Determine the callee.
-  auto calleeLV = getConstantValue(apply->getOperand(0));
-  if (!calleeLV.isConstant())
-    return failure(UnknownReason::Default);
+  auto calleeFn = getConstantValue(apply->getOperand(0));
+  if (!calleeFn.isConstant())
+    return SymbolicValue::getUnknown((SILInstruction*)apply,
+                                     UnknownReason::Default);
 
   SILFunction *callee;
   Optional<ProtocolConformanceRef> conformance;
-  std::tie(callee, conformance) = calleeLV.getFunctionValue();
+  std::tie(callee, conformance) = calleeFn.getFunctionValue();
 
 
   // If we reached an external function that hasn't been deserialized yet, make
   // sure to pull it in so we can see its body.  If that fails, then we can't
   // analyze the function.
   if (callee->isExternalDeclaration()) {
-    auto newCallee = initLoader(evaluator.getSILLoader(),
-                                callee->getModule()).lookupSILFunction(callee);
-    if (!newCallee || newCallee->isExternalDeclaration()) {
-      DEBUG(llvm::errs() << "ConstExpr Opaque Callee: " << *callee << "\n");
-      return failure(UnknownReason::Default);
-    }
-    callee = newCallee;
+    callee->getModule().loadFunction(callee);
+    if (callee->isExternalDeclaration())
+      return computeOpaqueCallResult(apply, callee);
   }
 
   // TODO: Verify that the callee was defined as a @constexpr function.
 
+  // If this is a well-known function, do not step into it.
+  //
+  // FIXME: This should be based on the SILFunction carrying a
+  // @constexprSemantics sort of attribute that indicates it is well known,
+  // just like the existing SemanticsAttr thing.
+  switch (classifyFunction(callee->getName())) {
+  default: break;
+  case WellKnownFunction::StringInitEmpty: {  // String.init()
+    assert(conventions.getNumDirectSILResults() == 1 &&
+           conventions.getNumIndirectSILResults() == 0 &&
+           "unexpected String.init() signature");
+    auto result = SymbolicValue::getString("", evaluator.getAllocator());
+    setValue(apply->getResults()[0], result);
+    return None;
+  }
+  }
+
   // Verify that we can fold all of the arguments to the call.
   SmallVector<SymbolicValue, 4> paramConstants;
   unsigned applyParamBaseIndex = 1+conventions.getNumIndirectSILResults();
@@ -834,7 +904,7 @@ ConstExprFunctionState::computeCallResult(ApplyInst *apply) {
   if (unsigned numNormalResults = conventions.getNumDirectSILResults()) {
     // TODO: unclear when this happens, is this for tuple result values?
     assert(numNormalResults == 1 && "Multiple results aren't supported?");
-    calculatedValues[apply->getResults()[0]] = results[nextResult];
+    setValue(apply->getResults()[0], results[nextResult]);
     ++nextResult;
   }
 
@@ -863,6 +933,13 @@ SymbolicValue ConstExprFunctionState::getConstantValue(SILValue value) {
 
   // Compute the value of a normal instruction based on its operands.
   auto result = computeConstantValue(value);
+
+  // If this is the top-level lazy interpreter, output a debug trace.
+  if (!fn) {
+    DEBUG(llvm::errs() << "ConstExpr top level: "; value->dump());
+    DEBUG(llvm::errs() << "  RESULT: ";  result.dump());
+  }
+
   return calculatedValues[value] = result;
 }
 
@@ -1185,11 +1262,12 @@ ConstExprFunctionState::evaluateFlowSensitive(SILInstruction *inst) {
 
   if (isa<CondFailInst>(inst)) {
     auto failed = getConstantValue(inst->getOperand(0));
-    if (failed.isConstant() && failed.getIntegerValue() == 0)
-      return None;
-    // TODO: Emit a diagnostic if this cond_fail actually fails under constant
-    // folding.
-    DEBUG(llvm::errs() << "CONDFAIL FAILED!\n");
+    if (failed.getKind() == SymbolicValue::Integer) {
+      if (failed.getIntegerValue() == 0)
+        return None;
+      // Conditional fail actually failed.
+      return SymbolicValue::getUnknown(inst, UnknownReason::Trap);
+    }
   }
 
   // If this is a call, evaluate it.

branches/tensorflow-merge/lib/SILOptimizer/Mandatory/TFConstExpr.h

@@ -32,7 +32,6 @@ namespace swift {
   class SILBuilder;
   class SILModule;
   class SILValue;
-  class SerializedSILLoader;
   class SymbolicValue;
 
 namespace tf {
@@ -44,17 +43,13 @@ class ConstExprEvaluator {
   /// result values for the cached constexpr calls we have already analyzed.
   llvm::BumpPtrAllocator allocator;
 
-  /// This is a handle to a loader for serialized code.
-  std::unique_ptr<SerializedSILLoader> silLoader;
-
   ConstExprEvaluator(const ConstExprEvaluator &) = delete;
   void operator=(const ConstExprEvaluator &) = delete;
 public:
   explicit ConstExprEvaluator(SILModule &m);
   ~ConstExprEvaluator();
 
   llvm::BumpPtrAllocator &getAllocator() { return allocator; }
-  std::unique_ptr<SerializedSILLoader> &getSILLoader() { return silLoader; }
 
   /// Analyze the specified values to determine if they are constant values.
   /// This is done in code that is not necessarily itself a constexpr