On Fri, Apr 1, 2016 at 1:48 PM, Jason Ekstrand <ja...@jlekstrand.net> wrote:
>
>
> On Sat, Mar 26, 2016 at 2:02 PM, Rob Clark <robdcl...@gmail.com> wrote:
>>
>> From: Rob Clark <robcl...@freedesktop.org>
>>
>> Since it will gain support to lower inputs, give it a more generic name.
>>
>> Signed-off-by: Rob Clark <robcl...@freedesktop.org>
>> ---
>> src/compiler/Makefile.sources | 2 +-
>> src/compiler/nir/nir.h | 2 +-
>> src/compiler/nir/nir_lower_io_to_temporaries.c | 129
>> +++++++++++++++++++++
>> .../nir/nir_lower_outputs_to_temporaries.c | 129
>> ---------------------
>> src/mesa/drivers/dri/i965/brw_nir.c | 2 +-
>> 5 files changed, 132 insertions(+), 132 deletions(-)
>> create mode 100644 src/compiler/nir/nir_lower_io_to_temporaries.c
>> delete mode 100644 src/compiler/nir/nir_lower_outputs_to_temporaries.c
>>
>> diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources
>> index 8f1ffdc..454e768 100644
>> --- a/src/compiler/Makefile.sources
>> +++ b/src/compiler/Makefile.sources
>> @@ -196,8 +196,8 @@ NIR_FILES = \
>> nir/nir_lower_idiv.c \
>> nir/nir_lower_indirect_derefs.c \
>> nir/nir_lower_io.c \
>> + nir/nir_lower_io_to_temporaries.c \
>> nir/nir_lower_io_types.c \
>> - nir/nir_lower_outputs_to_temporaries.c \
>
>
> If you don't also update nir/Makefile.sources it will break scons.
actually, removing nir/Makefile.sources (on master) doesn't break
scons build.. afaict scons build doesn't build nir..
but ofc w/ my patchset which makes mesa/st depend on nir, things get
much worse. Since scons isn't built and the py stuff that generates
some of the nir related .c/.h code doesn't run.. :-(
So this isn't a problem with this patch, but it is a bigger problem
with the patchset :-(
(and I still hate scons ;-))
BR,
-R
>>
>> nir/nir_lower_passthrough_edgeflags.c \
>> nir/nir_lower_phis_to_scalar.c \
>> nir/nir_lower_returns.c \
>> diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
>> index 7f7c459..ab73068 100644
>> --- a/src/compiler/nir/nir.h
>> +++ b/src/compiler/nir/nir.h
>> @@ -2160,7 +2160,7 @@ bool nir_lower_indirect_derefs(nir_shader *shader,
>> uint32_t mode_mask);
>>
>> bool nir_lower_locals_to_regs(nir_shader *shader);
>>
>> -void nir_lower_outputs_to_temporaries(nir_shader *shader);
>> +void nir_lower_io_to_temporaries(nir_shader *shader);
>>
>> void nir_assign_var_locations(struct exec_list *var_list,
>> unsigned *size,
>> diff --git a/src/compiler/nir/nir_lower_io_to_temporaries.c
>> b/src/compiler/nir/nir_lower_io_to_temporaries.c
>> new file mode 100644
>> index 0000000..0db436b
>> --- /dev/null
>> +++ b/src/compiler/nir/nir_lower_io_to_temporaries.c
>> @@ -0,0 +1,129 @@
>> +/*
>> + * Copyright © 2015 Intel Corporation
>> + *
>> + * Permission is hereby granted, free of charge, to any person obtaining
>> a
>> + * copy of this software and associated documentation files (the
>> "Software"),
>> + * to deal in the Software without restriction, including without
>> limitation
>> + * the rights to use, copy, modify, merge, publish, distribute,
>> sublicense,
>> + * and/or sell copies of the Software, and to permit persons to whom the
>> + * Software is furnished to do so, subject to the following conditions:
>> + *
>> + * The above copyright notice and this permission notice (including the
>> next
>> + * paragraph) shall be included in all copies or substantial portions of
>> the
>> + * Software.
>> + *
>> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>> EXPRESS OR
>> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>> MERCHANTABILITY,
>> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
>> SHALL
>> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
>> OTHER
>> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
>> ARISING
>> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
>> DEALINGS
>> + * IN THE SOFTWARE.
>> + */
>> +
>> +/*
>> + * Implements a pass that lowers output variables to a temporary plus an
>> + * output variable with a single copy at each exit point of the shader.
>> + * This way the output variable is only ever written.
>> + */
>> +
>> +#include "nir.h"
>> +
>> +struct lower_io_state {
>> + nir_shader *shader;
>> + struct exec_list old_outputs;
>> +};
>> +
>> +static void
>> +emit_output_copies(nir_cursor cursor, struct lower_io_state *state)
>> +{
>> + assert(exec_list_length(&state->shader->outputs) ==
>> + exec_list_length(&state->old_outputs));
>> +
>> + foreach_two_lists(out_node, &state->shader->outputs,
>> + temp_node, &state->old_outputs) {
>> + nir_variable *output = exec_node_data(nir_variable, out_node,
>> node);
>> + nir_variable *temp = exec_node_data(nir_variable, temp_node, node);
>> +
>> + nir_intrinsic_instr *copy =
>> + nir_intrinsic_instr_create(state->shader,
>> nir_intrinsic_copy_var);
>> + copy->variables[0] = nir_deref_var_create(copy, output);
>> + copy->variables[1] = nir_deref_var_create(copy, temp);
>> +
>> + nir_instr_insert(cursor, ©->instr);
>> + }
>> +}
>> +
>> +static bool
>> +emit_output_copies_block(nir_block *block, void *state)
>> +{
>> + nir_foreach_instr(block, instr) {
>> + if (instr->type != nir_instr_type_intrinsic)
>> + continue;
>> +
>> + nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
>> + if (intrin->intrinsic == nir_intrinsic_emit_vertex)
>> + emit_output_copies(nir_before_instr(&intrin->instr), state);
>> + }
>> +
>> + return true;
>> +}
>> +
>> +void
>> +nir_lower_io_to_temporaries(nir_shader *shader)
>> +{
>> + struct lower_io_state state;
>> +
>> + if (shader->stage == MESA_SHADER_TESS_CTRL)
>> + return;
>> +
>> + state.shader = shader;
>> + exec_list_move_nodes_to(&shader->outputs, &state.old_outputs);
>> +
>> + /* Walk over all of the outputs turn each output into a temporary and
>> + * make a new variable for the actual output.
>> + */
>> + nir_foreach_variable(var, &state.old_outputs) {
>> + nir_variable *output = ralloc(shader, nir_variable);
>> + memcpy(output, var, sizeof *output);
>> +
>> + /* The orignal is now the temporary */
>> + nir_variable *temp = var;
>> +
>> + /* Reparent the name to the new variable */
>> + ralloc_steal(output, output->name);
>> +
>> + /* Give the output a new name with @out-temp appended */
>> + temp->name = ralloc_asprintf(var, "%s@out-temp", output->name);
>> + temp->data.mode = nir_var_global;
>> + temp->constant_initializer = NULL;
>> +
>> + exec_list_push_tail(&shader->outputs, &output->node);
>> + }
>> +
>> + nir_foreach_function(shader, function) {
>> + if (function->impl == NULL)
>> + continue;
>> +
>> + if (shader->stage == MESA_SHADER_GEOMETRY) {
>> + /* For geometry shaders, we have to emit the output copies right
>> + * before each EmitVertex call.
>> + */
>> + nir_foreach_block(function->impl, emit_output_copies_block,
>> &state);
>> + } else if (strcmp(function->name, "main") == 0) {
>> + /* For all other shader types, we need to do the copies right
>> before
>> + * the jumps to the end block.
>> + */
>> + struct set_entry *block_entry;
>> + set_foreach(function->impl->end_block->predecessors,
>> block_entry) {
>> + struct nir_block *block = (void *)block_entry->key;
>> + emit_output_copies(nir_after_block_before_jump(block),
>> &state);
>> + }
>> + }
>> +
>> + nir_metadata_preserve(function->impl, nir_metadata_block_index |
>> + nir_metadata_dominance);
>> + }
>> +
>> + exec_list_append(&shader->globals, &state.old_outputs);
>> +}
>> diff --git a/src/compiler/nir/nir_lower_outputs_to_temporaries.c
>> b/src/compiler/nir/nir_lower_outputs_to_temporaries.c
>> deleted file mode 100644
>> index 0e518cd..0000000
>> --- a/src/compiler/nir/nir_lower_outputs_to_temporaries.c
>> +++ /dev/null
>> @@ -1,129 +0,0 @@
>> -/*
>> - * Copyright © 2015 Intel Corporation
>> - *
>> - * Permission is hereby granted, free of charge, to any person obtaining
>> a
>> - * copy of this software and associated documentation files (the
>> "Software"),
>> - * to deal in the Software without restriction, including without
>> limitation
>> - * the rights to use, copy, modify, merge, publish, distribute,
>> sublicense,
>> - * and/or sell copies of the Software, and to permit persons to whom the
>> - * Software is furnished to do so, subject to the following conditions:
>> - *
>> - * The above copyright notice and this permission notice (including the
>> next
>> - * paragraph) shall be included in all copies or substantial portions of
>> the
>> - * Software.
>> - *
>> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>> EXPRESS OR
>> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>> MERCHANTABILITY,
>> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
>> SHALL
>> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
>> OTHER
>> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
>> ARISING
>> - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
>> DEALINGS
>> - * IN THE SOFTWARE.
>> - */
>> -
>> -/*
>> - * Implements a pass that lowers output variables to a temporary plus an
>> - * output variable with a single copy at each exit point of the shader.
>> - * This way the output variable is only ever written.
>> - */
>> -
>> -#include "nir.h"
>> -
>> -struct lower_outputs_state {
>> - nir_shader *shader;
>> - struct exec_list old_outputs;
>> -};
>> -
>> -static void
>> -emit_output_copies(nir_cursor cursor, struct lower_outputs_state *state)
>> -{
>> - assert(exec_list_length(&state->shader->outputs) ==
>> - exec_list_length(&state->old_outputs));
>> -
>> - foreach_two_lists(out_node, &state->shader->outputs,
>> - temp_node, &state->old_outputs) {
>> - nir_variable *output = exec_node_data(nir_variable, out_node,
>> node);
>> - nir_variable *temp = exec_node_data(nir_variable, temp_node, node);
>> -
>> - nir_intrinsic_instr *copy =
>> - nir_intrinsic_instr_create(state->shader,
>> nir_intrinsic_copy_var);
>> - copy->variables[0] = nir_deref_var_create(copy, output);
>> - copy->variables[1] = nir_deref_var_create(copy, temp);
>> -
>> - nir_instr_insert(cursor, ©->instr);
>> - }
>> -}
>> -
>> -static bool
>> -emit_output_copies_block(nir_block *block, void *state)
>> -{
>> - nir_foreach_instr(block, instr) {
>> - if (instr->type != nir_instr_type_intrinsic)
>> - continue;
>> -
>> - nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
>> - if (intrin->intrinsic == nir_intrinsic_emit_vertex)
>> - emit_output_copies(nir_before_instr(&intrin->instr), state);
>> - }
>> -
>> - return true;
>> -}
>> -
>> -void
>> -nir_lower_outputs_to_temporaries(nir_shader *shader)
>> -{
>> - struct lower_outputs_state state;
>> -
>> - if (shader->stage == MESA_SHADER_TESS_CTRL)
>> - return;
>> -
>> - state.shader = shader;
>> - exec_list_move_nodes_to(&shader->outputs, &state.old_outputs);
>> -
>> - /* Walk over all of the outputs turn each output into a temporary and
>> - * make a new variable for the actual output.
>> - */
>> - nir_foreach_variable(var, &state.old_outputs) {
>> - nir_variable *output = ralloc(shader, nir_variable);
>> - memcpy(output, var, sizeof *output);
>> -
>> - /* The orignal is now the temporary */
>> - nir_variable *temp = var;
>> -
>> - /* Reparent the name to the new variable */
>> - ralloc_steal(output, output->name);
>> -
>> - /* Give the output a new name with @out-temp appended */
>> - temp->name = ralloc_asprintf(var, "%s@out-temp", output->name);
>> - temp->data.mode = nir_var_global;
>> - temp->constant_initializer = NULL;
>> -
>> - exec_list_push_tail(&shader->outputs, &output->node);
>> - }
>> -
>> - nir_foreach_function(shader, function) {
>> - if (function->impl == NULL)
>> - continue;
>> -
>> - if (shader->stage == MESA_SHADER_GEOMETRY) {
>> - /* For geometry shaders, we have to emit the output copies right
>> - * before each EmitVertex call.
>> - */
>> - nir_foreach_block(function->impl, emit_output_copies_block,
>> &state);
>> - } else if (strcmp(function->name, "main") == 0) {
>> - /* For all other shader types, we need to do the copies right
>> before
>> - * the jumps to the end block.
>> - */
>> - struct set_entry *block_entry;
>> - set_foreach(function->impl->end_block->predecessors,
>> block_entry) {
>> - struct nir_block *block = (void *)block_entry->key;
>> - emit_output_copies(nir_after_block_before_jump(block),
>> &state);
>> - }
>> - }
>> -
>> - nir_metadata_preserve(function->impl, nir_metadata_block_index |
>> - nir_metadata_dominance);
>> - }
>> -
>> - exec_list_append(&shader->globals, &state.old_outputs);
>> -}
>> diff --git a/src/mesa/drivers/dri/i965/brw_nir.c
>> b/src/mesa/drivers/dri/i965/brw_nir.c
>> index e0c9465..10f4ae1 100644
>> --- a/src/mesa/drivers/dri/i965/brw_nir.c
>> +++ b/src/mesa/drivers/dri/i965/brw_nir.c
>> @@ -560,7 +560,7 @@ brw_create_nir(struct brw_context *brw,
>> /* First, lower the GLSL IR or Mesa IR to NIR */
>> if (shader_prog) {
>> nir = glsl_to_nir(shader_prog, stage, options);
>> - nir_lower_outputs_to_temporaries(nir);
>> + nir_lower_io_to_temporaries(nir);
>> } else {
>> nir = prog_to_nir(prog, options);
>> OPT_V(nir_convert_to_ssa); /* turn registers into SSA */
>> --
>> 2.5.5
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
