Mesa (master): aco: remove use of f-strings

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sat May 2 14:09:17 UTC 2020


Module: Mesa
Branch: master
Commit: 8e02de4d7fc3bc7ac1f7f9faf0e18f33fe0098e3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e02de4d7fc3bc7ac1f7f9faf0e18f33fe0098e3

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Fri May  1 16:42:05 2020 +0100

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 at gmail.com>
Reviewed-by: Daniel Schürmann <daniel at 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>

---

 src/amd/compiler/aco_opcodes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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



More information about the mesa-commit mailing list