From 699f7866b6ffe3f1007885f46c87966aef18c420 Mon Sep 17 00:00:00 2001
From: Vivian <vivian.zhang@amd.com>
Date: Wed, 24 Jul 2024 13:11:55 -0700
Subject: [PATCH] Bump IREE (#587)

Co-authored-by: Nirvedh Meshram <nirvedh@gmail.com>
---
 build_tools/ci/build_test_cpp.sh                          | 1 -
 .../target/AMD-AIE/aievec/VectorToVectorConversions.cpp   | 8 ++++----
 .../AMD-AIE/iree-amd-aie/Transforms/test/CMakeLists.txt   | 2 ++
 sync_deps.py                                              | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build_tools/ci/build_test_cpp.sh b/build_tools/ci/build_test_cpp.sh
index 12524b00b..753bcd3cf 100644
--- a/build_tools/ci/build_test_cpp.sh
+++ b/build_tools/ci/build_test_cpp.sh
@@ -61,7 +61,6 @@ cmake -S "$iree_dir" -B "$build_dir" \
   -DCMAKE_INSTALL_PREFIX="$install_dir" \
   -DCMAKE_INSTALL_LIBDIR=lib \
   -DIREE_ENABLE_ASSERTIONS=ON \
-  -DIREE_DEFAULT_CPU_LLVM_TARGETS=host \
   -DIREE_BUILD_SAMPLES=OFF \
   -DIREE_BUILD_PYTHON_BINDINGS=OFF \
   -DIREE_BUILD_BINDINGS_TFLITE=OFF \
diff --git a/compiler/plugins/target/AMD-AIE/aievec/VectorToVectorConversions.cpp b/compiler/plugins/target/AMD-AIE/aievec/VectorToVectorConversions.cpp
index 3c5b3503d..5c82372b8 100644
--- a/compiler/plugins/target/AMD-AIE/aievec/VectorToVectorConversions.cpp
+++ b/compiler/plugins/target/AMD-AIE/aievec/VectorToVectorConversions.cpp
@@ -306,8 +306,8 @@ struct FlattenMultDimTransferReadPattern
 
     auto inBoundsArrayAttrOpt = adaptor.getInBounds();
     if (inBoundsArrayAttrOpt) {
-      SmallVector<bool> inBounds = llvm::to_vector(
-          inBoundsArrayAttrOpt.value().getAsValueRange<BoolAttr>());
+      SmallVector<bool> inBounds =
+          llvm::to_vector(inBoundsArrayAttrOpt.getAsValueRange<BoolAttr>());
       SmallVector<bool> newInBounds({false});
       newInBounds[0] = std::all_of(inBounds.begin(), inBounds.end(),
                                    [](bool v) { return v; });
@@ -364,8 +364,8 @@ struct FlattenMultDimTransferWritePattern
 
     auto inBoundsArrayAttrOpt = adaptor.getInBounds();
     if (inBoundsArrayAttrOpt) {
-      SmallVector<bool> inBounds = llvm::to_vector(
-          inBoundsArrayAttrOpt.value().getAsValueRange<BoolAttr>());
+      SmallVector<bool> inBounds =
+          llvm::to_vector(inBoundsArrayAttrOpt.getAsValueRange<BoolAttr>());
       SmallVector<bool> newInBounds({false});
       newInBounds[0] = std::all_of(inBounds.begin(), inBounds.end(),
                                    [](bool v) { return v; });
diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/CMakeLists.txt b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/CMakeLists.txt
index 32ed26d8e..45bcfa501 100644
--- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/CMakeLists.txt
+++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/CMakeLists.txt
@@ -71,4 +71,6 @@ iree_cc_test(
   DEPS
     gtest
     iree::target::amd-aie::Transforms
+    iree::compiler::Dialect::HAL::IR
+    iree::compiler::Dialect::HAL::IR::HALDialect
 )
diff --git a/sync_deps.py b/sync_deps.py
index 902a97d2d..0c1d4b6a5 100644
--- a/sync_deps.py
+++ b/sync_deps.py
@@ -7,7 +7,7 @@
 ### Update with: shark-workspace pin
 
 PINNED_VERSIONS = {
-  "iree": "dcc8a0d1cce384baf10dd9dd5870f148e02db288",
+  "iree": "d07a309d010981d7ecef6bc8bfc573c559395989",
 }
 
 ORIGINS = {