[mlir] fix references of attributes which are not defined earlier

[tdanyluk]

If an attribute is not defined earlier in the same file, but just referenced from its dialect directly, then currently not the correct check is being emited.

What would it emit for #toy.shape<[1, 2, 3]>:
Earlier:
// CHECK: #[['?']]<[1, 2, 3]>
Now:
// CHECK: #toy.shape<[1, 2, 3]>

[llvmbot]

@llvm/pr-subscribers-mlir

Author: None (tdanyluk)

Changes

If an attribute is not defined earlier in the same file, but just referenced from its dialect directly, then currently not the correct check is being emited.

What would it emit for this:
Earlier:
// CHECK: #[['?']]<[1, 2, 3]>
Now:
// CHECK: #toy.shape<[1, 2, 3]>

---

Full diff: https://github.com/llvm/llvm-project/pull/134364.diff

1 Files Affected:

• (modified) mlir/utils/generate-test-checks.py (+5-6)

diff --git a/mlir/utils/generate-test-checks.py b/mlir/utils/generate-test-checks.py
index 749bfa13fe734..f15d0fee0ea11 100755
--- a/mlir/utils/generate-test-checks.py
+++ b/mlir/utils/generate-test-checks.py
@@ -145,10 +145,9 @@ def generate_name(self, source_attribute_name):
         return attribute_name
 
     # Get the saved substitution name for the given attribute name. If no name
-    # has been generated for the given attribute yet, the source attribute name
-    # itself is returned.
+    # has been generated for the given attribute yet, None is returned.
     def get_name(self, source_attribute_name):
-        return self.map[source_attribute_name] if source_attribute_name in self.map else '?'
+        return self.map[source_attribute_name] if source_attribute_name in self.map else None
 
 # Return the number of SSA results in a line of type
 #   %0, %1, ... = ...
@@ -227,9 +226,9 @@ def process_attribute_references(line, attribute_namer):
     components = ATTR_RE.split(line)
     for component in components:
         m = ATTR_RE.match(component)
-        if m:
-            output_line += '#[[' + attribute_namer.get_name(m.group(1)) + ']]'
-            output_line += component[len(m.group()):]
+        attribute_name = attribute_namer.get_name(m.group(1)) if m else None
+        if attribute_name:
+            output_line += f'#[[{attribute_name}]]{component[len(m.group()):]}'
         else:
             output_line += component
     return output_line

[github-actions]

✅ With the latest revision this PR passed the Python code formatter.

[ftynse]

Is there a way to test this?

[tdanyluk]

Fair question, but there are currently no tests for generate-test-checks.py and adding them would probably take too much of my working time.

If you just want to try this change, you can make a file (test-input.txt):

{
    #my_attr = my.attr<[1, 2, 3]>
    %0 = toy.reshape %arg0 {shape = #my_attr} : (tensor<3xf32>) -> tensor<3xf32>
    %0 = toy.reshape %arg0 {shape = #toy.shape<[1, 2, 3]>} : (tensor<3xf32>) -> tensor<3xf32>
}

cat test-input.txt | python3 generate-test-checks.py --source test-input.txt

Earlier version would output:

// CHECK-LABEL:     #[[$ATTR_0]] = my.attr<[1, 2, 3]>
// CHECK:           %[[VAL_0:.*]] = toy.reshape %[[VAL_1:.*]] {shape = #[[$ATTR_0]]} : (tensor<3xf32>) -> tensor<3xf32>
// CHECK:           %[[VAL_0]] = toy.reshape %[[VAL_1]] {shape = #[[?]]<[1, 2, 3]>} : (tensor<3xf32>) -> tensor<3xf32>

New version would output:

// CHECK-LABEL:     #[[$ATTR_0]] = my.attr<[1, 2, 3]>
// CHECK:           %[[VAL_0:.*]] = toy.reshape %[[VAL_1:.*]] {shape = #[[$ATTR_0]]} : (tensor<3xf32>) -> tensor<3xf32>
// CHECK:           %[[VAL_0]] = toy.reshape %[[VAL_1]] {shape = #toy.shape<[1, 2, 3]>} : (tensor<3xf32>) -> tensor<3xf32>

So the case where the attribute is defined locally is unchanged, but the case where it's not is different.

[sergey-kozub]

Nit: self.map.get(source_attribute_name) is an equivalent (lines 151-153, not sure how the UI lost the context)

[joker-eph]

LG overall