KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aco/ir: Add vcmpx opcode to get_cmp_info. 

Signed-off-by: Georg Lehmann <dadschoorse@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17763>
This commit is contained in:
Georg Lehmann 2022-07-27 12:27:07 +02:00 committed by Marge Bot
parent 369b8c031a
commit 578d0a1934
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/amd/compiler/aco_ir.cpp
View File

@ -606,6 +606,7 @@ struct CmpInfo {
aco_opcode unordered; aco_opcode unordered;
aco_opcode swapped; aco_opcode swapped;
aco_opcode inverse; aco_opcode inverse;
aco_opcode vcmpx;
aco_opcode f32; aco_opcode f32;
unsigned size; unsigned size;
}; };
@ -630,6 +631,8 @@ get_cmp_info(aco_opcode op, CmpInfo* info)
: aco_opcode::v_cmp_n##ord##_f##sz; \ : aco_opcode::v_cmp_n##ord##_f##sz; \
info->f32 = op == aco_opcode::v_cmp_##ord##_f##sz ? aco_opcode::v_cmp_##ord##_f32 \ info->f32 = op == aco_opcode::v_cmp_##ord##_f##sz ? aco_opcode::v_cmp_##ord##_f32 \
: aco_opcode::v_cmp_n##unord##_f32; \ : aco_opcode::v_cmp_n##unord##_f32; \
info->vcmpx = op == aco_opcode::v_cmp_##ord##_f##sz ? aco_opcode::v_cmpx_##ord##_f##sz \
: aco_opcode::v_cmpx_n##unord##_f##sz; \
info->size = sz; \ info->size = sz; \
return true; return true;
#define CMP(ord, unord, ord_swap, unord_swap) \ #define CMP(ord, unord, ord_swap, unord_swap) \
@ -648,11 +651,13 @@ get_cmp_info(aco_opcode op, CmpInfo* info)
case aco_opcode::v_cmp_u_f##sz: \ case aco_opcode::v_cmp_u_f##sz: \
info->f32 = aco_opcode::v_cmp_u_f32; \ info->f32 = aco_opcode::v_cmp_u_f32; \
info->inverse = aco_opcode::v_cmp_o_f##sz; \ info->inverse = aco_opcode::v_cmp_o_f##sz; \
info->vcmpx = aco_opcode::v_cmpx_u_f##sz; \
info->size = sz; \ info->size = sz; \
return true; \ return true; \
case aco_opcode::v_cmp_o_f##sz: \ case aco_opcode::v_cmp_o_f##sz: \
info->f32 = aco_opcode::v_cmp_o_f32; \ info->f32 = aco_opcode::v_cmp_o_f32; \
info->inverse = aco_opcode::v_cmp_u_f##sz; \ info->inverse = aco_opcode::v_cmp_u_f##sz; \
info->vcmpx = aco_opcode::v_cmpx_o_f##sz; \
info->size = sz; \ info->size = sz; \
return true; return true;
ORD_TEST(16) ORD_TEST(16)
@ -663,6 +668,7 @@ get_cmp_info(aco_opcode op, CmpInfo* info)
case aco_opcode::v_cmp_##op##_##type##sz: \ case aco_opcode::v_cmp_##op##_##type##sz: \
info->swapped = aco_opcode::v_cmp_##swap##_##type##sz; \ info->swapped = aco_opcode::v_cmp_##swap##_##type##sz; \
info->inverse = aco_opcode::v_cmp_##inv##_##type##sz; \ info->inverse = aco_opcode::v_cmp_##inv##_##type##sz; \
info->vcmpx = aco_opcode::v_cmpx_##op##_##type##sz; \
info->size = sz; \ info->size = sz; \
return true; return true;
#define CMPI(op, swap, inv) \ #define CMPI(op, swap, inv) \
@ -713,6 +719,13 @@ get_f32_cmp(aco_opcode op)
return get_cmp_info(op, &info) ? info.f32 : aco_opcode::num_opcodes; return get_cmp_info(op, &info) ? info.f32 : aco_opcode::num_opcodes;
} }
aco_opcode
get_vcmpx(aco_opcode op)
{
CmpInfo info;
return get_cmp_info(op, &info) ? info.vcmpx : aco_opcode::num_opcodes;
}
unsigned unsigned
get_cmp_bitsize(aco_opcode op) get_cmp_bitsize(aco_opcode op)
{ {

1
src/amd/compiler/aco_ir.h
View File

@ -1809,6 +1809,7 @@ aco_opcode get_ordered(aco_opcode op);
aco_opcode get_unordered(aco_opcode op); aco_opcode get_unordered(aco_opcode op);
aco_opcode get_inverse(aco_opcode op); aco_opcode get_inverse(aco_opcode op);
aco_opcode get_f32_cmp(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); unsigned get_cmp_bitsize(aco_opcode op);
bool is_cmp(aco_opcode op); bool is_cmp(aco_opcode op);