From 9e41d6e55c4b5d9607871740a36ed04f79ed7551 Mon Sep 17 00:00:00 2001 From: Kevin Gleason Date: Fri, 4 Apr 2025 00:07:29 +0000 Subject: [PATCH 1/2] [mlir] Add support for broader range of input files in generate-test-checks.py --- mlir/utils/generate-test-checks.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mlir/utils/generate-test-checks.py b/mlir/utils/generate-test-checks.py index 07440990a58d7..a3d60b445aaa3 100755 --- a/mlir/utils/generate-test-checks.py +++ b/mlir/utils/generate-test-checks.py @@ -236,9 +236,12 @@ def process_attribute_references(line, attribute_namer): # Pre-process a line of input to remove any character sequences that will be # problematic with FileCheck. def preprocess_line(line): + # If input line has `{{` i.e. in a StrAttr with serialized proto. + output_line = line.replace("{{", "{{\\{\\{}}") + # Replace any double brackets, '[[' with escaped replacements. '[[' # corresponds to variable names in FileCheck. - output_line = line.replace("[[", "{{\\[\\[}}") + output_line = output_line.replace("[[", "{{\\[\\[}}") # Replace any single brackets that are followed by an SSA identifier, the # identifier will be replace by a variable; Creating the same situation as @@ -327,6 +330,11 @@ def main(): if not input_line: continue + # When using `--starts_from_scope=0` to capture module lines, the file + # split needs to be skipped, otherwise a `CHECK: // -----` is inserted. + if input_line.startswith("// -----"): + continue + # Check if this is an attribute definition and process it process_attribute_definition(input_line, attribute_namer, output) From 399667518d73bcfd4a68bb4962e8f68dcedde461 Mon Sep 17 00:00:00 2001 From: Kevin Gleason Date: Fri, 11 Apr 2025 16:44:37 +0000 Subject: [PATCH 2/2] Address feedback --- mlir/utils/generate-test-checks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mlir/utils/generate-test-checks.py b/mlir/utils/generate-test-checks.py index a3d60b445aaa3..394ef7e0f7da0 100755 --- a/mlir/utils/generate-test-checks.py +++ b/mlir/utils/generate-test-checks.py @@ -236,7 +236,8 @@ def process_attribute_references(line, attribute_namer): # Pre-process a line of input to remove any character sequences that will be # problematic with FileCheck. def preprocess_line(line): - # If input line has `{{` i.e. in a StrAttr with serialized proto. + # Replace any `{{` with escaped replacements. `{{` corresponds to regex + # checks in FileCheck. output_line = line.replace("{{", "{{\\{\\{}}") # Replace any double brackets, '[[' with escaped replacements. '[['