pan/bi: Use canonical subgroup size

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8213>
This commit is contained in:
Alyssa Rosenzweig 2020-11-27 13:31:13 -05:00 committed by Marge Bot
parent c41cecd404
commit 5789bbfdbc
2 changed files with 7 additions and 7 deletions

View file

@ -234,7 +234,7 @@ bi_emit_deriv(bi_context *ctx, nir_alu_instr *instr)
bi_instruction clper1 = {
.type = BI_SPECIAL_ADD,
.op.special = ctx->arch == 6 ? BI_SPECIAL_CLPER_V6 : BI_SPECIAL_CLPER_V7,
.special.subgroup_sz = BI_CLPER_SUBGROUP_SZ_4,
.special.subgroup_sz = BI_SUBGROUP_SUBGROUP4,
.special.clper.lane_op_mod = BI_LANE_OP_NONE,
.special.clper.inactive_res = BI_CLPER_INACTIVE_RES_ZERO,
.dest = bi_make_temp(ctx),
@ -247,7 +247,7 @@ bi_emit_deriv(bi_context *ctx, nir_alu_instr *instr)
bi_instruction clper2 = {
.type = BI_SPECIAL_ADD,
.op.special = ctx->arch == 6 ? BI_SPECIAL_CLPER_V6 : BI_SPECIAL_CLPER_V7,
.special.subgroup_sz = BI_CLPER_SUBGROUP_SZ_4,
.special.subgroup_sz = BI_SUBGROUP_SUBGROUP4,
.special.clper.lane_op_mod = BI_LANE_OP_NONE,
.special.clper.inactive_res = BI_CLPER_INACTIVE_RES_ZERO,
.dest = bi_make_temp(ctx),

View file

@ -275,10 +275,10 @@ enum bi_lane_op {
BI_LANE_OP_SHIFT,
};
enum bi_subgroup_sz {
BI_CLPER_SUBGROUP_SZ_2,
BI_CLPER_SUBGROUP_SZ_4,
BI_CLPER_SUBGROUP_SZ_8,
enum bi_subgroup {
BI_SUBGROUP_SUBGROUP2,
BI_SUBGROUP_SUBGROUP4,
BI_SUBGROUP_SUBGROUP8,
};
enum bi_clper_inactive_res {
@ -305,7 +305,7 @@ struct bi_special {
enum bi_lane_op lane_op_mod;
enum bi_clper_inactive_res inactive_res;
} clper;
enum bi_subgroup_sz subgroup_sz;
enum bi_subgroup subgroup_sz;
};
struct bi_attribute {