[gold] Remove support for legacy pass manager

[nikic]

Summary

This removes support for performing LTO using the legacy pass manager in gold. Explicitly enabling the new pass manager is retained as a no-op.

[nikic]

llvm/test/tools/gold/X86/opt-remarks.ll

56

I believe this remark duplication is because both AlwaysInliner and Inliner emit remarks.

[MaskRay]

llvm/tools/gold/gold-plugin.cpp

288

//

[MaskRay]

sing the legacy pass manager in gold

in LLVMgold.so

Despite the name, this supports both gold and GNU ld.

llvm/test/tools/gold/X86/disable-verify.ll

 ; RUN: llvm-as %s -o %t.o
 ; REQUIRES: asserts
 
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
-; RUN:    --plugin-opt=disable-verify --plugin-opt=legacy-pass-manager \
-; RUN:    --plugin-opt=-debug-pass=Arguments \
+; RUN:    --plugin-opt=disable-verify --plugin-opt=debug-pass-manager \
 ; RUN:    -shared %t.o -o %t2.o 2>&1 | FileCheck %s
 
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
-; RUN:    --plugin-opt=-debug-pass=Arguments --plugin-opt=legacy-pass-manager \
+; RUN:    --plugin-opt=debug-pass-manager \
 ; RUN:    -shared %t.o -o %t2.o 2>&1 | FileCheck %s -check-prefix=VERIFY
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 ; -disable-verify should disable output verification from the optimization
 ; pipeline.
-; CHECK: Pass Arguments: {{.*}} -verify -
-; CHECK-NOT: -verify
+; CHECK-NOT: VerifierPass
 
-; VERIFY: Pass Arguments: {{.*}} -verify {{.*}} -verify
+; VERIFY: Running pass: VerifierPass on [module]
+; VERIFY: Running pass: VerifierPass on [module]
 
 define void @f() {
 entry:
   ret void
 }

llvm/test/tools/gold/X86/new-pm.ll

 ; Test plugin options new-pass-manager and debug-pass-manager
 ; RUN: opt -module-summary %s -o %t.o
 
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     --plugin-opt=thinlto \
 ; RUN:     --plugin-opt=new-pass-manager \
 ; RUN:     --plugin-opt=debug-pass-manager \
 ; RUN:     --plugin-opt=cache-dir=%t.cache \
 ; RUN:     -o %t2.o %t.o 2>&1 | FileCheck %s
 
 ; CHECK: Running pass:
 
-;; --plugin-opt=debug-pass-manager is a no-op for the legacy pass manager.
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
-; RUN:     --plugin-opt=thinlto \
-; RUN:     --plugin-opt=legacy-pass-manager --plugin-opt=debug-pass-manager \
-; RUN:     -o /dev/null %t.o 2>&1 | count 0
-
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 define void @globalfunc() #0 {
 entry:
   ret void
 }

llvm/test/tools/gold/X86/opt-level.ll

 ; RUN: llvm-as -o %t.bc %s
 ; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext -plugin-opt=save-temps \
-; RUN:    -m elf_x86_64 \
-; RUN:    -plugin-opt=O0 -r -o %t.o %t.bc
-; RUN: llvm-dis < %t.o.0.4.opt.bc -o - | FileCheck --check-prefix=CHECK-O0 %s
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext -plugin-opt=save-temps \
-; RUN:    -m elf_x86_64 --plugin-opt=legacy-pass-manager \
-; RUN:    -plugin-opt=O1 -r -o %t.o %t.bc
-; RUN: llvm-dis < %t.o.0.4.opt.bc -o - | FileCheck --check-prefix=CHECK-O1 --check-prefix=CHECK-O1-OLDPM %s
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext -plugin-opt=save-temps \
-; RUN:    -m elf_x86_64 \
-; RUN:    -plugin-opt=O2 -r -o %t.o %t.bc
-; RUN: llvm-dis < %t.o.0.4.opt.bc -o - | FileCheck --check-prefix=CHECK-O2 %s
-
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext -plugin-opt=save-temps \
 ; RUN:    -m elf_x86_64 --plugin-opt=new-pass-manager \
 ; RUN:    -plugin-opt=O0 -r -o %t.o %t.bc
 ; RUN: llvm-dis < %t.o.0.4.opt.bc -o - | FileCheck --check-prefix=CHECK-O0 %s
 ; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext -plugin-opt=save-temps \
 ; RUN:    -m elf_x86_64 --plugin-opt=new-pass-manager \
 ; RUN:    -plugin-opt=O1 -r -o %t.o %t.bc
-; RUN: llvm-dis < %t.o.0.4.opt.bc -o - | FileCheck --check-prefix=CHECK-O1 --check-prefix=CHECK-O1-NEWPM %s
+; RUN: llvm-dis < %t.o.0.4.opt.bc -o - | FileCheck --check-prefix=CHECK-O1 %s
 ; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext -plugin-opt=save-temps \
 ; RUN:    -m elf_x86_64 --plugin-opt=new-pass-manager \
 ; RUN:    -plugin-opt=O2 -r -o %t.o %t.bc
 ; RUN: llvm-dis < %t.o.0.4.opt.bc -o - | FileCheck --check-prefix=CHECK-O2 %s
 
 ; CHECK-O0: define internal void @foo(
 ; CHECK-O1: define internal void @foo(
 ; CHECK-O2-NOT: define internal void @foo(

 t:
   br label %end
 
 f:
   br label %end
 
 end:
   ; CHECK-O0: phi
-  ; CHECK-O1-OLDPM: select
-  ; The new PM does not do as many optimizations at O1
-  ; CHECK-O1-NEWPM: phi
+  ; CHECK-O1: phi
   %r = phi i32 [ 1, %t ], [ 2, %f ]
   ret i32 %r
 }
 
 define i1 @baz() {
   call void @foo()
   %c = call i32 @bar(i1 true)
   %p = call i1 @llvm.type.test(i8* undef, metadata !"typeid1")

llvm/test/tools/gold/X86/opt-remarks.ll

 ; Test plugin options for opt-remarks.
 ; RUN: llvm-as %s -o %t.o
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext -shared \
-; RUN:    -plugin-opt=save-temps -plugin-opt=legacy-pass-manager \
+; RUN:    -plugin-opt=save-temps \
 ; RUN:    -plugin-opt=opt-remarks-passes=inline \
 ; RUN:    -plugin-opt=opt-remarks-format=yaml \
 ; RUN:    -plugin-opt=opt-remarks-filename=%t.yaml %t.o -o %t2.o 2>&1
 ; RUN: llvm-dis %t2.o.0.4.opt.bc -o - | FileCheck %s
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext -shared \
 ; RUN:    -plugin-opt=opt-remarks-passes=inline \
 ; RUN:    -plugin-opt=opt-remarks-format=yaml \
 ; RUN:    -plugin-opt=opt-remarks-with-hotness \

 ; YAML-NEXT: Name:            NoDefinition
 ; YAML-NEXT: Function:        f
 ; YAML-NEXT: Args:
 ; YAML-NEXT:   - Callee:          bar
 ; YAML-NEXT:   - String:          ' will not be inlined into '
 ; YAML-NEXT:   - Caller:          f
 ; YAML-NEXT:   - String:          ' because its definition is unavailable'
 ; YAML-NEXT: ...
+; YAML-NEXT: --- !Missed
+; YAML-NEXT: Pass:            inline
+; YAML-NEXT: Name:            NoDefinition
+; YAML-NEXT: Function:        f
+; YAML-NEXT: Args:
+; YAML-NEXT:   - Callee:          bar
+; YAML-NEXT:   - String:          ' will not be inlined into '
+; YAML-NEXT:   - Caller:          f
+; YAML-NEXT:   - String:          ' because its definition is unavailable'
+; YAML-NEXT: ...
 ; YAML-NEXT: --- !Passed
 ; YAML-NEXT: Pass:            inline
 ; YAML-NEXT: Name:            Inlined
 ; YAML-NEXT: Function:        _start
 ; YAML-NEXT: Args:
 ; YAML-NEXT:   - String:          ''''
 ; YAML-NEXT:   - Callee:          f
 ; YAML-NEXT:   - String:          ''' inlined into '''

llvm/test/tools/gold/X86/slp-vectorize.ll

 ; RUN: llvm-as %s -o %t.o
 
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
-; RUN:    --plugin-opt=save-temps --plugin-opt=legacy-pass-manager \
-; RUN:    -shared %t.o -o %t2.o
+; RUN:    --plugin-opt=save-temps -shared %t.o -o %t2.o
 ; RUN: llvm-dis %t2.o.0.4.opt.bc -o - | FileCheck %s
 
 ; test that the vectorizer is run.
 ; CHECK: fadd <4 x float>
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 

llvm/test/tools/gold/X86/vectorize.ll

 ; RUN: llvm-as %s -o %t.o
 
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
-; RUN:    --plugin-opt=save-temps --plugin-opt=legacy-pass-manager \
-; RUN:    -shared %t.o -o %t2.o
+; RUN:    --plugin-opt=save-temps -shared %t.o -o %t2.o
 ; RUN: llvm-dis %t2.o.0.4.opt.bc -o - | FileCheck %s
 
 ; test that the vectorizer is run.
 ; CHECK: fadd <4 x float>
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 

llvm/tools/gold/gold-plugin.cpp

#endif
   // Optional pruning policy for ThinLTO caches.
   static std::string cache_policy;
   // Additional options to pass into the code generator.
   // Note: This array will contain all plugin options which are not claimed
   // as plugin exclusive to pass to the code generator.
   static std::vector<const char *> extra;
   // Sample profile file path
   static std::string sample_profile;
-  // New pass manager
-  static bool new_pass_manager = true;
   // Debug new pass manager
   static bool debug_pass_manager = false;
   // Directory to store the .dwo files.
   static std::string dwo_dir;
   /// Statistics output filename.
   static std::string stats_file;
   // Asserts that LTO link has whole program visibility
   static bool whole_program_visibility = false;
if (opt.consume_front("mcpu=")) {
       DisableVerify = true;
     } else if (opt.consume_front("sample-profile=")) {
       sample_profile = std::string(opt);
     } else if (opt == "cs-profile-generate") {
       cs_pgo_gen = true;
     } else if (opt.consume_front("cs-profile-path=")) {
       cs_profile_path = std::string(opt);
     } else if (opt == "new-pass-manager") {
-      new_pass_manager = true;
-    } else if (opt == "legacy-pass-manager") {
-      new_pass_manager = false;
+      // We always use the new pass manager.
     } else if (opt == "debug-pass-manager") {
       debug_pass_manager = true;
     } else if (opt == "whole-program-visibility") {
       whole_program_visibility = true;
     } else if (opt.consume_front("dwo_dir=")) {
       dwo_dir = std::string(opt);
     } else if (opt.consume_front("opt-remarks-filename=")) {
       RemarksFilename = std::string(opt);
static std::unique_ptr<LTO> createLTO(IndexWriteCallback OnIndexWrite,
 
   // Set up optimization remarks handling.
   Conf.RemarksFilename = options::RemarksFilename;
   Conf.RemarksPasses = options::RemarksPasses;
   Conf.RemarksWithHotness = options::RemarksWithHotness;
   Conf.RemarksHotnessThreshold = options::RemarksHotnessThreshold;
   Conf.RemarksFormat = options::RemarksFormat;
 
-  // Use new pass manager if set in driver
-  Conf.UseNewPM = options::new_pass_manager;
   // Debug new pass manager if requested
   Conf.DebugPassManager = options::debug_pass_manager;
 
   Conf.HasWholeProgramVisibility = options::whole_program_visibility;
 
   Conf.StatsFile = options::stats_file;
   return std::make_unique<LTO>(std::move(Conf), Backend,
                                 options::ParallelCodeGenParallelismLevel);