Skip to content

Commit 6456e9a

Browse files
bgogulbgogul
authored
Enabled strict-deabstraction and update expectations for some tests. (#18262)
1 parent 3b1a012 commit 6456e9a

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

‎test/TensorFlow/playground_1.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
// RUN: %empty-directory(%t)
77
// RUN: cp %s %t/main.swift
88
// RUN: %target-swift-frontend -debugger-support -dump-ast -playground %t/main.swift %S/PlaygroundsRuntime.swift
9-
// RUN: %target-swift-frontend -debugger-support -Xllvm -tf-dump-intermediates -O -emit-sil -playground %t/main.swift %S/PlaygroundsRuntime.swift
10-
// RUN: %target-swift-frontend -debugger-support -Xllvm -tf-dump-intermediates -O -emit-sil -playground %t/main.swift %S/PlaygroundsRuntime.swift -verify | %FileCheck %s
9+
// RUN: %target-swift-frontend -debugger-support -Xllvm -tf-dump-intermediates -Xllvm -tf-strict-deabstraction -O -emit-sil -playground %t/main.swift %S/PlaygroundsRuntime.swift
10+
// 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
1111

1212
import TensorFlow
1313

@@ -40,8 +40,8 @@ func someLocalFunctionThatShouldBeForceInlined() {
4040
// CHECK-LABEL: --- TFPartition Accelerator Result: main
4141
// CHECK: sil private @main.tf : $@callee_owned ()
4242
// CHECK: graph_op "Const"
43-
// CHECK: builtin "__tfop_Add,
44-
// CHECK: builtin "__tfop_Sub,
43+
// CHECK: graph_op "Add,
44+
// CHECK: graph_op "Sub,
4545
// CHECK: return
4646

4747
// CHECK-LABEL: --- XLA CFG Canonicalize: main

‎test/TensorFlow/retain_release.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %target-swift-frontend -Xllvm -tf-dump-intermediates -O -emit-sil %s -o -
2-
// RUN: %target-swift-frontend -Xllvm -tf-dump-intermediates -O -emit-sil %s -verify | %FileCheck %s
1+
// RUN: %target-swift-frontend -Xllvm -tf-dump-intermediates -Xllvm -tf-strict-deabstraction -O -emit-sil %s -o -
2+
// RUN: %target-swift-frontend -Xllvm -tf-dump-intermediates -Xllvm -tf-strict-deabstraction -O -emit-sil %s -verify | %FileCheck %s
33

44
import TensorFlow
55

@@ -96,11 +96,11 @@ public func testBalancedRetainReleases() {
9696
// CHECK: function_ref @_swift_tfc_FinishTensorComputation
9797
// CHECK: [[H:%.*]] = alloc_ref $TensorHandle<Float>
9898
//
99-
// Currently we generate a retain for the use of __tf_receive below
100-
// CHECK: strong_retain [[H]] : $TensorHandle<Float>
101-
//
10299
// __tf_receive is called here
103100
// CHECK: [[RECV:%.*]] = function_ref @__tf_receive
101+
//
102+
// Currently we generate a retain for the use of apply below
103+
// CHECK: strong_retain [[H]] : $TensorHandle<Float>
104104
// CHECK: apply [[RECV]]<Float>([[H]])
105105
//
106106
// CHECK: strong_release [[H]] : $TensorHandle<Float>

‎test/TensorFlow/top_level_code_1.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %target-swift-frontend -Xllvm -tf-dump-intermediates -O -emit-sil -verify %s
2-
// RUN: %target-swift-frontend -Xllvm -tf-dump-intermediates -O -emit-sil -verify %s | %FileCheck %s
1+
// RUN: %target-swift-frontend -Xllvm -tf-dump-intermediates -Xllvm -tf-strict-deabstraction -O -emit-sil -verify %s
2+
// RUN: %target-swift-frontend -Xllvm -tf-dump-intermediates -Xllvm -tf-strict-deabstraction -O -emit-sil -verify %s | %FileCheck %s
33
import TensorFlow
44

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

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

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

0 commit comments

Comments
 (0)