From 1fa432741c45cf9cdbdd416cd0f7b424f2ffc7a5 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Fri, 17 Mar 2017 16:21:38 -0700 Subject: [PATCH] nir: Add positional argument specifiers. Fix build with Python < 2.7. File "src/compiler/nir/nir_builder_opcodes_h.py", line 46, in from nir_opcodes import opcodes File "src/compiler/nir/nir_opcodes.py", line 178, in 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 --- src/compiler/nir/nir_opcodes.py | 2 +- src/compiler/nir/nir_opcodes_c.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/nir/nir_opcodes.py b/src/compiler/nir/nir_opcodes.py index 52868d5..98692da 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 c66f3bc..a1db54f 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"); -- 2.7.4