Bump OSS LLVM to 48acece15dcf63cb4fee043a4e66ddf3917a359a plus required fixes.

PiperOrigin-RevId: 292558361
Change-Id: I45f1e57fb11a5c3083b17447987ba78fee804b33
This commit is contained in:
Thomas Joerg 2020-01-31 09:23:44 -08:00 committed by TensorFlower Gardener
parent e3130b5bbd
commit 7e5faef4f3
3 changed files with 14 additions and 4 deletions
tensorflow
third_party/mlir

View File

@ -1,4 +1,4 @@
// RUN: tf-opt %s -lhlo-legalize-to-gpu -split-input-file | FileCheck %s
// RUN: tf-opt %s -lhlo-legalize-to-gpu -split-input-file | FileCheck %s --dump-input=fail
func @reduce(%arg: memref<100x10xf32>,
%init: memref<f32>,
@ -12,6 +12,7 @@ func @reduce(%arg: memref<100x10xf32>,
: (memref<100x10xf32>, memref<f32>, memref<100xf32>) -> ()
return
}
// CHECK: #map0 = [[MAP:.*]]
// CHECK: func @reduce(%[[ARG0:.*]]: memref<100x10xf32>, %[[ARG1:.*]]: memref<f32>, %[[ARG2:.*]]: memref<100xf32>) {
// CHECK-DAG: %[[C100:.*]] = constant 100 : index
@ -25,7 +26,7 @@ func @reduce(%arg: memref<100x10xf32>,
// CHECK: loop.for %[[IDX1:.*]] = %[[LB]] to %[[UB]] step %[[STEP]] {
// CHECK: %[[LHS:.*]] = linalg.slice %[[RES]][%[[IDX]]] : memref<100xf32>, index, memref<f32, #map0>
// CHECK: %[[RHS:.*]] = linalg.slice %[[VAL]][%[[IDX]], %[[IDX1]]] : memref<100x10xf32>, index, index, memref<f32, #map0>
// CHECK: "xla_lhlo.add"(%[[LHS]], %[[RHS]], %[[LHS]]) : (memref<f32, #map0>, memref<f32, #map0>, memref<f32, #map0>) -> ()
// CHECK: "xla_lhlo.add"(%[[LHS]], %[[RHS]], %[[LHS]]) : (memref<f32, [[MAP]]>, memref<f32, [[MAP]]>, memref<f32, [[MAP]]>) -> ()
// CHECK: }
// CHECK: gpu.terminator
// CHECK: }

View File

@ -595,8 +595,8 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
)
# Check out LLVM and MLIR from llvm-project.
LLVM_COMMIT = "4801522432a4dd6aeebf2b461744891953f7fd1d"
LLVM_SHA256 = "15fb47f839ea8325dd7ad211cd459608fa3f96cf24dab68fb7342de06f29286d"
LLVM_COMMIT = "48acece15dcf63cb4fee043a4e66ddf3917a359a"
LLVM_SHA256 = "8c587db5316e4bfe2240a74be1a68afd5174ef7f24d2c6a8689bfd85c3578c1f"
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),

View File

@ -817,6 +817,14 @@ gentbl(
"-gen-llvmir-conversions",
"include/mlir/Dialect/LLVMIR/LLVMConversions.inc",
),
(
"-gen-enum-to-llvmir-conversions",
"include/mlir/Dialect/LLVMIR/LLVMConversionEnumsToLLVM.inc",
),
(
"-gen-enum-from-llvmir-conversions",
"include/mlir/Dialect/LLVMIR/LLVMConversionEnumsFromLLVM.inc",
),
],
tblgen = ":mlir-tblgen",
td_file = "include/mlir/Dialect/LLVMIR/LLVMOps.td",
@ -1599,6 +1607,7 @@ cc_library(
includes = ["include"],
deps = [
":IR",
":LLVMConversionIncGen",
":LLVMDialect",
":LLVMIRModuleTranslation",
":Support",