[NFC][mlir][spirv] Fix syntax warnings in gen_spirv_dialect.py #111775
Conversation
In the context of regular expressions, Python (used to) gracefully ignore the escape behavior of `\` in some contexts, e.g. for representing the regular expression `\w+`. However in newer versions of Python this now gives a warning in the form ``` SyntaxWarning: invalid escape sequence '\w' ``` Fix by explicitly using raw strings instead.
|
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be notified. If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers. If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
|
@llvm/pr-subscribers-mlir Author: Caio Oliveira (cmarcelo) ChangesIn the context of regular expressions, Python (used to) gracefully ignore the escape behavior of Fix by explicitly using raw strings instead. Full diff: https://github.com/llvm/llvm-project/pull/111775.diff 1 Files Affected:
diff --git a/mlir/utils/spirv/gen_spirv_dialect.py b/mlir/utils/spirv/gen_spirv_dialect.py
index 78c1022428d8a1..6d82c012158196 100755
--- a/mlir/utils/spirv/gen_spirv_dialect.py
+++ b/mlir/utils/spirv/gen_spirv_dialect.py
@@ -538,7 +538,7 @@ def gen_instr_coverage_report(path, instructions):
prefix = "def SPIRV_OC_"
existing_opcodes = [
- k[len(prefix) :] for k in re.findall(prefix + "\w+", content[1])
+ k[len(prefix) :] for k in re.findall(prefix + r"\w+", content[1])
]
existing_instructions = list(
filter(lambda inst: (inst["opname"] in existing_opcodes), instructions)
@@ -597,7 +597,7 @@ def update_td_opcodes(path, instructions, filter_list):
# Extend opcode list with existing list
prefix = "def SPIRV_OC_"
existing_opcodes = [
- k[len(prefix) :] for k in re.findall(prefix + "\w+", content[1])
+ k[len(prefix) :] for k in re.findall(prefix + r"\w+", content[1])
]
filter_list.extend(existing_opcodes)
filter_list = list(set(filter_list))
@@ -644,7 +644,7 @@ def update_td_enum_attrs(path, operand_kinds, filter_list):
suffix = "Attr"
existing_kinds = [
k[len(prefix) : -len(suffix)]
- for k in re.findall(prefix + "\w+" + suffix, content[1])
+ for k in re.findall(prefix + r"\w+" + suffix, content[1])
]
filter_list.extend(existing_kinds)
@@ -971,7 +971,7 @@ def extract_td_op_info(op_def):
suffix = "Op"
opname = [
o[len(prefix) : -len(suffix)]
- for o in re.findall(prefix + "\w+" + suffix, op_def)
+ for o in re.findall(prefix + r"\w+" + suffix, op_def)
]
assert len(opname) == 1, "more than one ops in the same section!"
opname = opname[0]
@@ -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", 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"
|
|
@kuhar just a note: I don't have repo access so you'll have to merge this. |
|
@cmarcelo Congratulations on having your first Pull Request (PR) merged into the LLVM Project! Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR. Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues. How to do this, and the rest of the post-merge process, is covered in detail here. If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again. If you don't get any reports, no action is required from you. Your changes are working as expected, well done! |
…111775) In the context of regular expressions, Python (used to) gracefully ignore the escape behavior of `\` in some contexts, e.g. for representing the regular expression `\w+`. However in newer versions of Python this now gives a warning in the form ``` SyntaxWarning: invalid escape sequence '\w' ``` Fix by explicitly using raw strings instead.
In the context of regular expressions, Python (used to) gracefully ignore the escape behavior of
\in some contexts, e.g. for representing the regular expression\w+. However in newer versions of Python this now gives a warning in the formFix by explicitly using raw strings instead.