From 974f9833cbee159d0fe3c7f7c5be4428a97e80b9 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Tue, 11 Nov 2025 15:32:27 +0800 Subject: [PATCH] freedreno: Do not use align as variable name, as it's a function in u_math.h and will be used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Yonggang Luo Reviewed-by: Timur Kristóf Acked-by: Alyssa Rosenzweig Part-of: --- src/freedreno/ir3/ir3_shared_ra.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/freedreno/ir3/ir3_shared_ra.c b/src/freedreno/ir3/ir3_shared_ra.c index 4a0b6ef041d..7ab2312b21f 100644 --- a/src/freedreno/ir3/ir3_shared_ra.c +++ b/src/freedreno/ir3/ir3_shared_ra.c @@ -352,7 +352,7 @@ reg_file_size(struct ir3_register *reg) static physreg_t find_best_gap(struct ra_ctx *ctx, struct ir3_register *dst, unsigned size, - unsigned align) + unsigned alignment) { unsigned file_size = reg_file_size(dst); @@ -362,7 +362,7 @@ find_best_gap(struct ra_ctx *ctx, struct ir3_register *dst, unsigned size, if (size > file_size) return (physreg_t) ~0; - unsigned start = ALIGN(ctx->start, align); + unsigned start = ALIGN(ctx->start, alignment); if (start + size > file_size) start = 0; unsigned candidate = start; @@ -380,7 +380,7 @@ find_best_gap(struct ra_ctx *ctx, struct ir3_register *dst, unsigned size, return candidate; } - candidate += align; + candidate += alignment; if (candidate + size > file_size) candidate = 0; } while (candidate != start); @@ -390,12 +390,12 @@ find_best_gap(struct ra_ctx *ctx, struct ir3_register *dst, unsigned size, static physreg_t find_best_spill_reg(struct ra_ctx *ctx, struct ir3_register *reg, - unsigned size, unsigned align) + unsigned size, unsigned alignment) { unsigned file_size = reg_file_size(reg); unsigned min_cost = UINT_MAX; - unsigned start = ALIGN(ctx->start, align); + unsigned start = ALIGN(ctx->start, alignment); if (start + size > file_size) start = 0; physreg_t candidate = start; @@ -427,7 +427,7 @@ find_best_spill_reg(struct ra_ctx *ctx, struct ir3_register *reg, best_reg = candidate; } - candidate += align; + candidate += alignment; if (candidate + size > file_size) candidate = 0; } while (candidate != start);