OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/compile: refactor DERIVATIVE_GROUP logic

Browse Source 
Minor changes to logic to make following changes easier.

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10733>
This commit is contained in:
Felix DeGrood
2021-05-19 11:48:09 -07:00
committed by Marge Bot
parent ca59db9900
commit bbd6ce6e9d
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/intel/compiler/brw_nir_lower_cs_intrinsics.c
View File

@@ -89,6 +89,7 @@ lower_cs_intrinsics_convert_block(struct lower_intrinsics_state *state,
size_x = nir_imm_int(b, nir->info.cs.local_size[0]); size_x = nir_imm_int(b, nir->info.cs.local_size[0]);
size_y = nir_imm_int(b, nir->info.cs.local_size[1]); size_y = nir_imm_int(b, nir->info.cs.local_size[1]);
} }
nir_ssa_def *size_xy = nir_imul(b, size_x, size_y);
/* The local invocation index and ID must respect the following /* The local invocation index and ID must respect the following
* *
@@ -113,21 +114,21 @@ lower_cs_intrinsics_convert_block(struct lower_intrinsics_state *state,
/* If not using derivatives, just set the local invocation /* If not using derivatives, just set the local invocation
* index linearly, and calculate local invocation ID from that. * index linearly, and calculate local invocation ID from that.
*/ */
local_index = linear; id_x = nir_umod(b, linear, size_x);
id_x = nir_umod(b, local_index, size_x); id_y = nir_umod(b, nir_udiv(b, linear, size_x), size_y);
id_y = nir_umod(b, nir_udiv(b, local_index, size_x), size_y); id_z = nir_udiv(b, linear, size_xy);
id_z = nir_udiv(b, local_index, nir_imul(b, size_x, size_y));
local_id = nir_vec3(b, id_x, id_y, id_z); local_id = nir_vec3(b, id_x, id_y, id_z);
local_index = linear;
break; break;
case DERIVATIVE_GROUP_LINEAR: case DERIVATIVE_GROUP_LINEAR:
/* For linear, just set the local invocation index linearly, /* For linear, just set the local invocation index linearly,
* and calculate local invocation ID from that. * and calculate local invocation ID from that.
*/ */
local_index = linear; id_x = nir_umod(b, linear, size_x);
id_x = nir_umod(b, local_index, size_x); id_y = nir_umod(b, nir_udiv(b, linear, size_x), size_y);
id_y = nir_umod(b, nir_udiv(b, local_index, size_x), size_y); id_z = nir_udiv(b, linear, size_xy);
id_z = nir_udiv(b, local_index, nir_imul(b, size_x, size_y));
local_id = nir_vec3(b, id_x, id_y, id_z); local_id = nir_vec3(b, id_x, id_y, id_z);
local_index = linear;
break; break;
case DERIVATIVE_GROUP_QUADS: { case DERIVATIVE_GROUP_QUADS: {
/* For quads, first we figure out the 2x2 grid the invocation /* For quads, first we figure out the 2x2 grid the invocation