Module: Mesa Branch: staging/23.2 Commit: 7429e4985a2a4c59c5314115042fb4e00014abfb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7429e4985a2a4c59c5314115042fb4e00014abfb
Author: Christian Gmeiner <[email protected]> Date: Wed Aug 30 17:12:16 2023 +0200 isaspec: encode: Correct used regex The current regex misses the = sign and therefore fails to match DST:align=16. Fixes: 9e56f69edf5 ("isaspec: encode: handle special fieldname properties") Signed-off-by: Christian Gmeiner <[email protected]> Reviewed-by: Rob Clark <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25451> (cherry picked from commit ef602e77f676ba71606f99c99df4a389d9fb65dc) --- .pick_status.json | 2 +- src/compiler/isaspec/encode.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 2c1ff27d22b..3fe319990c3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1844,7 +1844,7 @@ "description": "isaspec: encode: Correct used regex", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "9e56f69edf5e1755e04b1461272e3a08051d25a3", "notes": null diff --git a/src/compiler/isaspec/encode.py b/src/compiler/isaspec/encode.py index acaa45703b6..514910e61a0 100755 --- a/src/compiler/isaspec/encode.py +++ b/src/compiler/isaspec/encode.py @@ -134,7 +134,7 @@ class Case(object): self.expr = None if case.expr is not None: self.expr = bitset.isa.expressions[case.expr] - self.fieldnames = re.findall(r"{([a-zA-Z0-9_:]+)}", case.display) + self.fieldnames = re.findall(r"{([a-zA-Z0-9_:=]+)}", case.display) self.append_forced(bitset) # remove special fieldname properties e.g. :align=
