From 65e5006962bd49d0236a18d6772ea9f165b8c41a Mon Sep 17 00:00:00 2001 From: Arthur Eubanks Date: Mon, 19 Oct 2020 11:28:45 -0700 Subject: [PATCH] [NPM][opt] Run -O# after other passes in legacy PM compatibility mode Generally tests run -O# before other passes, not after. --- llvm/test/Transforms/LoopVectorize/X86/metadata-enable.ll | 1 + llvm/tools/opt/opt.cpp | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm/test/Transforms/LoopVectorize/X86/metadata-enable.ll b/llvm/test/Transforms/LoopVectorize/X86/metadata-enable.ll index 0a3a504..e7a57fe 100644 --- a/llvm/test/Transforms/LoopVectorize/X86/metadata-enable.ll +++ b/llvm/test/Transforms/LoopVectorize/X86/metadata-enable.ll @@ -8,6 +8,7 @@ ; RUN: opt < %s -mcpu=corei7 -O1 -loop-vectorize -S -unroll-allow-partial=0 | FileCheck %s --check-prefix=O1VEC2 ; RUN: opt < %s -mcpu=corei7 -Oz -loop-vectorize -S -unroll-allow-partial=0 | FileCheck %s --check-prefix=OzVEC2 ; RUN: opt < %s -mcpu=corei7 -O3 -unroll-threshold=150 -vectorize-loops=false -S -unroll-allow-partial=0 | FileCheck %s --check-prefix=O3DIS +; RUN: opt < %s -mcpu=corei7 -O1 -loop-vectorize -S -unroll-allow-partial=0 -enable-new-pm=1 | FileCheck %s --check-prefix=O1VEC2 ; This file tests the llvm.loop.vectorize.enable metadata forcing ; vectorization even when optimization levels are too low, or when diff --git a/llvm/tools/opt/opt.cpp b/llvm/tools/opt/opt.cpp index 3ba02dc..37fb271 100644 --- a/llvm/tools/opt/opt.cpp +++ b/llvm/tools/opt/opt.cpp @@ -759,9 +759,6 @@ int main(int argc, char **argv) { return 1; } SmallVector Passes; - for (const auto &P : PassList) { - Passes.push_back(P->getPassArgument()); - } if (OptLevelO0) Passes.push_back("default"); if (OptLevelO1) @@ -774,6 +771,8 @@ int main(int argc, char **argv) { Passes.push_back("default"); if (OptLevelOz) Passes.push_back("default"); + for (const auto &P : PassList) + Passes.push_back(P->getPassArgument()); OutputKind OK = OK_NoOutput; if (!NoOutput) OK = OutputAssembly -- 2.7.4