From b8370b8c3a9edfdd95f2bbd2cc303751649e54c7 Mon Sep 17 00:00:00 2001
From: Scott Todd <scott.todd0@gmail.com>
Date: Fri, 26 Jul 2024 17:32:21 -0700
Subject: [PATCH] Integrate LLVM at llvm/llvm-project@98c73d5df7 (#18016)

Advance to https://github.com/llvm/llvm-project/commit/98c73d5df7

* Still carrying a revert of
https://github.com/llvm/llvm-project/commit/fa0666876cdf11162af341911b99311a56be2274
* Still carrying a revert of
https://github.com/llvm/llvm-project/commit/bbd4af5da2b741672a8e6f625eb12ea5c2d6220f
* Still carrying a local patch of
https://github.com/llvm/llvm-project/commit/4f8050806e14d9f7791bfaa33681cacb1ac02549

---------

Signed-off-by: Benoit Jacob <jacob.benoit.1@gmail.com>
Co-authored-by: Benoit Jacob <jacob.benoit.1@gmail.com>
---
 .../compiler/Dialect/Stream/Transforms/test/refine_usage.mlir | 4 ++--
 third_party/llvm-project                                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/src/iree/compiler/Dialect/Stream/Transforms/test/refine_usage.mlir b/compiler/src/iree/compiler/Dialect/Stream/Transforms/test/refine_usage.mlir
index 32bd4d1c7082..0a708f979096 100644
--- a/compiler/src/iree/compiler/Dialect/Stream/Transforms/test/refine_usage.mlir
+++ b/compiler/src/iree/compiler/Dialect/Stream/Transforms/test/refine_usage.mlir
@@ -85,11 +85,11 @@ util.func private @propagateBlocks(%cond: i1, %size: index) -> (!stream.resource
   // CHECK-SAME:               ^bb2
   cf.cond_br %cond, ^bb1(%fill0, %bb1_1_new : !stream.resource<*>, !stream.resource<*>),
                  ^bb2(%fill0, %bb1_1_new : !stream.resource<*>, !stream.resource<*>)
-// CHECK: ^bb2
+// CHECK: ^bb2(%[[BB2_ARG_FILL0:.+]]: !stream.resource<{{.*}}>, %[[BB2_ARG_SELECT:.+]]: !stream.resource<{{.*}}>)
 ^bb2(%bb2_0: !stream.resource<*>, %bb2_1: !stream.resource<*>):
   // CHECK-NOT: stream.async.transfer
   %external_transfer = stream.async.transfer %bb2_1 : !stream.resource<*>{%size} -> !stream.resource<external>{%size}
-  // CHECK: util.return %[[FILL0]], %[[SELECT]] : !stream.resource<transient>, !stream.resource<external>
+  // CHECK: util.return %[[BB2_ARG_FILL0]], %[[BB2_ARG_SELECT]] : !stream.resource<transient>, !stream.resource<external>
   util.return %bb2_0, %external_transfer : !stream.resource<*>, !stream.resource<external>
 }
 
diff --git a/third_party/llvm-project b/third_party/llvm-project
index e162ef8b32b3..387ec9610eaa 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit e162ef8b32b35dea992d21a009c07050b57183fa
+Subproject commit 387ec9610eaa612811f666e7d7c2a912917afc9b