[llvm] [llvm] Guard CGTestPlugin folder under LLVM_ENABLE_PLUGINS uniformly (NFC) (PR #225362)

[Stefan Gränitz via llvm-commits]

https://github.com/weliveindetail updated https://github.com/llvm/llvm-project/pull/225362

>From dbdee1cf8f639e7f0a80444def7ffd84c24474b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Gr=C3=A4nitz?= <stefan.graenitz at gmail.com>
Date: Tue, 22 Sep 2026 10:58:15 +0200
Subject: [PATCH 1/2] [llvm] Guard CGTestPlugin folder under
 LLVM_ENABLE_PLUGINS uniformly (NFC)

---
 llvm/test/Other/codegen-plugin-loading.ll     |  2 +-
 .../CGPluginTest/Plugin/CMakeLists.txt        | 22 +++++++++----------
 .../CodeGen/CGPluginTest/PluginTest.cpp       | 10 ---------
 llvm/unittests/CodeGen/CMakeLists.txt         |  5 ++++-
 4 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/llvm/test/Other/codegen-plugin-loading.ll b/llvm/test/Other/codegen-plugin-loading.ll
index cfbd239470ccb..0e2af7757696c 100644
--- a/llvm/test/Other/codegen-plugin-loading.ll
+++ b/llvm/test/Other/codegen-plugin-loading.ll
@@ -1,5 +1,5 @@
 ; RUN: llc -load-pass-plugin %llvmshlibdir/CGTestPlugin%pluginext %s -o - | FileCheck %s
-; REQUIRES: native, system-linux, llvm-dylib
+; REQUIRES: native, system-linux, llvm-dylib, plugins
 
 ; CHECK: CodeGen Test Pass running on main
 define void @main() {
diff --git a/llvm/unittests/CodeGen/CGPluginTest/Plugin/CMakeLists.txt b/llvm/unittests/CodeGen/CGPluginTest/Plugin/CMakeLists.txt
index 6cd2e15d2968c..8c1699e007dbc 100644
--- a/llvm/unittests/CodeGen/CGPluginTest/Plugin/CMakeLists.txt
+++ b/llvm/unittests/CodeGen/CGPluginTest/Plugin/CMakeLists.txt
@@ -1,14 +1,12 @@
-if (NOT WIN32 AND NOT CYGWIN)
-  unset(LLVM_LINK_COMPONENTS)
-  add_llvm_library(CGTestPlugin MODULE BUILDTREE_ONLY
-    CodeGenTestPass.cpp
-    Plugin.cpp
+unset(LLVM_LINK_COMPONENTS)
+add_llvm_library(CGTestPlugin MODULE BUILDTREE_ONLY
+  CodeGenTestPass.cpp
+  Plugin.cpp
 
-    DEPENDS
-    intrinsics_gen
-    vt_gen
-    )
+  DEPENDS
+  intrinsics_gen
+  vt_gen
+  )
 
-  set_target_properties(CGTestPlugin PROPERTIES FOLDER "Tests")
-  add_dependencies(CGPluginTest CGTestPlugin)
-endif ()
+set_target_properties(CGTestPlugin PROPERTIES FOLDER "Tests")
+add_dependencies(CGPluginTest CGTestPlugin)
diff --git a/llvm/unittests/CodeGen/CGPluginTest/PluginTest.cpp b/llvm/unittests/CodeGen/CGPluginTest/PluginTest.cpp
index 3e8be11c3433f..260f69c54e6d2 100644
--- a/llvm/unittests/CodeGen/CGPluginTest/PluginTest.cpp
+++ b/llvm/unittests/CodeGen/CGPluginTest/PluginTest.cpp
@@ -37,11 +37,6 @@ class CGPluginTests : public testing::Test {
 } // namespace llvm
 
 TEST_F(CGPluginTests, LoadPlugin) {
-#if !defined(LLVM_ENABLE_PLUGINS)
-  // Skip the test if plugins are disabled.
-  GTEST_SKIP();
-#endif
-
   auto PluginPath{std::string{"CGTestPlugin"} + LLVM_PLUGIN_EXT};
 
   std::string Error;
@@ -51,11 +46,6 @@ TEST_F(CGPluginTests, LoadPlugin) {
 }
 
 TEST_F(CGPluginTests, ExecuteCallback) {
-#if !defined(LLVM_ENABLE_PLUGINS)
-  // Skip the test if plugins are disabled.
-  GTEST_SKIP();
-#endif
-
   volatile bool CallbackExecuted = false;
   volatile bool MPassExecuted = false;
 
diff --git a/llvm/unittests/CodeGen/CMakeLists.txt b/llvm/unittests/CodeGen/CMakeLists.txt
index c192672e1a093..ea8028f4cf979 100644
--- a/llvm/unittests/CodeGen/CMakeLists.txt
+++ b/llvm/unittests/CodeGen/CMakeLists.txt
@@ -59,6 +59,9 @@ add_llvm_unittest(CodeGenTests
   )
 
 add_subdirectory(GlobalISel)
-add_subdirectory(CGPluginTest)
+
+if (LLVM_ENABLE_PLUGINS)
+  add_subdirectory(CGPluginTest)
+endif()
 
 target_link_libraries(CodeGenTests PRIVATE LLVMTestingSupport)

>From 2b90099ea69b5386f2592b0083d0e33e1d51b2c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Gr=C3=A4nitz?= <stefan.graenitz at gmail.com>
Date: Tue, 22 Sep 2026 15:08:33 +0200
Subject: [PATCH 2/2] Add CGTestPlugin to LLVM_TEST_DEPENDS and move test to
 Feature/codegen-plugin-legacy.ll

---
 llvm/test/CMakeLists.txt                                      | 4 ++++
 .../codegen-plugin-legacy.ll}                                 | 0
 2 files changed, 4 insertions(+)
 rename llvm/test/{Other/codegen-plugin-loading.ll => Feature/codegen-plugin-legacy.ll} (100%)

diff --git a/llvm/test/CMakeLists.txt b/llvm/test/CMakeLists.txt
index 6c411e9fa99c0..18f176c3fe17f 100644
--- a/llvm/test/CMakeLists.txt
+++ b/llvm/test/CMakeLists.txt
@@ -203,6 +203,10 @@ if (TARGET llvm-calc-occupancy)
   list(APPEND LLVM_TEST_DEPENDS llvm-calc-occupancy)
 endif ()
 
+if (TARGET CGTestPlugin)
+  list(APPEND LLVM_TEST_DEPENDS CGTestPlugin)
+endif()
+
 if(LLVM_INCLUDE_EXAMPLES)
   list(APPEND LLVM_TEST_DEPENDS
     Kaleidoscope-Ch3
diff --git a/llvm/test/Other/codegen-plugin-loading.ll b/llvm/test/Feature/codegen-plugin-legacy.ll
similarity index 100%
rename from llvm/test/Other/codegen-plugin-loading.ll
rename to llvm/test/Feature/codegen-plugin-legacy.ll