fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 13:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nir: Extract logic to get dest and srcs types from intrinsic

Browse source 
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Acked-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23562>
This commit is contained in:
Caio Oliveira 2023-06-12 21:58:19 -07:00 • committed by Marge Bot
parent 7de530d3df
commit 5d15f4ef28
3 changed files with 85 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/compiler/nir/nir.c
View file

@ -3261,6 +3261,73 @@ nir_intrinsic_dest_components(nir_intrinsic_instr *intr)
return intr->num_components;
}
nir_alu_type
nir_intrinsic_instr_src_type(const nir_intrinsic_instr *intrin, unsigned src)
{
/* We could go nuts here, but we'll just handle a few simple
* cases and let everything else be untyped.
*/
switch (intrin->intrinsic) {
case nir_intrinsic_store_deref: {
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
if (src == 1 && intrin->src[1].is_ssa)
return nir_get_nir_type_for_glsl_type(deref->type);
break;
}
case nir_intrinsic_store_output:
if (src == 0 && intrin->src[0].is_ssa)
return nir_intrinsic_src_type(intrin);
break;
default:
break;
}
/* For the most part, we leave other intrinsics alone. Most
* of them don't matter in OpenGL ES 2.0 drivers anyway.
* However, we should at least check if this is some sort of
* IO intrinsic and flag it's offset and index sources.
*/
{
int offset_src_idx = nir_get_io_offset_src_number(intrin);
if (src == offset_src_idx) {
const nir_src *offset_src = offset_src_idx >= 0 ? &intrin->src[offset_src_idx] : NULL;
if (offset_src && offset_src->is_ssa)
return nir_type_int;
}
}
return nir_type_invalid;
}
nir_alu_type
nir_intrinsic_instr_dest_type(const nir_intrinsic_instr *intrin)
{
/* We could go nuts here, but we'll just handle a few simple
* cases and let everything else be untyped.
*/
switch (intrin->intrinsic) {
case nir_intrinsic_load_deref: {
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
if (intrin->dest.is_ssa)
return nir_get_nir_type_for_glsl_type(deref->type);
break;
}
case nir_intrinsic_load_input:
case nir_intrinsic_load_uniform:
if (intrin->dest.is_ssa)
return nir_intrinsic_dest_type(intrin);
break;
default:
break;
}
return nir_type_invalid;
}
/**
* Helper to copy const_index[] from src to dst, without assuming they
* match in order.

6
src/compiler/nir/nir.h
View file

@ -2028,6 +2028,12 @@ nir_intrinsic_src_components(const nir_intrinsic_instr *intr, unsigned srcn);
unsigned
nir_intrinsic_dest_components(nir_intrinsic_instr *intr);
nir_alu_type
nir_intrinsic_instr_src_type(const nir_intrinsic_instr *intrin, unsigned src);
nir_alu_type
nir_intrinsic_instr_dest_type(const nir_intrinsic_instr *intrin);
/**
* Helper to copy const_index[] from src to dst, without assuming they
* match in order.

62
src/compiler/nir/nir_gather_ssa_types.c
View file

@ -170,62 +170,24 @@ nir_gather_ssa_types(nir_function_impl *impl,
case nir_instr_type_intrinsic: {
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
/* We could go nuts here, but we'll just handle a few simple
* cases and let everything else be untyped.
*/
switch (intrin->intrinsic) {
case nir_intrinsic_load_deref: {
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
if (intrin->dest.is_ssa) {
set_type(intrin->dest.ssa.index,
nir_get_nir_type_for_glsl_type(deref->type),
if (intrin->dest.is_ssa) {
nir_alu_type dest_type = nir_intrinsic_instr_dest_type(intrin);
if (dest_type != nir_type_invalid) {
set_type(intrin->dest.ssa.index, dest_type,
float_types, int_types, &progress);
}
break;
}
case nir_intrinsic_store_deref: {
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
if (intrin->src[1].is_ssa) {
set_type(intrin->src[1].ssa->index,
nir_get_nir_type_for_glsl_type(deref->type),
float_types, int_types, &progress);
const unsigned num_srcs = nir_intrinsic_infos[intrin->intrinsic].num_srcs;
for (unsigned i = 0; i < num_srcs; i++) {
if (intrin->src[i].is_ssa) {
nir_alu_type src_type = nir_intrinsic_instr_src_type(intrin, i);
if (src_type != nir_type_invalid) {
set_type(intrin->src[i].ssa->index, src_type,
float_types, int_types, &progress);
}
}
break;
}
case nir_intrinsic_load_input:
case nir_intrinsic_load_uniform:
if (intrin->dest.is_ssa) {
set_type(intrin->dest.ssa.index,
nir_intrinsic_dest_type(intrin),
float_types, int_types, &progress);
}
break;
case nir_intrinsic_store_output:
if (intrin->src[0].is_ssa) {
set_type(intrin->src[0].ssa->index,
nir_intrinsic_src_type(intrin),
float_types, int_types, &progress);
}
break;
default:
break;
}
/* For the most part, we leave other intrinsics alone. Most
* of them don't matter in OpenGL ES 2.0 drivers anyway.
* However, we should at least check if this is some sort of
* IO intrinsic and flag it's offset and index sources.
*/
nir_src *offset_src = nir_get_io_offset_src(intrin);
if (offset_src && offset_src->is_ssa) {
set_type(offset_src->ssa->index, nir_type_int,
float_types, int_types, &progress);
}
break;
}