This is an archive of the discontinued LLVM Phabricator instance.

Differential D90496

[FileCheck] Address unused prefixes in tests
ClosedPublic

Authored by mtrofin on Oct 30 2020, 1:56 PM.

Details

Reviewers
jhenderson
jdoerfert
grimar
MaskRay
Commits
rGee703eb4726b: [FileCheck] Address unused prefixes in tests
Summary

Added -allow-unused-prefixes as necessary.

Diff Detail

Event Timeline

mtrofin created this revision.Oct 30 2020, 1:56 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 30 2020, 1:56 PM
Herald added subscribers: llvm-commits, thopre. · View Herald Transcript
mtrofin requested review of this revision.Oct 30 2020, 1:56 PM
google-llvm-upstream-contributions added subscribers: jdenny, probinson.Oct 30 2020, 1:57 PM
MaskRay accepted this revision.Oct 30 2020, 2:08 PM

Looks great!

This revision is now accepted and ready to land.Oct 30 2020, 2:08 PM
This revision was landed with ongoing or failed builds.Oct 30 2020, 2:14 PM
Closed by commit rGee703eb4726b: [FileCheck] Address unused prefixes in tests (authored by mtrofin). · Explain Why
This revision was automatically updated to reflect the committed changes.
mtrofin added a commit: rGee703eb4726b: [FileCheck] Address unused prefixes in tests.
mtrofin added a comment.Oct 30 2020, 2:17 PM

Sorry, hit push very quickly - happy to address post-submit feedback.

Harbormaster completed remote builds in B77093: Diff 302008.Oct 30 2020, 2:20 PM

Revision Contents

Diff 302015

llvm/test/FileCheck/check-a-b-has-b.txt

; RUN: FileCheck -check-prefix=A -check-prefix=B -input-file %s %s ; RUN: FileCheck -check-prefix=A -check-prefix=B -input-file %s %s -allow-unused-prefixes
this is the string to be matched this is the string to be matched
; B-DAG: this is the string to be {{matched}} ; B-DAG: this is the string to be {{matched}}

llvm/test/FileCheck/check-b-a-has-b.txt

; RUN: FileCheck -check-prefix=B -check-prefix=A -input-file %s %s ; RUN: FileCheck -check-prefix=B -check-prefix=A -input-file %s %s -allow-unused-prefixes
this is the string to be matched this is the string to be matched
; B-DAG: this is the string to be {{matched}} ; B-DAG: this is the string to be {{matched}}

llvm/test/FileCheck/check-multiple-prefixes-substr.txt

// RUN: FileCheck -check-prefix=CHECKER -check-prefix=CHECK -input-file %s %s // RUN: FileCheck -check-prefix=CHECKER -check-prefix=CHECK -input-file %s %s -allow-unused-prefixes
// RUN: FileCheck -check-prefix=CHECK -check-prefix=CHECKER -input-file %s %s // RUN: FileCheck -check-prefix=CHECK -check-prefix=CHECKER -input-file %s %s -allow-unused-prefixes
foo foo
; CHECKER: fo{{o}} ; CHECKER: fo{{o}}

llvm/test/FileCheck/check-substring-multi-prefix-2.txt

; RUN: FileCheck -check-prefix=FOO -check-prefix=FOOBAR -check-prefix=BARFOO -input-file %s %s ; RUN: FileCheck -check-prefix=FOO -check-prefix=FOOBAR -check-prefix=BARFOO -input-file %s %s -allow-unused-prefixes
; RUN: FileCheck -check-prefix=FOOBAR -check-prefix=FOO -check-prefix=BARFOO -input-file %s %s ; RUN: FileCheck -check-prefix=FOOBAR -check-prefix=FOO -check-prefix=BARFOO -input-file %s %s -allow-unused-prefixes
; RUN: FileCheck -check-prefix=FOOBAR -check-prefix=BARFOO -check-prefix=FOO -input-file %s %s ; RUN: FileCheck -check-prefix=FOOBAR -check-prefix=BARFOO -check-prefix=FOO -input-file %s %s -allow-unused-prefixes
this is the match this is the match
this is another this is another
FOO FOO
FOOBAR FOOBAR
FOOBAR: this is the {{match}} FOOBAR: this is the {{match}}
BARFOO: this is {{another}} BARFOO: this is {{another}}

