From 50e4e385a4be60dd17cd80118eb6bdf386175479 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Thu, 4 Feb 2021 21:14:36 -0800 Subject: [PATCH] LLVMgold.so: Fix tests after D95380 --- llvm/test/tools/gold/X86/disable-verify.ll | 4 ++-- llvm/test/tools/gold/X86/opt-level.ll | 2 +- llvm/test/tools/gold/X86/opt-remarks.ll | 2 +- llvm/test/tools/gold/X86/slp-vectorize.ll | 2 +- llvm/test/tools/gold/X86/vectorize.ll | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/llvm/test/tools/gold/X86/disable-verify.ll b/llvm/test/tools/gold/X86/disable-verify.ll index b7211a7..c1ab6b0 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 bd49e09..57eddc8 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 d068ac2..bbd564b 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 fd4928e..4204d76 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 e78064d..71c9c46 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 -- 2.7.4