From 8a1a410389a0c92af99ce0dda59ec37fcdd70456 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 22 Jul 2025 16:13:48 -0400 Subject: [PATCH] treewide: use SWAP macro Via Coccinelle patch + manual clean up: @@ identifier temporary, a, b; type T; @@ -T temporary = a; -a = b; -b = temporary; +SWAP(a, b); Signed-off-by: Alyssa Rosenzweig Reviewed-by: Faith Ekstrand Part-of: --- .../instruction_selection/aco_isel_setup.cpp | 4 +--- .../nir/radv_nir_lower_cooperative_matrix.c | 4 +--- src/asahi/compiler/agx_lower_pseudo.c | 4 +--- src/asahi/compiler/agx_register_allocate.c | 4 +--- src/compiler/nir/nir_loop_analyze.c | 4 +--- src/gallium/auxiliary/draw/draw_pipe_clip.c | 15 +++------------ src/gallium/auxiliary/translate/translate_sse.c | 6 +----- .../drivers/d3d12/d3d12_context_graphics.cpp | 4 +--- src/gallium/drivers/llvmpipe/lp_setup_line.c | 8 ++------ src/gallium/drivers/vc4/vc4_qir_schedule.c | 4 +--- src/mesa/main/mipmap.c | 4 +--- src/util/set.c | 4 +--- src/vulkan/runtime/vk_meta_blit_resolve.c | 4 +--- 13 files changed, 16 insertions(+), 53 deletions(-) diff --git a/src/amd/compiler/instruction_selection/aco_isel_setup.cpp b/src/amd/compiler/instruction_selection/aco_isel_setup.cpp index d351dccf21d..6b0e7b2cabb 100644 --- a/src/amd/compiler/instruction_selection/aco_isel_setup.cpp +++ b/src/amd/compiler/instruction_selection/aco_isel_setup.cpp @@ -169,9 +169,7 @@ apply_nuw_to_ssa(isel_context* ctx, nir_def* ssa) nir_scalar src1 = nir_scalar_chase_alu_src(scalar, 1); if (nir_scalar_is_const(src0)) { - nir_scalar tmp = src0; - src0 = src1; - src1 = tmp; + std::swap(src0, src1); } uint32_t src1_ub = nir_unsigned_upper_bound(ctx->shader, ctx->range_ht, src1, &ctx->ub_config); diff --git a/src/amd/vulkan/nir/radv_nir_lower_cooperative_matrix.c b/src/amd/vulkan/nir/radv_nir_lower_cooperative_matrix.c index 879f54ec5c4..9cdc86418cf 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_cooperative_matrix.c +++ b/src/amd/vulkan/nir/radv_nir_lower_cooperative_matrix.c @@ -562,9 +562,7 @@ radv_nir_lower_cooperative_matrix(nir_shader *shader, enum amd_gfx_level gfx_lev row_offset = nir_iadd_imm(&b, base_row, row_iter); if (layout == GLSL_MATRIX_LAYOUT_ROW_MAJOR) { - nir_def *tmp = col_offset; - col_offset = row_offset; - row_offset = tmp; + SWAP(col_offset, row_offset); } col_offset = nir_imul(&b, col_offset, stride); diff --git a/src/asahi/compiler/agx_lower_pseudo.c b/src/asahi/compiler/agx_lower_pseudo.c index d51746bbf5a..b208b275d20 100644 --- a/src/asahi/compiler/agx_lower_pseudo.c +++ b/src/asahi/compiler/agx_lower_pseudo.c @@ -31,9 +31,7 @@ cmpsel_for_break_if(agx_builder *b, agx_instr *I) agx_index f = r0l; if (I->invert_cond) { - agx_index temp = t; - t = f; - f = temp; + SWAP(t, f); } if (I->op == AGX_OPCODE_BREAK_IF_FCMP) diff --git a/src/asahi/compiler/agx_register_allocate.c b/src/asahi/compiler/agx_register_allocate.c index b7b4e5ad88e..d38a6c12e35 100644 --- a/src/asahi/compiler/agx_register_allocate.c +++ b/src/asahi/compiler/agx_register_allocate.c @@ -64,9 +64,7 @@ phi_web_union(struct phi_web_node *web, unsigned x, unsigned y) /* Union-by-rank: ensure x.rank >= y.rank */ if (web[x].rank < web[y].rank) { - unsigned temp = x; - x = y; - y = temp; + SWAP(x, y); } web[y].parent = x; diff --git a/src/compiler/nir/nir_loop_analyze.c b/src/compiler/nir/nir_loop_analyze.c index 17d22319b2a..6ff87aad344 100644 --- a/src/compiler/nir/nir_loop_analyze.c +++ b/src/compiler/nir/nir_loop_analyze.c @@ -1020,9 +1020,7 @@ try_find_trip_count_vars_in_logical_op(nir_scalar *cond, if (!nir_scalar_is_alu(logical_op) || !nir_scalar_is_const(zero)) { /* Maybe we had it the wrong way, flip things around */ - nir_scalar tmp = zero; - zero = logical_op; - logical_op = tmp; + SWAP(zero, logical_op); /* If we still didn't find what we need then return */ if (!nir_scalar_is_const(zero)) diff --git a/src/gallium/auxiliary/draw/draw_pipe_clip.c b/src/gallium/auxiliary/draw/draw_pipe_clip.c index 7a47a7a5f45..eb499a28dec 100644 --- a/src/gallium/auxiliary/draw/draw_pipe_clip.c +++ b/src/gallium/auxiliary/draw/draw_pipe_clip.c @@ -517,18 +517,9 @@ do_clip_tri(struct draw_stage *stage, } /* swap in/out lists */ - { - struct vertex_header **tmp = inlist; - inlist = outlist; - outlist = tmp; - n = outcount; - } - { - bool *tmp = inEdges; - inEdges = outEdges; - outEdges = tmp; - } - + SWAP(inlist, outlist); + SWAP(inEdges, outEdges); + n = outcount; } /* If constant interpolated, copy provoking vertex attrib to polygon vertex[0] diff --git a/src/gallium/auxiliary/translate/translate_sse.c b/src/gallium/auxiliary/translate/translate_sse.c index 7c597bf07a5..2fe1913a517 100644 --- a/src/gallium/auxiliary/translate/translate_sse.c +++ b/src/gallium/auxiliary/translate/translate_sse.c @@ -807,11 +807,7 @@ translate_attr_convert(struct translate_sse *p, sse2_por(p->func, tmpXMM, dataXMM); sse2_psrlw_imm(p->func, dataXMM, 7); sse2_por(p->func, tmpXMM, dataXMM); - { - struct x86_reg t = dataXMM; - dataXMM = tmpXMM; - tmpXMM = t; - } + SWAP(dataXMM, tmpXMM); } else { sse2_punpcklbw(p->func, dataXMM, dataXMM); diff --git a/src/gallium/drivers/d3d12/d3d12_context_graphics.cpp b/src/gallium/drivers/d3d12/d3d12_context_graphics.cpp index 1bf4a1185e2..ebb16e2f13e 100644 --- a/src/gallium/drivers/d3d12/d3d12_context_graphics.cpp +++ b/src/gallium/drivers/d3d12/d3d12_context_graphics.cpp @@ -1319,9 +1319,7 @@ d3d12_set_viewport_states(struct pipe_context *pctx, bool reverse_depth_range = near_depth > far_depth; if (reverse_depth_range) { - float tmp = near_depth; - near_depth = far_depth; - far_depth = tmp; + std::swap(near_depth, far_depth); ctx->reverse_depth_range |= (1 << (start_slot + i)); } else ctx->reverse_depth_range &= ~(1 << (start_slot + i)); diff --git a/src/gallium/drivers/llvmpipe/lp_setup_line.c b/src/gallium/drivers/llvmpipe/lp_setup_line.c index 1555d6756c7..bd1deaea23e 100644 --- a/src/gallium/drivers/llvmpipe/lp_setup_line.c +++ b/src/gallium/drivers/llvmpipe/lp_setup_line.c @@ -418,9 +418,7 @@ try_setup_line(struct lp_setup_context *setup, if (dx < 0.0f) { /* if v2 is to the right of v1, swap pointers */ - const float (*temp)[4] = v1; - v1 = v2; - v2 = temp; + SWAP(v1, v2); /* Otherwise shift planes appropriately */ /* left edge */ @@ -517,9 +515,7 @@ try_setup_line(struct lp_setup_context *setup, if (dy > 0.0f) { /* if v2 is on top of v1, swap pointers */ - const float (*temp)[4] = v1; - v1 = v2; - v2 = temp; + SWAP(v1, v2); if (setup->bottom_edge_rule) { will_draw_start = y1diff >= 0.f; diff --git a/src/gallium/drivers/vc4/vc4_qir_schedule.c b/src/gallium/drivers/vc4/vc4_qir_schedule.c index 7d13d9fa0bf..57baef8c610 100644 --- a/src/gallium/drivers/vc4/vc4_qir_schedule.c +++ b/src/gallium/drivers/vc4/vc4_qir_schedule.c @@ -91,9 +91,7 @@ add_dep(enum direction dir, assert(before != after); if (dir == R) { - struct schedule_node *t = before; - before = after; - after = t; + SWAP(before, after); } dag_add_edge(&after->dag, &before->dag, 0); diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c index c9cde9b8b16..35530038419 100644 --- a/src/mesa/main/mipmap.c +++ b/src/mesa/main/mipmap.c @@ -1054,9 +1054,7 @@ generate_mipmap_compressed(struct gl_context *ctx, GLenum target, /* swap src and dest pointers */ { - GLubyte *temp = temp_src; - temp_src = temp_dst; - temp_dst = temp; + SWAP(temp_src, temp_dst); temp_src_row_stride = temp_dst_row_stride; temp_src_img_stride = temp_dst_img_stride; } diff --git a/src/util/set.c b/src/util/set.c index dc837146300..5912a391199 100644 --- a/src/util/set.c +++ b/src/util/set.c @@ -622,9 +622,7 @@ _mesa_set_intersects(struct set *a, struct set *b) /* iterate over the set with less entries */ if (b->entries < a->entries) { - struct set *tmp = a; - a = b; - b = tmp; + SWAP(a, b); } set_foreach(a, entry) { diff --git a/src/vulkan/runtime/vk_meta_blit_resolve.c b/src/vulkan/runtime/vk_meta_blit_resolve.c index cece3fc7450..155e4d8834d 100644 --- a/src/vulkan/runtime/vk_meta_blit_resolve.c +++ b/src/vulkan/runtime/vk_meta_blit_resolve.c @@ -98,9 +98,7 @@ compute_off_scale(uint32_t src_level_size, *dst1_out = dst0; /* Flip the source region */ - uint32_t tmp = src0; - src0 = src1; - src1 = tmp; + SWAP(src0, src1); } double src_region_size = (double)src1 - (double)src0;