Add some target aliases in the LLVM BUILD file to align them with internal google conventions

PiperOrigin-RevId: 314949750 Change-Id: I5385df826c863a7351180ccbb2f4afab811aa49e
2020-06-05 10:16:18 -07:00 · 2020-06-05 10:16:18 -07:00 · 78eca642cf
commit 78eca642cf
parent ddca073ead
11 changed files with 212 additions and 117 deletions
--- a/tensorflow/compiler/aot/BUILD
+++ b/tensorflow/compiler/aot/BUILD
@ -67,13 +67,13 @@ cc_library(
        "//tensorflow/core:lib",
        "//tensorflow/core:lib_internal",
        "//tensorflow/core:protos_all_cc",
-        "@llvm-project//llvm:arm_code_gen",  # fixdeps: keep
-        "@llvm-project//llvm:powerpc_code_gen",  # fixdeps: keep
-        "@llvm-project//llvm:target",
-        "@llvm-project//llvm:x86_code_gen",  # fixdeps: keep
+        "@llvm-project//llvm:arm_target",  # fixdeps: keep
+        "@llvm-project//llvm:powerpc_target",  # fixdeps: keep
+        "@llvm-project//llvm:target_base",
+        "@llvm-project//llvm:x86_target",  # fixdeps: keep
        "//tensorflow/core:regexp_internal",
    ] + if_llvm_aarch64_available([
-        "//third_party/llvm/llvm-project/llvm:aarch64_target",  # fixdeps: keep
+        "@llvm-project//llvm:aarch64_target",  # fixdeps: keep
    ]),
 )

@ -95,7 +95,7 @@ tf_cc_test(
        "//tensorflow/core/platform:resource_loader",
        "@com_google_absl//absl/strings",
        "@llvm-project//llvm:support",  # fixdeps: keep
-        "@llvm-project//llvm:x86_code_gen",  # fixdeps: keep
+        "@llvm-project//llvm:x86_target",  # fixdeps: keep
    ],
 )

@ -109,12 +109,12 @@ cc_library(
    name = "llvm_targets",
    visibility = ["//tensorflow/python:__pkg__"],
    deps = [
-        "@llvm-project//llvm:arm_code_gen",  # fixdeps: keep
-        "@llvm-project//llvm:powerpc_code_gen",  # fixdeps: keep
-        "@llvm-project//llvm:target",
-        "@llvm-project//llvm:x86_code_gen",  # fixdeps: keep
+        "@llvm-project//llvm:arm_target",  # fixdeps: keep
+        "@llvm-project//llvm:powerpc_target",  # fixdeps: keep
+        "@llvm-project//llvm:target_base",
+        "@llvm-project//llvm:x86_target",  # fixdeps: keep
    ] + if_llvm_aarch64_available([
-        "//third_party/llvm/llvm-project/llvm:aarch64_target",  # fixdeps: keep
+        "@llvm-project//llvm:aarch64_target",  # fixdeps: keep
    ]),
 )

@ -286,9 +286,9 @@ cc_library(
        "@com_google_absl//absl/memory",
        "@com_google_absl//absl/strings",
        "@com_google_absl//absl/types:span",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
-        "@llvm-project//llvm:target",
+        "@llvm-project//llvm:target_base",
    ],
 )

