From 1894af3bd276183a9088532cfdc813f7d1fbe95c Mon Sep 17 00:00:00 2001
From: Stanley Winata <68087699+raikonenfnu@users.noreply.github.com>
Date: Tue, 17 Dec 2024 18:30:47 +0700
Subject: [PATCH] Update LLVM to llvm/llvm-project@dd6f6a0 (#19489)

Update LLVM to https://github.com/llvm/llvm-project/commit/3f136f7
(https://github.com/iree-org/iree/pull/19479)
Carrying the following reverts

- https://github.com/llvm/llvm-project/pull/116470
- https://github.com/llvm/llvm-project/pull/117424
- https://github.com/llvm/llvm-project/pull/119671
- https://github.com/llvm/llvm-project/pull/119970

First two are carry over from previous-previous integrate. It is being
fixed in
https://github.com/iree-org/iree/pull/19451 . The last one is a from the
previous integrate.
The last one is a new error being tracked in
https://github.com/iree-org/iree/issues/19498

---------

Signed-off-by: Stanley Winata <stanley.winata@amd.com>
---
 compiler/src/iree/compiler/Codegen/Common/GPU/BUILD.bazel       | 1 +
 compiler/src/iree/compiler/Codegen/Common/GPU/CMakeLists.txt    | 1 +
 .../Codegen/Common/GPU/GPUNestedLayoutDistributionPatterns.cpp  | 2 +-
 third_party/llvm-project                                        | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/compiler/src/iree/compiler/Codegen/Common/GPU/BUILD.bazel b/compiler/src/iree/compiler/Codegen/Common/GPU/BUILD.bazel
index 66177778f683..f4f8c414936e 100644
--- a/compiler/src/iree/compiler/Codegen/Common/GPU/BUILD.bazel
+++ b/compiler/src/iree/compiler/Codegen/Common/GPU/BUILD.bazel
@@ -125,6 +125,7 @@ iree_compiler_cc_library(
         "@llvm-project//mlir:GPUDialect",
         "@llvm-project//mlir:GPUTransformOps",
         "@llvm-project//mlir:GPUTransforms",
+        "@llvm-project//mlir:GPUUtils",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:LLVMCommonConversion",
         "@llvm-project//mlir:LinalgDialect",
diff --git a/compiler/src/iree/compiler/Codegen/Common/GPU/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/Common/GPU/CMakeLists.txt
index 2f065df2bb52..4c1422e11ba5 100644
--- a/compiler/src/iree/compiler/Codegen/Common/GPU/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/Common/GPU/CMakeLists.txt
@@ -103,6 +103,7 @@ iree_cc_library(
     MLIRGPUDialect
     MLIRGPUTransformOps
     MLIRGPUTransforms
+    MLIRGPUUtils
     MLIRIR
     MLIRLLVMCommonConversion
     MLIRLinalgDialect
diff --git a/compiler/src/iree/compiler/Codegen/Common/GPU/GPUNestedLayoutDistributionPatterns.cpp b/compiler/src/iree/compiler/Codegen/Common/GPU/GPUNestedLayoutDistributionPatterns.cpp
index e2d773f13b37..0b4d812def17 100644
--- a/compiler/src/iree/compiler/Codegen/Common/GPU/GPUNestedLayoutDistributionPatterns.cpp
+++ b/compiler/src/iree/compiler/Codegen/Common/GPU/GPUNestedLayoutDistributionPatterns.cpp
@@ -17,7 +17,7 @@
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/Affine/Utils.h"
 #include "mlir/Dialect/Arith/IR/Arith.h"
-#include "mlir/Dialect/GPU/Transforms/Utils.h"
+#include "mlir/Dialect/GPU/Utils/GPUUtils.h"
 #include "mlir/Dialect/Utils/IndexingUtils.h"
 #include "mlir/Dialect/Vector/IR/VectorOps.h"
 #include "mlir/IR/AffineExpr.h"
diff --git a/third_party/llvm-project b/third_party/llvm-project
index 1cfbe1f2e035..ccdbcf948ba2 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit 1cfbe1f2e035fce940fef0dd6a0568a05d989d11
+Subproject commit ccdbcf948ba24cfc80860e9a0256eb343f3373da