Merge pull request #3901 from GMNGeoffrey:main-to-google
PiperOrigin-RevId: 343112174
diff --git a/SUBMODULE_VERSIONS b/SUBMODULE_VERSIONS
index ec37869..f52f4af 100644
--- a/SUBMODULE_VERSIONS
+++ b/SUBMODULE_VERSIONS
@@ -5,8 +5,8 @@
a5d9d0f7d368054fd1691aedf1db4116efcc233e third_party/flatbuffers
4fb0ff7069bd88ee85902f4d0bb62794e5f6d021 third_party/flatcc
f2fb48c3b3d79a75a88a99fba6576b25d42ec528 third_party/googletest
-9c04d22c6068ec07d25e236b14e3362f3e5efc2c third_party/llvm-bazel
-499bce3abab8a362b9b4197944bd40b826c736c4 third_party/llvm-project
+7280663185ee9560211974b9d84cf56814e74107 third_party/llvm-bazel
+2be569870486a2068667f4625723c0a7409f4c97 third_party/llvm-project
55801f03f9cc69abfcf8b508a873f702c11b3b5f third_party/mlir-emitc
74d7261be17cf659d5930d4830609406bd7553e3 third_party/pffft
d8c7ee00a687ac369e62e2032514a93a9b413502 third_party/pybind11
@@ -14,7 +14,7 @@
a1390ed39ec77ecfb574bc6fcd5bfc5e3adbdea9 third_party/sdl2
685f86471e9d26b3eb7676695a2e2cefb4551ae9 third_party/spirv_cross
f8bf11a0253a32375c32cad92c841237b96696c0 third_party/spirv_headers
-448e080c752a1b5f54c422401b41e824b0274a91 third_party/tensorflow
+856698be1fe9c624310fbcc131c002b15b3d0b12 third_party/tensorflow
d7059eca6351546d1f51e248fc75e49dfeee709e third_party/tracy
9bd3f561bcee3f01d22912de10bb07ce4e23d378 third_party/vulkan_headers
3528e2aed3e8808f33e1e7d63eeb1560456a605a third_party/vulkan_memory_allocator
diff --git a/integrations/tensorflow/e2e/iree_e2e_cartesian_product_test_suite.bzl b/integrations/tensorflow/e2e/iree_e2e_cartesian_product_test_suite.bzl
index df6b021..7f49f83 100644
--- a/integrations/tensorflow/e2e/iree_e2e_cartesian_product_test_suite.bzl
+++ b/integrations/tensorflow/e2e/iree_e2e_cartesian_product_test_suite.bzl
@@ -169,7 +169,7 @@
"got `{}`".format(flags["target_backends"]))
driver = get_driver(flags["target_backends"])
if not driver:
- continue
+ continue
# Check if this is a failing configuration.
failing = flags in failing_flag_configurations
diff --git a/integrations/tensorflow/e2e/iree_e2e_test_suite.bzl b/integrations/tensorflow/e2e/iree_e2e_test_suite.bzl
index 2892e60..58be0f6 100644
--- a/integrations/tensorflow/e2e/iree_e2e_test_suite.bzl
+++ b/integrations/tensorflow/e2e/iree_e2e_test_suite.bzl
@@ -19,6 +19,7 @@
def get_driver(backend):
# TODO(#2175): Simplify this after backend names are standardized.
driver = backend.replace("iree_", "") # "iree_<driver>" --> "<driver>"
+
# TODO(#2673): enable LLVM AOT for these tests. JIT is deprecated.
if driver == "llvmjit":
driver = ""
@@ -72,7 +73,7 @@
driver = get_driver(backend)
if not driver:
- continue
+ continue
py_test_tags = ["driver={}".format(driver)]
if tags != None: # `is` is not supported.
py_test_tags += tags
diff --git a/iree/compiler/Conversion/LinalgToSPIRV/test/convert_to_spirv.mlir b/iree/compiler/Conversion/LinalgToSPIRV/test/convert_to_spirv.mlir
index 0be6dc4..ea292d3 100644
--- a/iree/compiler/Conversion/LinalgToSPIRV/test/convert_to_spirv.mlir
+++ b/iree/compiler/Conversion/LinalgToSPIRV/test/convert_to_spirv.mlir
@@ -6,7 +6,7 @@
func @push_constant() {
// CHECK: %[[INDEX_0:.+]] = spv.constant 0 : i32
// CHECK: %[[INDEX_1:.+]] = spv.constant 2 : i32
- // CHECK: %[[ADDR:.+]] = spv._address_of @__push_constant_var__ : !spv.ptr<!spv.struct<(!spv.array<5 x i32, stride=4> [0])>, PushConstant>
+ // CHECK: %[[ADDR:.+]] = spv.mlir.addressof @__push_constant_var__ : !spv.ptr<!spv.struct<(!spv.array<5 x i32, stride=4> [0])>, PushConstant>
// CHECK: %[[AC:.+]] = spv.AccessChain %[[ADDR]][%[[INDEX_0]], %[[INDEX_1]]] : !spv.ptr<!spv.struct<(!spv.array<5 x i32, stride=4> [0])>, PushConstant>
// CHECK: spv.Load "PushConstant" %[[AC]] : i32
%0 = hal.interface.load.constant offset = 2 : index
@@ -49,8 +49,8 @@
// CHECK: spv.func @resource_bindings_in_entry_func1()
func @resource_bindings_in_entry_func1() {
- // CHECK: spv._address_of @[[FUNC1_ARG:.+]]
- // CHECK: spv._address_of @[[FUNC1_RET:.+]]
+ // CHECK: spv.mlir.addressof @[[FUNC1_ARG:.+]]
+ // CHECK: spv.mlir.addressof @[[FUNC1_RET:.+]]
%0 = iree.placeholder for "interface buffer" {binding = @legacy_io::@arg0} : memref<4x4xf32>
%1 = iree.placeholder for "interface buffer" {binding = @legacy_io::@ret0} : memref<4xvector<4xf32>>
return
@@ -58,8 +58,8 @@
// CHECK: spv.func @resource_bindings_in_entry_func2()
func @resource_bindings_in_entry_func2() {
- // CHECK: spv._address_of @[[FUNC2_ARG]]
- // CHECK: spv._address_of @[[FUNC2_RET]]
+ // CHECK: spv.mlir.addressof @[[FUNC2_ARG]]
+ // CHECK: spv.mlir.addressof @[[FUNC2_RET]]
%0 = iree.placeholder for "interface buffer" {binding = @legacy_io::@arg0} : memref<4x4xf32>
%1 = iree.placeholder for "interface buffer" {binding = @legacy_io::@ret0} : memref<4x4xf32>
return
diff --git a/third_party/llvm-bazel b/third_party/llvm-bazel
index 9c04d22..7280663 160000
--- a/third_party/llvm-bazel
+++ b/third_party/llvm-bazel
@@ -1 +1 @@
-Subproject commit 9c04d22c6068ec07d25e236b14e3362f3e5efc2c
+Subproject commit 7280663185ee9560211974b9d84cf56814e74107
diff --git a/third_party/llvm-project b/third_party/llvm-project
index 499bce3..2be5698 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit 499bce3abab8a362b9b4197944bd40b826c736c4
+Subproject commit 2be569870486a2068667f4625723c0a7409f4c97
diff --git a/third_party/tensorflow b/third_party/tensorflow
index 448e080..856698b 160000
--- a/third_party/tensorflow
+++ b/third_party/tensorflow
@@ -1 +1 @@
-Subproject commit 448e080c752a1b5f54c422401b41e824b0274a91
+Subproject commit 856698be1fe9c624310fbcc131c002b15b3d0b12
