[PATCH] D70890: [update_cc_test_checks.py] Use CHECK_RE from common
Alexander Richardson via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon Dec 2 03:09:03 PST 2019
arichardson created this revision.
arichardson added a reviewer: MaskRay.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
This change modifies the common.CHECK_RE regex to also handle '//'
comment prefixes which allows us to share it between clang and IR tests.
Using the regex from common means that *-SAME lines are also stripped
now. Before this change using the --function-signature flag would result
in -SAME: lines from previous runs not being removed.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D70890
Files:
llvm/utils/UpdateTestChecks/common.py
llvm/utils/update_cc_test_checks.py
Index: llvm/utils/update_cc_test_checks.py
===================================================================
--- llvm/utils/update_cc_test_checks.py
+++ llvm/utils/update_cc_test_checks.py
@@ -28,8 +28,6 @@
ADVERT = '// NOTE: Assertions have been autogenerated by '
-CHECK_RE = re.compile(r'^\s*//\s*([^:]+?)(?:-NEXT|-NOT|-DAG|-LABEL)?:')
-
SUBST = {
'%clang': [],
'%clang_cc1': ['-cc1'],
@@ -238,7 +236,7 @@
input_lines = []
with open(filename, 'r+') as f:
for line in f:
- m = CHECK_RE.match(line)
+ m = common.CHECK_RE.match(line)
if not (m and m.group(1) in prefix_set) and line != '//\n':
input_lines.append(line)
f.seek(0)
Index: llvm/utils/UpdateTestChecks/common.py
===================================================================
--- llvm/utils/UpdateTestChecks/common.py
+++ llvm/utils/UpdateTestChecks/common.py
@@ -61,7 +61,7 @@
RUN_LINE_RE = re.compile(r'^\s*(?://|[;#])\s*RUN:\s*(.*)$')
CHECK_PREFIX_RE = re.compile(r'--?check-prefix(?:es)?[= ](\S+)')
PREFIX_RE = re.compile('^[a-zA-Z0-9_-]+$')
-CHECK_RE = re.compile(r'^\s*[;#]\s*([^:]+?)(?:-NEXT|-NOT|-DAG|-LABEL|-SAME)?:')
+CHECK_RE = re.compile(r'^\s*(?://|[;#])\s*([^:]+?)(?:-NEXT|-NOT|-DAG|-LABEL|-SAME)?:')
OPT_FUNCTION_RE = re.compile(
r'^\s*define\s+(?:internal\s+)?[^@]*@(?P<func>[\w-]+?)\s*'
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D70890.231659.patch
Type: text/x-patch
Size: 1357 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191202/ee7cbff8/attachment-0001.bin>
More information about the llvm-commits
mailing list