fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 20:20:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

treewide: use nir_break_if

Browse source 
Via Coccinelle patch and some manual hunk editing:

    @@
    expression b, E;
    @@

    -nir_push_if(b, E);
    -{
    -nir_jump(b, nir_jump_break);
    -}
    -nir_pop_if(b, NULL);
    +nir_break_if(b, E);

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29877>
This commit is contained in:
Alyssa Rosenzweig 2024-06-24 11:50:23 -04:00 • committed by Marge Bot
parent d57934fdec
commit dd85b50d18
10 changed files with 17 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/amd/vulkan/meta/radv_meta.c
View file

@ -715,9 +715,7 @@ radv_break_on_count(nir_builder *b, nir_variable *var, nir_def *count)
{
nir_def *counter = nir_load_var(b, var);
nir_push_if(b, nir_uge(b, counter, count));
nir_jump(b, nir_jump_break);
nir_pop_if(b, NULL);
nir_break_if(b, nir_uge(b, counter, count));
counter = nir_iadd_imm(b, counter, 1);
nir_store_var(b, var, counter, 0x1);

12
src/amd/vulkan/nir/radv_nir_rt_shader.c
View file

@ -1461,11 +1461,7 @@ handle_candidate_triangle(nir_builder *b, struct radv_triangle_intersection *int
nir_store_var(b, data->trav_vars->hit, nir_imm_true(b), 1);
nir_def *ray_terminated = nir_load_var(b, data->vars->ahit_terminate);
nir_push_if(b, nir_ior(b, ray_flags->terminate_on_first_hit, ray_terminated));
{
nir_jump(b, nir_jump_break);
}
nir_pop_if(b, NULL);
nir_break_if(b, nir_ior(b, ray_flags->terminate_on_first_hit, ray_terminated));
}
static void
@ -1525,11 +1521,7 @@ handle_candidate_aabb(nir_builder *b, struct radv_leaf_intersection *intersectio
nir_def *terminate_on_first_hit = nir_test_mask(b, args->flags, SpvRayFlagsTerminateOnFirstHitKHRMask);
nir_def *ray_terminated = nir_load_var(b, data->vars->ahit_terminate);
nir_push_if(b, nir_ior(b, terminate_on_first_hit, ray_terminated));
{
nir_jump(b, nir_jump_break);
}
nir_pop_if(b, NULL);
nir_break_if(b, nir_ior(b, terminate_on_first_hit, ray_terminated));
}
nir_pop_if(b, NULL);
}

30
src/amd/vulkan/radv_device_generated_commands.c
View file

