Author: Arthur Eubanks Date: 2021-01-19T12:38:58-08:00 New Revision: cabe1b11243740d39c0b49c10a8ce86001b1011c
URL: https://github.com/llvm/llvm-project/commit/cabe1b11243740d39c0b49c10a8ce86001b1011c DIFF: https://github.com/llvm/llvm-project/commit/cabe1b11243740d39c0b49c10a8ce86001b1011c.diff LOG: [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 Added: Modified: llvm/tools/opt/opt.cpp polly/test/ScopInfo/phi_not_grouped_at_top.ll Removed: ################################################################################ diff --git a/llvm/tools/opt/opt.cpp b/llvm/tools/opt/opt.cpp index 99197a8b5fd4..92df0bc19a30 100644 --- a/llvm/tools/opt/opt.cpp +++ b/llvm/tools/opt/opt.cpp @@ -480,30 +480,22 @@ static bool shouldPinPassToLegacyPM(StringRef Pass) { return false; std::vector<StringRef> PassNamePrefix = { - "x86-", "xcore-", "wasm-", "systemz-", "ppc-", "nvvm-", "nvptx-", - "mips-", "lanai-", "hexagon-", "bpf-", "avr-", "thumb2-", "arm-", - "si-", "gcn-", "amdgpu-", "aarch64-", "amdgcn-"}; + "x86-", "xcore-", "wasm-", "systemz-", "ppc-", "nvvm-", "nvptx-", + "mips-", "lanai-", "hexagon-", "bpf-", "avr-", "thumb2-", "arm-", + "si-", "gcn-", "amdgpu-", "aarch64-", "amdgcn-", "polly-"}; std::vector<StringRef> PassNameContain = {"ehprepare"}; - std::vector<StringRef> PassNameExact = {"safe-stack", - "cost-model", - "codegenprepare", - "interleaved-load-combine", - "unreachableblockelim", - "verify-safepoint-ir", - "divergence", - "atomic-expand", - "hardware-loops", - "type-promotion", - "mve-tail-predication", - "interleaved-access", - "global-merge", - "pre-isel-intrinsic-lowering", - "expand-reductions", - "indirectbr-expand", - "generic-to-nvvm", - "expandmemcmp", - "loop-reduce", - "lower-amx-type"}; + std::vector<StringRef> PassNameExact = { + "safe-stack", "cost-model", + "codegenprepare", "interleaved-load-combine", + "unreachableblockelim", "verify-safepoint-ir", + "divergence", "atomic-expand", + "hardware-loops", "type-promotion", + "mve-tail-predication", "interleaved-access", + "global-merge", "pre-isel-intrinsic-lowering", + "expand-reductions", "indirectbr-expand", + "generic-to-nvvm", "expandmemcmp", + "loop-reduce", "lower-amx-type", + "polyhedral-info"}; for (const auto &P : PassNamePrefix) if (Pass.startswith(P)) return true; diff --git a/polly/test/ScopInfo/phi_not_grouped_at_top.ll b/polly/test/ScopInfo/phi_not_grouped_at_top.ll index a5a80171a2e6..480c22d95569 100644 --- a/polly/test/ScopInfo/phi_not_grouped_at_top.ll +++ b/polly/test/ScopInfo/phi_not_grouped_at_top.ll @@ -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" declare i32 @funa() align 2 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
