fix

wsmoses · wsmoses · commit 99ea48f0f2b2 · 2024-01-24T15:19:12.000-05:00
diff --git a/llvm/test/CMakeLists.txt b/llvm/test/CMakeLists.txt
@@ -138,6 +138,7 @@ set(LLVM_TEST_DEPENDS
           not
           obj2yaml
           opt
+          opt-printplugin
           sancov
           sanstats
           split-file
diff --git a/llvm/test/Feature/load_staticextension.ll b/llvm/test/Feature/load_staticextension.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: x86-registered-target
-; RUN: opt-printplugin %s -load-pass-plugin="PrintPlugin" -passes="printpass" -disable-output 2>&1 | FileCheck %s
+; RUN: opt-printplugin %s -passes="printpass" -disable-output 2>&1 | FileCheck %s
 
 ; REQUIRES: plugins
 
diff --git a/llvm/tools/opt/CMakeLists.txt b/llvm/tools/opt/CMakeLists.txt
@@ -29,37 +29,6 @@ set(LLVM_LINK_COMPONENTS
   Passes
   )
 
-# We don't want to link this into libLLVM
-add_llvm_library(LLVMOptDriver
-  STATIC
-  NewPMDriver.cpp
-  optdriver.cpp
-  PARTIAL_SOURCES_INTENDED
-  DEPENDS
-  intrinsics_gen
-)
-
-add_llvm_tool(opt
-  PARTIAL_SOURCES_INTENDED
-  opt.cpp 
-  DEPENDS
-  intrinsics_gen
-  SUPPORT_PLUGINS
-
-  )
-target_link_libraries(opt PRIVATE LLVMOptDriver)
-
-export_executable_symbols_for_plugins(opt)
-
-if (LLVM_ENABLE_PLUGINS)
-add_llvm_tool(opt-printplugin
-  NewPMDriver.cpp
-  opt.cpp
-  PrintPlugin.cpp
-
-  DEPENDS
-  intrinsics_gen
-  SUPPORT_PLUGINS
-  )
-target_link_options(opt-printplugin PUBLIC -Wl,--export-dynamic-symbol=llvmGetPassPluginInfoPrintPlugin)
-endif()
+add_subdirectory(lib)
+add_subdirectory(driver)
+add_subdirectory(test)
diff --git a/llvm/tools/opt/driver/CMakeLists.txt b/llvm/tools/opt/driver/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_llvm_tool(opt
+  opt.cpp 
+  DEPENDS
+  intrinsics_gen
+  SUPPORT_PLUGINS
+  )
+target_link_libraries(opt PRIVATE LLVMOptDriver)
+export_executable_symbols_for_plugins(opt)
diff --git a/llvm/tools/opt/driver/opt.cpp b/llvm/tools/opt/driver/opt.cpp
diff --git a/llvm/tools/opt/lib/CMakeLists.txt b/llvm/tools/opt/lib/CMakeLists.txt
@@ -0,0 +1,9 @@
+# We don't want to link this into libLLVM
+add_llvm_library(LLVMOptDriver
+  STATIC
+  NewPMDriver.cpp
+  optdriver.cpp
+  PARTIAL_SOURCES_INTENDED
+  DEPENDS
+  intrinsics_gen
+)
diff --git a/llvm/tools/opt/lib/NewPMDriver.cpp b/llvm/tools/opt/lib/NewPMDriver.cpp
diff --git a/llvm/tools/opt/lib/NewPMDriver.h b/llvm/tools/opt/lib/NewPMDriver.h
diff --git a/llvm/tools/opt/lib/optdriver.cpp b/llvm/tools/opt/lib/optdriver.cpp
diff --git a/llvm/tools/opt/test/CMakeLists.txt b/llvm/tools/opt/test/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_llvm_tool(opt-printplugin
+  opt-printplugin.cpp
+  DEPENDS
+  intrinsics_gen
+  SUPPORT_PLUGINS
+  )
+target_link_libraries(opt-printplugin PRIVATE LLVMOptDriver)
+export_executable_symbols_for_plugins(opt-printplugin)
diff --git a/llvm/tools/opt/test/opt-printplugin.cpp b/llvm/tools/opt/test/opt-printplugin.cpp
@@ -1,24 +1,26 @@
-//===- LLVMPrintFunctionNames.cpp
-//---------------------------------------------===//
+//===- opt-printplugin.cpp - The LLVM Modular Optimizer -------------------------------===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 //
-// Example opt plugin which simply prints the names of all the functions
+// Example static opt plugin which simply prints the names of all the functions
 // within the generated LLVM code.
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/ADT/ArrayRef.h"
 #include "llvm/IR/PassManager.h"
 #include "llvm/Passes/OptimizationLevel.h"
 #include "llvm/Passes/PassBuilder.h"
 #include "llvm/Passes/PassPlugin.h"
 #include "llvm/Support/Registry.h"
 #include "llvm/Support/raw_ostream.h"
 
+#include <functional>
+
 using namespace llvm;
 
 namespace {
@@ -40,11 +42,7 @@ class PrintPass final : public llvm::AnalysisInfoMixin<PrintPass> {
   static bool isRequired() { return true; }
 };
 
-} // namespace
-
-llvm::PassPluginLibraryInfo getPrintPluginInfo() {
-  return {LLVM_PLUGIN_API_VERSION, "PrintPlugin", LLVM_VERSION_STRING,
-          [](PassBuilder &PB) {
+void registerPlugin(PassBuilder &PB) {
             PB.registerPipelineParsingCallback(
                 [](StringRef Name, llvm::ModulePassManager &PM,
                    ArrayRef<llvm::PassBuilder::PipelineElement>) {
@@ -54,10 +52,15 @@ llvm::PassPluginLibraryInfo getPrintPluginInfo() {
                   }
                   return false;
                 });
-          }};
 }
 
-extern "C" LLVM_ATTRIBUTE_WEAK ::llvm::PassPluginLibraryInfo
-llvmGetPassPluginInfoPrintPlugin() {
-  return getPrintPluginInfo();
+} // namespace
+
+extern "C" int optMain(int argc, char **argv,
+                       llvm::ArrayRef<std::function<void(llvm::PassBuilder &)>>
+                           PassBuilderCallbacks);
+
+int main(int argc, char **argv) {
+    std::function<void(llvm::PassBuilder &)> plugins[] = {registerPlugin};
+    return optMain(argc, argv, plugins);
 }
diff --git a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
@@ -4817,8 +4817,8 @@ cc_binary(
 cc_library(
     name = "opt-driver",
     srcs = glob([
-        "tools/opt/*.cpp",
-        "tools/opt/*.h",
+        "tools/opt/lib/*.cpp",
+        "tools/opt/lib/*.h",
     ]),
     copts = llvm_copts,
     linkopts = select({
@@ -4855,7 +4855,10 @@ cc_library(
 cc_binary(
     name = "opt",
     stamp = 0,
-    deps = [":opt-driver"]
+    deps = [":opt-driver"],
+    srcs = glob([
+        "tools/opt/driver/opt.cpp",
+    ]),
 )
 
 gentbl(
