From 5789bbfdbc2785714aa0efea859022bed7ceb90c Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 27 Nov 2020 13:31:13 -0500 Subject: [PATCH] pan/bi: Use canonical subgroup size Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/bifrost/bi_special.c | 4 ++-- src/panfrost/bifrost/compiler.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/panfrost/bifrost/bi_special.c b/src/panfrost/bifrost/bi_special.c index 273a3c67b79..15ef4a21441 100644 --- a/src/panfrost/bifrost/bi_special.c +++ b/src/panfrost/bifrost/bi_special.c @@ -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), diff --git a/src/panfrost/bifrost/compiler.h b/src/panfrost/bifrost/compiler.h index a25b4c39593..3d0fd535ff8 100644 --- a/src/panfrost/bifrost/compiler.h +++ b/src/panfrost/bifrost/compiler.h @@ -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 {