https://github.com/arichardson updated https://github.com/llvm/llvm-project/pull/238216
>From bb3c79e24a9f46366ce9654a3289ef3f5dabc295 Mon Sep 17 00:00:00 2001 From: Alex Richardson <[email protected]> Date: Mon, 2 Nov 2026 22:11:05 -0800 Subject: [PATCH 1/2] [nspr] initial commit --- llvm/utils/convert_mc_test_to_verify.py | 208 ++++++++++++++++++++++++ 1 file changed, 208 insertions(+) create mode 100755 llvm/utils/convert_mc_test_to_verify.py diff --git a/llvm/utils/convert_mc_test_to_verify.py b/llvm/utils/convert_mc_test_to_verify.py new file mode 100755 index 0000000000000..342506e3bf89c --- /dev/null +++ b/llvm/utils/convert_mc_test_to_verify.py @@ -0,0 +1,208 @@ +#!/usr/bin/env python3 +"""Convert 'not llvm-mc ... 2>&1 | FileCheck' tests to 'llvm-mc --verify'. + +This only handles simple tests whose FileCheck lines already check every +diagnostic llvm-mc emits. Since --verify (unlike FileCheck) requires every +diagnostic to be matched, other tests will fail after conversion and need +the missing expected-* directives added by hand. + +Tests are rewritten in place. Directories are searched recursively for test +files. Run the converted tests with llvm-lit afterwards and fix up or revert +any failures. +""" + +import argparse +import os +import pathlib +import re +import shlex +import sys + +from UpdateTestChecks import common + +sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "lit")) +from lit.ShCommands import Pipeline +from lit.ShUtil import ShParser +from lit.TestRunner import ( + CommandDirective, + IntegratedTestKeywordParser, + ParserKind, + kPdbgRegex, + parseIntegratedTestScriptCommands, +) + +TEST_SUFFIXES = {".s", ".S", ".asm", ".txt", ".test"} +# The body of a diagnostic check, e.g. ':[[@LINE-1]]:11: error: message'. +DIAG_RE = re.compile( + r"""(?:(?:<stdin>|[^\s:\[]*):?(?:\[\[\#?\s*@LINE(?P<offset>[+-]\d+)?\]\]|\[\[\#\]\]|\{\{\[0-9\]\+\}\}|\b\d+): + (?:(?P<col>\d+):)?\s*)? + (?:(?P<kind>error|warning|note|remark):\s*)? + (?P<msg>.+?)(?:\{\{\$\}\})?""", + re.VERBOSE, +) + + +def parse_run_lines(path): + """Return (first line, last line, shell AST) for each RUN line in path.""" + parser = IntegratedTestKeywordParser("RUN:", ParserKind.COMMAND, initial_value=[]) + for line_number, _, line in parseIntegratedTestScriptCommands(str(path), ["RUN:"]): + parser.parseLine(line_number, line) + # Drop the '%dbg(RUN: at line N)' that lit prepends to each command. + return [ + ( + d.start_line_number, + d.end_line_number, + ShParser(re.fullmatch(kPdbgRegex, d.command)[2]).parse(), + ) + for d in parser.getValue() + if isinstance(d, CommandDirective) + ] + + +def is_negative_mc_run(ast): + """Match 'not llvm-mc ... 2>&1 | FileCheck ...'.""" + if not isinstance(ast, Pipeline) or len(ast.commands) != 2: + return False + mc, filecheck = ast.commands + return ( + mc.args[:2] == ["not", "llvm-mc"] + and ((">&", 2), "1") in mc.redirects + # The directives must be in the input, so it has to be the test file. + and ("%s" in mc.args or (("<",), "%s") in mc.redirects) + and filecheck.args[0] == "FileCheck" + ) + + +def prefixes(command): + return common.get_check_prefixes(shlex.join(command.args)) + + +def commands(ast): + if isinstance(ast, Pipeline): + yield from ast.commands + else: + yield from commands(ast.lhs) + yield from commands(ast.rhs) + + +def to_shell(command): + """Print a parsed command without its 2>&1 redirect.""" + words = [ + arg if re.fullmatch(r"[\w@%+=:,./-]+", arg) else shlex.quote(arg) + for arg in command.args + ] + for (op, *fd), arg in command.redirects: + if (op, *fd) != (">&", 2): + words.append(f"{fd[0] if fd else ''}{op} {arg}") + return " ".join(words) + + +def find_code_line(lines, i): + """Return the offset from line i to the closest code line, skipping checks.""" + for step in (-1, 1): + j = i + step + while 0 <= j < len(lines) and common.CHECK_RE.match(lines[j]): + j += step + line = lines[j].strip() if 0 <= j < len(lines) else "" + if line and not line.startswith(("#", "//")): + return f"@{j - i:+d}" + return "@above" + + +def convert(path, text): + try: + runs = parse_run_lines(path) + except ValueError: # E.g. lit's %if substitutions. + return None + if any( + cmd.args[0] == "split-file" or any("%t" in arg for arg in cmd.args) + for _, _, ast in runs + for cmd in commands(ast) + ): + return None + neg = [prefixes(ast.commands[1]) for _, _, ast in runs if is_negative_mc_run(ast)] + pos = { + p + for _, _, ast in runs + if not is_negative_mc_run(ast) + for cmd in commands(ast) + if cmd.args[0] == "FileCheck" + for p in prefixes(cmd) + } + neg_prefixes = {p for ps in neg for p in ps} + if not neg or neg_prefixes & pos: + return None + + # Prefixes used by every RUN line become 'expected', others e.g. 'rv32'. + shared = set.intersection(*map(set, neg)) + verify_prefix = { + p: "expected" if p in shared else re.sub(r"^check[-_]?(?=.)", "", p.lower()) + for p in neg_prefixes + } + + # Split on '\n' only, so that the line numbers match lit's. + lines = text.split("\n") + # Replace each converted (possibly multi-line) RUN line with a single line, + # bottom-up so that the earlier line numbers stay valid. + for first, last, ast in reversed(runs): + if not is_negative_mc_run(ast): + continue + mc, filecheck = ast.commands + names = sorted({verify_prefix[p] for p in prefixes(filecheck)}) + flag = "--verify" if names == ["expected"] else "--verify=" + ",".join(names) + mc.args = ["llvm-mc", flag] + mc.args[2:] + leader = lines[first - 1][: lines[first - 1].index("RUN:") + len("RUN:")] + lines[first - 1 : last] = [f"{leader} {to_shell(mc)}"] + + prefix_alt = "|".join(map(re.escape, neg_prefixes)) + check_re = re.compile( + rf"^(?P<code>.*?)(?P<comment>(?:#|//)\s*)(?P<prefix>{prefix_alt})" + rf"(?P<suffix>-NEXT|-LABEL)?:\s*(?P<body>.*?)\s*$" + ) + for i, line in enumerate(lines): + m = check_re.match(line) + if not m or common.RUN_LINE_RE.match(line): + continue + diag = DIAG_RE.fullmatch(m["body"]) + if not diag or m["suffix"] == "-LABEL" or (m["suffix"] and not diag["kind"]): + return None + if diag["offset"]: + loc = "@" + diag["offset"] + elif m["code"].strip(): + loc = "" # Trailing comment on the same line as the code. + else: + loc = find_code_line(lines, i) + if diag["col"]: + loc += ":" + diag["col"] + kind = (diag["kind"] or "error") + ("-re" if "{{" in diag["msg"] else "") + directive = f"{verify_prefix[m['prefix']]}-{kind}{loc} {{{{{diag['msg']}}}}}" + lines[i] = m["code"] + m["comment"] + directive + return "\n".join(lines) + + +def find_tests(paths): + for path in map(pathlib.Path, paths): + if path.is_dir(): + yield from sorted(p for p in path.rglob("*") if p.suffix in TEST_SUFFIXES) + else: + yield path + + +def main(): + parser = argparse.ArgumentParser( + description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter + ) + parser.add_argument( + "tests", nargs="+", help="test files or directories to convert in place" + ) + for path in find_tests(parser.parse_args().tests): + # Some test inputs are not valid UTF-8, so preserve the raw bytes. + text = path.read_text(errors="surrogateescape") + new_text = convert(path, text) + if new_text is not None and new_text != text: + path.write_text(new_text, errors="surrogateescape") + print(f"Converted {path}") + + +if __name__ == "__main__": + main() >From d576a5313f3abc1a63fdacc3c1707b6ba0715dc5 Mon Sep 17 00:00:00 2001 From: Alex Richardson <[email protected]> Date: Mon, 2 Nov 2026 23:18:52 -0800 Subject: [PATCH 2/2] [nspr] update --- llvm/utils/convert_mc_test_to_verify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm/utils/convert_mc_test_to_verify.py b/llvm/utils/convert_mc_test_to_verify.py index 342506e3bf89c..6c45cadbdc6e1 100755 --- a/llvm/utils/convert_mc_test_to_verify.py +++ b/llvm/utils/convert_mc_test_to_verify.py @@ -35,7 +35,7 @@ # The body of a diagnostic check, e.g. ':[[@LINE-1]]:11: error: message'. DIAG_RE = re.compile( r"""(?:(?:<stdin>|[^\s:\[]*):?(?:\[\[\#?\s*@LINE(?P<offset>[+-]\d+)?\]\]|\[\[\#\]\]|\{\{\[0-9\]\+\}\}|\b\d+): - (?:(?P<col>\d+):)?\s*)? + (?:(?:(?P<col>\d+)|\[\[\#\]\]|\{\{[^}:\s]+\}\}):)?\s*)? (?:(?P<kind>error|warning|note|remark):\s*)? (?P<msg>.+?)(?:\{\{\$\}\})?""", re.VERBOSE, _______________________________________________ llvm-branch-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