--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@ -1193,7 +1193,7 @@ cc_library(
    deps = [
        ":compiler",
        "//tensorflow/core:lib_internal",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

@ -3906,7 +3906,7 @@ cc_library(
        "@com_google_absl//absl/container:flat_hash_map",
        "@com_google_absl//absl/strings",
        "@com_google_absl//absl/types:span",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:transform_utils",
    ],
 )
--- a/tensorflow/compiler/xla/service/cpu/BUILD
+++ b/tensorflow/compiler/xla/service/cpu/BUILD
@ -181,15 +181,15 @@ cc_library(
        "//tensorflow/compiler/xla/service/llvm_ir:llvm_util",
        "//tensorflow/core:lib",
        "//tensorflow/core:stream_executor_no_cuda",
-        "@llvm-project//llvm:core",
-        "@llvm-project//llvm:mc",
+        "@llvm-project//llvm:ir",
+        "@llvm-project//llvm:machine_code",
        "@llvm-project//llvm:object",
        "@llvm-project//llvm:support",
-        "@llvm-project//llvm:target",
-        "@llvm-project//llvm:x86_code_gen",  # fixdeps: keep
+        "@llvm-project//llvm:target_base",
+        "@llvm-project//llvm:x86_target",  # fixdeps: keep
    ] + select({
        "//tensorflow:linux_ppc64le": [
-            "@llvm-project//llvm:powerpc_code_gen",  # fixdeps: keep
+            "@llvm-project//llvm:powerpc_target",  # fixdeps: keep
        ],
        "//conditions:default": [
        ],
@ -223,11 +223,11 @@ cc_library(
        ":runtime_single_threaded_matmul",
        "@com_google_absl//absl/memory",
        "@llvm-project//llvm:execution_engine",
-        "@llvm-project//llvm:core",
-        "@llvm-project//llvm:mc",  # fixdeps: keep
-        "@llvm-project//llvm:orc_jit",
+        "@llvm-project//llvm:ir",
+        "@llvm-project//llvm:machine_code",  # fixdeps: keep
+        "@llvm-project//llvm:orcjit",
        "@llvm-project//llvm:support",
-        "@llvm-project//llvm:target",  # fixdeps: keep
+        "@llvm-project//llvm:target_base",  # fixdeps: keep
        "//tensorflow/compiler/xla/service:custom_call_target_registry",
        "//tensorflow/compiler/xla:types",
        "//tensorflow/compiler/xla:util",
@ -307,7 +307,7 @@ cc_library(
        "@com_google_absl//absl/strings",
        "@com_google_absl//absl/strings:str_format",
        "@com_google_absl//absl/types:span",
-        "@llvm-project//llvm:orc_jit",
+        "@llvm-project//llvm:orcjit",
    ],
 )

@ -365,10 +365,10 @@ cc_library(
        "@com_google_absl//absl/strings",
        "@com_google_absl//absl/strings:str_format",
        "@com_google_absl//absl/types:span",
-        "@llvm-project//llvm:code_gen",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:codegen",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
-        "@llvm-project//llvm:target",
+        "@llvm-project//llvm:target_base",
        "@llvm-project//mlir:IR",
    ],
 )
@ -385,7 +385,7 @@ cc_library(
        "//tensorflow/core:lib",
        "@com_google_absl//absl/container:flat_hash_map",
        "@llvm-project//llvm:analysis",
-        "@llvm-project//llvm:target",
+        "@llvm-project//llvm:target_base",
    ],
 )

@ -414,7 +414,7 @@ cc_library(
        "//tensorflow/compiler/xla/service/llvm_ir:llvm_util",
        "@com_google_absl//absl/strings",
        "@com_google_absl//absl/types:span",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

@ -430,7 +430,7 @@ cc_library(
        "//tensorflow/compiler/xla/service/llvm_ir:loop_emitter",
        "//tensorflow/core:lib",
        "@com_google_absl//absl/strings:str_format",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

@ -446,7 +446,7 @@ cc_library(
        "//tensorflow/compiler/xla/service/llvm_ir:kernel_support_library",
        "//tensorflow/compiler/xla/service/llvm_ir:llvm_util",
        "//tensorflow/core:lib",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

@ -478,7 +478,7 @@ cc_library(
        "//tensorflow/compiler/xla/service/llvm_ir:llvm_util",
        "//tensorflow/core:lib",
        "@com_google_absl//absl/strings",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//mlir:EDSC",
        "@llvm-project//mlir:IR",
        "@llvm-project//mlir:LinalgOps",
@ -521,12 +521,12 @@ cc_library(
        "//tensorflow/core:lib",
        "@com_google_absl//absl/memory",
        "@llvm-project//llvm:analysis",
-        "@llvm-project//llvm:core",
-        "@llvm-project//llvm:ipo",
-        "@llvm-project//llvm:mc",
+        "@llvm-project//llvm:ipo_transforms",
+        "@llvm-project//llvm:ir",
+        "@llvm-project//llvm:machine_code",
        "@llvm-project//llvm:object",
        "@llvm-project//llvm:support",
-        "@llvm-project//llvm:target",
+        "@llvm-project//llvm:target_base",
    ],
 )

@ -584,7 +584,7 @@ cc_library(
        "//tensorflow/compiler/xla/service/llvm_ir:llvm_util",
        "//tensorflow/compiler/xla/service/llvm_ir:math_ops",
        "//tensorflow/core:lib",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:transform_utils",
    ],
 )
@ -853,7 +853,7 @@ cc_library(
        "//tensorflow/compiler/xla:shape_util",
        "//tensorflow/compiler/xla:window_util",
        "//tensorflow/compiler/xla/service:hlo",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

@ -1046,7 +1046,7 @@ cc_library(
        "//tensorflow/core:lib",
        "@com_google_absl//absl/algorithm:container",
        "@com_google_absl//absl/types:span",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -1074,9 +1074,9 @@ tf_cc_test(
        "//tensorflow/compiler/xla:test",
        "//tensorflow/compiler/xla/tests:hlo_test_base",
        "//tensorflow/compiler/xla/tests:xla_internal_test_main",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
-        "@llvm-project//llvm:target",
+        "@llvm-project//llvm:target_base",
    ],
 )

@ -1088,8 +1088,8 @@ cc_library(
        "//tensorflow/compiler/mlir/xla:hlo_utils",
        "//tensorflow/compiler/xla:shape_util",
        "//tensorflow/compiler/xla:status",
-        "@llvm-project//llvm:core",
-        "@llvm-project//llvm:ipo",
+        "@llvm-project//llvm:ipo_transforms",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:linker",
        "@llvm-project//mlir:IR",
        "@llvm-project//mlir:LLVMTransforms",
--- a/tensorflow/compiler/xla/service/cpu/tests/BUILD
+++ b/tensorflow/compiler/xla/service/cpu/tests/BUILD
@ -108,7 +108,7 @@ tf_cc_test(
        "//tensorflow/core:test",
        "//tensorflow/core:test_main",
        "@com_google_absl//absl/memory",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

@ -123,9 +123,9 @@ tf_cc_test(
        "//tensorflow/core:test",
        "//tensorflow/core:test_main",
        "@com_google_absl//absl/strings",
-        "@llvm-project//llvm:arm_code_gen",  # fixdeps: keep
-        "@llvm-project//llvm:target",
-        "@llvm-project//llvm:x86_code_gen",  # fixdeps: keep
+        "@llvm-project//llvm:arm_target",  # fixdeps: keep
+        "@llvm-project//llvm:target_base",
+        "@llvm-project//llvm:x86_target",  # fixdeps: keep
    ],
 )

@ -155,9 +155,9 @@ tf_cc_test(
        "//tensorflow/core:test",
        "//tensorflow/core:test_main",
        "@com_google_absl//absl/strings",
-        "@llvm-project//llvm:arm_code_gen",  # fixdeps: keep
-        "@llvm-project//llvm:target",
-        "@llvm-project//llvm:x86_code_gen",  # fixdeps: keep
+        "@llvm-project//llvm:arm_target",  # fixdeps: keep
+        "@llvm-project//llvm:target_base",
+        "@llvm-project//llvm:x86_target",  # fixdeps: keep
    ],
 )

@ -259,8 +259,8 @@ tf_cc_test(
        "//tensorflow/core:test",
        "//tensorflow/core:test_main",
        "@com_google_absl//absl/strings",
-        "@llvm-project//llvm:arm_code_gen",  # fixdeps: keep
-        "@llvm-project//llvm:target",
-        "@llvm-project//llvm:x86_code_gen",  # fixdeps: keep
+        "@llvm-project//llvm:arm_target",  # fixdeps: keep
+        "@llvm-project//llvm:target_base",
+        "@llvm-project//llvm:x86_target",  # fixdeps: keep
    ],
 )
--- a/tensorflow/compiler/xla/service/gpu/BUILD
+++ b/tensorflow/compiler/xla/service/gpu/BUILD
@ -205,7 +205,7 @@ cc_library(
        "@com_google_absl//absl/container:flat_hash_set",
        "@com_google_absl//absl/strings",
        "@com_google_absl//absl/types:span",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

@ -219,7 +219,7 @@ cc_library(
        "//tensorflow/core:lib",
        "@com_google_absl//absl/strings",
        "@com_google_absl//absl/types:span",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -309,7 +309,7 @@ cc_library(
        "@com_google_absl//absl/strings",
        "@com_google_absl//absl/types:optional",
        "@com_google_absl//absl/types:span",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -328,7 +328,7 @@ cc_library(
        "//tensorflow/compiler/xla/service/llvm_ir:llvm_util",
        "//tensorflow/compiler/xla/service/llvm_ir:loop_emitter",
        "//tensorflow/core:lib",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

@ -357,7 +357,7 @@ cc_library(
        "//tensorflow/core:lib",
        "@com_google_absl//absl/strings",
        "@com_google_absl//absl/types:span",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -647,7 +647,7 @@ cc_library(
        "//tensorflow/core:stream_executor_no_cuda",
        "//tensorflow/stream_executor:device_description",
        "@com_google_absl//absl/algorithm:container",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

@ -1136,7 +1136,7 @@ cc_library(
        "//tensorflow/core:lib",
        "//tensorflow/core:stream_executor_no_cuda",
        "@com_google_absl//absl/memory",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
    alwayslink = True,  # Contains per-platform transfer manager registration
 )
@ -1235,7 +1235,7 @@ cc_library(
        "@com_google_absl//absl/strings",
        "@com_google_absl//absl/types:optional",
        "@com_google_absl//absl/types:span",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

--- a/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/BUILD
+++ b/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/BUILD
@ -43,16 +43,16 @@ cc_library(
        "@llvm-project//llvm:analysis",
        "@llvm-project//llvm:bit_reader",
        "@llvm-project//llvm:bit_writer",
-        "@llvm-project//llvm:code_gen",
-        "@llvm-project//llvm:core",
-        "@llvm-project//llvm:ipo",
+        "@llvm-project//llvm:codegen",
+        "@llvm-project//llvm:ipo_transforms",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:ir_reader",
        "@llvm-project//llvm:linker",
-        "@llvm-project//llvm:nvptx_code_gen",  # buildcleaner: keep
-        "@llvm-project//llvm:objc_arc",  # buildcleaner: keep
-        "@llvm-project//llvm:scalar",
+        "@llvm-project//llvm:nvptx_target",  # buildcleaner: keep
+        "@llvm-project//llvm:objcarc_transforms",  # buildcleaner: keep
+        "@llvm-project//llvm:scalar_transforms",
        "@llvm-project//llvm:support",
-        "@llvm-project//llvm:target",
+        "@llvm-project//llvm:target_base",
    ],
 )

@ -70,7 +70,7 @@ tf_cc_test(
        "//tensorflow/core:lib",
        "//tensorflow/core:test",
        "//tensorflow/core/platform:resource_loader",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
--- a/tensorflow/compiler/xla/service/llvm_ir/BUILD
+++ b/tensorflow/compiler/xla/service/llvm_ir/BUILD
@ -42,7 +42,7 @@ cc_library(
        "@com_google_absl//absl/container:flat_hash_map",
        "@com_google_absl//absl/container:flat_hash_set",
        "@com_google_absl//absl/strings",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

@ -79,9 +79,9 @@ cc_library(
        "@com_google_absl//absl/base",
        "@com_google_absl//absl/strings",
        "@com_google_absl//absl/types:span",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
-        "@llvm-project//llvm:target",
+        "@llvm-project//llvm:target_base",
        "@llvm-project//llvm:transform_utils",
    ],
 )
@ -101,7 +101,7 @@ cc_library(
        "@com_google_absl//absl/algorithm:container",
        "@com_google_absl//absl/strings",
        "@com_google_absl//absl/types:span",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

@ -119,7 +119,7 @@ cc_library(
        "@com_google_absl//absl/algorithm:container",
        "@com_google_absl//absl/strings",
        "@com_google_absl//absl/types:span",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

@ -137,7 +137,7 @@ cc_library(
        "//tensorflow/compiler/xla:xla_data_proto_cc",
        "//tensorflow/core:lib",
        "@com_google_absl//absl/strings:str_format",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

@ -162,7 +162,7 @@ cc_library(
        "@com_google_absl//absl/container:flat_hash_set",
        "@com_google_absl//absl/types:optional",
        "@com_google_absl//absl/types:span",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

@ -201,7 +201,7 @@ cc_library(
        "//tensorflow/core:lib",
        "@com_google_absl//absl/strings",
        "@com_google_absl//absl/types:span",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -218,7 +218,7 @@ cc_library(
        "//tensorflow/compiler/xla:xla_data_proto_cc",
        "//tensorflow/core:lib",
        "@com_google_absl//absl/types:span",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

@ -230,7 +230,7 @@ cc_library(
        ":llvm_loop",
        ":llvm_util",
        "@com_google_absl//absl/strings",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

@ -250,7 +250,7 @@ cc_library(
    hdrs = ["math_ops.h"],
    deps = [
        ":llvm_util",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

@ -259,6 +259,6 @@ cc_library(
    srcs = [],
    hdrs = ["ir_builder_mixin.h"],
    deps = [
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )
--- a/tensorflow/compiler/xla/service/mlir_gpu/BUILD
+++ b/tensorflow/compiler/xla/service/mlir_gpu/BUILD
@ -66,7 +66,7 @@ cc_library(
        "//tensorflow/compiler/xla/service:compiler",
        "//tensorflow/compiler/xla/service/gpu:target_constants",
        "//tensorflow/core:stream_executor_no_cuda",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//mlir:IR",
        "@llvm-project//mlir:LLVMDialect",
    ],
--- a/tensorflow/compiler/xla/tests/BUILD
+++ b/tensorflow/compiler/xla/tests/BUILD
@ -2143,7 +2143,7 @@ tf_cc_test(
        "//tensorflow/core:test_main",
        "//tensorflow/stream_executor",
        "@com_google_absl//absl/memory",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
    ],
 )

--- a/third_party/llvm/llvm.autogenerated.BUILD
+++ b/third_party/llvm/llvm.autogenerated.BUILD
@ -5446,3 +5446,98 @@ cc_library(
        ":gtest",
    ],
 )
+
+alias(
+    name = "aarch64_target",
+    actual = ":aarch64_code_gen",
+)
+
+alias(
+    name = "aarch64_target_disassembler",
+    actual = ":aarch64_disassembler",
+)
+
+alias(
+    name = "arm_target",
+    actual = ":arm_code_gen",
+)
+
+alias(
+    name = "arm_target_disassembler",
+    actual = ":arm_disassembler",
+)
+
+alias(
+    name = "codegen",
+    actual = ":code_gen",
+)
+
+alias(
+    name = "frontend_openmp",
+    actual = ":frontend_open_mp",
+)
+
+alias(
+    name = "ipo_transforms",
+    actual = ":ipo",
+)
+
+alias(
+    name = "ir",
+    actual = ":core",
+)
+
+alias(
+    name = "machine_code",
+    actual = ":mc",
+)
+
+alias(
+    name = "machine_code_disassembler",
+    actual = ":mc_disassembler",
+)
+
+alias(
+    name = "nvptx_target",
+    actual = ":nvptx_code_gen",
+)
+
+alias(
+    name = "objcarc_transforms",
+    actual = ":objc_arc",
+)
+
+alias(
+    name = "orcjit",
+    actual = ":orc_jit",
+)
+
+alias(
+    name = "powerpc_target",
+    actual = ":powerpc_code_gen",
+)
+
+alias(
+    name = "powerpc_target_disassembler",
+    actual = ":powerpc_disassembler",
+)
+
+alias(
+    name = "scalar_transforms",
+    actual = ":scalar",
+)
+
+alias(
+    name = "target_base",
+    actual = ":target",
+)
+
+alias(
+    name = "x86_target",
+    actual = ":x86_code_gen",
+)
+
+alias(
+    name = "x86_target_disassembler",
+    actual = ":x86_disassembler",
+)
--- a/third_party/mlir/BUILD
+++ b/third_party/mlir/BUILD
@ -284,7 +284,7 @@ cc_library(
        ":IR",
        ":SideEffects",
        ":VectorOps",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -313,7 +313,7 @@ cc_library(
        ":VectorOps",
        ":VectorToLLVM",
        ":VectorToSCF",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -751,7 +751,7 @@ cc_library(
        ":StandardOps",
        ":Support",
        ":Transforms",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -946,7 +946,7 @@ cc_library(
        ":IR",
        ":LLVMAVX512IncGen",
        ":LLVMDialect",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -979,7 +979,7 @@ cc_library(
        ":LLVMAVX512ConversionIncGen",
        ":LLVMIRModuleTranslation",
        ":Translation",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -1020,7 +1020,7 @@ cc_library(
        "@llvm-project//llvm:asm_parser",
        "@llvm-project//llvm:bit_reader",
        "@llvm-project//llvm:bit_writer",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -1348,10 +1348,10 @@ cc_library(
        ":Pass",
        ":Support",
        ":TargetNVVMIR",
-        "@llvm-project//llvm:core",
-        "@llvm-project//llvm:nvptx_code_gen",
+        "@llvm-project//llvm:ir",
+        "@llvm-project//llvm:nvptx_target",
        "@llvm-project//llvm:support",
-        "@llvm-project//llvm:target",
+        "@llvm-project//llvm:target_base",
    ],
 )

@ -1475,7 +1475,7 @@ cc_library(
        ":StandardOps",
        ":Support",
        "@llvm-project//llvm:asm_parser",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -1547,7 +1547,7 @@ cc_library(
        ":StandardOps",
        ":Support",
        "@llvm-project//llvm:asm_parser",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -2160,7 +2160,7 @@ cc_library(
        ":Support",
        ":TransformUtils",
        ":Transforms",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -2382,8 +2382,8 @@ cc_library(
        ":LLVMIRTransforms",
        ":OpenMPDialect",
        ":Support",
-        "@llvm-project//llvm:core",
-        "@llvm-project//llvm:frontend_open_mp",
+        "@llvm-project//llvm:frontend_openmp",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
        "@llvm-project//llvm:transform_utils",
    ],
@ -2407,7 +2407,7 @@ cc_library(
        ":Support",
        ":TargetLLVMAVX512Intr",
        ":Translation",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:ir_reader",
        "@llvm-project//llvm:support",
    ],
@ -2431,7 +2431,7 @@ cc_library(
        ":NVVMDialect",
        ":Support",
        ":Translation",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -2454,7 +2454,7 @@ cc_library(
        ":ROCDLDialect",
        ":Support",
        ":Translation",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -2477,15 +2477,15 @@ cc_library(
        ":Translation",
        "@llvm-project//llvm:bit_reader",
        "@llvm-project//llvm:bit_writer",
-        "@llvm-project//llvm:core",
        "@llvm-project//llvm:execution_engine",
-        "@llvm-project//llvm:mc",
-        "@llvm-project//llvm:orc_jit",
+        "@llvm-project//llvm:ir",
+        "@llvm-project//llvm:machine_code",
+        "@llvm-project//llvm:orcjit",
        "@llvm-project//llvm:support",
-        "@llvm-project//llvm:target",  # fixdeps: keep
+        "@llvm-project//llvm:target_base",  # fixdeps: keep
        "@llvm-project//llvm:transform_utils",
-        "@llvm-project//llvm:x86_code_gen",  # fixdeps: keep
-        "@llvm-project//llvm:x86_disassembler",  # fixdeps: keep
+        "@llvm-project//llvm:x86_target",  # fixdeps: keep
+        "@llvm-project//llvm:x86_target_disassembler",  # fixdeps: keep
    ],
 )

@ -2500,10 +2500,10 @@ cc_library(
    includes = ["include"],
    deps = [
        "@llvm-project//llvm:analysis",
-        "@llvm-project//llvm:core",
-        "@llvm-project//llvm:ipo",
+        "@llvm-project//llvm:ipo_transforms",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
-        "@llvm-project//llvm:target",
+        "@llvm-project//llvm:target_base",
    ],
 )

@ -2706,8 +2706,8 @@ cc_library(
        ":Parser",
        ":Pass",
        ":Support",
-        "@llvm-project//llvm:core",
-        "@llvm-project//llvm:orc_jit",
+        "@llvm-project//llvm:ir",
+        "@llvm-project//llvm:orcjit",
        "@llvm-project//llvm:support",
    ],
 )
@ -3202,7 +3202,7 @@ cc_library(
        ":Transforms",
        ":VectorToLLVM",
        ":VectorToSCF",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -3227,7 +3227,7 @@ cc_library(
        ":StandardOps",
        ":Support",
        ":Transforms",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -3343,7 +3343,7 @@ cc_library(
        ":Transforms",
        ":TransformsPassIncGen",
        ":VectorOps",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -3435,7 +3435,7 @@ cc_library(
        ":Support",
        ":Transforms",
        ":VectorOps",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )
@ -3463,7 +3463,7 @@ cc_library(
        ":Support",
        ":Transforms",
        ":VectorOps",
-        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:ir",
        "@llvm-project//llvm:support",
    ],
 )