fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 11:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

etnaviv: nir: Switch to derivative intrinsics

Browse source 
Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31034>
This commit is contained in:
Christian Gmeiner 2024-08-30 15:39:28 +02:00 • committed by Marge Bot
parent 5a15b36a64
commit 8dc8fa88ed
4 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/etnaviv/etnaviv_compiler.c
View file

@ -78,6 +78,7 @@ etna_compiler_create(const char *renderer, const struct etna_core_info *info)
.lower_ufind_msb = true,
.has_uclz = true,
.no_integers = info->halti < 2,
.has_ddx_intrinsics = true,
};
compiler->regs = etna_ra_setup(compiler);

38
src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c
View file

@ -375,6 +375,8 @@ get_src(struct etna_compile *c, nir_src *src)
case nir_intrinsic_load_uniform:
case nir_intrinsic_load_ubo:
case nir_intrinsic_load_reg:
case nir_intrinsic_ddx:
case nir_intrinsic_ddy:
return ra_src(c, src);
case nir_intrinsic_load_front_face:
return (hw_src) { .use = 1, .rgroup = ISA_REG_GROUP_INTERNAL };
@ -575,6 +577,42 @@ emit_intrinsic(struct etna_compile *c, nir_intrinsic_instr * intr)
case nir_intrinsic_terminate:
etna_emit_discard(c, SRC_DISABLE);
break;
case nir_intrinsic_ddx: {
unsigned dst_swiz;
struct etna_inst_dst dst = ra_def(c, &intr->def, &dst_swiz);
struct etna_inst_src src = get_src(c, &intr->src[0]);
src = src_swizzle(src, dst_swiz);
struct etna_inst inst = {
.dst = dst,
.opcode = ISA_OPC_DSX,
.cond = ISA_COND_TRUE,
.type = ISA_TYPE_F32,
.src[0] = src,
.src[1] = src,
};
emit_inst(c, &inst);
} break;
case nir_intrinsic_ddy: {
unsigned dst_swiz;
struct etna_inst_dst dst = ra_def(c, &intr->def, &dst_swiz);
struct etna_inst_src src = get_src(c, &intr->src[0]);
src = src_swizzle(src, dst_swiz);
struct etna_inst inst = {
.dst = dst,
.opcode = ISA_OPC_DSY,
.type = ISA_TYPE_F32,
.cond = ISA_COND_TRUE,
.src[0] = src,
.src[1] = src,
};
emit_inst(c, &inst);
} break;
case nir_intrinsic_load_uniform: {
unsigned dst_swiz;
struct etna_inst_dst dst = ra_def(c, &intr->def, &dst_swiz);

4
src/gallium/drivers/etnaviv/etnaviv_compiler_nir.h
View file

@ -296,7 +296,9 @@ def_for_instr(nir_instr *instr)
intr->intrinsic == nir_intrinsic_load_instance_id ||
intr->intrinsic == nir_intrinsic_load_vertex_id ||
intr->intrinsic == nir_intrinsic_load_texture_scale ||
intr->intrinsic == nir_intrinsic_load_texture_size_etna)
intr->intrinsic == nir_intrinsic_load_texture_size_etna ||
intr->intrinsic == nir_intrinsic_ddx ||
intr->intrinsic == nir_intrinsic_ddy)
def = &intr->def;
} break;
case nir_instr_type_deref:

5
src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.c
View file

@ -60,7 +60,6 @@ static const struct etna_op_info etna_ops[] = {
OPC(seq, SET, EQ), OPC(sne, SET, NE), OPC(sge, SET, GE), OPC(slt, SET, LT),
OPC(fcsel, SELECT, NZ),
OP(fdiv, DIV),
OP(fddx, DSX), OP(fddy, DSY),
/* type convert */
IOP(i2f32, I2F),
@ -159,10 +158,6 @@ etna_emit_alu(struct etna_compile *c, nir_op op, struct etna_inst_dst dst,
inst.src[1].swiz = inst_swiz_compose(src[1].swiz, swiz_scalar);
break;
/* deal with instructions which don't have 1:1 mapping */
case nir_op_fddx:
case nir_op_fddy:
inst.src[1] = src[0];
break;
case nir_op_fmin:
case nir_op_fmax:
case nir_op_imin: