mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-30 20:10:24 +01:00
6b7036498a
Commit 0a1adaf11d (nir: Report progress
from nir_lower_system_values().) introduced a bug caught by Valgrind:
==823== Conditional jump or move depends on uninitialised value(s)
==823== at 0xB09020C: convert_block (nir_lower_system_values.c:68)
==823== by 0xB079FB8: foreach_cf_node (nir.c:1310)
==823== by 0xB07A0AF: nir_foreach_block (nir.c:1336)
==823== by 0xB09026B: convert_impl (nir_lower_system_values.c:79)
...
==823== Uninitialised value was created by a stack allocation
==823== at 0xB090249: convert_impl (nir_lower_system_values.c:76)
which is trivially fixed by initializing progress.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
98 lines
2.9 KiB
C
98 lines
2.9 KiB
C
/*
|
|
* Copyright © 2014 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.
|
|
*
|
|
* Authors:
|
|
* Connor Abbott (cwabbott0@gmail.com)
|
|
*
|
|
*/
|
|
|
|
#include "nir.h"
|
|
#include "main/mtypes.h"
|
|
|
|
static bool
|
|
convert_instr(nir_intrinsic_instr *instr)
|
|
{
|
|
if (instr->intrinsic != nir_intrinsic_load_var)
|
|
return false;
|
|
|
|
nir_variable *var = instr->variables[0]->var;
|
|
if (var->data.mode != nir_var_system_value)
|
|
return false;
|
|
|
|
void *mem_ctx = ralloc_parent(instr);
|
|
|
|
nir_intrinsic_op op = nir_intrinsic_from_system_value(var->data.location);
|
|
nir_intrinsic_instr *new_instr = nir_intrinsic_instr_create(mem_ctx, op);
|
|
|
|
if (instr->dest.is_ssa) {
|
|
nir_ssa_dest_init(&new_instr->instr, &new_instr->dest,
|
|
instr->dest.ssa.num_components, NULL);
|
|
nir_ssa_def_rewrite_uses(&instr->dest.ssa,
|
|
nir_src_for_ssa(&new_instr->dest.ssa));
|
|
} else {
|
|
nir_dest_copy(&new_instr->dest, &instr->dest, mem_ctx);
|
|
}
|
|
|
|
nir_instr_insert_before(&instr->instr, &new_instr->instr);
|
|
nir_instr_remove(&instr->instr);
|
|
|
|
return true;
|
|
}
|
|
|
|
static bool
|
|
convert_block(nir_block *block, void *state)
|
|
{
|
|
bool *progress = state;
|
|
|
|
nir_foreach_instr_safe(block, instr) {
|
|
if (instr->type == nir_instr_type_intrinsic)
|
|
*progress = convert_instr(nir_instr_as_intrinsic(instr)) || *progress;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
static bool
|
|
convert_impl(nir_function_impl *impl)
|
|
{
|
|
bool progress = false;
|
|
|
|
nir_foreach_block(impl, convert_block, &progress);
|
|
nir_metadata_preserve(impl, nir_metadata_block_index |
|
|
nir_metadata_dominance);
|
|
return progress;
|
|
}
|
|
|
|
bool
|
|
nir_lower_system_values(nir_shader *shader)
|
|
{
|
|
bool progress = false;
|
|
|
|
nir_foreach_overload(shader, overload) {
|
|
if (overload->impl)
|
|
progress = convert_impl(overload->impl) || progress;
|
|
}
|
|
|
|
exec_list_make_empty(&shader->system_values);
|
|
|
|
return progress;
|
|
}
|