wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[polly][NewPM][test] Fix polly tests under -enable-new-pm 

In preparation for turning on opt's -enable-new-pm by default, this pins
uses of passes via the legacy "opt -passname" with pass names beginning
with "polly-" and "polyhedral-info" to the legacy PM. Many of these
tests use -analyze, which isn't supported in the new PM.

(This doesn't affect uses of "opt -passes=passname").

rL240766 accidentally removed `-polly-prepare` in
phi_not_grouped_at_top.ll, and it also doesn't use the output of
-analyze.

Reviewed By: Meinersbur

Differential Revision: https://reviews.llvm.org/D94266
This commit is contained in:
Arthur Eubanks 2021-01-07 14:01:04 -08:00
parent 27afc091e2
commit cabe1b1124
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
llvm/tools/opt/opt.cpp
View File

@ -480,30 +480,22 @@ static bool shouldPinPassToLegacyPM(StringRef Pass) {
return false; return false;
std::vector<StringRef> PassNamePrefix = { std::vector<StringRef> PassNamePrefix = {
"x86-", "xcore-", "wasm-", "systemz-", "ppc-", "nvvm-", "nvptx-", "x86-", "xcore-", "wasm-", "systemz-", "ppc-", "nvvm-", "nvptx-",
"mips-", "lanai-", "hexagon-", "bpf-", "avr-", "thumb2-", "arm-", "mips-", "lanai-", "hexagon-", "bpf-", "avr-", "thumb2-", "arm-",
"si-", "gcn-", "amdgpu-", "aarch64-", "amdgcn-"}; "si-", "gcn-", "amdgpu-", "aarch64-", "amdgcn-", "polly-"};
std::vector<StringRef> PassNameContain = {"ehprepare"}; std::vector<StringRef> PassNameContain = {"ehprepare"};
std::vector<StringRef> PassNameExact = {"safe-stack", std::vector<StringRef> PassNameExact = {
"cost-model", "safe-stack", "cost-model",
"codegenprepare", "codegenprepare", "interleaved-load-combine",
"interleaved-load-combine", "unreachableblockelim", "verify-safepoint-ir",
"unreachableblockelim", "divergence", "atomic-expand",
"verify-safepoint-ir", "hardware-loops", "type-promotion",
"divergence", "mve-tail-predication", "interleaved-access",
"atomic-expand", "global-merge", "pre-isel-intrinsic-lowering",
"hardware-loops", "expand-reductions", "indirectbr-expand",
"type-promotion", "generic-to-nvvm", "expandmemcmp",
"mve-tail-predication", "loop-reduce", "lower-amx-type",
"interleaved-access", "polyhedral-info"};
"global-merge",
"pre-isel-intrinsic-lowering",
"expand-reductions",
"indirectbr-expand",
"generic-to-nvvm",
"expandmemcmp",
"loop-reduce",
"lower-amx-type"};
for (const auto &P : PassNamePrefix) for (const auto &P : PassNamePrefix)
if (Pass.startswith(P)) if (Pass.startswith(P))
return true; return true;

2
polly/test/ScopInfo/phi_not_grouped_at_top.ll
View File

@ -1,4 +1,4 @@
; RUN: opt %loadPolly -analyze < %s ; RUN: opt %loadPolly -polly-prepare < %s
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
declare i32 @funa() align 2 declare i32 @funa() align 2