[NFC] Disallow unused prefixes under Other

[mtrofin]

new line(s)

llvm/test/Other/new-pass-manager.ll

369

@aeubanks : this test has CHECK-EXT asserts, but not CHECK-NOEXT. Is there a meaningful CHECK-NOEXT I could add? (other than {{.*}} )

llvm/test/Other/opt-LTO-pipeline.ll

1

@aeubanks : it seems this test doesn't have CHECK-EXT, not CHECK-NOEXT - OK to remove the %llvmcheckext?

llvm/test/Other/print-slotindexes.ll

1–2

@jsji : I think s/ALL/CHECK was the intention, correct? (The test passes)

[MaskRay]

llvm/test/Other/new-pass-manager.ll

369

llvm/test/lit.cfg.py defines %llvmcheckext, which expands to either CHECK-EXT or CHECK-NOEXT. You'll need two builds to verify.

[aeubanks]

llvm/test/Other/new-pass-manager.ll

369

There's nothing to check for CHECK-NOEXT

[mtrofin]

llvm/test/Other/new-pass-manager.ll

369

(combining the 2 comments) so then adding the artificial CHECK-NOEXT check is ok? The alternative is to not use %llvmcheckext here, and just explicitly use the CHECK-EXT prefix.

[aeubanks]

llvm/test/Other/lit.local.cfg

7–8

pardon my ignorance, but why is this substitution necessary? does opt-bisect-legacy-pass-manager.ll break with --allow-unused-prefixes=true?

llvm/test/Other/new-pass-manager.ll

369

Yeah I think adding the CHECK-NOEXT is fine. We need %llvmcheckext to test both configurations when the extension is enabled and when it isn't.

[mtrofin]

llvm/test/Other/lit.local.cfg

7–8

It's not that it breaks because of duplicate flags, it breaks because opt-bisect-helper.py has trouble starting a process called "FileCheck --allow-unused-prefixes=false"

[aeubanks]

llvm/test/Other/lit.local.cfg

7–8

Oh FileCheck expands into FileCheck --allow-unused-prefixes=...? Why not keep FileCheck the way it is, then after everything has been fixed/pinned to --allow-unused-prefixes=false, change the default value of allow-unused-prefixes to true? Regressions should be fairly rare and easily fixable.
That's what I've been doing for opt's enable-new-pm flag.

[mtrofin]

llvm/test/Other/lit.local.cfg

7–8

I'd prefer avoiding the regressions even if rare. The fix here - once the flag default is flipped - is also very simple.

[aeubanks]

llvm/test/Other/lit.local.cfg

7–8

Can you add a FIXME/TODO so it's clear that this can be reverted at some point?

[mtrofin]

added FIXME for the %FileChechRaw% substitution.

[mtrofin]

llvm/test/Other/lit.local.cfg

7–8

Good point - done!

[MaskRay]

LGTM. If --allow-unused-prefixes=false tests are more than --allow-unused-prefixes=true tests, it is probably time to flip FileCheck default.

[jsji]

llvm/test/Other/print-slotindexes.ll

1–2

Yes, you are right. Thanks for fixing.

llvm/test/Other/lit.local.cfg

+from lit.llvm.subst import ToolSubst
+
+fc = ToolSubst('FileCheck', unresolved='fatal')
+# Insert this first. Then, we'll first update the blank FileCheck command; then,
+# the default substitution of FileCheck will replace it to its full path.
+config.substitutions.insert(0, (fc.regex,
+    'FileCheck --allow-unused-prefixes=false'))
+
+# FIXME: this substitution should be removed together with the above, when the
+# default --allow-unused-prefixes is fixed. At that point, the use of %FileCheckRaw%
+# in opt-bisect-legacy-pass-manager.ll should be switched back to just FileCheck.
+config.substitutions.append(('%FileCheckRaw%', 'FileCheck'))

