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

r600/sfn: Skip move instructions if they are only ssa and without modifiers

Browse Source 
Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5085>
This commit is contained in:
Gert Wollny
2020-05-06 23:28:30 +02:00
committed by Marge Bot
parent aed9618e20
commit dfb0ba8272
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gallium/drivers/r600/sfn/sfn_emitaluinstruction.cpp
View File

@@ -56,7 +56,7 @@ bool EmitAluInstruction::do_emit(nir_instr* ir)
case nir_op_i2b1: return emit_alu_i2orf2_b1(instr, op2_setne_int);
case nir_op_f2b1: return emit_alu_i2orf2_b1(instr, op2_setne_dx10);
case nir_op_b2b1:
case nir_op_mov:return emit_alu_op1(instr, op1_mov);
case nir_op_mov:return emit_mov(instr);
case nir_op_ftrunc: return emit_alu_op1(instr, op1_trunc);
case nir_op_fabs: return emit_alu_op1(instr, op1_mov, {1 << alu_src0_abs});
case nir_op_fneg: return emit_alu_op1(instr, op1_mov, {1 << alu_src0_neg});
@@ -262,6 +262,30 @@ bool EmitAluInstruction::emit_alu_op1(const nir_alu_instr& instr, EAluOp opcode,
return true;
}
bool EmitAluInstruction::emit_mov(const nir_alu_instr& instr)
{
/* If the op is a plain move beween SSA values we can just forward
* the register reference to the original register */
if (instr.dest.dest.is_ssa && instr.src[0].src.is_ssa &&
!instr.src[0].abs && !instr.src[0].negate && !instr.dest.saturate) {
bool result = true;
for (int i = 0; i < 4 ; ++i) {
if (instr.dest.write_mask & (1 << i)){
auto src = from_nir(instr.src[0], i);
result &= inject_register(instr.dest.dest.ssa.index, i,
src, true);
if (src->type() == Value::kconst) {
add_uniform((instr.dest.dest.ssa.index << 2) + i, src);
}
}
}
return result;
} else {
return emit_alu_op1(instr, op1_mov);
}
}
bool EmitAluInstruction::emit_alu_trig_op1(const nir_alu_instr& instr, EAluOp opcode)
{
// normalize by dividing by 2*PI, shift by 0.5, take fraction, and

1
src/gallium/drivers/r600/sfn/sfn_emitaluinstruction.h
View File

@@ -53,6 +53,7 @@ private:
void split_constants(const nir_alu_instr& instr);
bool emit_mov(const nir_alu_instr& instr);
bool emit_alu_op1(const nir_alu_instr& instr, EAluOp opcode, const AluOpFlags &flags = 0);
bool emit_alu_op2(const nir_alu_instr& instr, EAluOp opcode, AluOp2Opts ops = op2_opt_none);
bool emit_alu_op2_split_src_mods(const nir_alu_instr& instr, EAluOp opcode, AluOp2Opts ops = op2_opt_none);