From f60cb8d0af00837f8230abcc467226dcf821bccc Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Mon, 15 Aug 2022 17:01:06 +0100 Subject: [PATCH] aco: rename is_cmp to is_fp_cmp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The old name is no longer accurate. Signed-off-by: Rhys Perry Reviewed-by: Georg Lehmann Reviewed-by: Timur Kristóf Part-of: --- src/amd/compiler/aco_ir.cpp | 2 +- src/amd/compiler/aco_ir.h | 2 +- src/amd/compiler/aco_optimizer.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/amd/compiler/aco_ir.cpp b/src/amd/compiler/aco_ir.cpp index dd0c5960e8a..028990920cb 100644 --- a/src/amd/compiler/aco_ir.cpp +++ b/src/amd/compiler/aco_ir.cpp @@ -746,7 +746,7 @@ get_cmp_bitsize(aco_opcode op) } bool -is_cmp(aco_opcode op) +is_fp_cmp(aco_opcode op) { CmpInfo info; return get_cmp_info(op, &info) && info.ordered != aco_opcode::num_opcodes; diff --git a/src/amd/compiler/aco_ir.h b/src/amd/compiler/aco_ir.h index 89fd0dd7e27..f22438bd86e 100644 --- a/src/amd/compiler/aco_ir.h +++ b/src/amd/compiler/aco_ir.h @@ -1811,7 +1811,7 @@ aco_opcode get_inverse(aco_opcode op); aco_opcode get_f32_cmp(aco_opcode op); aco_opcode get_vcmpx(aco_opcode op); unsigned get_cmp_bitsize(aco_opcode op); -bool is_cmp(aco_opcode op); +bool is_fp_cmp(aco_opcode op); bool can_swap_operands(aco_ptr& instr, aco_opcode* new_op); diff --git a/src/amd/compiler/aco_optimizer.cpp b/src/amd/compiler/aco_optimizer.cpp index d8337418e22..564c658c9c1 100644 --- a/src/amd/compiler/aco_optimizer.cpp +++ b/src/amd/compiler/aco_optimizer.cpp @@ -2214,7 +2214,7 @@ combine_comparison_ordering(opt_ctx& ctx, aco_ptr& instr) else if (get_f32_cmp(nan_test->opcode) != expected_nan_test) return false; - if (!is_cmp(cmp->opcode) || get_cmp_bitsize(cmp->opcode) != get_cmp_bitsize(nan_test->opcode)) + if (!is_fp_cmp(cmp->opcode) || get_cmp_bitsize(cmp->opcode) != get_cmp_bitsize(nan_test->opcode)) return false; if (!nan_test->operands[0].isTemp() || !nan_test->operands[1].isTemp()) @@ -2317,7 +2317,7 @@ combine_constant_comparison_ordering(opt_ctx& ctx, aco_ptr& instr) return false; unsigned bit_size = get_cmp_bitsize(cmp->opcode); - if (!is_cmp(cmp->opcode) || get_cmp_bitsize(nan_test->opcode) != bit_size) + if (!is_fp_cmp(cmp->opcode) || get_cmp_bitsize(nan_test->opcode) != bit_size) return false; if (!nan_test->operands[0].isTemp() || !nan_test->operands[1].isTemp())