diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2024-05-01 02:01:45 -0500 |
|---|---|---|
| committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2024-05-03 06:37:38 -0700 |
| commit | f4a19f8c3a506c6ef7241e80ed966230d18acb03 (patch) | |
| tree | ebb2f9f5897a71309c9d7ed6225b00e9bce1d1de | |
| parent | 48382cb8641a46db18cf91ff1cd33baf87a56983 (diff) | |
For a normal string, it's not correct to use just one backslash as
escape char as that conflicts with Python's escape. Use raw strings for
the regex patterns to avoid this problem. Fix the following warnings
that starts showing up with Python 3.12 (see
https://docs.python.org/3/whatsnew/3.12.html#other-language-changes):
[4/1809] Generating lib/i915-perf-registers-hsw with a custom command
/home/ldmartin/p/igt-gpu-tools/lib/i915/perf-configs/codegen.py:165: SyntaxWarning: invalid escape sequence '\$'
m = re.search('\$GtSlice([0-9]+)XeCore([0-9]+)$', name)
/home/ldmartin/p/igt-gpu-tools/lib/i915/perf-configs/codegen.py:168: SyntaxWarning: invalid escape sequence '\$'
m = re.search('\$GtSlice([0-9]+)$', name)
/home/ldmartin/p/igt-gpu-tools/lib/i915/perf-configs/codegen.py:171: SyntaxWarning: invalid escape sequence '\$'
m = re.search('\$GtSlice([0-9]+)DualSubslice([0-9]+)$', name)
/home/ldmartin/p/igt-gpu-tools/lib/i915/perf-configs/codegen.py:341: SyntaxWarning: invalid escape sequence '\$'
m = re.search('\$GtSlice([0-9]+)$', name)
/home/ldmartin/p/igt-gpu-tools/lib/i915/perf-configs/codegen.py:344: SyntaxWarning: invalid escape sequence '\$'
m = re.search('\$GtSlice([0-9]+)DualSubslice([0-9]+)$', name)
/home/ldmartin/p/igt-gpu-tools/lib/i915/perf-configs/codegen.py:347: SyntaxWarning: invalid escape sequence '\$'
m = re.search('\$GtSlice([0-9]+)XeCore([0-9]+)$', name)
Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/20240501070145.49810-1-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
| -rw-r--r-- | lib/i915/perf-configs/codegen.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/i915/perf-configs/codegen.py b/lib/i915/perf-configs/codegen.py index 020e76ef4..0d1847592 100644 --- a/lib/i915/perf-configs/codegen.py +++ b/lib/i915/perf-configs/codegen.py @@ -162,13 +162,13 @@ hw_vars_mapping = { } def is_hw_var(name): - m = re.search('\$GtSlice([0-9]+)XeCore([0-9]+)$', name) + m = re.search(r'\$GtSlice([0-9]+)XeCore([0-9]+)$', name) if m: return True - m = re.search('\$GtSlice([0-9]+)$', name) + m = re.search(r'\$GtSlice([0-9]+)$', name) if m: return True - m = re.search('\$GtSlice([0-9]+)DualSubslice([0-9]+)$', name) + m = re.search(r'\$GtSlice([0-9]+)DualSubslice([0-9]+)$', name) if m: return True return name in hw_vars_mapping @@ -338,13 +338,13 @@ class Gen: return self.hw_vars[name]['c'] if name in set.counter_vars: return set.read_funcs[name] + "(perf, metric_set, accumulator)" - m = re.search('\$GtSlice([0-9]+)$', name) + m = re.search(r'\$GtSlice([0-9]+)$', name) if m: return 'intel_perf_devinfo_slice_available(&perf->devinfo, {0})'.format(m.group(1)) - m = re.search('\$GtSlice([0-9]+)DualSubslice([0-9]+)$', name) + m = re.search(r'\$GtSlice([0-9]+)DualSubslice([0-9]+)$', name) if m: return 'intel_perf_devinfo_subslice_available(&perf->devinfo, {0}, {1})'.format(m.group(1), m.group(2)) - m = re.search('\$GtSlice([0-9]+)XeCore([0-9]+)$', name) + m = re.search(r'\$GtSlice([0-9]+)XeCore([0-9]+)$', name) if m: return 'intel_perf_devinfo_subslice_available(&perf->devinfo, {0}, {1})'.format(m.group(1), m.group(2)) return None |