Merge google -> main #2638
d140ccb Integrate TF at tensorflow/tensorflow@e4a48da
9580b5f Merge pull request #2633 from rsuderman:main-to-google
648070a Synchronize submodules
e3b362f Integrate LLVM at llvm/llvm-project@99ad956
6e7481d Synchronize submodules
ed2638c Integrate TF at tensorflow/tensorflow@803ce80
8c3e501 Set executable bit on some files that were missing it
diff --git a/README.md b/README.md
index adea75b..b1fd668 100644
--- a/README.md
+++ b/README.md
@@ -37,8 +37,8 @@
working on enabling macOS support. For deployment, IREE aims to additionally
cover Android and iOS.
-Please see the [Getting Started](https://google.github.io/iree/get_started) pages
-on IREE's [documentation hub](https://google.github.io/iree) to configure,
+Please see the [Getting Started](https://google.github.io/iree/get_started)
+pages on IREE's [documentation hub](https://google.github.io/iree) to configure,
compile, and run IREE in your favorite development environment!
## Documentation and Talks
diff --git a/SUBMODULE_VERSIONS b/SUBMODULE_VERSIONS
index 8f4e2e6..b802f7d 100644
--- a/SUBMODULE_VERSIONS
+++ b/SUBMODULE_VERSIONS
@@ -4,7 +4,7 @@
a5d9d0f7d368054fd1691aedf1db4116efcc233e third_party/flatbuffers
4fb0ff7069bd88ee85902f4d0bb62794e5f6d021 third_party/flatcc
f2fb48c3b3d79a75a88a99fba6576b25d42ec528 third_party/googletest
-5623da56d07b2fa434825af0f3e8494afacf3c52 third_party/llvm-project
+99ad956fdaee5398fdcf46fa49cb433cf52dc461 third_party/llvm-project
17b12a4481daa150e2d1ea3ada086b551b856707 third_party/marl
67f3ccebee84f3488b46a8d3ac005178c52ff264 third_party/mlir-emitc
80d452484c5409444b0ec19383faa84bb7a4d351 third_party/pybind11
@@ -12,7 +12,7 @@
b73f111094da3e380a1774b56b15f16c90ae8e23 third_party/sdl2
f8bf11a0253a32375c32cad92c841237b96696c0 third_party/spirv_headers
57eb48aed36160c4876bc8310d9ca84d42ee9e2a third_party/swiftshader
-dca2939a9b1828780338ae1275c74ee141b1210e third_party/tensorflow
+e4a48da690fac3443825b535ec02cb31c5625337 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/llvm/BUILD.bazel b/build_tools/bazel/third_party_import/llvm-project/overlay/llvm/BUILD.bazel
index fb1eff3..befc20c 100644
--- a/build_tools/bazel/third_party_import/llvm-project/overlay/llvm/BUILD.bazel
+++ b/build_tools/bazel/third_party_import/llvm-project/overlay/llvm/BUILD.bazel
@@ -155,10 +155,10 @@
name = "InstCombineTableGen",
tbl_outs = [(
"-gen-searchable-tables",
- "lib/Transforms/InstCombine/InstCombineTables.inc",
+ "lib/Target/AMDGPU/InstCombineTables.inc",
)],
tblgen = ":llvm-tblgen",
- td_file = "lib/Transforms/InstCombine/InstCombineTables.td",
+ td_file = "lib/Target/AMDGPU/InstCombineTables.td",
td_srcs = glob([
"include/llvm/CodeGen/*.td",
"include/llvm/IR/Intrinsics*.td",
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 12f73c5..ae413a1 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
@@ -500,6 +500,7 @@
deps = [
":Affine",
":IR",
+ ":Support",
"@llvm-project//llvm:Support",
],
)
diff --git a/build_tools/kokoro/gcp_ubuntu/docker_common.sh b/build_tools/kokoro/gcp_ubuntu/docker_common.sh
old mode 100755
new mode 100644
diff --git a/docs/developing_iree/contributor_tips.md b/docs/developing_iree/contributor_tips.md
index 7f98d9d..03ddffc 100644
--- a/docs/developing_iree/contributor_tips.md
+++ b/docs/developing_iree/contributor_tips.md
@@ -2,11 +2,11 @@
This is an opinionated guide documenting workflows that some members of the team
have found useful. It is focused on meta-tooling, not on IREE code specifically
-(you will find the latter in the [Developer Overview](developer_overview.md))
-It is certainly possible to use workflows other than these, but some common
-tasks, especially for maintainers will likely be made easier if you use these
-flows. It assumes a basic knowledge of `git` and GitHub and suggests some
-specific ways of using it.
+(you will find the latter in the [Developer Overview](developer_overview.md)) It
+is certainly possible to use workflows other than these, but some common tasks,
+especially for maintainers will likely be made easier if you use these flows. It
+assumes a basic knowledge of `git` and GitHub and suggests some specific ways of
+using it.
## Git Structure
diff --git a/docs/get_started/getting_started_macos_bazel.md b/docs/get_started/getting_started_macos_bazel.md
index cc544dc..3fc3dcb 100644
--- a/docs/get_started/getting_started_macos_bazel.md
+++ b/docs/get_started/getting_started_macos_bazel.md
@@ -126,8 +126,8 @@
### Further Reading
* For an introduction to IREE's project structure and developer tools, see
- [Developer Overview](../developing_iree/developer_overview.md) <!-- TODO: Link to macOS
- versions of these guides once they are developed.
+ [Developer Overview](../developing_iree/developer_overview.md) <!-- TODO:
+ Link to macOS versions of these guides once they are developed.
* To target GPUs using Vulkan, see
[Getting Started on Linux with Vulkan](getting_started_linux_vulkan.md)
* To use IREE's Python bindings, see
diff --git a/docs/get_started/getting_started_macos_cmake.md b/docs/get_started/getting_started_macos_cmake.md
index 411bda6..7b916cd 100644
--- a/docs/get_started/getting_started_macos_cmake.md
+++ b/docs/get_started/getting_started_macos_cmake.md
@@ -110,8 +110,8 @@
### Further Reading
* For an introduction to IREE's project structure and developer tools, see
- [Developer Overview](../developing_iree/developer_overview.md) <!-- TODO: Link to macOS
- versions of these guides once they are developed.
+ [Developer Overview](../developing_iree/developer_overview.md) <!-- TODO:
+ Link to macOS versions of these guides once they are developed.
* To target GPUs using Vulkan, see
[Getting Started on Linux with Vulkan](getting_started_linux_vulkan.md)
* To use IREE's Python bindings, see
diff --git a/scripts/prepare_doc_publication.py b/scripts/prepare_doc_publication.py
index ce5ecbc..cc396dc 100755
--- a/scripts/prepare_doc_publication.py
+++ b/scripts/prepare_doc_publication.py
@@ -48,7 +48,6 @@
# header. This dictionary will overrule that default behavior.
DOC_TITLE_DICT = {
'index.md': 'Home',
-
'getting_started_linux_bazel.md': 'Linux with Bazel',
'getting_started_linux_cmake.md': 'Linux with CMake',
'getting_started_linux_vulkan.md': 'Linux with Vulkan',
@@ -60,7 +59,6 @@
'getting_started_android_cmake.md': 'Android with CMake',
'generic_vulkan_env_setup.md': 'Generic Vulkan Setup',
'getting_started_python.md': 'Python',
-
'milestones.md': 'Short-term Focus Areas',
'design_roadmap.md': 'Long-term Design Roadmap',
}
diff --git a/third_party/llvm-project b/third_party/llvm-project
index 5623da5..99ad956 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit 5623da56d07b2fa434825af0f3e8494afacf3c52
+Subproject commit 99ad956fdaee5398fdcf46fa49cb433cf52dc461
diff --git a/third_party/tensorflow b/third_party/tensorflow
index dca2939..e4a48da 160000
--- a/third_party/tensorflow
+++ b/third_party/tensorflow
@@ -1 +1 @@
-Subproject commit dca2939a9b1828780338ae1275c74ee141b1210e
+Subproject commit e4a48da690fac3443825b535ec02cb31c5625337
