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

[aeubanks]

Summary

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-" or "polyhedral-" 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").

[aeubanks]

ping

[Meinersbur]

Note that for same passes, there Polly has NPM equivalents. E.g. -polly-prepare has -passes=polly-prepare, -polly-scops has -passes='scop(print<polly-scops>)'.

Assuming this is the accepted workaround for the NPM transition (I personally think it is ugly), this looks fine for the Polly side of things.

llvm/tools/opt/opt.cpp

486

The only pass with polyhedral- prefix is polyhedral-info, i.e. could be added to PassNameExact.

polly/test/ScopInfo/phi_not_grouped_at_top.ll

1

This test doesn't anything. It once used the -polly-prepare which has been erroneously removed in rL240766. I suggest to re-add it again, although the code this was testing was removed since, making the entire test obsolete.

[aeubanks]

address comments

[aeubanks]

In D94266#2507718, @Meinersbur wrote:

Note that for same passes, there Polly has NPM equivalents. E.g. -polly-prepare has -passes=polly-prepare, -polly-scops has -passes='scop(print<polly-scops>)'.

Assuming this is the accepted workaround for the NPM transition (I personally think it is ugly), this looks fine for the Polly side of things.

I agree it's ugly, but it allows us to update the polly tests to use the new PM in parallel with the new PM switch.

[Meinersbur]

LGTM. Thanks for the changes.

llvm/tools/opt/opt.cpp

std::vector<StringRef> PassNameExactToIgnore = {
       "amdgpu-unify-metadata",
       "amdgpu-printf-runtime-binding",
       "amdgpu-always-inline"};
   for (const auto &P : PassNameExactToIgnore)
     if (Pass == P)
       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;
   for (const auto &P : PassNameContain)
     if (Pass.contains(P))
       return true;
   for (const auto &P : PassNameExact)
     if (Pass == P)

polly/test/ScopInfo/phi_not_grouped_at_top.ll

-; 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
 
 declare i32 @generic_personality_v0(i32, i64, i8*, i8*)
 
 define void @funb() personality i32 (i32, i64, i8*, i8*)* @generic_personality_v0 {
 entry: