Integrate LLVM at llvm/llvm-project@5ffd940ac02a
Updates LLVM usage to match
[5ffd940ac02a](https://github.com/llvm/llvm-project/commit/5ffd940ac02a)
PiperOrigin-RevId: 329606435
Change-Id: I905f344b33368b20133612791f543ff70a0a649a
diff --git a/tensorflow/compiler/mlir/python/mlir_wrapper/BUILD b/tensorflow/compiler/mlir/python/mlir_wrapper/BUILD
index 5e21ddd..31bce8d 100644
--- a/tensorflow/compiler/mlir/python/mlir_wrapper/BUILD
+++ b/tensorflow/compiler/mlir/python/mlir_wrapper/BUILD
@@ -21,6 +21,7 @@
"//tensorflow/python:pybind11_lib",
"//tensorflow/python:pybind11_status",
"@llvm-project//llvm:Support",
+ "@llvm-project//llvm:filecheck-lib",
"@llvm-project//mlir:IR",
"@llvm-project//mlir:Parser",
"@llvm-project//mlir:StandardOps",
@@ -37,6 +38,7 @@
"//tensorflow/python:pybind11_lib",
"//tensorflow/python:pybind11_status",
"@llvm-project//llvm:Support",
+ "@llvm-project//llvm:filecheck-lib",
"@pybind11",
],
)
diff --git a/tensorflow/compiler/mlir/python/mlir_wrapper/basic_classes.cc b/tensorflow/compiler/mlir/python/mlir_wrapper/basic_classes.cc
index 25adb44..5ae6388 100644
--- a/tensorflow/compiler/mlir/python/mlir_wrapper/basic_classes.cc
+++ b/tensorflow/compiler/mlir/python/mlir_wrapper/basic_classes.cc
@@ -13,7 +13,7 @@
limitations under the License.
==============================================================================*/
-#include "llvm/Support/FileCheck.h"
+#include "llvm/FileCheck/FileCheck.h"
#include "mlir/IR/Block.h" // from @llvm-project
#include "mlir/IR/Location.h" // from @llvm-project
#include "mlir/IR/MLIRContext.h" // from @llvm-project
diff --git a/tensorflow/compiler/mlir/python/mlir_wrapper/filecheck_wrapper.cc b/tensorflow/compiler/mlir/python/mlir_wrapper/filecheck_wrapper.cc
index 8a84185..051952e 100644
--- a/tensorflow/compiler/mlir/python/mlir_wrapper/filecheck_wrapper.cc
+++ b/tensorflow/compiler/mlir/python/mlir_wrapper/filecheck_wrapper.cc
@@ -13,7 +13,7 @@
limitations under the License.
==============================================================================*/
-#include "llvm/Support/FileCheck.h"
+#include "llvm/FileCheck/FileCheck.h"
#include "llvm/Support/SourceMgr.h"
#include "pybind11/pybind11.h"
#include "pybind11/stl.h"
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index d43f06d..40c049e 100755
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -722,8 +722,8 @@
)
# Check out LLVM and MLIR from llvm-project.
- LLVM_COMMIT = "ffd0b31c7cbaa8322d2963afe6ace4e3a0889ddb"
- LLVM_SHA256 = "a0ee81e91362821047e321788033f7b12d794c92067a8ea2b7cfa2a8faefd443"
+ LLVM_COMMIT = "5ffd940ac02a8e000691c45a6dc4f69d0198e675"
+ LLVM_SHA256 = "fb0e839b6ece41bcd028683ce7e4e063b159cd85cd42502141a4391e02cefe36"
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),
diff --git a/third_party/llvm/llvm.autogenerated.BUILD b/third_party/llvm/llvm.autogenerated.BUILD
index a63c38c..2dee203 100644
--- a/third_party/llvm/llvm.autogenerated.BUILD
+++ b/third_party/llvm/llvm.autogenerated.BUILD
@@ -419,6 +419,19 @@
],
)
+cc_library(
+ name = "filecheck-lib",
+ srcs = glob([
+ "lib/FileCheck/*.cpp",
+ "lib/FileCheck/*.h",
+ ]),
+ hdrs = glob([
+ "include/llvm/FileCheck/*.h",
+ ]),
+ includes = ["include"],
+ deps = [":Support"],
+)
+
cc_binary(
name = "FileCheck",
testonly = 1,
@@ -429,7 +442,10 @@
copts = llvm_copts,
linkopts = llvm_linkopts,
stamp = 0,
- deps = [":Support"],
+ deps = [
+ ":Support",
+ ":filecheck-lib",
+ ],
)
llvm_target_list = [
