diff options
| author | Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> | 2020-11-27 13:31:49 -0500 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-12-23 17:06:57 +0000 |
| commit | 550bbcdcd1827ca6751ca3e156ad4aeb82a6fc56 (patch) | |
| tree | e68aaa68219504ea081807c1b1f21af71063310e | |
| parent | 5789bbfdbc2785714aa0efea859022bed7ceb90c (diff) | |
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>
| -rw-r--r-- | src/panfrost/bifrost/bi_special.c | 4 | ||||
| -rw-r--r-- | src/panfrost/bifrost/compiler.h | 36 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/panfrost/bifrost/bi_special.c b/src/panfrost/bifrost/bi_special.c index 15ef4a21441..96938360908 100644 --- a/src/panfrost/bifrost/bi_special.c +++ b/src/panfrost/bifrost/bi_special.c @@ -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 }, diff --git a/src/panfrost/bifrost/compiler.h b/src/panfrost/bifrost/compiler.h index 3d0fd535ff8..f08c028b4b7 100644 --- a/src/panfrost/bifrost/compiler.h +++ b/src/panfrost/bifrost/compiler.h @@ -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; }; |