diff --git a/SUBMODULE_VERSIONS b/SUBMODULE_VERSIONS
index f91f76a..999fd59 100644
--- a/SUBMODULE_VERSIONS
+++ b/SUBMODULE_VERSIONS
@@ -10,7 +10,7 @@
 b73f111094da3e380a1774b56b15f16c90ae8e23 third_party/sdl2
 f8bf11a0253a32375c32cad92c841237b96696c0 third_party/spirv_headers
 57eb48aed36160c4876bc8310d9ca84d42ee9e2a third_party/swiftshader
-7e85bf98da5981b07d9b9115199c0f55003b3971 third_party/tensorflow
+6a4711835ade7ba20547d8605ead805e90835e3d third_party/tensorflow
 864d86e8b6d21449474db5e9313dbff90aa9c24f third_party/tracy
 8a457f8552d8d47ce3a96ed80a714ff6396f8ad8 third_party/vulkan_extensionlayer
 9bd3f561bcee3f01d22912de10bb07ce4e23d378 third_party/vulkan_headers
diff --git a/build_tools/bazel/third_party_import/llvm-project/overlay/llvm/BUILD.bazel b/build_tools/bazel/third_party_import/llvm-project/overlay/llvm/BUILD.bazel
index c16b62f..9e26f9f 100644
--- a/build_tools/bazel/third_party_import/llvm-project/overlay/llvm/BUILD.bazel
+++ b/build_tools/bazel/third_party_import/llvm-project/overlay/llvm/BUILD.bazel
@@ -659,7 +659,7 @@
 )
 
 cc_library(
-    name = "aarch64_asm_parser",
+    name = "AArch64AsmParser",
     srcs = glob([
         "lib/Target/AArch64/AsmParser/*.c",
         "lib/Target/AArch64/AsmParser/*.cpp",
@@ -673,18 +673,23 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/AArch64"],
     deps = [
-        ":aarch64_desc",
-        ":aarch64_info",
-        ":aarch64_utils",
+        ":AArch64Desc",
+        ":AArch64Info",
+        ":AArch64Utils",
+        ":MC",
+        ":MCParser",
+        ":Support",
         ":config",
-        ":mc",
-        ":mc_parser",
-        ":support",
     ],
 )
 
+alias(
+    name = "aarch64_asm_parser",
+    actual = ":AArch64AsmParser",
+)
+
 cc_library(
-    name = "aarch64_code_gen",
+    name = "AArch64CodeGen",
     srcs = glob([
         "lib/Target/AArch64/*.c",
         "lib/Target/AArch64/*.cpp",
@@ -698,27 +703,32 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/AArch64"],
     deps = [
-        ":aarch64_desc",
-        ":aarch64_info",
-        ":aarch64_utils",
-        ":analysis",
-        ":asm_printer",
-        ":cf_guard",
-        ":code_gen",
+        ":AArch64Desc",
+        ":AArch64Info",
+        ":AArch64Utils",
+        ":Analysis",
+        ":AsmPrinter",
+        ":CFGuard",
+        ":CodeGen",
+        ":Core",
+        ":GlobalISel",
+        ":MC",
+        ":Scalar",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
+        ":TransformUtils",
         ":config",
-        ":core",
-        ":global_i_sel",
-        ":mc",
-        ":scalar",
-        ":selection_dag",
-        ":support",
-        ":target",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "aarch64_code_gen",
+    actual = ":AArch64CodeGen",
+)
+
 cc_library(
-    name = "aarch64_desc",
+    name = "AArch64Desc",
     srcs = glob([
         "lib/Target/AArch64/MCTargetDesc/*.c",
         "lib/Target/AArch64/MCTargetDesc/*.cpp",
@@ -732,21 +742,26 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/AArch64"],
     deps = [
-        ":aarch64_info",
+        ":AArch64Info",
+        ":AArch64Utils",
+        ":BinaryFormat",
+        ":MC",
+        ":Support",
         ":aarch64_target_gen",
-        ":aarch64_utils",
         ":attributes_gen",
-        ":binary_format",
         ":config",
         ":intrinsic_enums_gen",
         ":intrinsics_impl_gen",
-        ":mc",
-        ":support",
     ],
 )
 
+alias(
+    name = "aarch64_desc",
+    actual = ":AArch64Desc",
+)
+
 cc_library(
-    name = "aarch64_disassembler",
+    name = "AArch64Disassembler",
     srcs = glob([
         "lib/Target/AArch64/Disassembler/*.c",
         "lib/Target/AArch64/Disassembler/*.cpp",
@@ -760,18 +775,23 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/AArch64"],
     deps = [
-        ":aarch64_desc",
-        ":aarch64_info",
-        ":aarch64_utils",
+        ":AArch64Desc",
+        ":AArch64Info",
+        ":AArch64Utils",
+        ":MC",
+        ":MCDisassembler",
+        ":Support",
         ":config",
-        ":mc",
-        ":mc_disassembler",
-        ":support",
     ],
 )
 
+alias(
+    name = "aarch64_disassembler",
+    actual = ":AArch64Disassembler",
+)
+
 cc_library(
-    name = "aarch64_info",
+    name = "AArch64Info",
     srcs = glob([
         "lib/Target/AArch64/TargetInfo/*.c",
         "lib/Target/AArch64/TargetInfo/*.cpp",
@@ -788,15 +808,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/AArch64"],
     deps = [
+        ":Support",
         ":code_gen",
         ":config",
-        ":support",
         ":target",
     ],
 )
 
+alias(
+    name = "aarch64_info",
+    actual = ":AArch64Info",
+)
+
 cc_library(
-    name = "aarch64_utils",
+    name = "AArch64Utils",
     srcs = glob([
         "lib/Target/AArch64/Utils/*.c",
         "lib/Target/AArch64/Utils/*.cpp",
@@ -811,15 +836,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/AArch64"],
     deps = [
+        ":Support",
         ":aarch64_target_gen",
         ":config",
         ":mc",
-        ":support",
     ],
 )
 
+alias(
+    name = "aarch64_utils",
+    actual = ":AArch64Utils",
+)
+
 cc_library(
-    name = "amdgpu_asm_parser",
+    name = "AMDGPUAsmParser",
     srcs = glob([
         "lib/Target/AMDGPU/AsmParser/*.c",
         "lib/Target/AMDGPU/AsmParser/*.cpp",
@@ -833,18 +863,23 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/AMDGPU"],
     deps = [
-        ":amdgpu_desc",
-        ":amdgpu_info",
-        ":amdgpu_utils",
+        ":AMDGPUDesc",
+        ":AMDGPUInfo",
+        ":AMDGPUUtils",
+        ":MC",
+        ":MCParser",
+        ":Support",
         ":config",
-        ":mc",
-        ":mc_parser",
-        ":support",
     ],
 )
 
+alias(
+    name = "amdgpu_asm_parser",
+    actual = ":AMDGPUAsmParser",
+)
+
 cc_library(
-    name = "amdgpu_code_gen",
+    name = "AMDGPUCodeGen",
     srcs = glob([
         "lib/Target/AMDGPU/*.c",
         "lib/Target/AMDGPU/*.cpp",
@@ -858,30 +893,35 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/AMDGPU"],
     deps = [
-        ":amdgpu_desc",
-        ":amdgpu_info",
-        ":amdgpu_utils",
-        ":analysis",
-        ":asm_printer",
-        ":binary_format",
-        ":code_gen",
+        ":AMDGPUDesc",
+        ":AMDGPUInfo",
+        ":AMDGPUUtils",
+        ":Analysis",
+        ":AsmPrinter",
+        ":BinaryFormat",
+        ":CodeGen",
+        ":Core",
+        ":GlobalISel",
+        ":IPO",
+        ":MC",
+        ":MIRParser",
+        ":Scalar",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
+        ":TransformUtils",
+        ":Vectorize",
         ":config",
-        ":core",
-        ":global_i_sel",
-        ":ipo",
-        ":mc",
-        ":mir_parser",
-        ":scalar",
-        ":selection_dag",
-        ":support",
-        ":target",
-        ":transform_utils",
-        ":vectorize",
     ],
 )
 
+alias(
+    name = "amdgpu_code_gen",
+    actual = ":AMDGPUCodeGen",
+)
+
 cc_library(
-    name = "amdgpu_desc",
+    name = "AMDGPUDesc",
     srcs = glob([
         "lib/Target/AMDGPU/MCTargetDesc/*.c",
         "lib/Target/AMDGPU/MCTargetDesc/*.cpp",
@@ -895,18 +935,23 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/AMDGPU"],
     deps = [
-        ":amdgpu_info",
-        ":amdgpu_utils",
-        ":binary_format",
+        ":AMDGPUInfo",
+        ":AMDGPUUtils",
+        ":BinaryFormat",
+        ":Core",
+        ":MC",
+        ":Support",
         ":config",
-        ":core",
-        ":mc",
-        ":support",
     ],
 )
 
+alias(
+    name = "amdgpu_desc",
+    actual = ":AMDGPUDesc",
+)
+
 cc_library(
-    name = "amdgpu_disassembler",
+    name = "AMDGPUDisassembler",
     srcs = glob([
         "lib/Target/AMDGPU/Disassembler/*.c",
         "lib/Target/AMDGPU/Disassembler/*.cpp",
@@ -920,18 +965,23 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/AMDGPU"],
     deps = [
-        ":amdgpu_desc",
-        ":amdgpu_info",
-        ":amdgpu_utils",
+        ":AMDGPUDesc",
+        ":AMDGPUInfo",
+        ":AMDGPUUtils",
+        ":MC",
+        ":MCDisassembler",
+        ":Support",
         ":config",
-        ":mc",
-        ":mc_disassembler",
-        ":support",
     ],
 )
 
+alias(
+    name = "amdgpu_disassembler",
+    actual = ":AMDGPUDisassembler",
+)
+
 cc_library(
-    name = "amdgpu_info",
+    name = "AMDGPUInfo",
     srcs = glob([
         "lib/Target/AMDGPU/TargetInfo/*.c",
         "lib/Target/AMDGPU/TargetInfo/*.cpp",
@@ -945,16 +995,21 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/AMDGPU"],
     deps = [
+        ":Support",
         ":amdgpu_r600_target_gen",
         ":amdgpu_target_gen",
         ":config",
         ":core",
-        ":support",
     ],
 )
 
+alias(
+    name = "amdgpu_info",
+    actual = ":AMDGPUInfo",
+)
+
 cc_library(
-    name = "amdgpu_utils",
+    name = "AMDGPUUtils",
     srcs = glob([
         "lib/Target/AMDGPU/Utils/*.c",
         "lib/Target/AMDGPU/Utils/*.cpp",
@@ -968,18 +1023,23 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/AMDGPU"],
     deps = [
+        ":BinaryFormat",
+        ":Core",
+        ":MC",
+        ":Support",
         ":amdgpu_r600_target_gen",
         ":amdgpu_target_gen",
-        ":binary_format",
         ":config",
-        ":core",
-        ":mc",
-        ":support",
     ],
 )
 
+alias(
+    name = "amdgpu_utils",
+    actual = ":AMDGPUUtils",
+)
+
 cc_library(
-    name = "arc_code_gen",
+    name = "ARCCodeGen",
     srcs = glob([
         "lib/Target/ARC/*.c",
         "lib/Target/ARC/*.cpp",
@@ -993,23 +1053,28 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/ARC"],
     deps = [
-        ":analysis",
-        ":arc_desc",
-        ":arc_info",
-        ":asm_printer",
-        ":code_gen",
+        ":ARCDesc",
+        ":ARCInfo",
+        ":Analysis",
+        ":AsmPrinter",
+        ":CodeGen",
+        ":Core",
+        ":MC",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
+        ":TransformUtils",
         ":config",
-        ":core",
-        ":mc",
-        ":selection_dag",
-        ":support",
-        ":target",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "arc_code_gen",
+    actual = ":ARCCodeGen",
+)
+
 cc_library(
-    name = "arc_desc",
+    name = "ARCDesc",
     srcs = glob([
         "lib/Target/ARC/MCTargetDesc/*.c",
         "lib/Target/ARC/MCTargetDesc/*.cpp",
@@ -1023,15 +1088,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/ARC"],
     deps = [
-        ":arc_info",
+        ":ARCInfo",
+        ":MC",
+        ":Support",
         ":config",
-        ":mc",
-        ":support",
     ],
 )
 
+alias(
+    name = "arc_desc",
+    actual = ":ARCDesc",
+)
+
 cc_library(
-    name = "arc_disassembler",
+    name = "ARCDisassembler",
     srcs = glob([
         "lib/Target/ARC/Disassembler/*.c",
         "lib/Target/ARC/Disassembler/*.cpp",
@@ -1045,15 +1115,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/ARC"],
     deps = [
-        ":arc_info",
+        ":ARCInfo",
+        ":MCDisassembler",
+        ":Support",
         ":config",
-        ":mc_disassembler",
-        ":support",
     ],
 )
 
+alias(
+    name = "arc_disassembler",
+    actual = ":ARCDisassembler",
+)
+
 cc_library(
-    name = "arc_info",
+    name = "ARCInfo",
     srcs = glob([
         "lib/Target/ARC/TargetInfo/*.c",
         "lib/Target/ARC/TargetInfo/*.cpp",
@@ -1067,13 +1142,18 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/ARC"],
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "arc_info",
+    actual = ":ARCInfo",
+)
+
 cc_library(
-    name = "arm_asm_parser",
+    name = "ARMAsmParser",
     srcs = glob([
         "lib/Target/ARM/AsmParser/*.c",
         "lib/Target/ARM/AsmParser/*.cpp",
@@ -1087,18 +1167,23 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/ARM"],
     deps = [
-        ":arm_desc",
-        ":arm_info",
-        ":arm_utils",
+        ":ARMDesc",
+        ":ARMInfo",
+        ":ARMUtils",
+        ":MC",
+        ":MCParser",
+        ":Support",
         ":config",
-        ":mc",
-        ":mc_parser",
-        ":support",
     ],
 )
 
+alias(
+    name = "arm_asm_parser",
+    actual = ":ARMAsmParser",
+)
+
 cc_library(
-    name = "arm_code_gen",
+    name = "ARMCodeGen",
     srcs = glob([
         "lib/Target/ARM/*.c",
         "lib/Target/ARM/*.cpp",
@@ -1112,27 +1197,32 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/ARM"],
     deps = [
-        ":analysis",
-        ":arm_desc",
-        ":arm_info",
-        ":arm_utils",
-        ":asm_printer",
-        ":cf_guard",
-        ":code_gen",
+        ":ARMDesc",
+        ":ARMInfo",
+        ":ARMUtils",
+        ":Analysis",
+        ":AsmPrinter",
+        ":CFGuard",
+        ":CodeGen",
+        ":Core",
+        ":GlobalISel",
+        ":MC",
+        ":Scalar",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
+        ":TransformUtils",
         ":config",
-        ":core",
-        ":global_i_sel",
-        ":mc",
-        ":scalar",
-        ":selection_dag",
-        ":support",
-        ":target",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "arm_code_gen",
+    actual = ":ARMCodeGen",
+)
+
 cc_library(
-    name = "arm_desc",
+    name = "ARMDesc",
     srcs = glob([
         "lib/Target/ARM/MCTargetDesc/*.c",
         "lib/Target/ARM/MCTargetDesc/*.cpp",
@@ -1148,22 +1238,27 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/ARM"],
     deps = [
-        ":arm_info",
+        ":ARMInfo",
+        ":ARMUtils",
+        ":BinaryFormat",
+        ":MC",
+        ":MCDisassembler",
+        ":Support",
         ":arm_target_gen",
-        ":arm_utils",
         ":attributes_gen",
-        ":binary_format",
         ":config",
         ":intrinsic_enums_gen",
         ":intrinsics_impl_gen",
-        ":mc",
-        ":mc_disassembler",
-        ":support",
     ],
 )
 
+alias(
+    name = "arm_desc",
+    actual = ":ARMDesc",
+)
+
 cc_library(
-    name = "arm_disassembler",
+    name = "ARMDisassembler",
     srcs = glob([
         "lib/Target/ARM/Disassembler/*.c",
         "lib/Target/ARM/Disassembler/*.cpp",
@@ -1177,17 +1272,22 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/ARM"],
     deps = [
-        ":arm_desc",
-        ":arm_info",
-        ":arm_utils",
+        ":ARMDesc",
+        ":ARMInfo",
+        ":ARMUtils",
+        ":MCDisassembler",
+        ":Support",
         ":config",
-        ":mc_disassembler",
-        ":support",
     ],
 )
 
+alias(
+    name = "arm_disassembler",
+    actual = ":ARMDisassembler",
+)
+
 cc_library(
-    name = "arm_info",
+    name = "ARMInfo",
     srcs = glob([
         "lib/Target/ARM/TargetInfo/*.c",
         "lib/Target/ARM/TargetInfo/*.cpp",
@@ -1202,15 +1302,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/ARM"],
     deps = [
+        ":Support",
         ":arm_target_gen",
         ":config",
-        ":support",
         ":target",
     ],
 )
 
+alias(
+    name = "arm_info",
+    actual = ":ARMInfo",
+)
+
 cc_library(
-    name = "arm_utils",
+    name = "ARMUtils",
     srcs = glob([
         "lib/Target/ARM/Utils/*.c",
         "lib/Target/ARM/Utils/*.cpp",
@@ -1225,15 +1330,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/ARM"],
     deps = [
+        ":Support",
         ":arm_target_gen",
         ":config",
         ":mc",
-        ":support",
     ],
 )
 
+alias(
+    name = "arm_utils",
+    actual = ":ARMUtils",
+)
+
 cc_library(
-    name = "avr_asm_parser",
+    name = "AVRAsmParser",
     srcs = glob([
         "lib/Target/AVR/AsmParser/*.c",
         "lib/Target/AVR/AsmParser/*.cpp",
@@ -1247,17 +1357,22 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/AVR"],
     deps = [
-        ":avr_desc",
-        ":avr_info",
+        ":AVRDesc",
+        ":AVRInfo",
+        ":MC",
+        ":MCParser",
+        ":Support",
         ":config",
-        ":mc",
-        ":mc_parser",
-        ":support",
     ],
 )
 
+alias(
+    name = "avr_asm_parser",
+    actual = ":AVRAsmParser",
+)
+
 cc_library(
-    name = "avr_code_gen",
+    name = "AVRCodeGen",
     srcs = glob([
         "lib/Target/AVR/*.c",
         "lib/Target/AVR/*.cpp",
@@ -1271,21 +1386,26 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/AVR"],
     deps = [
-        ":asm_printer",
-        ":avr_desc",
-        ":avr_info",
-        ":code_gen",
+        ":AVRDesc",
+        ":AVRInfo",
+        ":AsmPrinter",
+        ":CodeGen",
+        ":Core",
+        ":MC",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
         ":config",
-        ":core",
-        ":mc",
-        ":selection_dag",
-        ":support",
-        ":target",
     ],
 )
 
+alias(
+    name = "avr_code_gen",
+    actual = ":AVRCodeGen",
+)
+
 cc_library(
-    name = "avr_desc",
+    name = "AVRDesc",
     srcs = glob([
         "lib/Target/AVR/MCTargetDesc/*.c",
         "lib/Target/AVR/MCTargetDesc/*.cpp",
@@ -1299,15 +1419,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/AVR"],
     deps = [
-        ":avr_info",
+        ":AVRInfo",
+        ":MC",
+        ":Support",
         ":config",
-        ":mc",
-        ":support",
     ],
 )
 
+alias(
+    name = "avr_desc",
+    actual = ":AVRDesc",
+)
+
 cc_library(
-    name = "avr_disassembler",
+    name = "AVRDisassembler",
     srcs = glob([
         "lib/Target/AVR/Disassembler/*.c",
         "lib/Target/AVR/Disassembler/*.cpp",
@@ -1321,15 +1446,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/AVR"],
     deps = [
-        ":avr_info",
+        ":AVRInfo",
+        ":MCDisassembler",
+        ":Support",
         ":config",
-        ":mc_disassembler",
-        ":support",
     ],
 )
 
+alias(
+    name = "avr_disassembler",
+    actual = ":AVRDisassembler",
+)
+
 cc_library(
-    name = "avr_info",
+    name = "AVRInfo",
     srcs = glob([
         "lib/Target/AVR/TargetInfo/*.c",
         "lib/Target/AVR/TargetInfo/*.cpp",
@@ -1343,13 +1473,18 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/AVR"],
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "avr_info",
+    actual = ":AVRInfo",
+)
+
 cc_library(
-    name = "aggressive_inst_combine",
+    name = "AggressiveInstCombine",
     srcs = glob([
         "lib/Transforms/AggressiveInstCombine/*.c",
         "lib/Transforms/AggressiveInstCombine/*.cpp",
@@ -1363,16 +1498,21 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":analysis",
+        ":Analysis",
+        ":Core",
+        ":Support",
+        ":TransformUtils",
         ":config",
-        ":core",
-        ":support",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "aggressive_inst_combine",
+    actual = ":AggressiveInstCombine",
+)
+
 cc_library(
-    name = "analysis",
+    name = "Analysis",
     srcs = glob([
         "lib/Analysis/*.c",
         "lib/Analysis/*.cpp",
@@ -1388,17 +1528,22 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":binary_format",
+        ":BinaryFormat",
+        ":Core",
+        ":Object",
+        ":ProfileData",
+        ":Support",
         ":config",
-        ":core",
-        ":object",
-        ":profile_data",
-        ":support",
     ],
 )
 
+alias(
+    name = "analysis",
+    actual = ":Analysis",
+)
+
 cc_library(
-    name = "asm_parser",
+    name = "AsmParser",
     srcs = glob([
         "lib/AsmParser/*.c",
         "lib/AsmParser/*.cpp",
@@ -1412,15 +1557,20 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":binary_format",
+        ":BinaryFormat",
+        ":Core",
+        ":Support",
         ":config",
-        ":core",
-        ":support",
     ],
 )
 
+alias(
+    name = "asm_parser",
+    actual = ":AsmParser",
+)
+
 cc_library(
-    name = "asm_printer",
+    name = "AsmPrinter",
     srcs = glob([
         "lib/CodeGen/AsmPrinter/*.c",
         "lib/CodeGen/AsmPrinter/*.cpp",
@@ -1435,24 +1585,29 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":analysis",
-        ":binary_format",
-        ":code_gen",
+        ":Analysis",
+        ":BinaryFormat",
+        ":CodeGen",
+        ":Core",
+        ":DebugInfoCodeView",
+        ":DebugInfoDWARF",
+        ":DebugInfoMSF",
+        ":MC",
+        ":MCParser",
+        ":Remarks",
+        ":Support",
+        ":Target",
         ":config",
-        ":core",
-        ":debug_info_code_view",
-        ":debug_info_dwarf",
-        ":debug_info_msf",
-        ":mc",
-        ":mc_parser",
-        ":remarks",
-        ":support",
-        ":target",
     ],
 )
 
+alias(
+    name = "asm_printer",
+    actual = ":AsmPrinter",
+)
+
 cc_library(
-    name = "bpf_asm_parser",
+    name = "BPFAsmParser",
     srcs = glob([
         "lib/Target/BPF/AsmParser/*.c",
         "lib/Target/BPF/AsmParser/*.cpp",
@@ -1466,17 +1621,22 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/BPF"],
     deps = [
-        ":bpf_desc",
-        ":bpf_info",
+        ":BPFDesc",
+        ":BPFInfo",
+        ":MC",
+        ":MCParser",
+        ":Support",
         ":config",
-        ":mc",
-        ":mc_parser",
-        ":support",
     ],
 )
 
+alias(
+    name = "bpf_asm_parser",
+    actual = ":BPFAsmParser",
+)
+
 cc_library(
-    name = "bpf_code_gen",
+    name = "BPFCodeGen",
     srcs = glob([
         "lib/Target/BPF/*.c",
         "lib/Target/BPF/*.cpp",
@@ -1490,21 +1650,26 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/BPF"],
     deps = [
-        ":asm_printer",
-        ":bpf_desc",
-        ":bpf_info",
-        ":code_gen",
+        ":AsmPrinter",
+        ":BPFDesc",
+        ":BPFInfo",
+        ":CodeGen",
+        ":Core",
+        ":MC",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
         ":config",
-        ":core",
-        ":mc",
-        ":selection_dag",
-        ":support",
-        ":target",
     ],
 )
 
+alias(
+    name = "bpf_code_gen",
+    actual = ":BPFCodeGen",
+)
+
 cc_library(
-    name = "bpf_desc",
+    name = "BPFDesc",
     srcs = glob([
         "lib/Target/BPF/MCTargetDesc/*.c",
         "lib/Target/BPF/MCTargetDesc/*.cpp",
@@ -1518,15 +1683,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/BPF"],
     deps = [
-        ":bpf_info",
+        ":BPFInfo",
+        ":MC",
+        ":Support",
         ":config",
-        ":mc",
-        ":support",
     ],
 )
 
+alias(
+    name = "bpf_desc",
+    actual = ":BPFDesc",
+)
+
 cc_library(
-    name = "bpf_disassembler",
+    name = "BPFDisassembler",
     srcs = glob([
         "lib/Target/BPF/Disassembler/*.c",
         "lib/Target/BPF/Disassembler/*.cpp",
@@ -1540,15 +1710,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/BPF"],
     deps = [
-        ":bpf_info",
+        ":BPFInfo",
+        ":MCDisassembler",
+        ":Support",
         ":config",
-        ":mc_disassembler",
-        ":support",
     ],
 )
 
+alias(
+    name = "bpf_disassembler",
+    actual = ":BPFDisassembler",
+)
+
 cc_library(
-    name = "bpf_info",
+    name = "BPFInfo",
     srcs = glob([
         "lib/Target/BPF/TargetInfo/*.c",
         "lib/Target/BPF/TargetInfo/*.cpp",
@@ -1562,13 +1737,18 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/BPF"],
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "bpf_info",
+    actual = ":BPFInfo",
+)
+
 cc_library(
-    name = "binary_format",
+    name = "BinaryFormat",
     srcs = glob([
         "lib/BinaryFormat/*.c",
         "lib/BinaryFormat/*.cpp",
@@ -1584,13 +1764,18 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "binary_format",
+    actual = ":BinaryFormat",
+)
+
 cc_library(
-    name = "bit_reader",
+    name = "BitReader",
     srcs = glob([
         "lib/Bitcode/Reader/*.c",
         "lib/Bitcode/Reader/*.cpp",
@@ -1605,15 +1790,20 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":bitstream_reader",
+        ":BitstreamReader",
+        ":Core",
+        ":Support",
         ":config",
-        ":core",
-        ":support",
     ],
 )
 
+alias(
+    name = "bit_reader",
+    actual = ":BitReader",
+)
+
 cc_library(
-    name = "bit_writer",
+    name = "BitWriter",
     srcs = glob([
         "lib/Bitcode/Writer/*.c",
         "lib/Bitcode/Writer/*.cpp",
@@ -1630,17 +1820,22 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":analysis",
+        ":Analysis",
+        ":Core",
+        ":MC",
+        ":Object",
+        ":Support",
         ":config",
-        ":core",
-        ":mc",
-        ":object",
-        ":support",
     ],
 )
 
+alias(
+    name = "bit_writer",
+    actual = ":BitWriter",
+)
+
 cc_library(
-    name = "bitstream_reader",
+    name = "BitstreamReader",
     srcs = glob([
         "lib/Bitstream/Reader/*.c",
         "lib/Bitstream/Reader/*.cpp",
@@ -1654,13 +1849,18 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "bitstream_reader",
+    actual = ":BitstreamReader",
+)
+
 cc_library(
-    name = "cf_guard",
+    name = "CFGuard",
     srcs = glob([
         "lib/Transforms/CFGuard/*.c",
         "lib/Transforms/CFGuard/*.cpp",
@@ -1674,14 +1874,19 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Core",
+        ":Support",
         ":config",
-        ":core",
-        ":support",
     ],
 )
 
+alias(
+    name = "cf_guard",
+    actual = ":CFGuard",
+)
+
 cc_library(
-    name = "code_gen",
+    name = "CodeGen",
     srcs = glob([
         "lib/CodeGen/*.c",
         "lib/CodeGen/*.cpp",
@@ -1696,23 +1901,28 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":analysis",
-        ":bit_reader",
-        ":bit_writer",
+        ":Analysis",
+        ":BitReader",
+        ":BitWriter",
+        ":Core",
+        ":MC",
+        ":ProfileData",
+        ":Scalar",
+        ":Support",
+        ":Target",
+        ":TransformUtils",
         ":config",
-        ":core",
         ":instrumentation",
-        ":mc",
-        ":profile_data",
-        ":scalar",
-        ":support",
-        ":target",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "code_gen",
+    actual = ":CodeGen",
+)
+
 cc_library(
-    name = "core",
+    name = "Core",
     srcs = glob([
         "lib/IR/*.c",
         "lib/IR/*.cpp",
@@ -1734,11 +1944,13 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":BinaryFormat",
+        ":Remarks",
+        ":Support",
         ":aarch64_enums_gen",
         ":amdgcn_enums_gen",
         ":arm_enums_gen",
         ":attributes_gen",
-        ":binary_format",
         ":bpf_enums_gen",
         ":config",
         ":hexagon_enums_gen",
@@ -1748,18 +1960,21 @@
         ":nvvm_enums_gen",
         ":ppc_enums_gen",
         ":r600_enums_gen",
-        ":remarks",
         ":riscv_enums_gen",
         ":s390_enums_gen",
-        ":support",
         ":wasm_enums_gen",
         ":x86_enums_gen",
         ":xcore_enums_gen",
     ],
 )
 
+alias(
+    name = "core",
+    actual = ":Core",
+)
+
 cc_library(
-    name = "coroutines",
+    name = "Coroutines",
     srcs = glob([
         "lib/Transforms/Coroutines/*.c",
         "lib/Transforms/Coroutines/*.cpp",
@@ -1773,18 +1988,23 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":analysis",
+        ":Analysis",
+        ":Core",
+        ":IPO",
+        ":Scalar",
+        ":Support",
+        ":TransformUtils",
         ":config",
-        ":core",
-        ":ipo",
-        ":scalar",
-        ":support",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "coroutines",
+    actual = ":Coroutines",
+)
+
 cc_library(
-    name = "coverage",
+    name = "Coverage",
     srcs = glob([
         "lib/ProfileData/Coverage/*.c",
         "lib/ProfileData/Coverage/*.cpp",
@@ -1798,16 +2018,21 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Core",
+        ":Object",
+        ":ProfileData",
+        ":Support",
         ":config",
-        ":core",
-        ":object",
-        ":profile_data",
-        ":support",
     ],
 )
 
+alias(
+    name = "coverage",
+    actual = ":Coverage",
+)
+
 cc_library(
-    name = "dwarf_linker",
+    name = "DWARFLinker",
     srcs = glob([
         "lib/DWARFLinker/*.c",
         "lib/DWARFLinker/*.cpp",
@@ -1821,18 +2046,23 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":asm_printer",
-        ":code_gen",
+        ":AsmPrinter",
+        ":CodeGen",
+        ":DebugInfoDWARF",
+        ":MC",
+        ":Object",
+        ":Support",
         ":config",
-        ":debug_info_dwarf",
-        ":mc",
-        ":object",
-        ":support",
     ],
 )
 
+alias(
+    name = "dwarf_linker",
+    actual = ":DWARFLinker",
+)
+
 cc_library(
-    name = "debug_info_code_view",
+    name = "DebugInfoCodeView",
     srcs = glob([
         "lib/DebugInfo/CodeView/*.c",
         "lib/DebugInfo/CodeView/*.cpp",
@@ -1846,15 +2076,20 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":DebugInfoMSF",
+        ":Support",
         ":binary_format",
         ":config",
-        ":debug_info_msf",
-        ":support",
     ],
 )
 
+alias(
+    name = "debug_info_code_view",
+    actual = ":DebugInfoCodeView",
+)
+
 cc_library(
-    name = "debug_info_dwarf",
+    name = "DebugInfoDWARF",
     srcs = glob([
         "lib/DebugInfo/DWARF/*.c",
         "lib/DebugInfo/DWARF/*.cpp",
@@ -1868,16 +2103,21 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":binary_format",
+        ":BinaryFormat",
+        ":MC",
+        ":Object",
+        ":Support",
         ":config",
-        ":mc",
-        ":object",
-        ":support",
     ],
 )
 
+alias(
+    name = "debug_info_dwarf",
+    actual = ":DebugInfoDWARF",
+)
+
 cc_library(
-    name = "debug_info_gsym",
+    name = "DebugInfoGSYM",
     srcs = glob([
         "lib/DebugInfo/GSYM/*.c",
         "lib/DebugInfo/GSYM/*.cpp",
@@ -1891,16 +2131,21 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":DebugInfoDWARF",
+        ":MC",
+        ":Object",
+        ":Support",
         ":config",
-        ":debug_info_dwarf",
-        ":mc",
-        ":object",
-        ":support",
     ],
 )
 
+alias(
+    name = "debug_info_gsym",
+    actual = ":DebugInfoGSYM",
+)
+
 cc_library(
-    name = "debug_info_msf",
+    name = "DebugInfoMSF",
     srcs = glob([
         "lib/DebugInfo/MSF/*.c",
         "lib/DebugInfo/MSF/*.cpp",
@@ -1914,13 +2159,18 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "debug_info_msf",
+    actual = ":DebugInfoMSF",
+)
+
 cc_library(
-    name = "debug_info_pdb",
+    name = "DebugInfoPDB",
     srcs = glob([
         "lib/DebugInfo/PDB/*.c",
         "lib/DebugInfo/PDB/*.cpp",
@@ -1934,17 +2184,22 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":binary_format",
+        ":BinaryFormat",
+        ":DebugInfoCodeView",
+        ":DebugInfoMSF",
+        ":Object",
+        ":Support",
         ":config",
-        ":debug_info_code_view",
-        ":debug_info_msf",
-        ":object",
-        ":support",
     ],
 )
 
+alias(
+    name = "debug_info_pdb",
+    actual = ":DebugInfoPDB",
+)
+
 cc_library(
-    name = "demangle",
+    name = "Demangle",
     srcs = glob([
         "lib/Demangle/*.c",
         "lib/Demangle/*.cpp",
@@ -1960,8 +2215,13 @@
     deps = [":config"],
 )
 
+alias(
+    name = "demangle",
+    actual = ":Demangle",
+)
+
 cc_library(
-    name = "dlltool_driver",
+    name = "DlltoolDriver",
     srcs = glob([
         "lib/ToolDrivers/llvm-dlltool/*.c",
         "lib/ToolDrivers/llvm-dlltool/*.cpp",
@@ -1975,15 +2235,20 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Object",
+        ":Option",
+        ":Support",
         ":config",
-        ":object",
-        ":option",
-        ":support",
     ],
 )
 
+alias(
+    name = "dlltool_driver",
+    actual = ":DlltoolDriver",
+)
+
 cc_library(
-    name = "execution_engine",
+    name = "ExecutionEngine",
     srcs = glob([
         "lib/ExecutionEngine/*.c",
         "lib/ExecutionEngine/*.cpp",
@@ -1997,18 +2262,23 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Core",
+        ":MC",
+        ":Object",
+        ":RuntimeDyld",
+        ":Support",
+        ":Target",
         ":config",
-        ":core",
-        ":mc",
-        ":object",
-        ":runtime_dyld",
-        ":support",
-        ":target",
     ],
 )
 
+alias(
+    name = "execution_engine",
+    actual = ":ExecutionEngine",
+)
+
 cc_library(
-    name = "extensions",
+    name = "Extensions",
     srcs = glob([
         "lib/Extensions/*.c",
         "lib/Extensions/*.cpp",
@@ -2024,8 +2294,13 @@
     deps = [":config"],
 )
 
+alias(
+    name = "extensions",
+    actual = ":Extensions",
+)
+
 cc_library(
-    name = "frontend_open_mp",
+    name = "FrontendOpenMP",
     srcs = glob([
         "lib/Frontend/OpenMP/*.c",
         "lib/Frontend/OpenMP/*.cpp",
@@ -2039,15 +2314,20 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Core",
+        ":Support",
+        ":TransformUtils",
         ":config",
-        ":core",
-        ":support",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "frontend_open_mp",
+    actual = ":FrontendOpenMP",
+)
+
 cc_library(
-    name = "fuzz_mutate",
+    name = "FuzzMutate",
     srcs = glob([
         "lib/FuzzMutate/*.c",
         "lib/FuzzMutate/*.cpp",
@@ -2061,19 +2341,24 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":analysis",
-        ":bit_reader",
-        ":bit_writer",
+        ":Analysis",
+        ":BitReader",
+        ":BitWriter",
+        ":Core",
+        ":Scalar",
+        ":Support",
+        ":Target",
         ":config",
-        ":core",
-        ":scalar",
-        ":support",
-        ":target",
     ],
 )
 
+alias(
+    name = "fuzz_mutate",
+    actual = ":FuzzMutate",
+)
+
 cc_library(
-    name = "global_i_sel",
+    name = "GlobalISel",
     srcs = glob([
         "lib/CodeGen/GlobalISel/*.c",
         "lib/CodeGen/GlobalISel/*.cpp",
@@ -2087,20 +2372,25 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":analysis",
-        ":code_gen",
+        ":Analysis",
+        ":CodeGen",
+        ":Core",
+        ":MC",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
+        ":TransformUtils",
         ":config",
-        ":core",
-        ":mc",
-        ":selection_dag",
-        ":support",
-        ":target",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "global_i_sel",
+    actual = ":GlobalISel",
+)
+
 cc_library(
-    name = "hexagon_asm_parser",
+    name = "HexagonAsmParser",
     srcs = glob([
         "lib/Target/Hexagon/AsmParser/*.c",
         "lib/Target/Hexagon/AsmParser/*.cpp",
@@ -2114,17 +2404,22 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Hexagon"],
     deps = [
+        ":HexagonDesc",
+        ":HexagonInfo",
+        ":MC",
+        ":MCParser",
+        ":Support",
         ":config",
-        ":hexagon_desc",
-        ":hexagon_info",
-        ":mc",
-        ":mc_parser",
-        ":support",
     ],
 )
 
+alias(
+    name = "hexagon_asm_parser",
+    actual = ":HexagonAsmParser",
+)
+
 cc_library(
-    name = "hexagon_code_gen",
+    name = "HexagonCodeGen",
     srcs = glob([
         "lib/Target/Hexagon/*.c",
         "lib/Target/Hexagon/*.cpp",
@@ -2138,26 +2433,31 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Hexagon"],
     deps = [
-        ":analysis",
-        ":asm_printer",
-        ":code_gen",
+        ":Analysis",
+        ":AsmPrinter",
+        ":CodeGen",
+        ":Core",
+        ":HexagonAsmParser",
+        ":HexagonDesc",
+        ":HexagonInfo",
+        ":IPO",
+        ":MC",
+        ":Scalar",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
+        ":TransformUtils",
         ":config",
-        ":core",
-        ":hexagon_asm_parser",
-        ":hexagon_desc",
-        ":hexagon_info",
-        ":ipo",
-        ":mc",
-        ":scalar",
-        ":selection_dag",
-        ":support",
-        ":target",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "hexagon_code_gen",
+    actual = ":HexagonCodeGen",
+)
+
 cc_library(
-    name = "hexagon_desc",
+    name = "HexagonDesc",
     srcs = glob([
         "lib/Target/Hexagon/MCTargetDesc/*.c",
         "lib/Target/Hexagon/MCTargetDesc/*.cpp",
@@ -2171,15 +2471,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Hexagon"],
     deps = [
+        ":HexagonInfo",
+        ":MC",
+        ":Support",
         ":config",
-        ":hexagon_info",
-        ":mc",
-        ":support",
     ],
 )
 
+alias(
+    name = "hexagon_desc",
+    actual = ":HexagonDesc",
+)
+
 cc_library(
-    name = "hexagon_disassembler",
+    name = "HexagonDisassembler",
     srcs = glob([
         "lib/Target/Hexagon/Disassembler/*.c",
         "lib/Target/Hexagon/Disassembler/*.cpp",
@@ -2193,17 +2498,22 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Hexagon"],
     deps = [
+        ":HexagonDesc",
+        ":HexagonInfo",
+        ":MC",
+        ":MCDisassembler",
+        ":Support",
         ":config",
-        ":hexagon_desc",
-        ":hexagon_info",
-        ":mc",
-        ":mc_disassembler",
-        ":support",
     ],
 )
 
+alias(
+    name = "hexagon_disassembler",
+    actual = ":HexagonDisassembler",
+)
+
 cc_library(
-    name = "hexagon_info",
+    name = "HexagonInfo",
     srcs = glob([
         "lib/Target/Hexagon/TargetInfo/*.c",
         "lib/Target/Hexagon/TargetInfo/*.cpp",
@@ -2217,13 +2527,18 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Hexagon"],
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "hexagon_info",
+    actual = ":HexagonInfo",
+)
+
 cc_library(
-    name = "ipo",
+    name = "IPO",
     srcs = glob([
         "lib/Transforms/IPO/*.c",
         "lib/Transforms/IPO/*.cpp",
@@ -2240,28 +2555,33 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":aggressive_inst_combine",
-        ":analysis",
-        ":bit_reader",
-        ":bit_writer",
+        ":AggressiveInstCombine",
+        ":Analysis",
+        ":BitReader",
+        ":BitWriter",
+        ":Core",
+        ":FrontendOpenMP",
+        ":IRReader",
+        ":InstCombine",
+        ":Instrumentation",
+        ":Linker",
+        ":Object",
+        ":ProfileData",
+        ":Scalar",
+        ":Support",
+        ":TransformUtils",
+        ":Vectorize",
         ":config",
-        ":core",
-        ":frontend_open_mp",
-        ":inst_combine",
-        ":instrumentation",
-        ":ir_reader",
-        ":linker",
-        ":object",
-        ":profile_data",
-        ":scalar",
-        ":support",
-        ":transform_utils",
-        ":vectorize",
     ],
 )
 
+alias(
+    name = "ipo",
+    actual = ":IPO",
+)
+
 cc_library(
-    name = "ir_reader",
+    name = "IRReader",
     srcs = glob([
         "lib/IRReader/*.c",
         "lib/IRReader/*.cpp",
@@ -2275,16 +2595,21 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":asm_parser",
-        ":bit_reader",
+        ":AsmParser",
+        ":BitReader",
+        ":Core",
+        ":Support",
         ":config",
-        ":core",
-        ":support",
     ],
 )
 
+alias(
+    name = "ir_reader",
+    actual = ":IRReader",
+)
+
 cc_library(
-    name = "inst_combine",
+    name = "InstCombine",
     srcs = glob([
         "lib/Transforms/InstCombine/*.c",
         "lib/Transforms/InstCombine/*.cpp",
@@ -2298,17 +2623,22 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":analysis",
+        ":Analysis",
+        ":Core",
+        ":Support",
+        ":TransformUtils",
         ":config",
-        ":core",
         ":instcombine_transforms_gen",
-        ":support",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "inst_combine",
+    actual = ":InstCombine",
+)
+
 cc_library(
-    name = "instrumentation",
+    name = "Instrumentation",
     srcs = glob([
         "lib/Transforms/Instrumentation/*.c",
         "lib/Transforms/Instrumentation/*.cpp",
@@ -2326,18 +2656,23 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":analysis",
+        ":Analysis",
+        ":Core",
+        ":MC",
+        ":ProfileData",
+        ":Support",
+        ":TransformUtils",
         ":config",
-        ":core",
-        ":mc",
-        ":profile_data",
-        ":support",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "instrumentation",
+    actual = ":Instrumentation",
+)
+
 cc_library(
-    name = "interpreter",
+    name = "Interpreter",
     srcs = glob([
         "lib/ExecutionEngine/Interpreter/*.c",
         "lib/ExecutionEngine/Interpreter/*.cpp",
@@ -2351,16 +2686,21 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":code_gen",
+        ":CodeGen",
+        ":Core",
+        ":ExecutionEngine",
+        ":Support",
         ":config",
-        ":core",
-        ":execution_engine",
-        ":support",
     ],
 )
 
+alias(
+    name = "interpreter",
+    actual = ":Interpreter",
+)
+
 cc_library(
-    name = "jit_link",
+    name = "JITLink",
     srcs = glob([
         "lib/ExecutionEngine/JITLink/*.c",
         "lib/ExecutionEngine/JITLink/*.cpp",
@@ -2374,15 +2714,20 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":binary_format",
+        ":BinaryFormat",
+        ":Object",
+        ":Support",
         ":config",
-        ":object",
-        ":support",
     ],
 )
 
+alias(
+    name = "jit_link",
+    actual = ":JITLink",
+)
+
 cc_library(
-    name = "lto",
+    name = "LTO",
     srcs = glob([
         "lib/LTO/*.c",
         "lib/LTO/*.cpp",
@@ -2396,32 +2741,37 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":aggressive_inst_combine",
-        ":analysis",
-        ":binary_format",
-        ":bit_reader",
-        ":bit_writer",
-        ":code_gen",
+        ":AggressiveInstCombine",
+        ":Analysis",
+        ":BinaryFormat",
+        ":BitReader",
+        ":BitWriter",
+        ":CodeGen",
+        ":Core",
+        ":Extensions",
+        ":IPO",
+        ":InstCombine",
+        ":Linker",
+        ":MC",
+        ":ObjCARC",
+        ":Object",
+        ":Passes",
+        ":Remarks",
+        ":Scalar",
+        ":Support",
+        ":Target",
+        ":TransformUtils",
         ":config",
-        ":core",
-        ":extensions",
-        ":inst_combine",
-        ":ipo",
-        ":linker",
-        ":mc",
-        ":objc_arc",
-        ":object",
-        ":passes",
-        ":remarks",
-        ":scalar",
-        ":support",
-        ":target",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "lto",
+    actual = ":LTO",
+)
+
 cc_library(
-    name = "lanai_asm_parser",
+    name = "LanaiAsmParser",
     srcs = glob([
         "lib/Target/Lanai/AsmParser/*.c",
         "lib/Target/Lanai/AsmParser/*.cpp",
@@ -2435,17 +2785,22 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Lanai"],
     deps = [
+        ":LanaiDesc",
+        ":LanaiInfo",
+        ":MC",
+        ":MCParser",
+        ":Support",
         ":config",
-        ":lanai_desc",
-        ":lanai_info",
-        ":mc",
-        ":mc_parser",
-        ":support",
     ],
 )
 
+alias(
+    name = "lanai_asm_parser",
+    actual = ":LanaiAsmParser",
+)
+
 cc_library(
-    name = "lanai_code_gen",
+    name = "LanaiCodeGen",
     srcs = glob([
         "lib/Target/Lanai/*.c",
         "lib/Target/Lanai/*.cpp",
@@ -2459,24 +2814,29 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Lanai"],
     deps = [
-        ":analysis",
-        ":asm_printer",
-        ":code_gen",
+        ":Analysis",
+        ":AsmPrinter",
+        ":CodeGen",
+        ":Core",
+        ":LanaiAsmParser",
+        ":LanaiDesc",
+        ":LanaiInfo",
+        ":MC",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
+        ":TransformUtils",
         ":config",
-        ":core",
-        ":lanai_asm_parser",
-        ":lanai_desc",
-        ":lanai_info",
-        ":mc",
-        ":selection_dag",
-        ":support",
-        ":target",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "lanai_code_gen",
+    actual = ":LanaiCodeGen",
+)
+
 cc_library(
-    name = "lanai_desc",
+    name = "LanaiDesc",
     srcs = glob([
         "lib/Target/Lanai/MCTargetDesc/*.c",
         "lib/Target/Lanai/MCTargetDesc/*.cpp",
@@ -2490,16 +2850,21 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Lanai"],
     deps = [
+        ":LanaiInfo",
+        ":MC",
+        ":MCDisassembler",
+        ":Support",
         ":config",
-        ":lanai_info",
-        ":mc",
-        ":mc_disassembler",
-        ":support",
     ],
 )
 
+alias(
+    name = "lanai_desc",
+    actual = ":LanaiDesc",
+)
+
 cc_library(
-    name = "lanai_disassembler",
+    name = "LanaiDisassembler",
     srcs = glob([
         "lib/Target/Lanai/Disassembler/*.c",
         "lib/Target/Lanai/Disassembler/*.cpp",
@@ -2513,17 +2878,22 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Lanai"],
     deps = [
+        ":LanaiDesc",
+        ":LanaiInfo",
+        ":MC",
+        ":MCDisassembler",
+        ":Support",
         ":config",
-        ":lanai_desc",
-        ":lanai_info",
-        ":mc",
-        ":mc_disassembler",
-        ":support",
     ],
 )
 
+alias(
+    name = "lanai_disassembler",
+    actual = ":LanaiDisassembler",
+)
+
 cc_library(
-    name = "lanai_info",
+    name = "LanaiInfo",
     srcs = glob([
         "lib/Target/Lanai/TargetInfo/*.c",
         "lib/Target/Lanai/TargetInfo/*.cpp",
@@ -2537,13 +2907,18 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Lanai"],
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "lanai_info",
+    actual = ":LanaiInfo",
+)
+
 cc_library(
-    name = "lib_driver",
+    name = "LibDriver",
     srcs = glob([
         "lib/ToolDrivers/llvm-lib/*.c",
         "lib/ToolDrivers/llvm-lib/*.cpp",
@@ -2557,17 +2932,22 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":binary_format",
-        ":bit_reader",
+        ":BinaryFormat",
+        ":BitReader",
+        ":Object",
+        ":Option",
+        ":Support",
         ":config",
-        ":object",
-        ":option",
-        ":support",
     ],
 )
 
+alias(
+    name = "lib_driver",
+    actual = ":LibDriver",
+)
+
 cc_library(
-    name = "line_editor",
+    name = "LineEditor",
     srcs = glob([
         "lib/LineEditor/*.c",
         "lib/LineEditor/*.cpp",
@@ -2581,13 +2961,18 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "line_editor",
+    actual = ":LineEditor",
+)
+
 cc_library(
-    name = "linker",
+    name = "Linker",
     srcs = glob([
         "lib/Linker/*.c",
         "lib/Linker/*.cpp",
@@ -2601,15 +2986,20 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Core",
+        ":Support",
+        ":TransformUtils",
         ":config",
-        ":core",
-        ":support",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "linker",
+    actual = ":Linker",
+)
+
 cc_library(
-    name = "mc",
+    name = "MC",
     srcs = glob([
         "lib/MC/*.c",
         "lib/MC/*.cpp",
@@ -2623,15 +3013,22 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":BinaryFormat",
+        ":DebugInfoCodeView",
+        ":Support",
         ":binary_format",
         ":config",
         ":debug_info_code_view",
-        ":support",
     ],
 )
 
+alias(
+    name = "mc",
+    actual = ":MC",
+)
+
 cc_library(
-    name = "mca",
+    name = "MCA",
     srcs = glob([
         "lib/MCA/*.c",
         "lib/MCA/*.cpp",
@@ -2645,14 +3042,19 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":MC",
+        ":Support",
         ":config",
-        ":mc",
-        ":support",
     ],
 )
 
+alias(
+    name = "mca",
+    actual = ":MCA",
+)
+
 cc_library(
-    name = "mc_disassembler",
+    name = "MCDisassembler",
     srcs = glob([
         "lib/MC/MCDisassembler/*.c",
         "lib/MC/MCDisassembler/*.cpp",
@@ -2666,14 +3068,19 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":MC",
+        ":Support",
         ":config",
-        ":mc",
-        ":support",
     ],
 )
 
+alias(
+    name = "mc_disassembler",
+    actual = ":MCDisassembler",
+)
+
 cc_library(
-    name = "mcjit",
+    name = "MCJIT",
     srcs = glob([
         "lib/ExecutionEngine/MCJIT/*.c",
         "lib/ExecutionEngine/MCJIT/*.cpp",
@@ -2687,18 +3094,23 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Core",
+        ":ExecutionEngine",
+        ":Object",
+        ":RuntimeDyld",
+        ":Support",
+        ":Target",
         ":config",
-        ":core",
-        ":execution_engine",
-        ":object",
-        ":runtime_dyld",
-        ":support",
-        ":target",
     ],
 )
 
+alias(
+    name = "mcjit",
+    actual = ":MCJIT",
+)
+
 cc_library(
-    name = "mc_parser",
+    name = "MCParser",
     srcs = glob([
         "lib/MC/MCParser/*.c",
         "lib/MC/MCParser/*.cpp",
@@ -2712,14 +3124,19 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":MC",
+        ":Support",
         ":config",
-        ":mc",
-        ":support",
     ],
 )
 
+alias(
+    name = "mc_parser",
+    actual = ":MCParser",
+)
+
 cc_library(
-    name = "mir_parser",
+    name = "MIRParser",
     srcs = glob([
         "lib/CodeGen/MIRParser/*.c",
         "lib/CodeGen/MIRParser/*.cpp",
@@ -2733,19 +3150,24 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":asm_parser",
-        ":binary_format",
-        ":code_gen",
+        ":AsmParser",
+        ":BinaryFormat",
+        ":CodeGen",
+        ":Core",
+        ":MC",
+        ":Support",
+        ":Target",
         ":config",
-        ":core",
-        ":mc",
-        ":support",
-        ":target",
     ],
 )
 
+alias(
+    name = "mir_parser",
+    actual = ":MIRParser",
+)
+
 cc_library(
-    name = "ml_policies",
+    name = "MLPolicies",
     srcs = glob([
         "lib/Analysis/ML/*.c",
         "lib/Analysis/ML/*.cpp",
@@ -2759,14 +3181,19 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Core",
+        ":Support",
         ":config",
-        ":core",
-        ":support",
     ],
 )
 
+alias(
+    name = "ml_policies",
+    actual = ":MLPolicies",
+)
+
 cc_library(
-    name = "msp430_asm_parser",
+    name = "MSP430AsmParser",
     srcs = glob([
         "lib/Target/MSP430/AsmParser/*.c",
         "lib/Target/MSP430/AsmParser/*.cpp",
@@ -2780,17 +3207,22 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/MSP430"],
     deps = [
+        ":MC",
+        ":MCParser",
+        ":MSP430Desc",
+        ":MSP430Info",
+        ":Support",
         ":config",
-        ":mc",
-        ":mc_parser",
-        ":msp430_desc",
-        ":msp430_info",
-        ":support",
     ],
 )
 
+alias(
+    name = "msp430_asm_parser",
+    actual = ":MSP430AsmParser",
+)
+
 cc_library(
-    name = "msp430_code_gen",
+    name = "MSP430CodeGen",
     srcs = glob([
         "lib/Target/MSP430/*.c",
         "lib/Target/MSP430/*.cpp",
@@ -2804,21 +3236,26 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/MSP430"],
     deps = [
-        ":asm_printer",
-        ":code_gen",
+        ":AsmPrinter",
+        ":CodeGen",
+        ":Core",
+        ":MC",
+        ":MSP430Desc",
+        ":MSP430Info",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
         ":config",
-        ":core",
-        ":mc",
-        ":msp430_desc",
-        ":msp430_info",
-        ":selection_dag",
-        ":support",
-        ":target",
     ],
 )
 
+alias(
+    name = "msp430_code_gen",
+    actual = ":MSP430CodeGen",
+)
+
 cc_library(
-    name = "msp430_desc",
+    name = "MSP430Desc",
     srcs = glob([
         "lib/Target/MSP430/MCTargetDesc/*.c",
         "lib/Target/MSP430/MCTargetDesc/*.cpp",
@@ -2832,15 +3269,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/MSP430"],
     deps = [
+        ":MC",
+        ":MSP430Info",
+        ":Support",
         ":config",
-        ":mc",
-        ":msp430_info",
-        ":support",
     ],
 )
 
+alias(
+    name = "msp430_desc",
+    actual = ":MSP430Desc",
+)
+
 cc_library(
-    name = "msp430_disassembler",
+    name = "MSP430Disassembler",
     srcs = glob([
         "lib/Target/MSP430/Disassembler/*.c",
         "lib/Target/MSP430/Disassembler/*.cpp",
@@ -2854,15 +3296,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/MSP430"],
     deps = [
+        ":MCDisassembler",
+        ":MSP430Info",
+        ":Support",
         ":config",
-        ":mc_disassembler",
-        ":msp430_info",
-        ":support",
     ],
 )
 
+alias(
+    name = "msp430_disassembler",
+    actual = ":MSP430Disassembler",
+)
+
 cc_library(
-    name = "msp430_info",
+    name = "MSP430Info",
     srcs = glob([
         "lib/Target/MSP430/TargetInfo/*.c",
         "lib/Target/MSP430/TargetInfo/*.cpp",
@@ -2876,13 +3323,18 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/MSP430"],
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "msp430_info",
+    actual = ":MSP430Info",
+)
+
 cc_library(
-    name = "mips_asm_parser",
+    name = "MipsAsmParser",
     srcs = glob([
         "lib/Target/Mips/AsmParser/*.c",
         "lib/Target/Mips/AsmParser/*.cpp",
@@ -2896,17 +3348,22 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Mips"],
     deps = [
+        ":MC",
+        ":MCParser",
+        ":MipsDesc",
+        ":MipsInfo",
+        ":Support",
         ":config",
-        ":mc",
-        ":mc_parser",
-        ":mips_desc",
-        ":mips_info",
-        ":support",
     ],
 )
 
+alias(
+    name = "mips_asm_parser",
+    actual = ":MipsAsmParser",
+)
+
 cc_library(
-    name = "mips_code_gen",
+    name = "MipsCodeGen",
     srcs = glob([
         "lib/Target/Mips/*.c",
         "lib/Target/Mips/*.cpp",
@@ -2920,23 +3377,28 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Mips"],
     deps = [
-        ":analysis",
-        ":asm_printer",
-        ":code_gen",
+        ":Analysis",
+        ":AsmPrinter",
+        ":CodeGen",
+        ":Core",
+        ":GlobalISel",
+        ":MC",
+        ":MipsDesc",
+        ":MipsInfo",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
         ":config",
-        ":core",
-        ":global_i_sel",
-        ":mc",
-        ":mips_desc",
-        ":mips_info",
-        ":selection_dag",
-        ":support",
-        ":target",
     ],
 )
 
+alias(
+    name = "mips_code_gen",
+    actual = ":MipsCodeGen",
+)
+
 cc_library(
-    name = "mips_desc",
+    name = "MipsDesc",
     srcs = glob([
         "lib/Target/Mips/MCTargetDesc/*.c",
         "lib/Target/Mips/MCTargetDesc/*.cpp",
@@ -2950,15 +3412,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Mips"],
     deps = [
+        ":MC",
+        ":MipsInfo",
+        ":Support",
         ":config",
-        ":mc",
-        ":mips_info",
-        ":support",
     ],
 )
 
+alias(
+    name = "mips_desc",
+    actual = ":MipsDesc",
+)
+
 cc_library(
-    name = "mips_disassembler",
+    name = "MipsDisassembler",
     srcs = glob([
         "lib/Target/Mips/Disassembler/*.c",
         "lib/Target/Mips/Disassembler/*.cpp",
@@ -2972,15 +3439,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Mips"],
     deps = [
+        ":MCDisassembler",
+        ":MipsInfo",
+        ":Support",
         ":config",
-        ":mc_disassembler",
-        ":mips_info",
-        ":support",
     ],
 )
 
+alias(
+    name = "mips_disassembler",
+    actual = ":MipsDisassembler",
+)
+
 cc_library(
-    name = "mips_info",
+    name = "MipsInfo",
     srcs = glob([
         "lib/Target/Mips/TargetInfo/*.c",
         "lib/Target/Mips/TargetInfo/*.cpp",
@@ -2994,13 +3466,18 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Mips"],
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "mips_info",
+    actual = ":MipsInfo",
+)
+
 cc_library(
-    name = "nvptx_code_gen",
+    name = "NVPTXCodeGen",
     srcs = glob([
         "lib/Target/NVPTX/*.c",
         "lib/Target/NVPTX/*.cpp",
@@ -3014,26 +3491,31 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/NVPTX"],
     deps = [
-        ":analysis",
-        ":asm_printer",
-        ":code_gen",
+        ":Analysis",
+        ":AsmPrinter",
+        ":CodeGen",
+        ":Core",
+        ":IPO",
+        ":MC",
+        ":NVPTXDesc",
+        ":NVPTXInfo",
+        ":Scalar",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
+        ":TransformUtils",
+        ":Vectorize",
         ":config",
-        ":core",
-        ":ipo",
-        ":mc",
-        ":nvptx_desc",
-        ":nvptx_info",
-        ":scalar",
-        ":selection_dag",
-        ":support",
-        ":target",
-        ":transform_utils",
-        ":vectorize",
     ],
 )
 
+alias(
+    name = "nvptx_code_gen",
+    actual = ":NVPTXCodeGen",
+)
+
 cc_library(
-    name = "nvptx_desc",
+    name = "NVPTXDesc",
     srcs = glob([
         "lib/Target/NVPTX/MCTargetDesc/*.c",
         "lib/Target/NVPTX/MCTargetDesc/*.cpp",
@@ -3048,15 +3530,20 @@
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/NVPTX"],
     deps = [
         "nvptx_target_gen",
+        ":MC",
+        ":NVPTXInfo",
+        ":Support",
         ":config",
-        ":mc",
-        ":nvptx_info",
-        ":support",
     ],
 )
 
+alias(
+    name = "nvptx_desc",
+    actual = ":NVPTXDesc",
+)
+
 cc_library(
-    name = "nvptx_info",
+    name = "NVPTXInfo",
     srcs = glob([
         "lib/Target/NVPTX/TargetInfo/*.c",
         "lib/Target/NVPTX/TargetInfo/*.cpp",
@@ -3073,16 +3560,21 @@
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/NVPTX"],
     deps = [
         "nvptx_target_gen",
+        ":Support",
         ":attributes_gen",
         ":config",
         ":core",
-        ":support",
         ":target",
     ],
 )
 
+alias(
+    name = "nvptx_info",
+    actual = ":NVPTXInfo",
+)
+
 cc_library(
-    name = "objc_arc",
+    name = "ObjCARC",
     srcs = glob([
         "lib/Transforms/ObjCARC/*.c",
         "lib/Transforms/ObjCARC/*.cpp",
@@ -3097,16 +3589,21 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":analysis",
+        ":Analysis",
+        ":Core",
+        ":Support",
+        ":TransformUtils",
         ":config",
-        ":core",
-        ":support",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "objc_arc",
+    actual = ":ObjCARC",
+)
+
 cc_library(
-    name = "object",
+    name = "Object",
     srcs = glob([
         "lib/Object/*.c",
         "lib/Object/*.cpp",
@@ -3120,19 +3617,24 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":binary_format",
-        ":bit_reader",
+        ":BinaryFormat",
+        ":BitReader",
+        ":Core",
+        ":MC",
+        ":MCParser",
+        ":Support",
+        ":TextAPI",
         ":config",
-        ":core",
-        ":mc",
-        ":mc_parser",
-        ":support",
-        ":text_api",
     ],
 )
 
+alias(
+    name = "object",
+    actual = ":Object",
+)
+
 cc_library(
-    name = "object_yaml",
+    name = "ObjectYAML",
     srcs = glob([
         "lib/ObjectYAML/*.c",
         "lib/ObjectYAML/*.cpp",
@@ -3146,16 +3648,21 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":DebugInfoCodeView",
+        ":MC",
+        ":Object",
+        ":Support",
         ":config",
-        ":debug_info_code_view",
-        ":mc",
-        ":object",
-        ":support",
     ],
 )
 
+alias(
+    name = "object_yaml",
+    actual = ":ObjectYAML",
+)
+
 cc_library(
-    name = "option",
+    name = "Option",
     srcs = glob([
         "lib/Option/*.c",
         "lib/Option/*.cpp",
@@ -3169,13 +3676,18 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "option",
+    actual = ":Option",
+)
+
 cc_library(
-    name = "orc_error",
+    name = "OrcError",
     srcs = glob([
         "lib/ExecutionEngine/OrcError/*.c",
         "lib/ExecutionEngine/OrcError/*.cpp",
@@ -3189,13 +3701,18 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "orc_error",
+    actual = ":OrcError",
+)
+
 cc_library(
-    name = "orc_jit",
+    name = "OrcJIT",
     srcs = glob([
         "lib/ExecutionEngine/Orc/*.c",
         "lib/ExecutionEngine/Orc/*.cpp",
@@ -3209,23 +3726,28 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Core",
+        ":ExecutionEngine",
+        ":JITLink",
+        ":MC",
+        ":Object",
+        ":OrcError",
+        ":Passes",
+        ":RuntimeDyld",
+        ":Support",
+        ":Target",
+        ":TransformUtils",
         ":config",
-        ":core",
-        ":execution_engine",
-        ":jit_link",
-        ":mc",
-        ":object",
-        ":orc_error",
-        ":passes",
-        ":runtime_dyld",
-        ":support",
-        ":target",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "orc_jit",
+    actual = ":OrcJIT",
+)
+
 cc_library(
-    name = "passes",
+    name = "Passes",
     srcs = glob([
         "lib/Passes/*.c",
         "lib/Passes/*.cpp",
@@ -3239,26 +3761,31 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":aggressive_inst_combine",
-        ":analysis",
-        ":code_gen",
+        ":AggressiveInstCombine",
+        ":Analysis",
+        ":CodeGen",
+        ":Core",
+        ":Coroutines",
+        ":IPO",
+        ":InstCombine",
+        ":Instrumentation",
+        ":MLPolicies",
+        ":Scalar",
+        ":Support",
+        ":Target",
+        ":TransformUtils",
+        ":Vectorize",
         ":config",
-        ":core",
-        ":coroutines",
-        ":inst_combine",
-        ":instrumentation",
-        ":ipo",
-        ":ml_policies",
-        ":scalar",
-        ":support",
-        ":target",
-        ":transform_utils",
-        ":vectorize",
     ],
 )
 
+alias(
+    name = "passes",
+    actual = ":Passes",
+)
+
 cc_library(
-    name = "powerpc_asm_parser",
+    name = "PowerPCAsmParser",
     srcs = glob([
         "lib/Target/PowerPC/AsmParser/*.c",
         "lib/Target/PowerPC/AsmParser/*.cpp",
@@ -3272,17 +3799,22 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/PowerPC"],
     deps = [
+        ":MC",
+        ":MCParser",
+        ":PowerPCDesc",
+        ":PowerPCInfo",
+        ":Support",
         ":config",
-        ":mc",
-        ":mc_parser",
-        ":powerpc_desc",
-        ":powerpc_info",
-        ":support",
     ],
 )
 
+alias(
+    name = "powerpc_asm_parser",
+    actual = ":PowerPCAsmParser",
+)
+
 cc_library(
-    name = "powerpc_code_gen",
+    name = "PowerPCCodeGen",
     srcs = glob([
         "lib/Target/PowerPC/*.c",
         "lib/Target/PowerPC/*.cpp",
@@ -3296,24 +3828,29 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/PowerPC"],
     deps = [
-        ":analysis",
-        ":asm_printer",
-        ":code_gen",
+        ":Analysis",
+        ":AsmPrinter",
+        ":CodeGen",
+        ":Core",
+        ":MC",
+        ":PowerPCDesc",
+        ":PowerPCInfo",
+        ":Scalar",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
+        ":TransformUtils",
         ":config",
-        ":core",
-        ":mc",
-        ":powerpc_desc",
-        ":powerpc_info",
-        ":scalar",
-        ":selection_dag",
-        ":support",
-        ":target",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "powerpc_code_gen",
+    actual = ":PowerPCCodeGen",
+)
+
 cc_library(
-    name = "powerpc_desc",
+    name = "PowerPCDesc",
     srcs = glob([
         "lib/Target/PowerPC/MCTargetDesc/*.c",
         "lib/Target/PowerPC/MCTargetDesc/*.cpp",
@@ -3327,20 +3864,25 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/PowerPC"],
     deps = [
+        ":BinaryFormat",
+        ":MC",
+        ":PowerPCInfo",
+        ":Support",
         ":attributes_gen",
-        ":binary_format",
         ":config",
         ":intrinsic_enums_gen",
         ":intrinsics_impl_gen",
-        ":mc",
-        ":powerpc_info",
         ":powerpc_target_gen",
-        ":support",
     ],
 )
 
+alias(
+    name = "powerpc_desc",
+    actual = ":PowerPCDesc",
+)
+
 cc_library(
-    name = "powerpc_disassembler",
+    name = "PowerPCDisassembler",
     srcs = glob([
         "lib/Target/PowerPC/Disassembler/*.c",
         "lib/Target/PowerPC/Disassembler/*.cpp",
@@ -3354,15 +3896,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/PowerPC"],
     deps = [
+        ":MCDisassembler",
+        ":PowerPCInfo",
+        ":Support",
         ":config",
-        ":mc_disassembler",
-        ":powerpc_info",
-        ":support",
     ],
 )
 
+alias(
+    name = "powerpc_disassembler",
+    actual = ":PowerPCDisassembler",
+)
+
 cc_library(
-    name = "powerpc_info",
+    name = "PowerPCInfo",
     srcs = glob([
         "lib/Target/PowerPC/TargetInfo/*.c",
         "lib/Target/PowerPC/TargetInfo/*.cpp",
@@ -3378,17 +3925,22 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/PowerPC"],
     deps = [
+        ":Support",
         ":attributes_gen",
         ":config",
         ":core",
         ":powerpc_target_gen",
-        ":support",
         ":target",
     ],
 )
 
+alias(
+    name = "powerpc_info",
+    actual = ":PowerPCInfo",
+)
+
 cc_library(
-    name = "profile_data",
+    name = "ProfileData",
     srcs = glob([
         "lib/ProfileData/*.c",
         "lib/ProfileData/*.cpp",
@@ -3402,14 +3954,19 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Core",
+        ":Support",
         ":config",
-        ":core",
-        ":support",
     ],
 )
 
+alias(
+    name = "profile_data",
+    actual = ":ProfileData",
+)
+
 cc_library(
-    name = "riscv_asm_parser",
+    name = "RISCVAsmParser",
     srcs = glob([
         "lib/Target/RISCV/AsmParser/*.c",
         "lib/Target/RISCV/AsmParser/*.cpp",
@@ -3423,18 +3980,23 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/RISCV"],
     deps = [
+        ":MC",
+        ":MCParser",
+        ":RISCVDesc",
+        ":RISCVInfo",
+        ":RISCVUtils",
+        ":Support",
         ":config",
-        ":mc",
-        ":mc_parser",
-        ":riscv_desc",
-        ":riscv_info",
-        ":riscv_utils",
-        ":support",
     ],
 )
 
+alias(
+    name = "riscv_asm_parser",
+    actual = ":RISCVAsmParser",
+)
+
 cc_library(
-    name = "riscv_code_gen",
+    name = "RISCVCodeGen",
     srcs = glob([
         "lib/Target/RISCV/*.c",
         "lib/Target/RISCV/*.cpp",
@@ -3448,24 +4010,29 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/RISCV"],
     deps = [
-        ":analysis",
-        ":asm_printer",
-        ":code_gen",
+        ":Analysis",
+        ":AsmPrinter",
+        ":CodeGen",
+        ":Core",
+        ":GlobalISel",
+        ":MC",
+        ":RISCVDesc",
+        ":RISCVInfo",
+        ":RISCVUtils",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
         ":config",
-        ":core",
-        ":global_i_sel",
-        ":mc",
-        ":riscv_desc",
-        ":riscv_info",
-        ":riscv_utils",
-        ":selection_dag",
-        ":support",
-        ":target",
     ],
 )
 
+alias(
+    name = "riscv_code_gen",
+    actual = ":RISCVCodeGen",
+)
+
 cc_library(
-    name = "riscv_desc",
+    name = "RISCVDesc",
     srcs = glob([
         "lib/Target/RISCV/MCTargetDesc/*.c",
         "lib/Target/RISCV/MCTargetDesc/*.cpp",
@@ -3479,16 +4046,21 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/RISCV"],
     deps = [
+        ":MC",
+        ":RISCVInfo",
+        ":RISCVUtils",
+        ":Support",
         ":config",
-        ":mc",
-        ":riscv_info",
-        ":riscv_utils",
-        ":support",
     ],
 )
 
+alias(
+    name = "riscv_desc",
+    actual = ":RISCVDesc",
+)
+
 cc_library(
-    name = "riscv_disassembler",
+    name = "RISCVDisassembler",
     srcs = glob([
         "lib/Target/RISCV/Disassembler/*.c",
         "lib/Target/RISCV/Disassembler/*.cpp",
@@ -3502,15 +4074,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/RISCV"],
     deps = [
+        ":MCDisassembler",
+        ":RISCVInfo",
+        ":Support",
         ":config",
-        ":mc_disassembler",
-        ":riscv_info",
-        ":support",
     ],
 )
 
+alias(
+    name = "riscv_disassembler",
+    actual = ":RISCVDisassembler",
+)
+
 cc_library(
-    name = "riscv_info",
+    name = "RISCVInfo",
     srcs = glob([
         "lib/Target/RISCV/TargetInfo/*.c",
         "lib/Target/RISCV/TargetInfo/*.cpp",
@@ -3524,13 +4101,18 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/RISCV"],
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "riscv_info",
+    actual = ":RISCVInfo",
+)
+
 cc_library(
-    name = "riscv_utils",
+    name = "RISCVUtils",
     srcs = glob([
         "lib/Target/RISCV/Utils/*.c",
         "lib/Target/RISCV/Utils/*.cpp",
@@ -3544,13 +4126,18 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/RISCV"],
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "riscv_utils",
+    actual = ":RISCVUtils",
+)
+
 cc_library(
-    name = "remarks",
+    name = "Remarks",
     srcs = glob([
         "lib/Remarks/*.c",
         "lib/Remarks/*.cpp",
@@ -3564,14 +4151,19 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":bitstream_reader",
+        ":BitstreamReader",
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "remarks",
+    actual = ":Remarks",
+)
+
 cc_library(
-    name = "runtime_dyld",
+    name = "RuntimeDyld",
     srcs = glob([
         "lib/ExecutionEngine/RuntimeDyld/*.c",
         "lib/ExecutionEngine/RuntimeDyld/*.cpp",
@@ -3593,16 +4185,21 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":MC",
+        ":Object",
+        ":Support",
         ":config",
-        ":mc",
         ":mc_disassembler",
-        ":object",
-        ":support",
     ],
 )
 
+alias(
+    name = "runtime_dyld",
+    actual = ":RuntimeDyld",
+)
+
 cc_library(
-    name = "scalar",
+    name = "Scalar",
     srcs = glob([
         "lib/Transforms/Scalar/*.c",
         "lib/Transforms/Scalar/*.cpp",
@@ -3621,19 +4218,24 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":aggressive_inst_combine",
-        ":analysis",
+        ":AggressiveInstCombine",
+        ":Analysis",
+        ":Core",
+        ":InstCombine",
+        ":Support",
+        ":TransformUtils",
         ":config",
-        ":core",
-        ":inst_combine",
-        ":support",
         ":target",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "scalar",
+    actual = ":Scalar",
+)
+
 cc_library(
-    name = "selection_dag",
+    name = "SelectionDAG",
     srcs = glob([
         "lib/CodeGen/SelectionDAG/*.c",
         "lib/CodeGen/SelectionDAG/*.cpp",
@@ -3647,19 +4249,24 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":analysis",
-        ":code_gen",
+        ":Analysis",
+        ":CodeGen",
+        ":Core",
+        ":MC",
+        ":Support",
+        ":Target",
+        ":TransformUtils",
         ":config",
-        ":core",
-        ":mc",
-        ":support",
-        ":target",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "selection_dag",
+    actual = ":SelectionDAG",
+)
+
 cc_library(
-    name = "sparc_asm_parser",
+    name = "SparcAsmParser",
     srcs = glob([
         "lib/Target/Sparc/AsmParser/*.c",
         "lib/Target/Sparc/AsmParser/*.cpp",
@@ -3673,17 +4280,22 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Sparc"],
     deps = [
+        ":MC",
+        ":MCParser",
+        ":SparcDesc",
+        ":SparcInfo",
+        ":Support",
         ":config",
-        ":mc",
-        ":mc_parser",
-        ":sparc_desc",
-        ":sparc_info",
-        ":support",
     ],
 )
 
+alias(
+    name = "sparc_asm_parser",
+    actual = ":SparcAsmParser",
+)
+
 cc_library(
-    name = "sparc_code_gen",
+    name = "SparcCodeGen",
     srcs = glob([
         "lib/Target/Sparc/*.c",
         "lib/Target/Sparc/*.cpp",
@@ -3697,21 +4309,26 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Sparc"],
     deps = [
-        ":asm_printer",
-        ":code_gen",
+        ":AsmPrinter",
+        ":CodeGen",
+        ":Core",
+        ":MC",
+        ":SelectionDAG",
+        ":SparcDesc",
+        ":SparcInfo",
+        ":Support",
+        ":Target",
         ":config",
-        ":core",
-        ":mc",
-        ":selection_dag",
-        ":sparc_desc",
-        ":sparc_info",
-        ":support",
-        ":target",
     ],
 )
 
+alias(
+    name = "sparc_code_gen",
+    actual = ":SparcCodeGen",
+)
+
 cc_library(
-    name = "sparc_desc",
+    name = "SparcDesc",
     srcs = glob([
         "lib/Target/Sparc/MCTargetDesc/*.c",
         "lib/Target/Sparc/MCTargetDesc/*.cpp",
@@ -3725,15 +4342,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Sparc"],
     deps = [
+        ":MC",
+        ":SparcInfo",
+        ":Support",
         ":config",
-        ":mc",
-        ":sparc_info",
-        ":support",
     ],
 )
 
+alias(
+    name = "sparc_desc",
+    actual = ":SparcDesc",
+)
+
 cc_library(
-    name = "sparc_disassembler",
+    name = "SparcDisassembler",
     srcs = glob([
         "lib/Target/Sparc/Disassembler/*.c",
         "lib/Target/Sparc/Disassembler/*.cpp",
@@ -3747,15 +4369,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Sparc"],
     deps = [
+        ":MCDisassembler",
+        ":SparcInfo",
+        ":Support",
         ":config",
-        ":mc_disassembler",
-        ":sparc_info",
-        ":support",
     ],
 )
 
+alias(
+    name = "sparc_disassembler",
+    actual = ":SparcDisassembler",
+)
+
 cc_library(
-    name = "sparc_info",
+    name = "SparcInfo",
     srcs = glob([
         "lib/Target/Sparc/TargetInfo/*.c",
         "lib/Target/Sparc/TargetInfo/*.cpp",
@@ -3769,13 +4396,18 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/Sparc"],
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "sparc_info",
+    actual = ":SparcInfo",
+)
+
 cc_library(
-    name = "support",
+    name = "Support",
     srcs = glob([
         "lib/Support/*.c",
         "lib/Support/*.cpp",
@@ -3799,14 +4431,19 @@
     ],
     copts = llvm_copts,
     deps = [
+        ":Demangle",
         ":config",
-        ":demangle",
         "@zlib",
     ],
 )
 
+alias(
+    name = "support",
+    actual = ":Support",
+)
+
 cc_library(
-    name = "symbolize",
+    name = "Symbolize",
     srcs = glob([
         "lib/DebugInfo/Symbolize/*.c",
         "lib/DebugInfo/Symbolize/*.cpp",
@@ -3820,17 +4457,22 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":DebugInfoDWARF",
+        ":DebugInfoPDB",
+        ":Demangle",
+        ":Object",
+        ":Support",
         ":config",
-        ":debug_info_dwarf",
-        ":debug_info_pdb",
-        ":demangle",
-        ":object",
-        ":support",
     ],
 )
 
+alias(
+    name = "symbolize",
+    actual = ":Symbolize",
+)
+
 cc_library(
-    name = "system_z_asm_parser",
+    name = "SystemZAsmParser",
     srcs = glob([
         "lib/Target/SystemZ/AsmParser/*.c",
         "lib/Target/SystemZ/AsmParser/*.cpp",
@@ -3844,17 +4486,22 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/SystemZ"],
     deps = [
+        ":MC",
+        ":MCParser",
+        ":Support",
+        ":SystemZDesc",
+        ":SystemZInfo",
         ":config",
-        ":mc",
-        ":mc_parser",
-        ":support",
-        ":system_z_desc",
-        ":system_z_info",
     ],
 )
 
+alias(
+    name = "system_z_asm_parser",
+    actual = ":SystemZAsmParser",
+)
+
 cc_library(
-    name = "system_z_code_gen",
+    name = "SystemZCodeGen",
     srcs = glob([
         "lib/Target/SystemZ/*.c",
         "lib/Target/SystemZ/*.cpp",
@@ -3868,23 +4515,28 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/SystemZ"],
     deps = [
-        ":analysis",
-        ":asm_printer",
-        ":code_gen",
+        ":Analysis",
+        ":AsmPrinter",
+        ":CodeGen",
+        ":Core",
+        ":MC",
+        ":Scalar",
+        ":SelectionDAG",
+        ":Support",
+        ":SystemZDesc",
+        ":SystemZInfo",
+        ":Target",
         ":config",
-        ":core",
-        ":mc",
-        ":scalar",
-        ":selection_dag",
-        ":support",
-        ":system_z_desc",
-        ":system_z_info",
-        ":target",
     ],
 )
 
+alias(
+    name = "system_z_code_gen",
+    actual = ":SystemZCodeGen",
+)
+
 cc_library(
-    name = "system_z_desc",
+    name = "SystemZDesc",
     srcs = glob([
         "lib/Target/SystemZ/MCTargetDesc/*.c",
         "lib/Target/SystemZ/MCTargetDesc/*.cpp",
@@ -3898,15 +4550,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/SystemZ"],
     deps = [
+        ":MC",
+        ":Support",
+        ":SystemZInfo",
         ":config",
-        ":mc",
-        ":support",
-        ":system_z_info",
     ],
 )
 
+alias(
+    name = "system_z_desc",
+    actual = ":SystemZDesc",
+)
+
 cc_library(
-    name = "system_z_disassembler",
+    name = "SystemZDisassembler",
     srcs = glob([
         "lib/Target/SystemZ/Disassembler/*.c",
         "lib/Target/SystemZ/Disassembler/*.cpp",
@@ -3920,17 +4577,22 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/SystemZ"],
     deps = [
+        ":MC",
+        ":MCDisassembler",
+        ":Support",
+        ":SystemZDesc",
+        ":SystemZInfo",
         ":config",
-        ":mc",
-        ":mc_disassembler",
-        ":support",
-        ":system_z_desc",
-        ":system_z_info",
     ],
 )
 
+alias(
+    name = "system_z_disassembler",
+    actual = ":SystemZDisassembler",
+)
+
 cc_library(
-    name = "system_z_info",
+    name = "SystemZInfo",
     srcs = glob([
         "lib/Target/SystemZ/TargetInfo/*.c",
         "lib/Target/SystemZ/TargetInfo/*.cpp",
@@ -3944,13 +4606,18 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/SystemZ"],
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "system_z_info",
+    actual = ":SystemZInfo",
+)
+
 cc_library(
-    name = "tablegen",
+    name = "TableGen",
     srcs = glob([
         "lib/TableGen/*.c",
         "lib/TableGen/*.cpp",
@@ -3966,14 +4633,19 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Support",
         ":config",
         ":mc",
-        ":support",
     ],
 )
 
+alias(
+    name = "tablegen",
+    actual = ":TableGen",
+)
+
 cc_library(
-    name = "target",
+    name = "Target",
     srcs = glob([
         "lib/Target/*.c",
         "lib/Target/*.cpp",
@@ -3992,16 +4664,21 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":analysis",
+        ":Analysis",
+        ":Core",
+        ":MC",
+        ":Support",
         ":config",
-        ":core",
-        ":mc",
-        ":support",
     ],
 )
 
+alias(
+    name = "target",
+    actual = ":Target",
+)
+
 cc_library(
-    name = "testing_support",
+    name = "TestingSupport",
     srcs = glob([
         "lib/Testing/Support/*.c",
         "lib/Testing/Support/*.cpp",
@@ -4015,13 +4692,18 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "testing_support",
+    actual = ":TestingSupport",
+)
+
 cc_library(
-    name = "text_api",
+    name = "TextAPI",
     srcs = glob([
         "lib/TextAPI/*.c",
         "lib/TextAPI/*.cpp",
@@ -4049,14 +4731,19 @@
     ],
     copts = llvm_copts,
     deps = [
-        ":binary_format",
+        ":BinaryFormat",
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "text_api",
+    actual = ":TextAPI",
+)
+
 cc_library(
-    name = "transform_utils",
+    name = "TransformUtils",
     srcs = glob([
         "lib/Transforms/Utils/*.c",
         "lib/Transforms/Utils/*.cpp",
@@ -4072,15 +4759,49 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":analysis",
+        ":Analysis",
+        ":Core",
+        ":Support",
         ":config",
-        ":core",
-        ":support",
     ],
 )
 
+alias(
+    name = "transform_utils",
+    actual = ":TransformUtils",
+)
+
 cc_library(
-    name = "ve_code_gen",
+    name = "VEAsmParser",
+    srcs = glob([
+        "lib/Target/VE/AsmParser/*.c",
+        "lib/Target/VE/AsmParser/*.cpp",
+        "lib/Target/VE/AsmParser/*.inc",
+    ]),
+    hdrs = glob([
+        "include/llvm/Target/VE/AsmParser/*.h",
+        "include/llvm/Target/VE/AsmParser/*.def",
+        "include/llvm/Target/VE/AsmParser/*.inc",
+        "lib/Target/VE/AsmParser/*.h",
+    ]),
+    copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/VE"],
+    deps = [
+        ":MC",
+        ":MCParser",
+        ":Support",
+        ":VEDesc",
+        ":VEInfo",
+        ":config",
+    ],
+)
+
+alias(
+    name = "ve_asm_parser",
+    actual = ":VEAsmParser",
+)
+
+cc_library(
+    name = "VECodeGen",
     srcs = glob([
         "lib/Target/VE/*.c",
         "lib/Target/VE/*.cpp",
@@ -4094,22 +4815,27 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/VE"],
     deps = [
-        ":analysis",
-        ":asm_printer",
-        ":code_gen",
+        ":Analysis",
+        ":AsmPrinter",
+        ":CodeGen",
+        ":Core",
+        ":MC",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
+        ":VEDesc",
+        ":VEInfo",
         ":config",
-        ":core",
-        ":mc",
-        ":selection_dag",
-        ":support",
-        ":target",
-        ":ve_desc",
-        ":ve_info",
     ],
 )
 
+alias(
+    name = "ve_code_gen",
+    actual = ":VECodeGen",
+)
+
 cc_library(
-    name = "ve_desc",
+    name = "VEDesc",
     srcs = glob([
         "lib/Target/VE/MCTargetDesc/*.c",
         "lib/Target/VE/MCTargetDesc/*.cpp",
@@ -4123,15 +4849,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/VE"],
     deps = [
+        ":MC",
+        ":Support",
+        ":VEInfo",
         ":config",
-        ":mc",
-        ":support",
-        ":ve_info",
     ],
 )
 
+alias(
+    name = "ve_desc",
+    actual = ":VEDesc",
+)
+
 cc_library(
-    name = "ve_info",
+    name = "VEInfo",
     srcs = glob([
         "lib/Target/VE/TargetInfo/*.c",
         "lib/Target/VE/TargetInfo/*.cpp",
@@ -4145,13 +4876,18 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/VE"],
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "ve_info",
+    actual = ":VEInfo",
+)
+
 cc_library(
-    name = "vectorize",
+    name = "Vectorize",
     srcs = glob([
         "lib/Transforms/Vectorize/*.c",
         "lib/Transforms/Vectorize/*.cpp",
@@ -4167,17 +4903,22 @@
     ]),
     copts = llvm_copts,
     deps = [
-        ":analysis",
+        ":Analysis",
+        ":Core",
+        ":Support",
+        ":TransformUtils",
         ":config",
-        ":core",
         ":scalar",
-        ":support",
-        ":transform_utils",
     ],
 )
 
+alias(
+    name = "vectorize",
+    actual = ":Vectorize",
+)
+
 cc_library(
-    name = "web_assembly_asm_parser",
+    name = "WebAssemblyAsmParser",
     srcs = glob([
         "lib/Target/WebAssembly/AsmParser/*.c",
         "lib/Target/WebAssembly/AsmParser/*.cpp",
@@ -4191,16 +4932,21 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/WebAssembly"],
     deps = [
+        ":MC",
+        ":MCParser",
+        ":Support",
+        ":WebAssemblyInfo",
         ":config",
-        ":mc",
-        ":mc_parser",
-        ":support",
-        ":web_assembly_info",
     ],
 )
 
+alias(
+    name = "web_assembly_asm_parser",
+    actual = ":WebAssemblyAsmParser",
+)
+
 cc_library(
-    name = "web_assembly_code_gen",
+    name = "WebAssemblyCodeGen",
     srcs = glob([
         "lib/Target/WebAssembly/*.c",
         "lib/Target/WebAssembly/*.cpp",
@@ -4214,25 +4960,30 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/WebAssembly"],
     deps = [
-        ":analysis",
-        ":asm_printer",
-        ":binary_format",
-        ":code_gen",
+        ":Analysis",
+        ":AsmPrinter",
+        ":BinaryFormat",
+        ":CodeGen",
+        ":Core",
+        ":MC",
+        ":Scalar",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
+        ":TransformUtils",
+        ":WebAssemblyDesc",
+        ":WebAssemblyInfo",
         ":config",
-        ":core",
-        ":mc",
-        ":scalar",
-        ":selection_dag",
-        ":support",
-        ":target",
-        ":transform_utils",
-        ":web_assembly_desc",
-        ":web_assembly_info",
     ],
 )
 
+alias(
+    name = "web_assembly_code_gen",
+    actual = ":WebAssemblyCodeGen",
+)
+
 cc_library(
-    name = "web_assembly_desc",
+    name = "WebAssemblyDesc",
     srcs = glob([
         "lib/Target/WebAssembly/MCTargetDesc/*.c",
         "lib/Target/WebAssembly/MCTargetDesc/*.cpp",
@@ -4246,15 +4997,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/WebAssembly"],
     deps = [
+        ":MC",
+        ":Support",
+        ":WebAssemblyInfo",
         ":config",
-        ":mc",
-        ":support",
-        ":web_assembly_info",
     ],
 )
 
+alias(
+    name = "web_assembly_desc",
+    actual = ":WebAssemblyDesc",
+)
+
 cc_library(
-    name = "web_assembly_disassembler",
+    name = "WebAssemblyDisassembler",
     srcs = glob([
         "lib/Target/WebAssembly/Disassembler/*.c",
         "lib/Target/WebAssembly/Disassembler/*.cpp",
@@ -4268,17 +5024,22 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/WebAssembly"],
     deps = [
+        ":MC",
+        ":MCDisassembler",
+        ":Support",
+        ":WebAssemblyDesc",
+        ":WebAssemblyInfo",
         ":config",
-        ":mc",
-        ":mc_disassembler",
-        ":support",
-        ":web_assembly_desc",
-        ":web_assembly_info",
     ],
 )
 
+alias(
+    name = "web_assembly_disassembler",
+    actual = ":WebAssemblyDisassembler",
+)
+
 cc_library(
-    name = "web_assembly_info",
+    name = "WebAssemblyInfo",
     srcs = glob([
         "lib/Target/WebAssembly/TargetInfo/*.c",
         "lib/Target/WebAssembly/TargetInfo/*.cpp",
@@ -4292,13 +5053,18 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/WebAssembly"],
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "web_assembly_info",
+    actual = ":WebAssemblyInfo",
+)
+
 cc_library(
-    name = "windows_manifest",
+    name = "WindowsManifest",
     srcs = glob([
         "lib/WindowsManifest/*.c",
         "lib/WindowsManifest/*.cpp",
@@ -4312,13 +5078,18 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "windows_manifest",
+    actual = ":WindowsManifest",
+)
+
 cc_library(
-    name = "x86_asm_parser",
+    name = "X86AsmParser",
     srcs = glob([
         "lib/Target/X86/AsmParser/*.c",
         "lib/Target/X86/AsmParser/*.cpp",
@@ -4332,17 +5103,22 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/X86"],
     deps = [
+        ":MC",
+        ":MCParser",
+        ":Support",
+        ":X86Desc",
+        ":X86Info",
         ":config",
-        ":mc",
-        ":mc_parser",
-        ":support",
-        ":x86_desc",
-        ":x86_info",
     ],
 )
 
+alias(
+    name = "x86_asm_parser",
+    actual = ":X86AsmParser",
+)
+
 cc_library(
-    name = "x86_code_gen",
+    name = "X86CodeGen",
     srcs = glob([
         "lib/Target/X86/*.c",
         "lib/Target/X86/*.cpp",
@@ -4356,26 +5132,31 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/X86"],
     deps = [
-        ":analysis",
-        ":asm_printer",
-        ":cf_guard",
-        ":code_gen",
+        ":Analysis",
+        ":AsmPrinter",
+        ":CFGuard",
+        ":CodeGen",
+        ":Core",
+        ":GlobalISel",
+        ":MC",
+        ":ProfileData",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
+        ":X86Desc",
+        ":X86Info",
         ":config",
-        ":core",
-        ":global_i_sel",
-        ":mc",
-        ":profile_data",
-        ":selection_dag",
-        ":support",
-        ":target",
         ":x86_defs",
-        ":x86_desc",
-        ":x86_info",
     ],
 )
 
+alias(
+    name = "x86_code_gen",
+    actual = ":X86CodeGen",
+)
+
 cc_library(
-    name = "x86_desc",
+    name = "X86Desc",
     srcs = glob([
         "lib/Target/X86/MCTargetDesc/*.c",
         "lib/Target/X86/MCTargetDesc/*.cpp",
@@ -4389,17 +5170,22 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/X86"],
     deps = [
-        ":binary_format",
+        ":BinaryFormat",
+        ":MC",
+        ":MCDisassembler",
+        ":Support",
+        ":X86Info",
         ":config",
-        ":mc",
-        ":mc_disassembler",
-        ":support",
-        ":x86_info",
     ],
 )
 
+alias(
+    name = "x86_desc",
+    actual = ":X86Desc",
+)
+
 cc_library(
-    name = "x86_disassembler",
+    name = "X86Disassembler",
     srcs = glob([
         "lib/Target/X86/Disassembler/*.c",
         "lib/Target/X86/Disassembler/*.cpp",
@@ -4413,15 +5199,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/X86"],
     deps = [
+        ":MCDisassembler",
+        ":Support",
+        ":X86Info",
         ":config",
-        ":mc_disassembler",
-        ":support",
-        ":x86_info",
     ],
 )
 
+alias(
+    name = "x86_disassembler",
+    actual = ":X86Disassembler",
+)
+
 cc_library(
-    name = "x86_info",
+    name = "X86Info",
     srcs = glob([
         "lib/Target/X86/TargetInfo/*.c",
         "lib/Target/X86/TargetInfo/*.cpp",
@@ -4436,15 +5227,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/X86"],
     deps = [
+        ":Support",
         ":config",
         ":mc",
-        ":support",
         ":x86_target_gen",
     ],
 )
 
+alias(
+    name = "x86_info",
+    actual = ":X86Info",
+)
+
 cc_library(
-    name = "x_core_code_gen",
+    name = "XCoreCodeGen",
     srcs = glob([
         "lib/Target/XCore/*.c",
         "lib/Target/XCore/*.cpp",
@@ -4458,23 +5254,28 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/XCore"],
     deps = [
-        ":analysis",
-        ":asm_printer",
-        ":code_gen",
+        ":Analysis",
+        ":AsmPrinter",
+        ":CodeGen",
+        ":Core",
+        ":MC",
+        ":SelectionDAG",
+        ":Support",
+        ":Target",
+        ":TransformUtils",
+        ":XCoreDesc",
+        ":XCoreInfo",
         ":config",
-        ":core",
-        ":mc",
-        ":selection_dag",
-        ":support",
-        ":target",
-        ":transform_utils",
-        ":x_core_desc",
-        ":x_core_info",
     ],
 )
 
+alias(
+    name = "x_core_code_gen",
+    actual = ":XCoreCodeGen",
+)
+
 cc_library(
-    name = "x_core_desc",
+    name = "XCoreDesc",
     srcs = glob([
         "lib/Target/XCore/MCTargetDesc/*.c",
         "lib/Target/XCore/MCTargetDesc/*.cpp",
@@ -4488,15 +5289,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/XCore"],
     deps = [
+        ":MC",
+        ":Support",
+        ":XCoreInfo",
         ":config",
-        ":mc",
-        ":support",
-        ":x_core_info",
     ],
 )
 
+alias(
+    name = "x_core_desc",
+    actual = ":XCoreDesc",
+)
+
 cc_library(
-    name = "x_core_disassembler",
+    name = "XCoreDisassembler",
     srcs = glob([
         "lib/Target/XCore/Disassembler/*.c",
         "lib/Target/XCore/Disassembler/*.cpp",
@@ -4510,15 +5316,20 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/XCore"],
     deps = [
+        ":MCDisassembler",
+        ":Support",
+        ":XCoreInfo",
         ":config",
-        ":mc_disassembler",
-        ":support",
-        ":x_core_info",
     ],
 )
 
+alias(
+    name = "x_core_disassembler",
+    actual = ":XCoreDisassembler",
+)
+
 cc_library(
-    name = "x_core_info",
+    name = "XCoreInfo",
     srcs = glob([
         "lib/Target/XCore/TargetInfo/*.c",
         "lib/Target/XCore/TargetInfo/*.cpp",
@@ -4532,13 +5343,18 @@
     ]),
     copts = llvm_copts + ["-Iexternal/llvm-project/llvm/lib/Target/XCore"],
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
+alias(
+    name = "x_core_info",
+    actual = ":XCoreInfo",
+)
+
 cc_library(
-    name = "x_ray",
+    name = "XRay",
     srcs = glob([
         "lib/XRay/*.c",
         "lib/XRay/*.cpp",
@@ -4552,12 +5368,17 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Object",
+        ":Support",
         ":config",
-        ":object",
-        ":support",
     ],
 )
 
+alias(
+    name = "x_ray",
+    actual = ":XRay",
+)
+
 cc_library(
     name = "gtest",
     srcs = glob([
@@ -4573,8 +5394,8 @@
     ]),
     copts = llvm_copts,
     deps = [
+        ":Support",
         ":config",
-        ":support",
     ],
 )
 
diff --git a/build_tools/bazel/third_party_import/llvm-project/overlay/mlir/BUILD.bazel b/build_tools/bazel/third_party_import/llvm-project/overlay/mlir/BUILD.bazel
index e3cec7d..68ed321 100644
--- a/build_tools/bazel/third_party_import/llvm-project/overlay/mlir/BUILD.bazel
+++ b/build_tools/bazel/third_party_import/llvm-project/overlay/mlir/BUILD.bazel
@@ -686,6 +686,25 @@
     ],
 )
 
+gentbl(
+    name = "MLIRShapeCanonicalizationIncGen",
+    strip_include_prefix = "include/mlir/Dialect/Shape",
+    tbl_outs = [
+        (
+            "-gen-rewriters",
+            "include/mlir/Dialect/Shape/IR/ShapeCanonicalization.inc",
+        ),
+    ],
+    tblgen = ":mlir-tblgen",
+    td_file = "lib/Dialect/Shape/IR/ShapeCanonicalization.td",
+    td_srcs = [
+        ":StdOpsTdFiles",
+        "include/mlir/Dialect/Shape/IR/ShapeBase.td",
+        "include/mlir/Dialect/Shape/IR/ShapeOps.td",
+        "include/mlir/Interfaces/InferTypeOpInterface.td",
+    ],
+)
+
 cc_library(
     name = "Shape",
     srcs = glob(
@@ -704,6 +723,7 @@
         ":Dialect",
         ":IR",
         ":InferTypeOpInterface",
+        ":MLIRShapeCanonicalizationIncGen",
         ":ShapeOpsIncGen",
         ":SideEffects",
         ":Support",
@@ -712,6 +732,31 @@
 )
 
 cc_library(
+    name = "ShapeToStandard",
+    srcs = glob([
+        "lib/Conversion/ShapeToStandard/*.cpp",
+        "lib/Conversion/ShapeToStandard/*.h",
+    ]) + ["lib/Conversion/PassDetail.h"],
+    hdrs = glob([
+        "include/mlir/Conversion/ShapeToStandard/*.h",
+    ]),
+    includes = ["include"],
+    deps = [
+        ":Affine",
+        ":ConversionPassIncGen",
+        ":IR",
+        ":Pass",
+        ":SCFDialect",
+        ":Shape",
+        ":StandardOps",
+        ":Support",
+        ":Transforms",
+        "@llvm-project//llvm:core",
+        "@llvm-project//llvm:support",
+    ],
+)
+
+cc_library(
     name = "StandardOps",
     srcs = glob(
         [
@@ -2486,6 +2531,7 @@
         ":Parser",
         ":Pass",
         ":SCFTransforms",
+        ":ShapeToStandard",
         ":StandardOpsTransforms",
         ":StandardToSPIRVConversions",
         ":Support",
@@ -2583,6 +2629,7 @@
         ":SPIRVLowering",
         ":SPIRVPassIncGen",
         ":Shape",
+        ":ShapeToStandard",
         ":StandardOps",
         ":StandardOpsTransforms",
         ":StandardOpsTransformsPassIncGen",
@@ -3269,6 +3316,7 @@
         "include/mlir/Dialect/Linalg/EDSC/Builders.h",
         "include/mlir/Dialect/Linalg/EDSC/FoldedIntrinsics.h",
         "include/mlir/Dialect/Linalg/Passes.h",
+        "include/mlir/Dialect/Linalg/Transforms/Hoisting.h",
         "include/mlir/Dialect/Linalg/Transforms/Transforms.h",
         "include/mlir/Dialect/Linalg/Utils/Utils.h",
     ],
@@ -3288,6 +3336,7 @@
         ":LinalgStructuredOpsIncGen",
         ":Pass",
         ":SCFDialect",
+        ":SCFTransforms",
         ":StandardOps",
         ":Support",
         ":TransformUtils",
diff --git a/third_party/tensorflow b/third_party/tensorflow
index 7e85bf9..6a47118 160000
--- a/third_party/tensorflow
+++ b/third_party/tensorflow
@@ -1 +1 @@
-Subproject commit 7e85bf98da5981b07d9b9115199c0f55003b3971
+Subproject commit 6a4711835ade7ba20547d8605ead805e90835e3d