Merge google -> main (#2468)
* defa1d92 Synchronize submodules
* a626b68e Update TF Submodule and LLVM BUILD files.
* ae90fc5d Synchronize submodules
* a29d6a97 Integrate LLVM at https://github.com/llvm/llvm-project/commit/c2a61ef38850
* 07c9af56 Merge pull request #2462 from GMNGeoffrey:main-to-google
diff --git a/SUBMODULE_VERSIONS b/SUBMODULE_VERSIONS
index e60139e..d1217f6 100644
--- a/SUBMODULE_VERSIONS
+++ b/SUBMODULE_VERSIONS
@@ -3,7 +3,7 @@
4c13807b7d43ff0946b7ffea0ae3aee9e611d778 third_party/dear_imgui
a5d9d0f7d368054fd1691aedf1db4116efcc233e third_party/flatbuffers
f2fb48c3b3d79a75a88a99fba6576b25d42ec528 third_party/googletest
-305b500eaf8c3b6a319e4571b4279a4694645d0d third_party/llvm-project
+c2a61ef3885019c5e0444d8789de63e1ce4d5003 third_party/llvm-project
17b12a4481daa150e2d1ea3ada086b551b856707 third_party/marl
67f3ccebee84f3488b46a8d3ac005178c52ff264 third_party/mlir-emitc
80d452484c5409444b0ec19383faa84bb7a4d351 third_party/pybind11
@@ -11,7 +11,7 @@
b73f111094da3e380a1774b56b15f16c90ae8e23 third_party/sdl2
f8bf11a0253a32375c32cad92c841237b96696c0 third_party/spirv_headers
57eb48aed36160c4876bc8310d9ca84d42ee9e2a third_party/swiftshader
-a61a816f86bb35d1d3a58f1c9a236be5e14c55c7 third_party/tensorflow
+585d8410613ad0d0551193e0ae1396864afdb69e third_party/tensorflow
864d86e8b6d21449474db5e9313dbff90aa9c24f third_party/tracy
9bd3f561bcee3f01d22912de10bb07ce4e23d378 third_party/vulkan_headers
909f36b714c9239ee0b112a321220213a474ba53 third_party/vulkan_memory_allocator
diff --git a/build_tools/bazel/third_party_import/llvm-project/overlay/mlir/BUILD.bazel b/build_tools/bazel/third_party_import/llvm-project/overlay/mlir/BUILD.bazel
index df0a2cc..5627067 100644
--- a/build_tools/bazel/third_party_import/llvm-project/overlay/mlir/BUILD.bazel
+++ b/build_tools/bazel/third_party_import/llvm-project/overlay/mlir/BUILD.bazel
@@ -157,6 +157,7 @@
name = "OpBaseTdFiles",
srcs = [
"include/mlir/Dialect/Affine/IR/AffineOpsBase.td",
+ "include/mlir/Dialect/StandardOps/IR/StandardOpsBase.td",
"include/mlir/IR/OpBase.td",
],
)
@@ -178,6 +179,7 @@
"include/mlir/Dialect/Affine/IR/AffineMemoryOpInterfaces.td",
"include/mlir/Dialect/Affine/IR/AffineOps.td",
"include/mlir/Dialect/Affine/IR/AffineOpsBase.td",
+ "include/mlir/Interfaces/ControlFlowInterfaces.td",
"include/mlir/Interfaces/LoopLikeInterface.td",
"include/mlir/Interfaces/SideEffectInterfaces.td",
":OpBaseTdFiles",
@@ -3360,6 +3362,19 @@
"-gen-op-defs",
"include/mlir/Dialect/Linalg/IR/LinalgStructuredOps.cpp.inc",
),
+ ],
+ tblgen = ":mlir-tblgen",
+ td_file = "include/mlir/Dialect/Linalg/IR/LinalgStructuredOps.td",
+ td_srcs = [
+ ":LinalgStructuredOpsTdFiles",
+ "include/mlir/Dialect/Linalg/IR/LinalgNamedStructuredOps.td",
+ ],
+)
+
+gentbl(
+ name = "LinalgStructuredInterfacesIncGen",
+ strip_include_prefix = "include",
+ tbl_outs = [
(
"-gen-op-interface-decls",
"include/mlir/Dialect/Linalg/IR/LinalgStructuredOpsInterfaces.h.inc",
@@ -3370,10 +3385,9 @@
),
],
tblgen = ":mlir-tblgen",
- td_file = "include/mlir/Dialect/Linalg/IR/LinalgStructuredOps.td",
+ td_file = "include/mlir/Dialect/Linalg/IR/LinalgStructuredOpsInterface.td",
td_srcs = [
":LinalgStructuredOpsTdFiles",
- "include/mlir/Dialect/Linalg/IR/LinalgNamedStructuredOps.td",
],
)
@@ -3503,6 +3517,7 @@
":IR",
":LinalgNamedStructuredOpsIncGen",
":LinalgOpsIncGen",
+ ":LinalgStructuredInterfacesIncGen",
":LinalgStructuredOpsIncGen",
":Parser",
":SideEffectInterfaces",
diff --git a/third_party/llvm-project b/third_party/llvm-project
index 305b500..c2a61ef 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit 305b500eaf8c3b6a319e4571b4279a4694645d0d
+Subproject commit c2a61ef3885019c5e0444d8789de63e1ce4d5003
diff --git a/third_party/tensorflow b/third_party/tensorflow
index a61a816..585d841 160000
--- a/third_party/tensorflow
+++ b/third_party/tensorflow
@@ -1 +1 @@
-Subproject commit a61a816f86bb35d1d3a58f1c9a236be5e14c55c7
+Subproject commit 585d8410613ad0d0551193e0ae1396864afdb69e
