KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pan/bi: Use canonical inactive result 

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:49 -05:00 committed by Marge Bot
parent 5789bbfdbc
commit 550bbcdcd1
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/panfrost/bifrost/bi_special.c
View File

@ -236,7 +236,7 @@ bi_emit_deriv(bi_context *ctx, nir_alu_instr *instr)
.op.special = ctx->arch == 6 ? BI_SPECIAL_CLPER_V6 : BI_SPECIAL_CLPER_V7,
.special.subgroup_sz = BI_SUBGROUP_SUBGROUP4,
.special.clper.lane_op_mod = BI_LANE_OP_NONE,
.special.clper.inactive_res = BI_CLPER_INACTIVE_RES_ZERO,
.special.clper.inactive_res = BI_INACTIVE_RESULT_ZERO,
.dest = bi_make_temp(ctx),
.dest_type = nir_type_uint32,
.src = { src, lane1.dest },
@ -249,7 +249,7 @@ bi_emit_deriv(bi_context *ctx, nir_alu_instr *instr)
.op.special = ctx->arch == 6 ? BI_SPECIAL_CLPER_V6 : BI_SPECIAL_CLPER_V7,
.special.subgroup_sz = BI_SUBGROUP_SUBGROUP4,
.special.clper.lane_op_mod = BI_LANE_OP_NONE,
.special.clper.inactive_res = BI_CLPER_INACTIVE_RES_ZERO,
.special.clper.inactive_res = BI_INACTIVE_RESULT_ZERO,
.dest = bi_make_temp(ctx),
.dest_type = nir_type_uint32,
.src = { src, lane2.dest },

36
src/panfrost/bifrost/compiler.h
View File

@ -281,29 +281,29 @@ enum bi_subgroup {
BI_SUBGROUP_SUBGROUP8,
};
enum bi_clper_inactive_res {
BI_CLPER_INACTIVE_RES_ZERO,
BI_CLPER_INACTIVE_RES_UMAX,
BI_CLPER_INACTIVE_RES_I1,
BI_CLPER_INACTIVE_RES_V2I1,
BI_CLPER_INACTIVE_RES_SMIN,
BI_CLPER_INACTIVE_RES_SMAX,
BI_CLPER_INACTIVE_RES_V2SMIN,
BI_CLPER_INACTIVE_RES_V2SMAX,
BI_CLPER_INACTIVE_RES_V4SMIN,
BI_CLPER_INACTIVE_RES_V4SMAX,
BI_CLPER_INACTIVE_RES_F1,
BI_CLPER_INACTIVE_RES_V2F1,
BI_CLPER_INACTIVE_RES_INFN,
BI_CLPER_INACTIVE_RES_INF,
BI_CLPER_INACTIVE_RES_V2INFN,
BI_CLPER_INACTIVE_RES_V2INF,
enum bi_clper_inactive_result {
BI_INACTIVE_RESULT_ZERO,
BI_INACTIVE_RESULT_UMAX,
BI_INACTIVE_RESULT_I1,
BI_INACTIVE_RESULT_V2I1,
BI_INACTIVE_RESULT_SMIN,
BI_INACTIVE_RESULT_SMAX,
BI_INACTIVE_RESULT_V2SMIN,
BI_INACTIVE_RESULT_V2SMAX,
BI_INACTIVE_RESULT_V4SMIN,
BI_INACTIVE_RESULT_V4SMAX,
BI_INACTIVE_RESULT_F1,
BI_INACTIVE_RESULT_V2F1,
BI_INACTIVE_RESULT_INFN,
BI_INACTIVE_RESULT_INF,
BI_INACTIVE_RESULT_V2INFN,
BI_INACTIVE_RESULT_V2INF,
};
struct bi_special {
struct {
enum bi_lane_op lane_op_mod;
enum bi_clper_inactive_res inactive_res;
enum bi_clper_inactive_result inactive_res;
} clper;
enum bi_subgroup subgroup_sz;
};