[bazel] NFC: Change tbl_outs to dicts.

There were some `gentbl_cc_library` targets left to convert.

Allow `gentbl_filegroup` rule to take a dict as well and change all targets.

Move lld/BUILD.bazel from //llvm:tblgen.bzl to //mlir:tblgen.bzl, delete the former.

This makes the BUILD files shorter and more readable.

Author: chsigg

utils/bazel/llvm-project-overlay/clang/BUILD.bazel

@@ -43,7 +43,7 @@ cc_binary(
 
 gentbl_cc_library(
     name = "diagnostic_defs_gen",
-    tbl_outs = [out for c in [
+    tbl_outs = dict([out for c in [
         "AST",
         "Analysis",
         "Comment",
@@ -59,47 +59,47 @@ gentbl_cc_library(
         "Serialization",
     ] for out in [
         (
+            "include/clang/Basic/Diagnostic%sKinds.inc" % c,
             [
                 "-gen-clang-diags-defs",
                 "-clang-component=%s" % c,
             ],
-            "include/clang/Basic/Diagnostic%sKinds.inc" % c,
         ),
         (
+            "include/clang/Basic/Diagnostic%sEnums.inc" % c,
             [
                 "-gen-clang-diags-enums",
                 "-clang-component=%s" % c,
             ],
-            "include/clang/Basic/Diagnostic%sEnums.inc" % c,
         ),
         (
+            "include/clang/Basic/Diagnostic%sCompatIDs.inc" % c,
             [
                 "-gen-clang-diags-compat-ids",
                 "-clang-component=%s" % c,
             ],
-            "include/clang/Basic/Diagnostic%sCompatIDs.inc" % c,
         ),
         (
+            "include/clang/Basic/Diagnostic%sInterface.inc" % c,
             [
                 "-gen-clang-diags-iface",
                 "-clang-component=%s" % c,
             ],
-            "include/clang/Basic/Diagnostic%sInterface.inc" % c,
         ),
     ]] + [
         (
-            ["-gen-clang-diag-groups"],
             "include/clang/Basic/DiagnosticGroups.inc",
+            ["-gen-clang-diag-groups"],
         ),
         (
-            ["-gen-clang-diags-index-name"],
             "include/clang/Basic/DiagnosticIndexName.inc",
+            ["-gen-clang-diags-index-name"],
         ),
         (
-            ["-gen-clang-diags-compat-ids"],
             "include/clang/Basic/DiagnosticAllCompatIDs.inc",
+            ["-gen-clang-diags-compat-ids"],
         ),
-    ],
+    ]),
     tblgen = ":clang-tblgen",
     td_file = "include/clang/Basic/Diagnostic.td",
     deps = [":BasicTdFiles"],

utils/bazel/llvm-project-overlay/lld/BUILD.bazel

@@ -8,7 +8,7 @@ load(
 )
 load("//llvm:binary_alias.bzl", "binary_alias")
 load("//llvm:driver.bzl", "llvm_driver_cc_binary")
-load("//llvm:tblgen.bzl", "gentbl")
+load("//mlir:tblgen.bzl", "gentbl_cc_library")
 
 package(
     default_visibility = ["//visibility:public"],
@@ -59,19 +59,14 @@ cc_library(
     ],
 )
 
-gentbl(
+gentbl_cc_library(
     name = "elf_options_inc_gen",
     # See https://github.com/bazelbuild/bazel/issues/13803
     strip_include_prefix = "ELF",
-    tbl_outs = [(
-        "-gen-opt-parser-defs",
-        "ELF/Options.inc",
-    )],
+    tbl_outs = {"ELF/Options.inc": ["-gen-opt-parser-defs"]},
     tblgen = "//llvm:llvm-tblgen",
     td_file = "ELF/Options.td",
-    td_srcs = [
-        "//llvm:include/llvm/Option/OptParser.td",
-    ],
+    deps = ["//llvm:OptParserTdFiles"],
 )
 
 cc_library(
@@ -116,19 +111,14 @@ cc_library(
     ],
 )
 
-gentbl(
+gentbl_cc_library(
     name = "coff_options_inc_gen",
     # See https://github.com/bazelbuild/bazel/issues/13803
     strip_include_prefix = "COFF",
-    tbl_outs = [(
-        "-gen-opt-parser-defs",
-        "COFF/Options.inc",
-    )],
+    tbl_outs = {"COFF/Options.inc": ["-gen-opt-parser-defs"]},
     tblgen = "//llvm:llvm-tblgen",
     td_file = "COFF/Options.td",
-    td_srcs = [
-        "//llvm:include/llvm/Option/OptParser.td",
-    ],
+    deps = ["//llvm:OptParserTdFiles"],
 )
 
 cc_library(
@@ -172,17 +162,12 @@ cc_library(
     ],
 )
 
-gentbl(
+gentbl_cc_library(
     name = "mingw_options_inc_gen",
-    tbl_outs = [(
-        "-gen-opt-parser-defs",
-        "MinGW/Options.inc",
-    )],
+    tbl_outs = {"MinGW/Options.inc": ["-gen-opt-parser-defs"]},
     tblgen = "//llvm:llvm-tblgen",
     td_file = "MinGW/Options.td",
-    td_srcs = [
-        "//llvm:include/llvm/Option/OptParser.td",
-    ],
+    deps = ["//llvm:OptParserTdFiles"],
 )
 
 cc_library(
@@ -200,19 +185,14 @@ cc_library(
     ],
 )
 
-gentbl(
+gentbl_cc_library(
     name = "macho_options_inc_gen",
     # See https://github.com/bazelbuild/bazel/issues/13803
     strip_include_prefix = "MachO",
-    tbl_outs = [(
-        "-gen-opt-parser-defs",
-        "MachO/Options.inc",
-    )],
+    tbl_outs = {"MachO/Options.inc": ["-gen-opt-parser-defs"]},
     tblgen = "//llvm:llvm-tblgen",
     td_file = "MachO/Options.td",
-    td_srcs = [
-        "//llvm:include/llvm/Option/OptParser.td",
-    ],
+    deps = ["//llvm:OptParserTdFiles"],
 )
 
 cc_library(
@@ -246,19 +226,14 @@ cc_library(
     ],
 )
 
-gentbl(
+gentbl_cc_library(
     name = "wasm_options_inc_gen",
     # See https://github.com/bazelbuild/bazel/issues/13803
     strip_include_prefix = "wasm",
-    tbl_outs = [(
-        "-gen-opt-parser-defs",
-        "wasm/Options.inc",
-    )],
+    tbl_outs = {"wasm/Options.inc": ["-gen-opt-parser-defs"]},
     tblgen = "//llvm:llvm-tblgen",
     td_file = "wasm/Options.td",
-    td_srcs = [
-        "//llvm:include/llvm/Option/OptParser.td",
-    ],
+    deps = ["//llvm:OptParserTdFiles"],
 )
 
 cc_library(