OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Refactor algebraic's block walk

Browse Source 
My motivation was to clarify the changes in the following commit, but
incidentally, it reduces runtime of
dEQP-GLES2.functional.uniform_api.random.3 (an algebraic-heavy
testcase) by -5.39524% +/- 2.21179% (n=15)

Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
This commit is contained in:
Eric Anholt
2019-11-13 12:15:08 -08:00
parent 305d1300f9
commit 90ad6304bf
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/compiler/nir/nir_search.c
View File

@@ -764,7 +764,7 @@ nir_algebraic_automaton(nir_instr *instr, struct util_dynarray *states,
} }
static bool static bool
nir_algebraic_block(nir_builder *build, nir_block *block, nir_algebraic_instr(nir_builder *build, nir_instr *instr,
struct hash_table *range_ht, struct hash_table *range_ht,
const bool *condition_flags, const bool *condition_flags,
const struct transform **transforms, const struct transform **transforms,
@@ -772,38 +772,35 @@ nir_algebraic_block(nir_builder *build, nir_block *block,
struct util_dynarray *states, struct util_dynarray *states,
const struct per_op_table *pass_op_table) const struct per_op_table *pass_op_table)
{ {
bool progress = false;
const unsigned execution_mode = build->shader->info.float_controls_execution_mode;
nir_foreach_instr_reverse_safe(instr, block) { if (instr->type != nir_instr_type_alu)
if (instr->type != nir_instr_type_alu) return false;
continue;
nir_alu_instr *alu = nir_instr_as_alu(instr); nir_alu_instr *alu = nir_instr_as_alu(instr);
if (!alu->dest.dest.is_ssa) if (!alu->dest.dest.is_ssa)
continue; return false;
unsigned bit_size = alu->dest.dest.ssa.bit_size; unsigned bit_size = alu->dest.dest.ssa.bit_size;
const bool ignore_inexact = const unsigned execution_mode =
nir_is_float_control_signed_zero_inf_nan_preserve(execution_mode, bit_size) || build->shader->info.float_controls_execution_mode;
nir_is_denorm_flush_to_zero(execution_mode, bit_size); const bool ignore_inexact =
nir_is_float_control_signed_zero_inf_nan_preserve(execution_mode, bit_size) ||
nir_is_denorm_flush_to_zero(execution_mode, bit_size);
int xform_idx = *util_dynarray_element(states, uint16_t, int xform_idx = *util_dynarray_element(states, uint16_t,
alu->dest.dest.ssa.index); alu->dest.dest.ssa.index);
for (uint16_t i = 0; i < transform_counts[xform_idx]; i++) { for (uint16_t i = 0; i < transform_counts[xform_idx]; i++) {
const struct transform *xform = &transforms[xform_idx][i]; const struct transform *xform = &transforms[xform_idx][i];
if (condition_flags[xform->condition_offset] && if (condition_flags[xform->condition_offset] &&
!(xform->search->inexact && ignore_inexact) && !(xform->search->inexact && ignore_inexact) &&
nir_replace_instr(build, alu, range_ht, states, pass_op_table, nir_replace_instr(build, alu, range_ht, states, pass_op_table,
xform->search, xform->replace)) { xform->search, xform->replace)) {
_mesa_hash_table_clear(range_ht, NULL); _mesa_hash_table_clear(range_ht, NULL);
progress = true; return true;
break;
}
} }
} }
return progress; return false;
} }
bool bool
@@ -836,9 +833,12 @@ nir_algebraic_impl(nir_function_impl *impl,
} }
nir_foreach_block_reverse(block, impl) { nir_foreach_block_reverse(block, impl) {
progress |= nir_algebraic_block(&build, block, range_ht, condition_flags, nir_foreach_instr_reverse_safe(instr, block) {
transforms, transform_counts, progress |= nir_algebraic_instr(&build, instr,
&states, pass_op_table); range_ht, condition_flags,
transforms, transform_counts, &states,
pass_op_table);
}
} }
ralloc_free(range_ht); ralloc_free(range_ht);