[unittest] Restructure plugin cmake target

[IBricchi]

Summary

Move plugin source and cmake files into separate directory.
Typically cmake targets in LLVM have a single target per directory.
This change brings this unittest more inline with that structure.

[IBricchi]

Add new lines to end of files

[IBricchi]

Fix missindentation

[IBricchi]

I moved the plugins into their own directory similar to https://reviews.llvm.org/D140559.

This reduces how many files need to be set as optional sources, however this folder still contains two unit tests as separate targets, so we still do need to have optional sources set when defining each target.

We could separate these two out into their own subdirectories aswell wdyt?

[thakis]

We could separate these two out into their own subdirectories aswell wdyt?

IMHO that'd be a good change.

[IBricchi]

Move all cmake targets into their own subdirectory

[IBricchi]

Add new line at end of files

[thakis]

Thanks, that looks much nicer!

llvm/unittests/Passes/Plugins/DoublerPlugin/CMakeLists.txt

1 ↗

(On Diff #485063)

should the two plugin dirs be below llvm/unittests/Passes/PassBuilderBindings now? (up to you)

[IBricchi]

llvm/unittests/Passes/Plugins/DoublerPlugin/CMakeLists.txt

1 ↗

(On Diff #485063)

I don't think so since it's the "Passes/Plugins/PluginsTests.cpp" file that uses them

[IBricchi]

I don't have commit access, could one of you two commit this for me?

Username: ibricchi
Email: [e-mail]

[IBricchi]

Implement fix for AIX cmake issue from https://reviews.llvm.org/D140559

[IBricchi]

I wanted to check again if someone could commit this for me since I don't have commit access
ibricchi <[e-mail]>

[IBricchi]

ping

llvm/unittests/Passes/CMakeLists.txt

-# Needed by LLVM's CMake checks because this file defines multiple targets.
-set(LLVM_OPTIONAL_SOURCES PluginsTest.cpp TestPlugin.cpp DoublerPlugin.cpp PassBuilderBindingsTest.cpp)
-
 # The plugin expects to not link against the Support and Core libraries,
 # but expects them to exist in the process loading the plugin. This doesn't
 # work with DLLs on Windows (where a shared library can't have undefined
 # references), so just skip this testcase on Windows.
 if (NOT WIN32)
+  # Needed by LLVM's CMake checks because this file defines multiple targets.
+  set(LLVM_OPTIONAL_SOURCES PassBuilderBindingsTest.cpp)
+
   # On AIX, enable run-time linking to allow symbols from the plugins shared
   # objects to be properly bound.
   if(CMAKE_SYSTEM_NAME STREQUAL "AIX")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-brtl")
   endif()
   set(LLVM_LINK_COMPONENTS Support Passes Core AsmParser)
     add_llvm_unittest(PluginsTests
     PluginsTest.cpp
     )
   export_executable_symbols_for_plugins(PluginsTests)
   target_link_libraries(PluginsTests PRIVATE LLVMTestingSupport)
 
-  set(LLVM_LINK_COMPONENTS)
-  foreach(PLUGIN TestPlugin DoublerPlugin)
-    add_llvm_library(${PLUGIN} MODULE BUILDTREE_ONLY ${PLUGIN}.cpp)
-
-    # Put PLUGIN next to the unit test executable.
-    set_output_directory(${PLUGIN}
-      BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
-      LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
-      )
-    set_target_properties(${PLUGIN} PROPERTIES FOLDER "Tests")
-
-    add_dependencies(${PLUGIN} intrinsics_gen)
-    add_dependencies(PluginsTests ${PLUGIN})
-  endforeach()
-
+  unset(LLVM_LINK_COMPONENTS)
+  add_subdirectory(TestPlugin)
+  add_subdirectory(DoublerPlugin)
 endif()
 
+# Needed by LLVM's CMake checks because this file defines multiple targets.
+set(LLVM_OPTIONAL_SOURCES PluginsTest.cpp)
+
 set(LLVM_LINK_COMPONENTS Support Passes Core Target native AllTargetsInfos)
 add_llvm_unittest(PassesBindingsTests
-  PassBuilderBindingsTest.cpp
-  )
 target_link_libraries(PassesBindingsTests PRIVATE LLVMTestingSupport)
 

llvm/unittests/Passes/DoublerPlugin/CMakeLists.txt

+add_llvm_library(DoublerPlugin MODULE BUILDTREE_ONLY DoublerPlugin.cpp)
+
+# Put PLUGIN next to the unit test executable.
+set_output_directory(DoublerPlugin
+    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/../
+    LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/../
+    )
+set_target_properties(DoublerPlugin PROPERTIES FOLDER "Tests")
+
+# The plugin depends on some of the output files of intrinsics_gen, so make sure
+# it is built before the plugin.
+add_dependencies(DoublerPlugin intrinsics_gen)
+add_dependencies(PluginsTests DoublerPlugin)
 No newline at end of file

llvm/unittests/Passes/DoublerPlugin/DoublerPlugin.cpp

 //===- unittests/Passes/DoublerPlugin.cpp
 //--------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Passes/PassBuilder.h"
 #include "llvm/Passes/PassPlugin.h"
 
 using namespace llvm;
 
 struct DoublerModulePass : public PassInfoMixin<DoublerModulePass> {
 
   // Double the value of the initializer
   PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM) {
     auto *GV = cast<GlobalVariable>(M.getNamedValue("doubleme"));
     auto *Init = GV->getInitializer();
     auto *Init2 = ConstantExpr::getAdd(Init, Init);
     GV->setInitializer(Init2);
 
     return PreservedAnalyses::none();
   }
 
   static void registerCallbacks(PassBuilder &PB) {
     PB.registerPipelineParsingCallback(
         [](StringRef Name, ModulePassManager &PM,
            ArrayRef<PassBuilder::PipelineElement> InnerPipeline) {
           if (Name == "doubler-pass") {
             PM.addPass(DoublerModulePass());
             return true;
           }
           return false;
         });
   }
 };
 
 extern "C" ::llvm::PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK
 llvmGetPassPluginInfo() {
   return {LLVM_PLUGIN_API_VERSION, "DoublerPlugin", "2.2-unit",
           DoublerModulePass::registerCallbacks};
 }

llvm/unittests/Passes/TestPlugin/CMakeLists.txt

+add_llvm_library(TestPlugin MODULE BUILDTREE_ONLY TestPlugin.cpp)
+
+# Put PLUGIN next to the unit test executable.
+set_output_directory(TestPlugin
+    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/../
+    LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/../
+    )
+set_target_properties(TestPlugin PROPERTIES FOLDER "Tests")
+
+# The plugin depends on some of the output files of intrinsics_gen, so make sure
+# it is built before the plugin.
+add_dependencies(TestPlugin intrinsics_gen)
+add_dependencies(PluginsTests TestPlugin)
 No newline at end of file

llvm/unittests/Passes/TestPlugin/TestPlugin.cpp

 //===- unittests/Passes/TestPlugin.cpp --------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Passes/PassBuilder.h"
 #include "llvm/Passes/PassPlugin.h"
 
-#include "TestPlugin.h"
+#include "../TestPlugin.h"
 
 using namespace llvm;
 
 struct TestModulePass : public PassInfoMixin<TestModulePass> {
   PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM) {
     return PreservedAnalyses::all();
   }