[llvm] [bazel] Fold "${Target}Analysis" targets into their respective CodeGe… (PR #134312)

[Jorge Gorbe Moya via llvm-commits]

https://github.com/slackito created https://github.com/llvm/llvm-project/pull/134312

…n targets.

After 3801bf6164f570a145e3ebd20cf9114782ae0329, SPIRVAnalysis needs to include SPIRV.h provided by SPIRVCodegen, but the CodeGen target already depends on Analysis, so that would cause a circular dependency.

Analysis is a subdirectory of CodeGen so it makes sense as a part of the main CodeGen target too.

>From f5546d998bccbd48ce1d7f952b8d42aed355c620 Mon Sep 17 00:00:00 2001
From: Jorge Gorbe Moya <jgorbe at google.com>
Date: Thu, 3 Apr 2025 15:07:28 -0700
Subject: [PATCH] [bazel] Fold "${Target}Analysis" targets into their
 respective CodeGen targets.

After 3801bf6164f570a145e3ebd20cf9114782ae0329, SPIRVAnalysis needs to
include SPIRV.h provided by SPIRVCodegen, but the CodeGen target already
depends on Analysis, so that would cause a circular dependency.

Analysis is a subdirectory of CodeGen so it makes sense as a part of the
main CodeGen target too.
---
 .../llvm-project-overlay/llvm/BUILD.bazel     | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
index 072147b7b6150..44fb4357c1e1f 100644
--- a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
@@ -3371,6 +3371,8 @@ gentbl_cc_library(
         name = target["name"] + "CodeGen",
         srcs = glob(
             [
+                "lib/Target/" + target["name"] + "/Analysis/*.cpp",
+                "lib/Target/" + target["name"] + "/Analysis/*.h",
                 "lib/Target/" + target["name"] + "/GISel/*.cpp",
                 "lib/Target/" + target["name"] + "/GISel/*.h",
                 "lib/Target/" + target["name"] + "/*.cpp",
@@ -3406,7 +3408,6 @@ gentbl_cc_library(
             ":TransformUtils",
             ":Vectorize",
             ":config",
-            ":" + target["name"] + "Analysis",
             ":" + target["name"] + "CommonTableGen",
             ":" + target["name"] + "Info",
             ":" + target["name"] + "UtilsAndDesc",
@@ -3511,24 +3512,6 @@ gentbl_cc_library(
             ":" + target["name"] + "UtilsAndDesc",
         ],
     )],
-    [cc_library(
-        name = target["name"] + "Analysis",
-        srcs = glob(
-            [
-                "lib/Target/" + target["name"] + "/Analysis/*.cpp",
-                "lib/Target/" + target["name"] + "/Analysis/*.h",
-            ],
-            allow_empty = True,
-        ),
-        copts = llvm_copts,
-        features = ["-layering_check"],
-        deps = [
-            ":Analysis",
-            ":Core",
-            ":Support",
-            ":TransformUtils",
-        ],
-    )],
 ] for target in llvm_target_lib_list]
 
 cc_library(