From: Vinson Lee <vlee@freedesktop.org>
Date: Fri, 17 Mar 2017 23:21:38 +0000 (-0700)
Subject: nir: Add positional argument specifiers.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1fa432741c45cf9cdbdd416cd0f7b424f2ffc7a5;p=mesa.git

nir: Add positional argument specifiers.

Fix build with Python < 2.7.

  File "src/compiler/nir/nir_builder_opcodes_h.py", line 46, in <module>
    from nir_opcodes import opcodes
  File "src/compiler/nir/nir_opcodes.py", line 178, in <module>
    unop_convert("{}2{}{}".format(src_t[0], dst_t[0], bit_size),
ValueError: zero length field name in format

Fixes: 762a6333f21f ("nir: Rework conversion opcodes")
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
---

diff --git a/src/compiler/nir/nir_opcodes.py b/src/compiler/nir/nir_opcodes.py
index 52868d5f5a4..98692da7be6 100644
--- a/src/compiler/nir/nir_opcodes.py
+++ b/src/compiler/nir/nir_opcodes.py
@@ -175,7 +175,7 @@ for src_t in [tint, tuint, tfloat]:
 
    for dst_t in dst_types:
       for bit_size in [32, 64]:
-         unop_convert("{}2{}{}".format(src_t[0], dst_t[0], bit_size),
+         unop_convert("{0}2{1}{2}".format(src_t[0], dst_t[0], bit_size),
                       dst_t + str(bit_size), src_t, "src0")
 
 # We'll hand-code the to/from bool conversion opcodes.  Because bool doesn't
diff --git a/src/compiler/nir/nir_opcodes_c.py b/src/compiler/nir/nir_opcodes_c.py
index c66f3bc7ad4..a1db54f05a8 100644
--- a/src/compiler/nir/nir_opcodes_c.py
+++ b/src/compiler/nir/nir_opcodes_c.py
@@ -64,7 +64,7 @@ nir_type_conversion_op(nir_alu_type src, nir_alu_type dst)
                switch (dst_bit_size) {
 %                 for dst_bits in [32, 64]:
                   case ${dst_bits}:
-                     return ${'nir_op_{}2{}{}'.format(src_t[0], dst_t[0], dst_bits)};
+                     return ${'nir_op_{0}2{1}{2}'.format(src_t[0], dst_t[0], dst_bits)};
 %                 endfor
                   default:
                      unreachable("Invalid nir alu bit size");