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

r600/sfn: Fix split_alu_modifiers

Browse Source 
Don't reuse the dest register so we can better track instruction
dependencies later.

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6706>
This commit is contained in:
Gert Wollny
2020-08-02 20:50:33 +02:00
committed by Marge Bot
parent e85c0bdda5
commit dfa45e26e2
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1225,12 +1225,12 @@ bool EmitAluInstruction::emit_alu_div_int(const nir_alu_instr& instr, bool use_s
} }
void EmitAluInstruction::split_alu_modifiers(const nir_alu_src& src, void EmitAluInstruction::split_alu_modifiers(const nir_alu_src& src,
GPRVector::Values& v, int ncomp) const GPRVector::Values& v, GPRVector::Values& out, int ncomp)
{ {
AluInstruction *alu = nullptr; AluInstruction *alu = nullptr;
for (int i = 0; i < ncomp; ++i) { for (int i = 0; i < ncomp; ++i) {
alu = new AluInstruction(op1_mov, v[i], v[i], {alu_write}); alu = new AluInstruction(op1_mov, out[i], v[i], {alu_write});
if (src.abs) if (src.abs)
alu->set_flag(alu_src0_abs); alu->set_flag(alu_src0_abs);
if (src.negate) if (src.negate)
@@ -1251,8 +1251,12 @@ bool EmitAluInstruction::emit_tex_fdd(const nir_alu_instr& instr, TexInstruction
auto src = vec_from_nir_with_fetch_constant(instr.src[0].src, (1 << ncomp) - 1, {0,1,2,3}); auto src = vec_from_nir_with_fetch_constant(instr.src[0].src, (1 << ncomp) - 1, {0,1,2,3});
if (instr.src[0].abs || instr.src[0].negate)
split_alu_modifiers(instr.src[0], src.values(), ncomp); if (instr.src[0].abs || instr.src[0].negate) {
GPRVector tmp = get_temp_vec4();
split_alu_modifiers(instr.src[0], src.values(), tmp.values(), ncomp);
src = tmp;
}
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
writemask[i] = (instr.dest.write_mask & (1 << i)) ? i : 7; writemask[i] = (instr.dest.write_mask & (1 << i)) ? i : 7;

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

@@ -100,7 +100,8 @@ private:
private: private:
void make_last(AluInstruction *ir) const; void make_last(AluInstruction *ir) const;
void split_alu_modifiers(const nir_alu_src &src, GPRVector::Values& v, int ncomp); void split_alu_modifiers(const nir_alu_src &src, const GPRVector::Values& v,
GPRVector::Values& out, int ncomp);
void preload_src(const nir_alu_instr& instr); void preload_src(const nir_alu_instr& instr);
unsigned num_src_comp(const nir_alu_instr& instr); unsigned num_src_comp(const nir_alu_instr& instr);