llvm/test/FileCheck/dump-input-annotations.txt

Show First 20 Lines • Show All 137 Lines • ▼ Show 20 Lines
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:'
; RUN: %ProtectFileCheckOutput \ ; RUN: %ProtectFileCheckOutput \
; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -v 2>&1 \ ; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -v 2>&1 \
; RUN: | FileCheck -match-full-lines %s -check-prefixes=NXT,NXT-V \ ; RUN: | FileCheck -match-full-lines %s -check-prefixes=NXT,NXT-V \
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:'
; RUN: %ProtectFileCheckOutput \ ; RUN: %ProtectFileCheckOutput \
; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -vv 2>&1 \ ; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -vv 2>&1 \
; RUN: | FileCheck -match-full-lines %s -check-prefixes=NXT,NXT-V,NXT-VV \ ; RUN: | FileCheck -match-full-lines %s -check-prefixes=NXT,NXT-V,NXT-VV \
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:' -allow-unused-prefixes
; Verbose diagnostics are suppressed but not errors. ; Verbose diagnostics are suppressed but not errors.
; NXT: {{.*}}error:{{.*}} ; NXT: {{.*}}error:{{.*}}
; NXT: <<<<<< ; NXT: <<<<<<
; NXT-NEXT: 1: hello ; NXT-NEXT: 1: hello
; NXT-V-NEXT: check:1 ^~~~~ ; NXT-V-NEXT: check:1 ^~~~~
; NXT-NEXT: 2: again ; NXT-NEXT: 2: again
Show All 40 Lines
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:'
; RUN: %ProtectFileCheckOutput \ ; RUN: %ProtectFileCheckOutput \
; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -v 2>&1 \ ; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -v 2>&1 \
; RUN: | FileCheck -match-full-lines %s -check-prefixes=SAM,SAM-V \ ; RUN: | FileCheck -match-full-lines %s -check-prefixes=SAM,SAM-V \
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:'
; RUN: %ProtectFileCheckOutput \ ; RUN: %ProtectFileCheckOutput \
; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -vv 2>&1 \ ; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -vv 2>&1 \
; RUN: | FileCheck -match-full-lines %s -check-prefixes=SAM,SAM-V,SAM-VV \ ; RUN: | FileCheck -match-full-lines %s -check-prefixes=SAM,SAM-V,SAM-VV \
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:' -allow-unused-prefixes
; Verbose diagnostics are suppressed but not errors. ; Verbose diagnostics are suppressed but not errors.
; SAM: {{.*}}error:{{.*}} ; SAM: {{.*}}error:{{.*}}
; SAM: <<<<<< ; SAM: <<<<<<
; SAM-NEXT: 1: hello world! ; SAM-NEXT: 1: hello world!
; SAM-V-NEXT: check:1 ^~~~~ ; SAM-V-NEXT: check:1 ^~~~~
; SAM-V-NEXT: same:2 ^~~~~ ; SAM-V-NEXT: same:2 ^~~~~
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:'
; RUN: %ProtectFileCheckOutput \ ; RUN: %ProtectFileCheckOutput \
; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -v 2>&1 \ ; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -v 2>&1 \
; RUN: | FileCheck -match-full-lines %s -check-prefixes=EMP,EMP-V \ ; RUN: | FileCheck -match-full-lines %s -check-prefixes=EMP,EMP-V \
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:'
; RUN: %ProtectFileCheckOutput \ ; RUN: %ProtectFileCheckOutput \
; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -vv 2>&1 \ ; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -vv 2>&1 \
; RUN: | FileCheck -match-full-lines %s -check-prefixes=EMP,EMP-V,EMP-VV \ ; RUN: | FileCheck -match-full-lines %s -check-prefixes=EMP,EMP-V,EMP-VV \
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:' -allow-unused-prefixes
; Verbose diagnostics are suppressed but not errors. ; Verbose diagnostics are suppressed but not errors.
; EMP: {{.*}}error:{{.*}} ; EMP: {{.*}}error:{{.*}}
; EMP: <<<<<< ; EMP: <<<<<<
; EMP-NEXT: 1: hello ; EMP-NEXT: 1: hello
; EMP-V-NEXT: check:1 ^~~~~ ; EMP-V-NEXT: check:1 ^~~~~
; EMP-NEXT: 2: ; EMP-NEXT: 2:
Show All 20 Lines
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:'
; RUN: %ProtectFileCheckOutput \ ; RUN: %ProtectFileCheckOutput \
; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -v 2>&1 \ ; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -v 2>&1 \
; RUN: | FileCheck -match-full-lines %s -check-prefixes=EMP2,EMP2-V \ ; RUN: | FileCheck -match-full-lines %s -check-prefixes=EMP2,EMP2-V \
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:'
; RUN: %ProtectFileCheckOutput \ ; RUN: %ProtectFileCheckOutput \
; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -vv 2>&1 \ ; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -vv 2>&1 \
; RUN: | FileCheck -match-full-lines %s -check-prefixes=EMP2,EMP2-V,EMP2-VV \ ; RUN: | FileCheck -match-full-lines %s -check-prefixes=EMP2,EMP2-V,EMP2-VV \
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:' -allow-unused-prefixes
; Verbose diagnostics are suppressed but not errors. ; Verbose diagnostics are suppressed but not errors.
; EMP2: {{.*}}error:{{.*}} ; EMP2: {{.*}}error:{{.*}}
; EMP2: <<<<<< ; EMP2: <<<<<<
; EMP2-NEXT: 1: hello ; EMP2-NEXT: 1: hello
; EMP2-V-NEXT: check:1 ^~~~~ ; EMP2-V-NEXT: check:1 ^~~~~
; EMP2-NEXT: 2: world ; EMP2-NEXT: 2: world
Show All 17 Lines
; RUN: %ProtectFileCheckOutput \ ; RUN: %ProtectFileCheckOutput \
; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk 2>&1 \ ; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk 2>&1 \
; RUN: | FileCheck -match-full-lines %s -check-prefix=NOT \ ; RUN: | FileCheck -match-full-lines %s -check-prefix=NOT \
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:'
; RUN: %ProtectFileCheckOutput \ ; RUN: %ProtectFileCheckOutput \
; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -v 2>&1 \ ; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -v 2>&1 \
; RUN: | FileCheck -match-full-lines %s -check-prefixes=NOT,NOT-V \ ; RUN: | FileCheck -match-full-lines %s -check-prefixes=NOT,NOT-V \
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:' -allow-unused-prefixes
; RUN: %ProtectFileCheckOutput \ ; RUN: %ProtectFileCheckOutput \
; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -vv 2>&1 \ ; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -vv 2>&1 \
; RUN: | FileCheck -match-full-lines %s -check-prefixes=NOT,NOT-V,NOT-VV \ ; RUN: | FileCheck -match-full-lines %s -check-prefixes=NOT,NOT-V,NOT-VV \
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:' -allow-unused-prefixes
; Verbose diagnostics are suppressed but not errors. ; Verbose diagnostics are suppressed but not errors.
; NOT: {{.*}}error:{{.*}} ; NOT: {{.*}}error:{{.*}}
; NOT: <<<<<< ; NOT: <<<<<<
; NOT-NEXT: 1: hello ; NOT-NEXT: 1: hello
; NOT-VV-NEXT: not:1 X~~~~ ; NOT-VV-NEXT: not:1 X~~~~
; NOT-NEXT: 2: world ; NOT-NEXT: 2: world
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:'
; RUN: %ProtectFileCheckOutput \ ; RUN: %ProtectFileCheckOutput \
; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -v 2>&1 \ ; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -v 2>&1 \
; RUN: | FileCheck -match-full-lines %s -check-prefixes=LAB,LAB-V \ ; RUN: | FileCheck -match-full-lines %s -check-prefixes=LAB,LAB-V \
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:'
; RUN: %ProtectFileCheckOutput \ ; RUN: %ProtectFileCheckOutput \
; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -vv 2>&1 \ ; RUN: not FileCheck -dump-input=always -input-file %t.in %t.chk -vv 2>&1 \
; RUN: | FileCheck -match-full-lines %s -check-prefixes=LAB,LAB-V,LAB-VV \ ; RUN: | FileCheck -match-full-lines %s -check-prefixes=LAB,LAB-V,LAB-VV \
; RUN: -implicit-check-not='remark:' ; RUN: -implicit-check-not='remark:' -allow-unused-prefixes
; Verbose diagnostics are suppressed but not errors. ; Verbose diagnostics are suppressed but not errors.
; LAB: {{.*}}error:{{.*}} ; LAB: {{.*}}error:{{.*}}
; LAB: {{.*}}possible intended match{{.*}} ; LAB: {{.*}}possible intended match{{.*}}
; LAB: <<<<<< ; LAB: <<<<<<
; LAB-NEXT: 1: lab0 ; LAB-NEXT: 1: lab0
; LAB-V-NEXT: label:1'0 ^~~~ ; LAB-V-NEXT: label:1'0 ^~~~
▲ Show 20 Lines • Show All 269 Lines • Show Last 20 Lines

