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

nir/lower_idiv: Factor out numer/denom load

Browse Source 
No need to duplicate across paths.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8339>
This commit is contained in:
Alyssa Rosenzweig
2021-01-05 14:06:07 -05:00
committed by Marge Bot
parent 7b0eb4aa00
commit e91dec1327
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/compiler/nir/nir_lower_idiv.c
View File

@@ -41,19 +41,16 @@
*/ */
static nir_ssa_def * static nir_ssa_def *
convert_instr(nir_builder *bld, nir_alu_instr *alu) convert_instr(nir_builder *bld, nir_op op,
nir_ssa_def *numer, nir_ssa_def *denom)
{ {
nir_ssa_def *numer, *denom, *af, *bf, *a, *b, *q, *r, *rt; nir_ssa_def *af, *bf, *a, *b, *q, *r, *rt;
nir_op op = alu->op;
bool is_signed; bool is_signed;
is_signed = (op == nir_op_idiv || is_signed = (op == nir_op_idiv ||
op == nir_op_imod || op == nir_op_imod ||
op == nir_op_irem); op == nir_op_irem);
numer = nir_ssa_for_alu_src(bld, alu, 0);
denom = nir_ssa_for_alu_src(bld, alu, 1);
if (is_signed) { if (is_signed) {
af = nir_i2f32(bld, numer); af = nir_i2f32(bld, numer);
bf = nir_i2f32(bld, denom); bf = nir_i2f32(bld, denom);
@@ -192,12 +189,9 @@ emit_idiv(nir_builder *bld, nir_ssa_def *numer, nir_ssa_def *denom, nir_op op)
} }
static nir_ssa_def * static nir_ssa_def *
convert_instr_precise(nir_builder *bld, nir_alu_instr *alu) convert_instr_precise(nir_builder *bld, nir_op op,
nir_ssa_def *numer, nir_ssa_def *denom)
{ {
nir_op op = alu->op;
nir_ssa_def *numer = nir_ssa_for_alu_src(bld, alu, 0);
nir_ssa_def *denom = nir_ssa_for_alu_src(bld, alu, 1);
if (op == nir_op_udiv || op == nir_op_umod) if (op == nir_op_udiv || op == nir_op_umod)
return emit_udiv(bld, numer, denom, op == nir_op_umod); return emit_udiv(bld, numer, denom, op == nir_op_umod);
else else
@@ -208,11 +202,15 @@ static nir_ssa_def *
lower_idiv(nir_builder *b, nir_instr *instr, void *_data) lower_idiv(nir_builder *b, nir_instr *instr, void *_data)
{ {
enum nir_lower_idiv_path *path = _data; enum nir_lower_idiv_path *path = _data;
nir_alu_instr *alu = nir_instr_as_alu(instr);
nir_ssa_def *numer = nir_ssa_for_alu_src(b, alu, 0);
nir_ssa_def *denom = nir_ssa_for_alu_src(b, alu, 1);
if (*path == nir_lower_idiv_precise) if (*path == nir_lower_idiv_precise)
return convert_instr_precise(b, nir_instr_as_alu(instr)); return convert_instr_precise(b, alu->op, numer, denom);
else else
return convert_instr(b, nir_instr_as_alu(instr)); return convert_instr(b, alu->op, numer, denom);
} }
static bool static bool