diff options
| author | Rhys Perry <pendingchaos02@gmail.com> | 2020-05-01 16:42:05 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2020-05-05 18:56:45 +0200 |
| commit | a63ca1776f615428469f3250f74cf757e0ccd0c6 (patch) | |
| tree | a33a00bc06513e35d3d789f5c7c57634f1ad1a44 | |
| parent | 263451f9c9174f8d3d0a2ba9743066d36906a509 (diff) | |
aco: remove use of f-strings
f-strings require Python 3.6 but 3.5 is still maintained and used.
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2839
Fixes: 2ab45f41 ("aco: implement sub-dword swaps")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4850>
(cherry picked from commit 8e02de4d7fc3bc7ac1f7f9faf0e18f33fe0098e3)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/amd/compiler/aco_opcodes.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 149910e18d9..4bf36b19a21 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -130,7 +130,7 @@ "description": "aco: remove use of f-strings", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "2ab45f41e08a3892138a1e9b20552621b4e18682" }, diff --git a/src/amd/compiler/aco_opcodes.py b/src/amd/compiler/aco_opcodes.py index 5b9b9b036a7..30656976fee 100644 --- a/src/amd/compiler/aco_opcodes.py +++ b/src/amd/compiler/aco_opcodes.py @@ -153,7 +153,7 @@ class Format(Enum): res = '' if self == Format.SDWA: for i in range(min(num_operands, 2)): - res += f'instr->sel[{i}] = op{i}.op.bytes() == 2 ? sdwa_uword : (op{i}.op.bytes() == 1 ? sdwa_ubyte : sdwa_udword);\n' + res += 'instr->sel[{0}] = op{0}.op.bytes() == 2 ? sdwa_uword : (op{0}.op.bytes() == 1 ? sdwa_ubyte : sdwa_udword);\n'.format(i) res += 'instr->dst_sel = def0.bytes() == 2 ? sdwa_uword : (def0.bytes() == 1 ? sdwa_ubyte : sdwa_udword);\n' res += 'instr->dst_preserve = true;' return res |