@ -754,11 +754,7 @@ build_dgc_buffer_tail(nir_builder *b, nir_def *sequence_count, const struct radv
nir_def *curr_offset = nir_load_var(b, offset);
const unsigned MAX_PACKET_WORDS = 0x3FFC;
nir_push_if(b, nir_ieq(b, curr_offset, cmd_buf_size));
{
nir_jump(b, nir_jump_break);
}
nir_pop_if(b, NULL);
nir_break_if(b, nir_ieq(b, curr_offset, cmd_buf_size));
nir_def *packet, *packet_size;
@ -1098,11 +1094,7 @@ dgc_emit_push_constant(struct dgc_cmdbuf *cs, nir_def *stream_addr, nir_def *pus
nir_push_loop(b);
{
nir_def *cur_idx = nir_load_var(b, idx);
nir_push_if(b, nir_uge(b, cur_idx, const_copy_words));
{
nir_jump(b, nir_jump_break);
}
nir_pop_if(b, NULL);
nir_break_if(b, nir_uge(b, cur_idx, const_copy_words));
nir_variable *data = nir_variable_create(b->shader, nir_var_shader_temp, glsl_uint_type(), "copy_data");
@ -1141,11 +1133,7 @@ dgc_emit_push_constant(struct dgc_cmdbuf *cs, nir_def *stream_addr, nir_def *pus
nir_push_loop(b);
{
nir_def *cur_shader_idx = nir_load_var(b, shader_idx);
nir_push_if(b, nir_uge(b, cur_shader_idx, shader_cnt));
{
nir_jump(b, nir_jump_break);
}
nir_pop_if(b, NULL);
nir_break_if(b, nir_uge(b, cur_shader_idx, shader_cnt));
nir_def *upload_sgpr = dgc_get_upload_sgpr(b, stream_addr, param_buf, param_offset, cur_shader_idx);
nir_def *inline_sgpr = dgc_get_inline_sgpr(b, stream_addr, param_buf, param_offset, cur_shader_idx);
@ -1171,11 +1159,7 @@ dgc_emit_push_constant(struct dgc_cmdbuf *cs, nir_def *stream_addr, nir_def *pus
nir_push_loop(b);
{
nir_def *cur_idx = nir_load_var(b, idx);
nir_push_if(b, nir_uge_imm(b, cur_idx, 64 /* bits in inline_mask */));
{
nir_jump(b, nir_jump_break);
}
nir_pop_if(b, NULL);
nir_break_if(b, nir_uge_imm(b, cur_idx, 64 /* bits in inline_mask */));
nir_def *l = nir_ishl(b, nir_imm_int64(b, 1), cur_idx);
nir_push_if(b, nir_ieq_imm(b, nir_iand(b, l, inline_mask), 0));
@ -1256,11 +1240,7 @@ dgc_emit_vertex_buffer(struct dgc_cmdbuf *cs, nir_def *stream_addr, nir_def *vbo
nir_push_loop(b);
{
nir_push_if(b, nir_uge(b, nir_load_var(b, vbo_idx), vbo_cnt));
{
nir_jump(b, nir_jump_break);
}
nir_pop_if(b, NULL);
nir_break_if(b, nir_uge(b, nir_load_var(b, vbo_idx), vbo_cnt));
nir_def *vbo_offset = nir_imul_imm(b, nir_load_var(b, vbo_idx), 16);
nir_variable *vbo_data = nir_variable_create(b->shader, nir_var_shader_temp, glsl_uvec4_type(), "vbo_data");

4
src/compiler/nir/nir_lower_goto_ifs.c
View file

@ -389,9 +389,7 @@ loop_routing_end(struct routes *routing, nir_builder *b)
routing_backup->brk.reachable) {
assert(!(routing->brk.fork->is_var &&
strcmp(routing->brk.fork->path_var->name, "path_break")));
nir_push_if(b, fork_condition(b, routing->brk.fork));
nir_jump(b, nir_jump_break);
nir_pop_if(b, NULL);
nir_break_if(b, fork_condition(b, routing->brk.fork));
routing->brk = routing->brk.fork->paths[0];
}
assert(routing->brk.fork == routing_backup->regular.fork);

4
src/compiler/spirv/vtn_structured_cfg.c
View file

@ -1510,9 +1510,7 @@ vtn_emit_control_flow_propagation(struct vtn_builder *b,
if (top->needs_break_propagation) {
vtn_assert(parent_with_nloop->break_var);
nir_push_if(&b->nb, nir_load_var(&b->nb, parent_with_nloop->break_var));
nir_jump(&b->nb, nir_jump_break);
nir_pop_if(&b->nb, NULL);
nir_break_if(&b->nb, nir_load_var(&b->nb, parent_with_nloop->break_var));
}
}

6
src/gallium/drivers/zink/zink_compiler.c
View file

@ -452,10 +452,8 @@ lower_pv_mode_gs_end_primitive(nir_builder *b,
nir_push_loop(b);
{
nir_def *out_pos_counter = nir_load_var(b, state->out_pos_counter);
nir_push_if(b, nir_ilt(b, nir_isub(b, pos_counter, out_pos_counter),
nir_imm_int(b, state->primitive_vert_count)));
nir_jump(b, nir_jump_break);
nir_pop_if(b, NULL);
nir_break_if(b, nir_ilt(b, nir_isub(b, pos_counter, out_pos_counter),
nir_imm_int(b, state->primitive_vert_count)));
lower_pv_mode_emit_rotated_prim(b, state, out_pos_counter);
nir_end_primitive(b);

8
src/gallium/frontends/lavapipe/lvp_ray_tracing_pipeline.c
View file

@ -608,9 +608,7 @@ lvp_handle_aabb_intersection(nir_builder *b, struct lvp_leaf_intersection *inter
nir_store_var(b, state->sbt_index, sbt_index, 0x1);
nir_store_var(b, state->traversal.hit, nir_imm_true(b), 0x1);
nir_push_if(b, nir_load_var(b, state->terminate));
nir_jump(b, nir_jump_break);
nir_pop_if(b, NULL);
nir_break_if(b, nir_load_var(b, state->terminate));
}
nir_push_else(b, NULL);
{
@ -686,9 +684,7 @@ lvp_handle_triangle_intersection(nir_builder *b,
nir_store_var(b, state->sbt_index, sbt_index, 0x1);
nir_store_var(b, state->traversal.hit, nir_imm_true(b), 0x1);
nir_push_if(b, nir_load_var(b, state->terminate));
nir_jump(b, nir_jump_break);
nir_pop_if(b, NULL);
nir_break_if(b, nir_load_var(b, state->terminate));
}
nir_push_else(b, NULL);
{

4
src/microsoft/compiler/dxil_nir_tess.c
View file

@ -142,9 +142,7 @@ start_tcs_loop(nir_builder *b, struct tcs_patch_loop_state *state, nir_deref_ins
nir_store_deref(b, loop_var_deref, nir_imm_int(b, 0), 1);
state->loop = nir_push_loop(b);
state->count = nir_load_deref(b, loop_var_deref);
nir_push_if(b, nir_ige_imm(b, state->count, b->impl->function->shader->info.tess.tcs_vertices_out));
nir_jump(b, nir_jump_break);
nir_pop_if(b, NULL);
nir_break_if(b, nir_ige_imm(b, state->count, b->impl->function->shader->info.tess.tcs_vertices_out));
state->insert_cursor = b->cursor;
nir_store_deref(b, loop_var_deref, nir_iadd_imm(b, state->count, 1), 1);
nir_pop_loop(b, state->loop);

6
src/nouveau/compiler/nak_nir.c
View file

@ -598,11 +598,7 @@ nak_nir_lower_system_value_intrin(nir_builder *b, nir_intrinsic_instr *intrin,
nir_store_var(b, clock, nir_vec2(b, clock_lo, clock_hi), 0x3);
nir_push_if(b, nir_ieq(b, clock_hi, nir_channel(b, last_clock, 1)));
{
nir_jump(b, nir_jump_break);
}
nir_pop_if(b, NULL);
nir_break_if(b, nir_ieq(b, clock_hi, nir_channel(b, last_clock, 1)));
}
nir_pop_loop(b, NULL);

6
src/nouveau/vulkan/nvk_query_pool.c
View file

@ -823,11 +823,7 @@ nvk_nir_copy_query(nir_builder *b, nir_variable *push, nir_def *i)
nir_push_loop(b);
{
nir_push_if(b, nir_ige(b, nir_load_var(b, r), num_reports));
{
nir_jump(b, nir_jump_break);
}
nir_pop_if(b, NULL);
nir_break_if(b, nir_ige(b, nir_load_var(b, r), num_reports));
nir_get_query_delta(b, nir_iadd(b, dst_addr, dst_offset),
report_addr, nir_load_var(b, r), flags);