llvm/test/Other/new-pass-manager.ll

 ; RUN:     | FileCheck %s --check-prefix=CHECK-O0 --check-prefix=%llvmcheckext
 ; CHECK-O0: Starting llvm::Module pass manager run
 ; CHECK-O0-NEXT: Running pass: AlwaysInlinerPass
 ; CHECK-O0-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*}}>
 ; CHECK-O0-NEXT: Running analysis: ProfileSummaryAnalysis
 ; CHECK-EXT-NEXT: Starting llvm::Function pass manager run.
 ; CHECK-EXT-NEXT: Running pass: {{.*}}Bye
 ; CHECK-EXT-NEXT: Finished llvm::Function pass manager run.
+; We don't have checks for CHECK-NOEXT here, but this simplifies the test, while
+; avoiding FileCheck complaining about the unused prefix.
+; CHECK-NOEXT: {{.*}}
 ; CHECK-O0-NEXT: Finished llvm::Module pass manager run
 
 ; RUN: opt -disable-output -disable-verify -debug-pass-manager \
 ; RUN:     -passes='repeat<3>(no-op-module)' %s 2>&1 \
 ; RUN:     | FileCheck %s --check-prefix=CHECK-REPEAT-MODULE-PASS
 ; CHECK-REPEAT-MODULE-PASS: Starting llvm::Module pass manager run
 ; CHECK-REPEAT-MODULE-PASS-NEXT: Running pass: RepeatedPass
 ; CHECK-REPEAT-MODULE-PASS-NEXT: Starting llvm::Module pass manager run

llvm/test/Other/opt-LTO-pipeline.ll

-; RUN: opt -enable-new-pm=0 -mtriple=x86_64-- -std-link-opts -debug-pass=Structure < %s -o /dev/null 2>&1 | FileCheck --check-prefixes=CHECK,%llvmcheckext %s
+; RUN: opt -enable-new-pm=0 -mtriple=x86_64-- -std-link-opts -debug-pass=Structure < %s -o /dev/null 2>&1 | FileCheck --check-prefix=CHECK %s
 
 ; REQUIRES: asserts
 
 ; CHECK-LABEL: Pass Arguments:
 ; CHECK-NEXT: Target Library Information
 ; CHECK-NEXT: Target Transform Information
 ;           : Target Pass Configuration
 ; CHECK:      Type-Based Alias Analysis

llvm/test/Other/opt-bisect-legacy-pass-manager.ll

 ; FIXME: There are still some AMDGPU passes being skipped that run at -O0.
 ; XFAIL: r600, amdgcn
 
 ; Verify that we can use the opt-bisect-helper.py script (derived from
 ; utils/bisect) to locate the optimization that inlines the call to
 ; f2() in f3().
 
 ; RUN: %python %S/opt-bisect-helper.py --start=0 --end=256 --optcmd=opt \
-; RUN:         --filecheckcmd=FileCheck --test=%s \
+; RUN:         --filecheckcmd=%FileCheckRaw% --test=%s \
 ; RUN:         --prefix=CHECK-BISECT-INLINE-HELPER \
 ; RUN:         | FileCheck %s --check-prefix=CHECK-BISECT-INLINE-RESULT
 ; The helper script uses this to find the optimization that inlines the call.
 ; CHECK-BISECT-INLINE-HELPER: call i32 @f2()
 ; These checks verifies that the optimization was found.
 ; CHECK-BISECT-INLINE-RESULT-NOT: Last good count: 0
 ; CHECK-BISECT-INLINE-RESULT: Last good count: {{[0-9]+}}
 

llvm/test/Other/print-slotindexes.ll

-; RUN: llc -print-after=slotindexes < %s 2>&1 | FileCheck %s --check-prefixes=ALL,SI 
-; RUN: llc -print-after=slotindexes -print-slotindexes=false < %s 2>&1 | FileCheck %s --check-prefixes=ALL,NOSI
+; RUN: llc -print-after=slotindexes < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,SI 
+; RUN: llc -print-after=slotindexes -print-slotindexes=false < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,NOSI
 ; REQUIRES: default_triple
 define void @foo(){
   ret void
 }
 
 ;CHECK: IR Dump {{.*}}
 ;CHECK: # Machine code for function foo{{.*}}
 ;SI: {{[0-9]+}}B bb.0 (%ir-block.0)
 ;NOSI: {{^}}bb.0 (%ir-block.0)