[llvm] 50e4e38 - LLVMgold.so: Fix tests after D95380

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2021-02-04T21:14:36-08:00
New Revision: 50e4e385a4be60dd17cd80118eb6bdf386175479

URL: https://github.com/llvm/llvm-project/commit/50e4e385a4be60dd17cd80118eb6bdf386175479
DIFF: https://github.com/llvm/llvm-project/commit/50e4e385a4be60dd17cd80118eb6bdf386175479.diff

LOG: LLVMgold.so: Fix tests after D95380

Added: 
    

Modified: 
    llvm/test/tools/gold/X86/disable-verify.ll
    llvm/test/tools/gold/X86/opt-level.ll
    llvm/test/tools/gold/X86/opt-remarks.ll
    llvm/test/tools/gold/X86/slp-vectorize.ll
    llvm/test/tools/gold/X86/vectorize.ll

Removed: 
    


################################################################################
diff  --git a/llvm/test/tools/gold/X86/disable-verify.ll b/llvm/test/tools/gold/X86/disable-verify.ll
index b7211a77ed65..c1ab6b06acf4 100644
--- a/llvm/test/tools/gold/X86/disable-verify.ll
+++ b/llvm/test/tools/gold/X86/disable-verify.ll
@@ -2,12 +2,12 @@
 ; REQUIRES: asserts
 
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
-; RUN:    --plugin-opt=disable-verify \
+; RUN:    --plugin-opt=disable-verify --plugin-opt=legacy-pass-manager \
 ; RUN:    --plugin-opt=-debug-pass=Arguments \
 ; 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 \
+; RUN:    --plugin-opt=-debug-pass=Arguments --plugin-opt=legacy-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"

diff  --git a/llvm/test/tools/gold/X86/opt-level.ll b/llvm/test/tools/gold/X86/opt-level.ll
index bd49e096a7d1..57eddc8c9129 100644
--- a/llvm/test/tools/gold/X86/opt-level.ll
+++ b/llvm/test/tools/gold/X86/opt-level.ll
@@ -4,7 +4,7 @@
 ; 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 \
+; 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 \

diff  --git a/llvm/test/tools/gold/X86/opt-remarks.ll b/llvm/test/tools/gold/X86/opt-remarks.ll
index d068ac251c4d..bbd564bfa057 100644
--- a/llvm/test/tools/gold/X86/opt-remarks.ll
+++ b/llvm/test/tools/gold/X86/opt-remarks.ll
@@ -1,7 +1,7 @@
 ; 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 \
+; RUN:	  -plugin-opt=save-temps -plugin-opt=legacy-pass-manager \
 ; 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

diff  --git a/llvm/test/tools/gold/X86/slp-vectorize.ll b/llvm/test/tools/gold/X86/slp-vectorize.ll
index fd4928e9cfcb..4204d761cf9c 100644
--- a/llvm/test/tools/gold/X86/slp-vectorize.ll
+++ b/llvm/test/tools/gold/X86/slp-vectorize.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-as %s -o %t.o
 
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
-; RUN:    --plugin-opt=save-temps \
+; RUN:    --plugin-opt=save-temps --plugin-opt=legacy-pass-manager \
 ; RUN:    -shared %t.o -o %t2.o
 ; RUN: llvm-dis %t2.o.0.4.opt.bc -o - | FileCheck %s
 

diff  --git a/llvm/test/tools/gold/X86/vectorize.ll b/llvm/test/tools/gold/X86/vectorize.ll
index e78064de5b97..71c9c4664852 100644
--- a/llvm/test/tools/gold/X86/vectorize.ll
+++ b/llvm/test/tools/gold/X86/vectorize.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-as %s -o %t.o
 
 ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
-; RUN:    --plugin-opt=save-temps \
+; RUN:    --plugin-opt=save-temps --plugin-opt=legacy-pass-manager \
 ; RUN:    -shared %t.o -o %t2.o
 ; RUN: llvm-dis %t2.o.0.4.opt.bc -o - | FileCheck %s