Merge google -> main (#5663)
* a5ee08a Synchronize submodules with LLVM at llvm/llvm-project@bf9eef9
* 7b11a4b Merge main -> google
* 749624a Integrate LLVM at llvm/llvm-project@bf9eef9
* 8f210c1 Disable imagenet tests failing since the switch to linalg-on-tensors
* 9be63b1 Synchronize submodules with LLVM at llvm/llvm-project@4b13b75
* 17de98f Integrate LLVM at llvm/llvm-project@4b13b75
diff --git a/SUBMODULE_VERSIONS.txt b/SUBMODULE_VERSIONS.txt
index 84c2bd6..8bf2e9c 100644
--- a/SUBMODULE_VERSIONS.txt
+++ b/SUBMODULE_VERSIONS.txt
@@ -4,16 +4,16 @@
4fb0ff7069bd88ee85902f4d0bb62794e5f6d021 third_party/flatcc
b1fbd33c06cdb0024c67733c6fdec2009d17b384 third_party/googletest
88b845dee001723c4a0db1fe5477de735b6d3bb0 third_party/liburing
-b5351f93142f95973a37884cdf90531dc4419a39 third_party/llvm-bazel
-f8de9aaef2f472ad7572748582444083d31d5a95 third_party/llvm-project
+24e073a2b2f5b60d0a3a2a8ad007de47c9430863 third_party/llvm-bazel
+bf9eef92b6cd71d262ac12ce6c4919271bd6c910 third_party/llvm-project
679d7183b657a24f48d16de1fcefb20d7cd1f6a2 third_party/mlir-emitc
-a5de7719d7cd7f5aec81873deb601778d74b7129 third_party/mlir-hlo
+9e9434a0ea92c9ff1519a0ac97fba86282d6fde4 third_party/mlir-hlo
2b2bd45bbf9be04fd22ece5cc1f54679202e9257 third_party/pffft
d8c7ee00a687ac369e62e2032514a93a9b413502 third_party/pybind11
2887692065c38ef6617f423feafc6b69dd0a0681 third_party/ruy
685f86471e9d26b3eb7676695a2e2cefb4551ae9 third_party/spirv_cross
f8bf11a0253a32375c32cad92c841237b96696c0 third_party/spirv_headers
-9d76720cb929fe6ba1b6822b077fac80ef33aea3 third_party/tensorflow
+b954ab5ffae2128c8fec03340a4d7ab6671dbf1b third_party/tensorflow
e35d02186d00eff26ec6c698331a0767a28a51b0 third_party/tracy
9bd3f561bcee3f01d22912de10bb07ce4e23d378 third_party/vulkan_headers
3528e2aed3e8808f33e1e7d63eeb1560456a605a third_party/vulkan_memory_allocator
diff --git a/integrations/tensorflow/e2e/keras/applications/BUILD b/integrations/tensorflow/e2e/keras/applications/BUILD
index 345e061..73266a6 100644
--- a/integrations/tensorflow/e2e/keras/applications/BUILD
+++ b/integrations/tensorflow/e2e/keras/applications/BUILD
@@ -234,6 +234,22 @@
iree_e2e_cartesian_product_test_suite(
name = "imagenet_non_hermetic_tests",
size = "enormous",
+ failing_configurations = [
+ # TODO(b/186579218): Fix linalg-on-tensors failures in these.
+ {
+ "target_backends": [
+ "iree_llvmaot",
+ "iree_vulkan",
+ ],
+ "model": [
+ "InceptionResNetV2",
+ "InceptionV3",
+ "NASNetLarge",
+ "NASNetMobile",
+ "ResNet152V2",
+ ],
+ },
+ ],
matrix = {
"src": "applications_test.py",
"reference_backend": "tf",
diff --git a/integrations/tensorflow/e2e/keras/applications/CMakeLists.txt b/integrations/tensorflow/e2e/keras/applications/CMakeLists.txt
index 67d8166..a2b9cf5 100644
--- a/integrations/tensorflow/e2e/keras/applications/CMakeLists.txt
+++ b/integrations/tensorflow/e2e/keras/applications/CMakeLists.txt
@@ -99,6 +99,17 @@
"True"
"DenseNet121;DenseNet169;DenseNet201;EfficientNetB0;EfficientNetB1;EfficientNetB2;EfficientNetB3;EfficientNetB4;EfficientNetB5;EfficientNetB6;EfficientNetB7;InceptionResNetV2;InceptionV3;MobileNet;MobileNetV2;MobileNetV3Large;MobileNetV3Small;NASNetLarge;NASNetMobile;ResNet101;ResNet101V2;ResNet152;ResNet152V2;ResNet50;ResNet50V2;VGG16;VGG19;Xception"
"tf;tflite;iree_vmla;iree_llvmaot;iree_vulkan"
+ FAILING_CONFIGURATIONS
+ ",,,,InceptionResNetV2,iree_llvmaot"
+ ",,,,InceptionV3,iree_llvmaot"
+ ",,,,NASNetLarge,iree_llvmaot"
+ ",,,,NASNetMobile,iree_llvmaot"
+ ",,,,ResNet152V2,iree_llvmaot"
+ ",,,,InceptionResNetV2,iree_vulkan"
+ ",,,,InceptionV3,iree_vulkan"
+ ",,,,NASNetLarge,iree_vulkan"
+ ",,,,NASNetMobile,iree_vulkan"
+ ",,,,ResNet152V2,iree_vulkan"
LABELS
"external"
"guitar"
diff --git a/third_party/llvm-bazel b/third_party/llvm-bazel
index b5351f9..24e073a 160000
--- a/third_party/llvm-bazel
+++ b/third_party/llvm-bazel
@@ -1 +1 @@
-Subproject commit b5351f93142f95973a37884cdf90531dc4419a39
+Subproject commit 24e073a2b2f5b60d0a3a2a8ad007de47c9430863
diff --git a/third_party/llvm-project b/third_party/llvm-project
index f8de9aa..bf9eef9 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit f8de9aaef2f472ad7572748582444083d31d5a95
+Subproject commit bf9eef92b6cd71d262ac12ce6c4919271bd6c910
diff --git a/third_party/mlir-hlo b/third_party/mlir-hlo
index a5de771..9e9434a 160000
--- a/third_party/mlir-hlo
+++ b/third_party/mlir-hlo
@@ -1 +1 @@
-Subproject commit a5de7719d7cd7f5aec81873deb601778d74b7129
+Subproject commit 9e9434a0ea92c9ff1519a0ac97fba86282d6fde4
diff --git a/third_party/tensorflow b/third_party/tensorflow
index 9d76720..b954ab5 160000
--- a/third_party/tensorflow
+++ b/third_party/tensorflow
@@ -1 +1 @@
-Subproject commit 9d76720cb929fe6ba1b6822b077fac80ef33aea3
+Subproject commit b954ab5ffae2128c8fec03340a4d7ab6671dbf1b