From 0a793c78a35ecadad088e34fcc1088f5126e636d Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Tue, 4 Dec 2018 16:40:30 +0100 Subject: [PATCH] nir: add bit_size parameter to system values with multiple allowed bit sizes v2: add assert to verify we have at least one valid bit_size v3: fix use of load_front_face in nir_lower_two_sided_color and tgsi_to_nir Signed-off-by: Karol Herbst Reviewed-by: Jason Ekstrand Reviewed-by: Bas Nieuwenhuizen --- src/compiler/nir/nir_builder_opcodes_h.py | 15 +++++++++++++-- src/compiler/nir/nir_lower_system_values.c | 4 ++-- src/compiler/nir/nir_lower_two_sided_color.c | 3 +-- src/gallium/auxiliary/nir/tgsi_to_nir.c | 2 +- src/gallium/drivers/vc4/vc4_nir_lower_blend.c | 4 ++-- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/compiler/nir/nir_builder_opcodes_h.py b/src/compiler/nir/nir_builder_opcodes_h.py index 34b8c4371e1..53fb23ca2b3 100644 --- a/src/compiler/nir/nir_builder_opcodes_h.py +++ b/src/compiler/nir/nir_builder_opcodes_h.py @@ -44,13 +44,14 @@ nir_${name}(nir_builder *build, ${src_decl_list(opcode.num_inputs)}) /* Generic builder for system values. */ static inline nir_ssa_def * -nir_load_system_value(nir_builder *build, nir_intrinsic_op op, int index) +nir_load_system_value(nir_builder *build, nir_intrinsic_op op, int index, + unsigned bit_size) { nir_intrinsic_instr *load = nir_intrinsic_instr_create(build->shader, op); load->num_components = nir_intrinsic_infos[op].dest_components; load->const_index[0] = index; nir_ssa_dest_init(&load->instr, &load->dest, - nir_intrinsic_infos[op].dest_components, 32, NULL); + nir_intrinsic_infos[op].dest_components, bit_size, NULL); nir_builder_instr_insert(build, &load->instr); return &load->dest.ssa; } @@ -60,6 +61,8 @@ def sysval_decl_list(opcode): res = '' if opcode.indices: res += ', unsigned ' + opcode.indices[0].lower() + if len(opcode.bit_sizes) != 1: + res += ', unsigned bit_size' return res def sysval_arg_list(opcode): @@ -68,10 +71,18 @@ def sysval_arg_list(opcode): args.append(opcode.indices[0].lower()) else: args.append('0') + + if len(opcode.bit_sizes) == 1: + bit_size = opcode.bit_sizes[0] + args.append(str(bit_size)) + else: + args.append('bit_size') + return ', '.join(args) %> % for name, opcode in filter(lambda v: v[1].sysval, sorted(INTR_OPCODES.items())): +<% assert len(opcode.bit_sizes) > 0 %> static inline nir_ssa_def * nir_${name}(nir_builder *build${sysval_decl_list(opcode)}) { diff --git a/src/compiler/nir/nir_lower_system_values.c b/src/compiler/nir/nir_lower_system_values.c index 08a9e8be44a..68b0ea89c8d 100644 --- a/src/compiler/nir/nir_lower_system_values.c +++ b/src/compiler/nir/nir_lower_system_values.c @@ -261,8 +261,8 @@ convert_block(nir_block *block, nir_builder *b) if (sysval == NULL) { nir_intrinsic_op sysval_op = nir_intrinsic_from_system_value(var->data.location); - sysval = nir_load_system_value(b, sysval_op, 0); - sysval->bit_size = load_deref->dest.ssa.bit_size; + sysval = nir_load_system_value(b, sysval_op, 0, + load_deref->dest.ssa.bit_size); } nir_ssa_def_rewrite_uses(&load_deref->dest.ssa, nir_src_for_ssa(sysval)); diff --git a/src/compiler/nir/nir_lower_two_sided_color.c b/src/compiler/nir/nir_lower_two_sided_color.c index 437dd5fb745..d1eb32a1887 100644 --- a/src/compiler/nir/nir_lower_two_sided_color.c +++ b/src/compiler/nir/nir_lower_two_sided_color.c @@ -158,11 +158,10 @@ nir_lower_two_sided_color_block(nir_block *block, * bcsel(load_system_value(FACE), load_input(COLn), load_input(BFCn)) */ b->cursor = nir_before_instr(&intr->instr); - nir_ssa_def *face = nir_load_front_face(b); /* gl_FrontFace is a boolean but the intrinsic constructor creates * 32-bit value by default. */ - face->bit_size = 1; + nir_ssa_def *face = nir_load_front_face(b, 1); nir_ssa_def *front = load_input(b, state->colors[idx].front); nir_ssa_def *back = load_input(b, state->colors[idx].back); nir_ssa_def *color = nir_bcsel(b, face, front, back); diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c index 000109621d8..10e24387849 100644 --- a/src/gallium/auxiliary/nir/tgsi_to_nir.c +++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c @@ -516,7 +516,7 @@ ttn_src_for_file_and_index(struct ttn_compile *c, unsigned file, unsigned index, c->scan->input_semantic_name[index] == TGSI_SEMANTIC_FACE) { nir_ssa_def *tgsi_frontface[4] = { nir_bcsel(&c->build, - nir_load_front_face(&c->build), + nir_load_front_face(&c->build, 1), nir_imm_float(&c->build, 1.0), nir_imm_float(&c->build, -1.0)), nir_imm_float(&c->build, 0.0), diff --git a/src/gallium/drivers/vc4/vc4_nir_lower_blend.c b/src/gallium/drivers/vc4/vc4_nir_lower_blend.c index 67ae05d4f61..ff6268f478a 100644 --- a/src/gallium/drivers/vc4/vc4_nir_lower_blend.c +++ b/src/gallium/drivers/vc4/vc4_nir_lower_blend.c @@ -100,7 +100,7 @@ vc4_blend_channel_f(nir_builder *b, return nir_load_system_value(b, nir_intrinsic_load_blend_const_color_r_float + channel, - 0); + 0, 32); case PIPE_BLENDFACTOR_CONST_ALPHA: return nir_load_blend_const_color_a_float(b); case PIPE_BLENDFACTOR_ZERO: @@ -118,7 +118,7 @@ vc4_blend_channel_f(nir_builder *b, nir_load_system_value(b, nir_intrinsic_load_blend_const_color_r_float + channel, - 0)); + 0, 32)); case PIPE_BLENDFACTOR_INV_CONST_ALPHA: return nir_fsub(b, nir_imm_float(b, 1.0), nir_load_blend_const_color_a_float(b)); -- 2.30.2