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

nir: Add subgroup arithmetic reduction intrinsics

Browse Source 
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
This commit is contained in:
Jason Ekstrand
2017-08-29 20:09:58 -07:00
parent b3a5b0f3fc
commit 82d493a939
4 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/compiler/nir/nir.h
View File

@@ -1081,6 +1081,16 @@ typedef enum {
*/ */
NIR_INTRINSIC_INTERP_MODE = 9, NIR_INTRINSIC_INTERP_MODE = 9,
/**
* A binary nir_op to use when performing a reduction or scan operation
*/
NIR_INTRINSIC_REDUCTION_OP = 10,
/**
* Cluster size for reduction operations
*/
NIR_INTRINSIC_CLUSTER_SIZE = 11,
NIR_INTRINSIC_NUM_INDEX_FLAGS, NIR_INTRINSIC_NUM_INDEX_FLAGS,
} nir_intrinsic_index_flag; } nir_intrinsic_index_flag;
@@ -1149,6 +1159,8 @@ INTRINSIC_IDX_ACCESSORS(desc_set, DESC_SET, unsigned)
INTRINSIC_IDX_ACCESSORS(binding, BINDING, unsigned) INTRINSIC_IDX_ACCESSORS(binding, BINDING, unsigned)
INTRINSIC_IDX_ACCESSORS(component, COMPONENT, unsigned) INTRINSIC_IDX_ACCESSORS(component, COMPONENT, unsigned)
INTRINSIC_IDX_ACCESSORS(interp_mode, INTERP_MODE, unsigned) INTRINSIC_IDX_ACCESSORS(interp_mode, INTERP_MODE, unsigned)
INTRINSIC_IDX_ACCESSORS(reduction_op, REDUCTION_OP, unsigned)
INTRINSIC_IDX_ACCESSORS(cluster_size, CLUSTER_SIZE, unsigned)
/** /**
* \group texture information * \group texture information

7
src/compiler/nir/nir_intrinsics.h
View File

@@ -177,6 +177,13 @@ INTRINSIC(quad_swap_vertical, 1, ARR(0), true, 0, 0,
INTRINSIC(quad_swap_diagonal, 1, ARR(0), true, 0, 0, INTRINSIC(quad_swap_diagonal, 1, ARR(0), true, 0, 0,
0, xx, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE) 0, xx, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE)
INTRINSIC(reduce, 1, ARR(0), true, 0, 0,
2, REDUCTION_OP, CLUSTER_SIZE, xx, NIR_INTRINSIC_CAN_ELIMINATE)
INTRINSIC(inclusive_scan, 1, ARR(0), true, 0, 0,
1, REDUCTION_OP, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE)
INTRINSIC(exclusive_scan, 1, ARR(0), true, 0, 0,
1, REDUCTION_OP, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE)
/** /**
* Basic Geometry Shader intrinsics. * Basic Geometry Shader intrinsics.
* *

10
src/compiler/nir/nir_lower_subgroups.c
View File

@@ -104,6 +104,9 @@ lower_subgroup_op_to_scalar(nir_builder *b, nir_intrinsic_instr *intrin)
nir_src_copy(&chan_intrin->src[1], &intrin->src[1], chan_intrin); nir_src_copy(&chan_intrin->src[1], &intrin->src[1], chan_intrin);
} }
chan_intrin->const_index[0] = intrin->const_index[0];
chan_intrin->const_index[1] = intrin->const_index[1];
nir_builder_instr_insert(b, &chan_intrin->instr); nir_builder_instr_insert(b, &chan_intrin->instr);
reads[i] = &chan_intrin->dest.ssa; reads[i] = &chan_intrin->dest.ssa;
@@ -372,6 +375,13 @@ lower_subgroups_intrin(nir_builder *b, nir_intrinsic_instr *intrin,
return lower_subgroup_op_to_scalar(b, intrin); return lower_subgroup_op_to_scalar(b, intrin);
break; break;
case nir_intrinsic_reduce:
case nir_intrinsic_inclusive_scan:
case nir_intrinsic_exclusive_scan:
if (options->lower_to_scalar && intrin->num_components > 1)
return lower_subgroup_op_to_scalar(b, intrin);
break;
default: default:
break; break;
} }

5
src/compiler/nir/nir_print.c
View File

@@ -619,6 +619,8 @@ print_intrinsic_instr(nir_intrinsic_instr *instr, print_state *state)
[NIR_INTRINSIC_BINDING] = "binding", [NIR_INTRINSIC_BINDING] = "binding",
[NIR_INTRINSIC_COMPONENT] = "component", [NIR_INTRINSIC_COMPONENT] = "component",
[NIR_INTRINSIC_INTERP_MODE] = "interp_mode", [NIR_INTRINSIC_INTERP_MODE] = "interp_mode",
[NIR_INTRINSIC_REDUCTION_OP] = "reduction_op",
[NIR_INTRINSIC_CLUSTER_SIZE] = "cluster_size",
}; };
for (unsigned idx = 1; idx < NIR_INTRINSIC_NUM_INDEX_FLAGS; idx++) { for (unsigned idx = 1; idx < NIR_INTRINSIC_NUM_INDEX_FLAGS; idx++) {
if (!info->index_map[idx]) if (!info->index_map[idx])
@@ -631,6 +633,9 @@ print_intrinsic_instr(nir_intrinsic_instr *instr, print_state *state)
for (unsigned i = 0; i < 4; i++) for (unsigned i = 0; i < 4; i++)
if ((wrmask >> i) & 1) if ((wrmask >> i) & 1)
fprintf(fp, "%c", "xyzw"[i]); fprintf(fp, "%c", "xyzw"[i]);
} else if (idx == NIR_INTRINSIC_REDUCTION_OP) {
nir_op reduction_op = nir_intrinsic_reduction_op(instr);
fprintf(fp, " reduction_op=%s", nir_op_infos[reduction_op].name);
} else { } else {
unsigned off = info->index_map[idx] - 1; unsigned off = info->index_map[idx] - 1;
assert(index_name[idx]); /* forgot to update index_name table? */ assert(index_name[idx]); /* forgot to update index_name table? */