[mlir][spirv] Make gen_spirv_dialect.py more precise when finding inst_category

cmarcelo · cmarcelo · commit e4c0e9d2ef00 · 2024-10-09T17:56:54.000-07:00
Use a word boundary, current code was currently failing when parsing the
definition of because it would also match
`CooperativeMatrixOp` from a later mention of
`SPIRV_KHR_CooperativeMatrixOperandsAttr`.
diff --git a/mlir/utils/spirv/gen_spirv_dialect.py b/mlir/utils/spirv/gen_spirv_dialect.py
@@ -979,7 +979,7 @@ def extract_td_op_info(op_def):
     # Get instruction category
     prefix = "SPIRV_"
     inst_category = [
-        o[len(prefix) :] for o in re.findall(prefix + "\w+Op", op_def.split(":", 1)[1])
+        o[len(prefix) :] for o in re.findall(prefix + r"\w+Op\b", op_def.split(":", 1)[1])
     ]
     assert len(inst_category) <= 1, "more than one ops in the same section!"
     inst_category = inst_category[0] if len(inst_category) == 1 else "Op"

Original file line number	Diff line number	Diff line change
`@@ -979,7 +979,7 @@ def extract_td_op_info(op_def):`
`979`	`979`	`# Get instruction category`
`980`	`980`	`prefix = "SPIRV_"`
`981`	`981`	`inst_category = [`
`982`		`- o[len(prefix) :] for o in re.findall(prefix + "\w+Op", op_def.split(":", 1)[1])`
	`982`	`+ o[len(prefix) :] for o in re.findall(prefix + r"\w+Op\b", op_def.split(":", 1)[1])`
`983`	`983`	`]`
`984`	`984`	`assert len(inst_category) <= 1, "more than one ops in the same section!"`
`985`	`985`	`inst_category = inst_category[0] if len(inst_category) == 1 else "Op"`