Reinstate "FileCheck [5/12]: Introduce regular numeric variables"
This reinstates r360578 (git e47362c1ec1ea31b626336cc05822035601c3e57),
reverted in r360653 (git 004393681c25e34e921adccc69ae6378090dee54),
with a fix for the list added in FileCheck.rst to build without error.
Copyright:
- Linaro (changes up to diff 183612 of revision D55940)
- GraphCore (changes in later versions of revision D55940 and
in new revision created off D55940)
Reviewers: jhenderson, chandlerc, jdenny, probinson, grimar,
arichardson, rnk
Subscribers: hiraditya, llvm-commits, probinson, dblaikie, grimar,
arichardson, tra, rnk, kristina, hfinkel, rogfer01, JonChesterfield
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D60385
llvm-svn: 360665
2019-05-14 19:58:30 +08:00
|
|
|
RUN: FileCheck -D#VAR1=11 --input-file %s %s
|
|
|
|
|
|
|
|
|
|
; We use CHECK-NEXT directives to force a match on all lines with digits.
|
|
|
|
|
|
|
|
|
|
; Numeric expressions using variables defined on the command-line without
|
|
|
|
|
; spaces
|
|
|
|
|
USE NO SPC
|
|
|
|
|
11
|
|
|
|
|
12
|
|
|
|
|
10
|
|
|
|
|
CHECK-LABEL: USE NO SPC
|
|
|
|
|
CHECK-NEXT: [[#VAR1]]
|
|
|
|
|
CHECK-NEXT: [[#VAR1+1]]
|
|
|
|
|
CHECK-NEXT: [[#VAR1-1]]
|
|
|
|
|
|
|
|
|
|
; Numeric expressions using variables defined on the command-line in alternate
|
|
|
|
|
; spacing
|
|
|
|
|
USE ALT SPC
|
|
|
|
|
11
|
|
|
|
|
11
|
|
|
|
|
12
|
|
|
|
|
12
|
|
|
|
|
12
|
|
|
|
|
12
|
|
|
|
|
10
|
|
|
|
|
10
|
|
|
|
|
10
|
|
|
|
|
10
|
|
|
|
|
CHECK-LABEL: USE ALT SPC
|
|
|
|
|
CHECK-NEXT: [[# VAR1]]
|
|
|
|
|
CHECK-NEXT: [[# VAR1 ]]
|
|
|
|
|
CHECK-NEXT: [[# VAR1+1]]
|
|
|
|
|
CHECK-NEXT: [[# VAR1 +1]]
|
|
|
|
|
CHECK-NEXT: [[# VAR1 + 1]]
|
|
|
|
|
CHECK-NEXT: [[# VAR1 + 1 ]]
|
|
|
|
|
CHECK-NEXT: [[# VAR1-1]]
|
|
|
|
|
CHECK-NEXT: [[# VAR1 -1]]
|
|
|
|
|
CHECK-NEXT: [[# VAR1 - 1]]
|
|
|
|
|
CHECK-NEXT: [[# VAR1 - 1 ]]
|
|
|
|
|
|
|
|
|
|
; Numeric expressions using variables defined on the command-line and an
|
|
|
|
|
; immediate interpreted as an unsigned value
|
|
|
|
|
; Note: 9223372036854775819 = 0x8000000000000000 + 11
|
|
|
|
|
; 9223372036854775808 = 0x8000000000000000
|
|
|
|
|
USE UNSIGNED IMM
|
|
|
|
|
9223372036854775819
|
|
|
|
|
CHECK-LABEL: USE UNSIGNED IMM
|
|
|
|
|
CHECK-NEXT: [[#VAR1+9223372036854775808]]
|
|
|
|
|
|
|
|
|
|
; Numeric expression using undefined variable
|
|
|
|
|
RUN: not FileCheck --check-prefix UNDEF-USE --input-file %s %s 2>&1 \
|
|
|
|
|
RUN: | FileCheck --strict-whitespace --check-prefix UNDEF-USE-MSG %s
|
|
|
|
|
|
|
|
|
|
UNDEF VAR USE
|
|
|
|
|
UNDEFVAR: 11
|
|
|
|
|
UNDEF-USE-LABEL: UNDEF VAR USE
|
|
|
|
|
UNDEF-USE-NEXT: UNDEFVAR: [[#UNDEFVAR]]
|
|
|
|
|
UNDEF-USE-MSG: numeric-expression.txt:[[#@LINE-1]]:30: error: using undefined numeric variable 'UNDEFVAR'
|
|
|
|
|
UNDEF-USE-MSG-NEXT: {{U}}NDEF-USE-NEXT: UNDEFVAR: {{\[\[#UNDEFVAR\]\]}}
|
|
|
|
|
UNDEF-USE-MSG-NEXT: {{^ \^$}}
|
|
|
|
|
|
|
|
|
|
; Numeric expression with unsupported operator
|
|
|
|
|
RUN: not FileCheck -D#VAR1=11 --check-prefixes CHECK,INVAL-OP --input-file %s %s 2>&1 \
|
|
|
|
|
RUN: | FileCheck --strict-whitespace --check-prefix INVAL-OP-MSG %s
|
|
|
|
|
|
|
|
|
|
INVALID OPERATOR
|
|
|
|
|
VAR1*2: 22
|
|
|
|
|
INVAL-OP-LABEL: INVALID OPERATOR
|
|
|
|
|
INVAL-OP-NEXT: VAR1*2: [[#VAR1*2]]
|
|
|
|
|
INVAL-OP-MSG: numeric-expression.txt:[[#@LINE-1]]:31: error: unsupported numeric operation '*'
|
|
|
|
|
INVAL-OP-MSG-NEXT: {{I}}NVAL-OP-NEXT: VAR1*2: {{\[\[#VAR1\*2\]\]}}
|
|
|
|
|
INVAL-OP-MSG-NEXT: {{^ \^$}}
|
|
|
|
|
|
FileCheck: Improve FileCheck variable terminology
Summary:
Terminology introduced by [[#]] blocks is confusing and does not
integrate well with existing terminology.
First, variables referred by [[]] blocks are called "pattern variables"
while the text a CHECK directive needs to match is called a "CHECK
pattern". This is inconsistent with variables in [[#]] blocks since
[[#]] blocks are also found in CHECK pattern yet those variables are
called "numeric variable".
Second, the replacing of both [[]] and [[#]] blocks by the value of the
variable or expression they contain is represented by a
FileCheckPatternSubstitution class. The naming refers to being a
substitution in a CHECK pattern but could be wrongly understood as being
a substitution of a pattern variable.
Third and lastly, comments use "numeric expression" to refer both to the
[[#]] blocks as well as to the numeric expressions these blocks contain
which get evaluated at match time.
This patch solves these confusions by
- calling variables in [[]] and [[#]] blocks as string and numeric
variables respectively;
- referring to [[]] and [[#]] as substitution *blocks*, with the former
being a string substitution block and the latter a numeric
substitution block;
- calling [[]] and [[#]] blocks to be replaced by the value of a
variable or expression they contain a substitution (as opposed to
definition when these blocks are used to defined a variable), with the
former being a string substitution and the latter a numeric
substitution;
- renaming the FileCheckPatternSubstitution as a FileCheckSubstitution
class with FileCheckStringSubstitution and
FileCheckNumericSubstitution subclasses;
- restricting the use of "numeric expression" to refer to the expression
that is evaluated in a numeric substitution.
While numeric substitution blocks only support numeric substitutions of
numeric expressions at the moment there are plans to augment numeric
substitution blocks to support numeric definitions as well as both a
numeric definition and numeric substitution in the same numeric
substitution block.
Reviewers: jhenderson, jdenny, probinson, arichardson
Subscribers: hiraditya, arichardson, probinson, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D62146
llvm-svn: 361445
2019-05-23 08:10:14 +08:00
|
|
|
; Name conflict between Numeric variable definition and string variable
|
Reinstate "FileCheck [5/12]: Introduce regular numeric variables"
This reinstates r360578 (git e47362c1ec1ea31b626336cc05822035601c3e57),
reverted in r360653 (git 004393681c25e34e921adccc69ae6378090dee54),
with a fix for the list added in FileCheck.rst to build without error.
Copyright:
- Linaro (changes up to diff 183612 of revision D55940)
- GraphCore (changes in later versions of revision D55940 and
in new revision created off D55940)
Reviewers: jhenderson, chandlerc, jdenny, probinson, grimar,
arichardson, rnk
Subscribers: hiraditya, llvm-commits, probinson, dblaikie, grimar,
arichardson, tra, rnk, kristina, hfinkel, rogfer01, JonChesterfield
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D60385
llvm-svn: 360665
2019-05-14 19:58:30 +08:00
|
|
|
; definition
|
|
|
|
|
RUN: not FileCheck -D#VAR1=11 -D#NUMVAR=42 --check-prefixes CONFLICT,CONFLICT1 --input-file %s %s 2>&1 \
|
|
|
|
|
RUN: | FileCheck --strict-whitespace --check-prefix CLI-INPUT-PAT-CONFLICT %s
|
|
|
|
|
RUN: not FileCheck -D#VAR1=11 -D#NUMVAR=42 -DNUMVAR=foobar --check-prefix CONFLICT --input-file %s %s 2>&1 \
|
|
|
|
|
RUN: | FileCheck --strict-whitespace --check-prefix CLI-CLI-PAT-CONFLICT %s
|
|
|
|
|
RUN: not FileCheck -D#VAR1=11 -DPATVAR=foobar -D#PATVAR=42 --check-prefix CONFLICT --input-file %s %s 2>&1 \
|
|
|
|
|
RUN: | FileCheck --strict-whitespace --check-prefix CLI-CLI-NUM-CONFLICT %s
|
|
|
|
|
|
|
|
|
|
PATVAR NUMVAR CONFLICT
|
|
|
|
|
foobar
|
|
|
|
|
CONFLICT-LABEL: PATVAR NUMVAR CONFLICT
|
|
|
|
|
CONFLICT1-NEXT: [[NUMVAR:foo.*]]
|
|
|
|
|
CLI-INPUT-PAT-CONFLICT: numeric-expression.txt:[[#@LINE-1]]:19: error: numeric variable with name 'NUMVAR' already exists
|
|
|
|
|
CLI-INPUT-PAT-CONFLICT-NEXT: {{C}}ONFLICT1-NEXT: {{\[\[NUMVAR:foo\.\*\]\]}}
|
|
|
|
|
CLI-INPUT-PAT-CONFLICT-NEXT: {{^ \^$}}
|
|
|
|
|
CLI-CLI-PAT-CONFLICT: Global defines:3:19: error: numeric variable with name 'NUMVAR' already exists
|
|
|
|
|
CLI-CLI-PAT-CONFLICT-NEXT: Global define #3: NUMVAR=foobar
|
|
|
|
|
CLI-CLI-PAT-CONFLICT-NEXT: {{^ \^$}}
|
FileCheck: Improve FileCheck variable terminology
Summary:
Terminology introduced by [[#]] blocks is confusing and does not
integrate well with existing terminology.
First, variables referred by [[]] blocks are called "pattern variables"
while the text a CHECK directive needs to match is called a "CHECK
pattern". This is inconsistent with variables in [[#]] blocks since
[[#]] blocks are also found in CHECK pattern yet those variables are
called "numeric variable".
Second, the replacing of both [[]] and [[#]] blocks by the value of the
variable or expression they contain is represented by a
FileCheckPatternSubstitution class. The naming refers to being a
substitution in a CHECK pattern but could be wrongly understood as being
a substitution of a pattern variable.
Third and lastly, comments use "numeric expression" to refer both to the
[[#]] blocks as well as to the numeric expressions these blocks contain
which get evaluated at match time.
This patch solves these confusions by
- calling variables in [[]] and [[#]] blocks as string and numeric
variables respectively;
- referring to [[]] and [[#]] as substitution *blocks*, with the former
being a string substitution block and the latter a numeric
substitution block;
- calling [[]] and [[#]] blocks to be replaced by the value of a
variable or expression they contain a substitution (as opposed to
definition when these blocks are used to defined a variable), with the
former being a string substitution and the latter a numeric
substitution;
- renaming the FileCheckPatternSubstitution as a FileCheckSubstitution
class with FileCheckStringSubstitution and
FileCheckNumericSubstitution subclasses;
- restricting the use of "numeric expression" to refer to the expression
that is evaluated in a numeric substitution.
While numeric substitution blocks only support numeric substitutions of
numeric expressions at the moment there are plans to augment numeric
substitution blocks to support numeric definitions as well as both a
numeric definition and numeric substitution in the same numeric
substitution block.
Reviewers: jhenderson, jdenny, probinson, arichardson
Subscribers: hiraditya, arichardson, probinson, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D62146
llvm-svn: 361445
2019-05-23 08:10:14 +08:00
|
|
|
CLI-CLI-NUM-CONFLICT: Global defines:3:20: error: string variable with name 'PATVAR' already exists
|
Reinstate "FileCheck [5/12]: Introduce regular numeric variables"
This reinstates r360578 (git e47362c1ec1ea31b626336cc05822035601c3e57),
reverted in r360653 (git 004393681c25e34e921adccc69ae6378090dee54),
with a fix for the list added in FileCheck.rst to build without error.
Copyright:
- Linaro (changes up to diff 183612 of revision D55940)
- GraphCore (changes in later versions of revision D55940 and
in new revision created off D55940)
Reviewers: jhenderson, chandlerc, jdenny, probinson, grimar,
arichardson, rnk
Subscribers: hiraditya, llvm-commits, probinson, dblaikie, grimar,
arichardson, tra, rnk, kristina, hfinkel, rogfer01, JonChesterfield
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D60385
llvm-svn: 360665
2019-05-14 19:58:30 +08:00
|
|
|
CLI-CLI-NUM-CONFLICT-NEXT: Global define #3: #PATVAR=42
|
|
|
|
|
CLI-CLI-NUM-CONFLICT-NEXT: {{^ \^$}}
|