---

yaml
---
r: 311289
b: refs/heads/tensorflow-merge
c: d8ce852
h: refs/heads/master
i:
  311287: fd23282

Author: rxwei

[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: 6564b11d6f062d2f43d3419a8387fcfa7bc74787
+refs/heads/tensorflow-merge: d8ce8529027a9d6a506462204a286d718916dda2
 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/lib/SILOptimizer/Mandatory/TFLowerGraph.cpp

@@ -217,6 +217,11 @@ struct TFGraphLowering : public SILInstructionVisitor<TFGraphLowering> {
   llvm::SmallSet<int, 4> processedTensorIdsForSend;
   llvm::SmallSet<int, 4> processedTensorIdsForReceive;
 
+  /// Mapping from declarations to the number to times a TF_Function took the
+  /// name from the declaration. This will be used in `getUniqueName` to produce
+  /// uniqued graph node names.
+  llvm::SmallDenseMap<ValueDecl *, unsigned> uniqueNames;
+
   /// This flag gets set if lowering code to the graph produces a TensorFlow
   /// error and emits a diagnostic.  This tells us to stop lowering and give up
   /// gracefully.
@@ -558,14 +563,29 @@ static void escapeOpName(std::string &name) {
   // Currently, invalid characters are simply replaced with underscores.
   // TODO: Use a more robust escaping transformation. It should handle unicode
   // characters (using llvm::UTF8 or some other means) and be reversible.
-  for (unsigned i = 0, n = name.size(); i < n; i++) {
-    char c = name[i];
-    if (!std::isalnum(c) && c != '.')
-      if (i == 0 || (i != '_' && i != '/'))
-        name[i] = '_';
+  for (auto i : indices(name)) {
+    char &c = name[i];
+    if (!llvm::isAlnum(c) && c != '.')
+      if (i == 0 || (c != '_' && c != '/'))
+        c = '_';
   }
 }
 
+/// Given a DeclName, returns an escaped (TF-compatible)
+/// name that replaces parentheses with '.' and colons with '_', for example:
+/// `foo(x:y:z:)` -> `foo.x_y_z_.`.
+static std::string escapeDeclName(DeclName name) {
+  SmallVector<char, 8> buffer;
+  auto newName = name.getString(buffer, /*skipEmptyArgumentNames*/ true);
+  for (char &c : buffer) {
+    if (c == '(' || c == ')')
+      c = '.';
+    else if (!llvm::isAlnum(c))
+      c = '_';
+  }
+  return newName.str();
+}
+
 /// Produce a "stack trace" for the specified location, producing it in a form
 /// that we can use as a unique op name.
 std::string TFGraphLowering::getUniqueName(SILDebugLocation loc,
@@ -580,6 +600,9 @@ std::string TFGraphLowering::getUniqueName(SILDebugLocation loc,
   // Form a name for this op based on the user's source location and "stack
   // trace" of where it got inlined in user code.  We use the form
   // "file:line:col".
+  //
+  // FIXME: InlinedCallSite is always nullptr even if we use the performance
+  // inliner, so it currently does not track the inlined call site.
   for (auto ds = loc.getScope(); ds; ds = ds->InlinedCallSite) {
     // If the call site location is invalid, stop scanning.
     if (!ds->Loc.getSourceLoc().isValid())
@@ -596,7 +619,27 @@ std::string TFGraphLowering::getUniqueName(SILDebugLocation loc,
       if (fnName.endswith(".device_partition"))
         fnName = fnName.drop_back(strlen(".device_partition"));
 
-      name += "." + fnName.str() + "." + llvm::utostr(lineCol.first);
+      // Separate functions using '/' so that TensorBoard can treat it as a
+      // hierarchical separator.
+      name += '/';
+
+      // If the SIL function is backed by a Swift decl, use the decl name.
+      // Otherwise, use the SIL name.
+      std::string funcName;
+      auto *dc = SILFn.getDeclContext();
+      if (auto *afd = dyn_cast_or_null<AbstractFunctionDecl>(dc)) {
+        funcName = escapeDeclName(afd->getEffectiveFullName());
+        // Make sure the name is unique.
+        auto declCountLookup = uniqueNames.find(afd);
+        if (declCountLookup != uniqueNames.end())
+          funcName += "_" + llvm::itostr(declCountLookup->getSecond()++);
+        else
+          uniqueNames.insert({afd, 1});
+      } else {
+        funcName = fnName.str();
+      }
+
+      name += funcName + "." + llvm::utostr(lineCol.first);
       name += "." + llvm::utostr(lineCol.second);
     }
   }
@@ -608,7 +651,7 @@ std::string TFGraphLowering::getUniqueName(SILDebugLocation loc,
     if (sourceLoc.isValid()) {
       auto lineCol = SM.getLineAndColumn(sourceLoc);
       auto bufferID = SM.getBufferIdentifierForLoc(sourceLoc);
-      name += "." + bufferID.str() + "." + llvm::utostr(lineCol.first);
+      name += "/" + bufferID.str() + "." + llvm::utostr(lineCol.first);
       name += "." + llvm::utostr(lineCol.second);
     }
   }
@@ -1099,7 +1142,6 @@ void TFGraphLowering::visitTFDataset(BuiltinInst *inst) {
   StringRef filePath;
   if (dataSource != DatasetCreationContext::FAKE) {
     auto operand = inst->getOperand(1);
-    auto opInfo = tfopInfo.operandClasses[1];
     auto *sli = cast<StringLiteralInst>(operand);
     assert(sli->getEncoding() == StringLiteralInst::Encoding::UTF8);
     filePath = sli->getValue();

branches/tensorflow-merge/test/TensorFlow/graph_node_names.swift

@@ -0,0 +1,33 @@
+// RUN: %target-swift-frontend -Xllvm -tf-dump-graph -O -emit-sil %s -verify | %FileCheck %s
+
+import TensorFlow
+
+
+func foo() -> Tensor<Float> {
+  return Tensor(1)
+}
+
+func bar() -> Tensor<Float> {
+  return sin(foo())
+}
+
+func baz() -> Tensor<Float> {
+  return bar() + 1
+}
+
+func main() {
+  _ = baz()
+}
+
+main()
+
+/// CHECK: op: "Const"
+/// CHECK: op: "Sin"
+/// CHECK: op: "Add"
+
+/// FIXME: Currently the performance inliner is not capturing inlining trace for
+/// some reason. When that's fixed, add checks in this file.
+///
+/// Expected node names:
+/// - Sin: op/main/baz/bar/sin
+/// - Const: op/main/baz/bar/foo

branches/tensorflow-merge/test/TensorFlow/sends_recvs.swift

@@ -54,7 +54,7 @@ public func test1SendWithParam(x: Float) {
 // CHECK:          node_def {
 // CHECK:            name: "RunControlDependency"
 // CHECK:            op: "Identity"
-// CHECK-NEXT:       input: "op.
+// CHECK-NEXT:       input: "op/test1SendWithParam.x_
 // CHECK-NEXT:       input: "^tf_send_0"
 
 public func test2Sends() {