llvm/test/FileCheck/multiple-missing-prefixes.txt

// RUN: FileCheck -check-prefix=ANOTHER-PREFIX -input-file %s %s // RUN: FileCheck -check-prefix=ANOTHER-PREFIX -input-file %s %s
// RUN: %ProtectFileCheckOutput not FileCheck -check-prefix=PREFIX1 -check-prefix=PREFIX2 -input-file %s %s 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK-NONEXISTENT-PREFIX -check-prefix=ALSO-NONEXISTENT %s // RUN: %ProtectFileCheckOutput not FileCheck -check-prefix=PREFIX1 -check-prefix=PREFIX2 -input-file %s %s 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK-NONEXISTENT-PREFIX -check-prefix=ALSO-NONEXISTENT -allow-unused-prefixes %s
// RUN: %ProtectFileCheckOutput not FileCheck -check-prefixes=PREFIX1,PREFIX2 -input-file %s %s 2>&1 | FileCheck -strict-whitespace -check-prefixes=CHECK-NONEXISTENT-PREFIX,ALSO-NONEXISTENT %s // RUN: %ProtectFileCheckOutput not FileCheck -check-prefixes=PREFIX1,PREFIX2 -input-file %s %s 2>&1 | FileCheck -strict-whitespace -check-prefixes=CHECK-NONEXISTENT-PREFIX,ALSO-NONEXISTENT -allow-unused-prefixes %s
foobar foobar
; ANOTHER-PREFIX: foobar ; ANOTHER-PREFIX: foobar
; We use regex to match the colon so that FileCheck won't think it is a check ; We use regex to match the colon so that FileCheck won't think it is a check
; prefix. ; prefix.
; CHECK-NONEXISTENT-PREFIX: error: no check strings found with prefixes 'PREFIX1{{:}}', 'PREFIX2{{:}}' ; CHECK-NONEXISTENT-PREFIX: error: no check strings found with prefixes 'PREFIX1{{:}}', 'PREFIX2{{:}}'