From bd5b853eaf2affb232099f65e7518a6526a4ce5e Mon Sep 17 00:00:00 2001
From: Jordan Rupprecht <rupprecht@google.com>
Date: Wed, 8 Oct 2025 12:42:09 -0700
Subject: [PATCH 1/2] [bazel][mlir][acc] Port #162328: add ArithDialect dep to
 OpenACC

---
 utils/bazel/llvm-project-overlay/mlir/BUILD.bazel | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
index 9a884cc7f5637..bf2e4ef12e1de 100644
--- a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
@@ -9995,6 +9995,7 @@ cc_library(
         "include/mlir/Dialect/OpenACCMPCommon/Interfaces/AtomicInterfaces.h",
     ],
     deps = [
+        ":ArithDialect",
         ":AtomicInterfaces",
         ":AtomicInterfacesIncGen",
         ":BytecodeOpInterface",

From 1a1e96ec58846a3e5553b80454ad834ab5d6823e Mon Sep 17 00:00:00 2001
From: Jordan Rupprecht <rupprecht@google.com>
Date: Wed, 8 Oct 2025 12:43:56 -0700
Subject: [PATCH 2/2] Fixes for mlir-opt tool

---
 .../bazel/llvm-project-overlay/mlir/BUILD.bazel  |  1 +
 .../llvm-project-overlay/mlir/test/BUILD.bazel   | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
index bf2e4ef12e1de..6c7679b5ea972 100644
--- a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
@@ -9436,6 +9436,7 @@ cc_binary(
         "//mlir/test:TestMemRef",
         "//mlir/test:TestMemRefToLLVMWithTransforms",
         "//mlir/test:TestNVGPU",
+        "//mlir/test:TestOpenACC",
         "//mlir/test:TestPDLL",
         "//mlir/test:TestPass",
         "//mlir/test:TestReducer",
diff --git a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
index 4064c2f0c65d2..56e4e70f18f26 100644
--- a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
@@ -953,6 +953,22 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "TestOpenACC",
+    srcs = glob(["lib/Dialect/OpenACC/*.cpp"]),
+    includes = ["lib/Dialect/Test"],
+    deps = [
+        "//llvm:Support",
+        "//mlir:ArithDialect",
+        "//mlir:FuncDialect",
+        "//mlir:IR",
+        "//mlir:MemRefDialect",
+        "//mlir:OpenACCDialect",
+        "//mlir:Pass",
+        "//mlir:Support",
+    ],
+)
+
 cc_library(
     name = "TestSCF",
     srcs = glob(["lib/Dialect/SCF/*.cpp"]),