Skip to content

Enabled strict-deabstraction and update expectations for some tests. #18262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 26, 2018
Merged

Enabled strict-deabstraction and update expectations for some tests. #18262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions test/TensorFlow/playground_1.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// RUN: %empty-directory(%t)
// RUN: cp %s %t/main.swift
// RUN: %target-swift-frontend -debugger-support -dump-ast -playground %t/main.swift %S/PlaygroundsRuntime.swift
// RUN: %target-swift-frontend -debugger-support -Xllvm -tf-dump-intermediates -O -emit-sil -playground %t/main.swift %S/PlaygroundsRuntime.swift
// RUN: %target-swift-frontend -debugger-support -Xllvm -tf-dump-intermediates -O -emit-sil -playground %t/main.swift %S/PlaygroundsRuntime.swift -verify | %FileCheck %s
// RUN: %target-swift-frontend -debugger-support -Xllvm -tf-dump-intermediates -Xllvm -tf-strict-deabstraction -O -emit-sil -playground %t/main.swift %S/PlaygroundsRuntime.swift
// RUN: %target-swift-frontend -debugger-support -Xllvm -tf-dump-intermediates -Xllvm -tf-strict-deabstraction -O -emit-sil -playground %t/main.swift %S/PlaygroundsRuntime.swift -verify | %FileCheck %s

import TensorFlow

Expand Down Expand Up @@ -40,8 +40,8 @@ func someLocalFunctionThatShouldBeForceInlined() {
// CHECK-LABEL: --- TFPartition Accelerator Result: main
// CHECK: sil private @main.tf : $@callee_owned ()
// CHECK: graph_op "Const"
// CHECK: builtin "__tfop_Add,
// CHECK: builtin "__tfop_Sub,
// CHECK: graph_op "Add,
// CHECK: graph_op "Sub,
// CHECK: return

// CHECK-LABEL: --- XLA CFG Canonicalize: main
10 changes: 5 additions & 5 deletions test/TensorFlow/retain_release.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %target-swift-frontend -Xllvm -tf-dump-intermediates -O -emit-sil %s -o -
// RUN: %target-swift-frontend -Xllvm -tf-dump-intermediates -O -emit-sil %s -verify | %FileCheck %s
// RUN: %target-swift-frontend -Xllvm -tf-dump-intermediates -Xllvm -tf-strict-deabstraction -O -emit-sil %s -o -
// RUN: %target-swift-frontend -Xllvm -tf-dump-intermediates -Xllvm -tf-strict-deabstraction -O -emit-sil %s -verify | %FileCheck %s

import TensorFlow

Expand Down Expand Up @@ -96,11 +96,11 @@ public func testBalancedRetainReleases() {
// CHECK: function_ref @_swift_tfc_FinishTensorComputation
// CHECK: [[H:%.*]] = alloc_ref $TensorHandle<Float>
//
// Currently we generate a retain for the use of __tf_receive below
// CHECK: strong_retain [[H]] : $TensorHandle<Float>
//
// __tf_receive is called here
// CHECK: [[RECV:%.*]] = function_ref @__tf_receive
//
// Currently we generate a retain for the use of apply below
// CHECK: strong_retain [[H]] : $TensorHandle<Float>
// CHECK: apply [[RECV]]<Float>([[H]])
//
// CHECK: strong_release [[H]] : $TensorHandle<Float>
Expand Down
20 changes: 10 additions & 10 deletions test/TensorFlow/top_level_code_1.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %target-swift-frontend -Xllvm -tf-dump-intermediates -O -emit-sil -verify %s
// RUN: %target-swift-frontend -Xllvm -tf-dump-intermediates -O -emit-sil -verify %s | %FileCheck %s
// RUN: %target-swift-frontend -Xllvm -tf-dump-intermediates -Xllvm -tf-strict-deabstraction -O -emit-sil -verify %s
// RUN: %target-swift-frontend -Xllvm -tf-dump-intermediates -Xllvm -tf-strict-deabstraction -O -emit-sil -verify %s | %FileCheck %s
import TensorFlow

// This test is intended to verify that all of the operations end up in-graph:
Expand Down Expand Up @@ -36,14 +36,14 @@ x -= one
let y = Tensor<Float>(2.0)
let y2 = y*y*y*y

// CHECK: [[ONE:%.*]] = builtin "__tfop_tfc.scalarToTensor
// CHECK: [[ADD1:%.*]] = builtin "__tfop_Add,$in,$in,T"([[ONE]] : $TensorHandle<Float>, [[ONE]] : $TensorHandle<Float>, {{.*}} : $@thick Float.Type)
// CHECK: [[ADD2:%.*]] = builtin "__tfop_Add,$in,$in,T"([[ADD1]] : $TensorHandle<Float>, [[ONE]] : $TensorHandle<Float>, {{.*}} : $@thick Float.Type)
// CHECK: builtin "__tfop_Sub,$in,$in,T"([[ONE]] : $TensorHandle<Float>, [[ONE]] : $TensorHandle<Float>, {{.*}} : $@thick Float.Type) : $TensorHandle<Float>
// CHECK: [[TWO:%.*]] = builtin "__tfop_tfc.scalarToTensor
// CHECK: [[MUL1:%.*]] = builtin "__tfop_Mul,$in,$in,T"([[TWO]] : $TensorHandle<Float>, [[TWO]] : $TensorHandle<Float>, {{.*}} : $@thick Float.Type)
// CHECK: [[MUL2:%.*]] = builtin "__tfop_Mul,$in,$in,T"([[MUL1]] : $TensorHandle<Float>, [[TWO]] : $TensorHandle<Float>, {{.*}} : $@thick Float.Type)
// CHECK: [[MUL3:%.*]] = builtin "__tfop_Mul,$in,$in,T"([[MUL2]] : $TensorHandle<Float>, [[TWO]] : $TensorHandle<Float>, {{.*}} : $@thick Float.Type)
// CHECK: [[ONE:%.*]] = graph_op "tfc.scalarToTensor,s"
// CHECK: [[ADD1:%.*]] = graph_op "Add,i,i"([[ONE]] : $TensorHandle<Float>, [[ONE]] : $TensorHandle<Float>)
// CHECK: [[ADD2:%.*]] = graph_op "Add,i,i"([[ADD1]] : $TensorHandle<Float>, [[ONE]] : $TensorHandle<Float>)
// CHECK: graph_op "Sub,i,i"([[ONE]] : $TensorHandle<Float>, [[ONE]] : $TensorHandle<Float>)
// CHECK: [[TWO:%.*]] = graph_op "tfc.scalarToTensor
// CHECK: [[MUL1:%.*]] = graph_op "Mul,i,i"([[TWO]] : $TensorHandle<Float>, [[TWO]] : $TensorHandle<Float>)
// CHECK: [[MUL2:%.*]] = graph_op "Mul,i,i"([[MUL1]] : $TensorHandle<Float>, [[TWO]] : $TensorHandle<Float>)
// CHECK: [[MUL3:%.*]] = graph_op "Mul,i,i"([[MUL2]] : $TensorHandle<Float>, [[TWO]] : $TensorHandle<Float>)

// b/76155918
let a: Tensor<Float> = [1, 2, 3]
Expand Down