experiments
/
STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump open source llvm revision to 0133cc60e4e230ee2c176c23eff5aa2f4ee17a75 

PiperOrigin-RevId: 289906787
Change-Id: Id0b0a9c58bad961d23c174f96f5d04d4bf52ca63
This commit is contained in:
Benjamin Kramer 2020-01-15 11:56:12 -08:00 committed by TensorFlower Gardener
parent 9d6198d555
commit 9a021222ac
8 changed files with 54 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tensorflow/compiler/mlir/tensorflow/tests/tf_executor_ops_location_roundtrip.mlir
View File

@ -17,8 +17,8 @@
// When parsing it back, we should recover all 3 locations (the
// tf_executor.island, tf.Identity, and tf_executor.yield).
// CHECK-LABEL: func @island_one_op_all_locs_same(%{{.*}}: tensor<f32>) -> tensor<f32> {
// CHECK-NEXT: "tf_executor.graph"() ( {
// CHECK-LABEL: "func"
// CHECK: "tf_executor.graph"() ( {
// CHECK-NEXT: "tf_executor.island"() ( {
// CHECK-NEXT: "tf.Identity"(%{{.*}}) : (tensor<f32>) -> tensor<f32> loc("identity@some_function")
// CHECK-NEXT: "tf_executor.yield"(%{{.*}}) : (tensor<f32>) -> () loc("identity@some_function")
@ -26,7 +26,7 @@
// CHECK-NEXT: "tf_executor.fetch"(%{{.*}}) : (tensor<f32>) -> () loc(unknown)
// CHECK-NEXT: }) : () -> tensor<f32> loc(unknown)
// CHECK-NEXT: "std.return"(%{{.*}}) : (tensor<f32>) -> () loc(unknown)
// CHECK-NEXT: } loc(unknown)
// CHECK-NEXT: sym_name = "island_one_op_all_locs_same"
func @island_one_op_all_locs_same(%arg0: tensor<f32>) -> tensor<f32> {
%0 = "tf_executor.graph"() ( {
@ -44,8 +44,8 @@ func @island_one_op_all_locs_same(%arg0: tensor<f32>) -> tensor<f32> {
// it is incorrect to use that syntax if the island, wrapped op, and yield
// don't have identical locations.
// CHECK-LABEL: func @island_one_op_all_locs_NOT_same(%{{.*}}: tensor<f32>) -> tensor<f32> {
// CHECK-NEXT: "tf_executor.graph"() ( {
// CHECK-LABEL: "func"
// CHECK: "tf_executor.graph"() ( {
// CHECK-NEXT: "tf_executor.island"() ( {
// CHECK-NEXT: "tf.Identity"(%{{.*}}) : (tensor<f32>) -> tensor<f32> loc("identity@some_function")
// CHECK-NEXT: "tf_executor.yield"(%{{.*}}) : (tensor<f32>) -> () loc("identity@some_function")
@ -53,7 +53,7 @@ func @island_one_op_all_locs_same(%arg0: tensor<f32>) -> tensor<f32> {
// CHECK-NEXT: "tf_executor.fetch"(%{{.*}}) : (tensor<f32>) -> () loc(unknown)
// CHECK-NEXT: }) : () -> tensor<f32> loc(unknown)
// CHECK-NEXT: "std.return"(%{{.*}}) : (tensor<f32>) -> () loc(unknown)
// CHECK-NEXT: } loc(unknown)
// CHECK-NEXT: sym_name = "island_one_op_all_locs_NOT_same"
func @island_one_op_all_locs_NOT_same(%arg0: tensor<f32>) -> tensor<f32> {
%0 = "tf_executor.graph"() ( {

8
tensorflow/compiler/mlir/xla/BUILD
View File

@ -155,8 +155,8 @@ cc_library(
"@com_google_absl//absl/memory",
"@llvm-project//llvm:support",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Linalg",
"@llvm-project//mlir:LinalgDialectRegistration",
"@llvm-project//mlir:LinalgOps",
"@llvm-project//mlir:Pass",
"@llvm-project//mlir:StandardOps",
"@llvm-project//mlir:Transforms",
@ -174,7 +174,7 @@ cc_library(
"@llvm-project//llvm:support",
"@llvm-project//mlir:GPUDialect",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Linalg",
"@llvm-project//mlir:LinalgOps",
"@llvm-project//mlir:LoopOps",
"@llvm-project//mlir:Pass",
"@llvm-project//mlir:StandardOps",
@ -189,8 +189,10 @@ cc_library(
deps = [
":lhlo",
"@com_google_absl//absl/memory",
"@llvm-project//mlir:Linalg",
"@llvm-project//mlir:EDSC",
"@llvm-project//mlir:LinalgDialectRegistration",
"@llvm-project//mlir:LinalgOps",
"@llvm-project//mlir:LinalgTransforms",
"@llvm-project//mlir:Pass",
],
alwayslink = 1,

3
tensorflow/compiler/mlir/xla/transforms/lhlo_fuse_linalg.cc
View File

@ -19,6 +19,7 @@ limitations under the License.
#include "mlir/Dialect/Linalg/Analysis/DependenceAnalysis.h"
#include "absl/memory/memory.h"
#include "mlir/Dialect/Linalg/Utils/Utils.h" // TF:llvm-project
#include "mlir/EDSC/Helpers.h" // TF:llvm-project
#include "mlir/Pass/Pass.h" // TF:llvm-project
namespace mlir {
@ -52,7 +53,7 @@ struct LhloFuseLinalg : public FunctionPass<LhloFuseLinalg> {
const SmallVector<int64_t, 2> tile_sizes(
generic_op.getNumInputsAndOutputs(), 1);
auto op = cast<LinalgOp>(generic_op.getOperation());
for (const Value result : op.getOutputs()) {
for (const Value result : op.getOutputBuffers()) {
if (!func_args.count(result)) continue;
if (linalg::tileLinalgOp(b, op, tile_sizes, /*permutation=*/{},
&folder)) {

3
tensorflow/compiler/xla/service/mlir_gpu/BUILD
View File

@ -160,9 +160,10 @@ cc_library(
"@llvm-project//mlir:IR",
"@llvm-project//mlir:LLVMDialect",
"@llvm-project//mlir:LLVMTransforms",
"@llvm-project//mlir:Linalg",
"@llvm-project//mlir:LinalgDialectRegistration",
"@llvm-project//mlir:LinalgOps",
"@llvm-project//mlir:LinalgToLLVM",
"@llvm-project//mlir:LinalgTransforms",
"@llvm-project//mlir:LoopDialectRegistration",
"@llvm-project//mlir:LoopOps",
"@llvm-project//mlir:LoopsToGPUPass",

2
tensorflow/compiler/xla/service/mlir_gpu/kernel_lowering.cc
View File

@ -284,7 +284,7 @@ Status LowerLHLOToGPU(mlir::ModuleOp module) {
pm.addPass(::mlir::xla_lhlo::createLegalizeToGpuPass());
// Fuse linalg operations. This will yield a single tiled loop nest where
// Go from linalg to normal loops.
pm.addPass(::mlir::linalg::createConvertLinalgToLoopsPass());
pm.addPass(::mlir::createConvertLinalgToLoopsPass());
// Canonicalize the code to simplify index computations.
pm.addNestedPass<::mlir::FuncOp>(::mlir::createCanonicalizerPass());
// The innermost loops will be single-trip.

4
tensorflow/workspace.bzl
View File

@ -570,8 +570,8 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
)
# Check out LLVM and MLIR from llvm-project.
LLVM_COMMIT = "41b520188820a732e6de4865c08704f412013209"
LLVM_SHA256 = "4cdf03a17f3acc0b6e23f97291ab266933df40a8dc5851ca39cf0209466eb37c"
LLVM_COMMIT = "0133cc60e4e230ee2c176c23eff5aa2f4ee17a75"
LLVM_SHA256 = "b660732cc9c2075916cd29b1719c1328e9d994568c838352d8e267ecba7bfa0a"
LLVM_URLS = [
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/llvm/llvm-project/archive/{commit}.tar.gz".format(commit = LLVM_COMMIT),
"https://github.com/llvm/llvm-project/archive/{commit}.tar.gz".format(commit = LLVM_COMMIT),

46
third_party/mlir/BUILD vendored
View File

@ -433,8 +433,8 @@ cc_library(
]),
includes = ["include"],
deps = [
":AffineOps",
":DialectUtils",
":EDSC",
":IR",
":StandardOps",
":Support",
@ -1345,7 +1345,7 @@ cc_library(
":AffineToStandardTransforms",
":GPUDialect",
":IR",
":Linalg",
":LinalgTransforms",
":LoopOps",
":StandardOps",
":Support",
@ -2195,7 +2195,8 @@ cc_library(
":IR",
":LLVMDialect",
":LLVMTransforms",
":Linalg",
":LinalgOps",
":LinalgTransforms",
":Pass",
":StandardOps",
":Support",
@ -2207,14 +2208,37 @@ cc_library(
alwayslink = 1,
)
# TODO(ntv): Update these to make mapping with cmake simpler.
cc_library(
name = "Linalg",
name = "LinalgOps",
srcs = [
"lib/Dialect/Linalg/IR/LinalgOps.cpp",
"lib/Dialect/Linalg/IR/LinalgTypes.cpp",
],
hdrs = [
"include/mlir/Dialect/Linalg/IR/LinalgOps.h",
"include/mlir/Dialect/Linalg/IR/LinalgTraits.h",
"include/mlir/Dialect/Linalg/IR/LinalgTypes.h",
],
includes = ["include"],
deps = [
":DialectUtils",
":IR",
":LinalgOpsIncGen",
":LinalgStructuredOpsIncGen",
":LinalgTransformPatternsIncGen",
":Parser",
":Support",
"@llvm-project//llvm:core",
"@llvm-project//llvm:support",
],
alwayslink = 1,
)
cc_library(
name = "LinalgTransforms",
srcs = [
"lib/Dialect/Linalg/Analysis/DependenceAnalysis.cpp",
"lib/Dialect/Linalg/EDSC/Builders.cpp",
"lib/Dialect/Linalg/IR/LinalgOps.cpp",
"lib/Dialect/Linalg/IR/LinalgTypes.cpp",
"lib/Dialect/Linalg/Transforms/Fusion.cpp",
"lib/Dialect/Linalg/Transforms/LinalgToLoops.cpp",
"lib/Dialect/Linalg/Transforms/LinalgTransforms.cpp",
@ -2226,9 +2250,6 @@ cc_library(
"include/mlir/Dialect/Linalg/Analysis/DependenceAnalysis.h",
"include/mlir/Dialect/Linalg/EDSC/Builders.h",
"include/mlir/Dialect/Linalg/EDSC/Intrinsics.h",
"include/mlir/Dialect/Linalg/IR/LinalgOps.h",
"include/mlir/Dialect/Linalg/IR/LinalgTraits.h",
"include/mlir/Dialect/Linalg/IR/LinalgTypes.h",
"include/mlir/Dialect/Linalg/Passes.h",
"include/mlir/Dialect/Linalg/Transforms/LinalgTransforms.h",
"include/mlir/Dialect/Linalg/Utils/Intrinsics.h",
@ -2245,6 +2266,7 @@ cc_library(
":IR",
":LLVMDialect",
":LLVMTransforms",
":LinalgOps",
":LinalgOpsIncGen",
":LinalgStructuredOpsIncGen",
":LinalgTransformPatternsIncGen",
@ -2264,8 +2286,8 @@ cc_library(
cc_library(
name = "LinalgDialectRegistration",
srcs = ["lib/Dialect/Linalg/LinalgRegistration.cpp"],
deps = [":Linalg"],
srcs = ["lib/Dialect/Linalg/IR/LinalgRegistration.cpp"],
deps = [":LinalgOps"],
alwayslink = 1,
)

3
third_party/mlir/test.BUILD vendored
View File

@ -156,7 +156,8 @@ cc_library(
"@llvm-project//mlir:EDSC",
"@llvm-project//mlir:GPUDialect",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Linalg",
"@llvm-project//mlir:LinalgOps",
"@llvm-project//mlir:LinalgTransforms",
"@llvm-project//mlir:LoopOps",
"@llvm-project//mlir:Pass",
"@llvm-project//mlir:StandardOps",