[mlir] Bazel fixes for 1b8b556 (#66929)

llvm · Sep 20, 2023 · f557986 · f557986
1 parent 3e4a8c2
commit f557986
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 22 deletions.
diff --git a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
@@ -4262,6 +4262,8 @@ cc_library(
         ":Support",
         ":TensorDialect",
         ":VectorInterfaces",
+        ":VectorAttributesIncGen",
+        ":VectorDialectIncGen",
         ":VectorOpsIncGen",
         ":ViewLikeInterface",
         "//llvm:Support",
@@ -10195,7 +10197,11 @@ td_library(
 
 td_library(
     name = "VectorOpsTdFiles",
-    srcs = ["include/mlir/Dialect/Vector/IR/VectorOps.td"],
+    srcs = [
+        "include/mlir/Dialect/Vector/IR/Vector.td",
+        "include/mlir/Dialect/Vector/IR/VectorAttributes.td",
+        "include/mlir/Dialect/Vector/IR/VectorOps.td",
+    ],
     includes = ["include"],
     deps = [
         ":ControlFlowInterfacesTdFiles",
@@ -10259,54 +10265,81 @@ gentbl_cc_library(
 )
 
 gentbl_cc_library(
-    name = "VectorOpsIncGen",
+    name = "VectorDialectIncGen",
     tbl_outs = [
-        (
-            ["-gen-op-decls"],
-            "include/mlir/Dialect/Vector/IR/VectorOps.h.inc",
-        ),
-        (
-            ["-gen-op-defs"],
-            "include/mlir/Dialect/Vector/IR/VectorOps.cpp.inc",
-        ),
         (
             [
                 "-gen-dialect-decls",
                 "-dialect=vector",
             ],
-            "include/mlir/Dialect/Vector/IR/VectorOpsDialect.h.inc",
+            "include/mlir/Dialect/Vector/IR/VectorDialect.h.inc",
         ),
         (
             [
                 "-gen-dialect-defs",
                 "-dialect=vector",
             ],
-            "include/mlir/Dialect/Vector/IR/VectorOpsDialect.cpp.inc",
+            "include/mlir/Dialect/Vector/IR/VectorDialect.cpp.inc",
+        ),
+        (
+            ["-gen-op-doc"],
+            "g3doc/Dialects/Vector/Vector.md",
         ),
+    ],
+    tblgen = ":mlir-tblgen",
+    td_file = "include/mlir/Dialect/Vector/IR/Vector.td",
+    deps = [
+        ":ArithOpsTdFiles", 
+        ":VectorOpsTdFiles"
+    ],
+)
+
+gentbl_cc_library(
+    name = "VectorOpsIncGen",
+    tbl_outs = [
+        (
+            ["-gen-op-decls"],
+            "include/mlir/Dialect/Vector/IR/VectorOps.h.inc",
+        ),
+        (
+            ["-gen-op-defs"],
+            "include/mlir/Dialect/Vector/IR/VectorOps.cpp.inc",
+        ),
+    ],
+    tblgen = ":mlir-tblgen",
+    td_file = "include/mlir/Dialect/Vector/IR/VectorOps.td",
+    deps = [
+        ":ArithOpsTdFiles", 
+        ":VectorOpsTdFiles"
+    ],
+)
+
+gentbl_cc_library(
+    name = "VectorAttributesIncGen",
+    tbl_outs = [
         (
             ["-gen-enum-decls"],
-            "include/mlir/Dialect/Vector/IR/VectorOpsEnums.h.inc",
+            "include/mlir/Dialect/Vector/IR/VectorEnums.h.inc",
         ),
         (
             ["-gen-enum-defs"],
-            "include/mlir/Dialect/Vector/IR/VectorOpsEnums.cpp.inc",
+            "include/mlir/Dialect/Vector/IR/VectorEnums.cpp.inc",
         ),
         (
             ["-gen-attrdef-decls"],
-            "include/mlir/Dialect/Vector/IR/VectorOpsAttrDefs.h.inc",
+            "include/mlir/Dialect/Vector/IR/VectorAttributes.h.inc",
         ),
         (
             ["-gen-attrdef-defs"],
-            "include/mlir/Dialect/Vector/IR/VectorOpsAttrDefs.cpp.inc",
-        ),
-        (
-            ["-gen-op-doc"],
-            "g3doc/Dialects/Vector/VectorOps.md",
+            "include/mlir/Dialect/Vector/IR/VectorAttributes.cpp.inc",
         ),
     ],
     tblgen = ":mlir-tblgen",
-    td_file = "include/mlir/Dialect/Vector/IR/VectorOps.td",
-    deps = [":VectorOpsTdFiles"],
+    td_file = "include/mlir/Dialect/Vector/IR/VectorAttributes.td",
+    deps = [
+        ":ArithOpsTdFiles", 
+        ":VectorOpsTdFiles"
+    ],
 )
 
 gentbl_cc_library(
@@ -10368,6 +10401,7 @@ cc_library(
     deps = [
         ":AMXDialect",
         ":AMXTransforms",
+        ":ArithAttrToLLVMConversion",
         ":ArithDialect",
         ":ArithUtils",
         ":ArmNeonDialect",

diff --git a/utils/bazel/llvm-project-overlay/mlir/python/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/python/BUILD.bazel
@@ -1349,6 +1349,7 @@ gentbl_filegroup(
     tblgen = "//mlir:mlir-tblgen",
     td_file = "mlir/dialects/VectorOps.td",
     deps = [
+        "//mlir:ArithOpsTdFiles",
         "//mlir:OpBaseTdFiles",
         "//mlir:VectorOpsTdFiles",
     ],