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

ir3/print: Consider the size of input when matching it to a reg

Browse Source 
First component of the input may never be read, so we have to find
the first component of the input which is being read.

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20533>
This commit is contained in:
Danylo Piliaiev
2023-01-05 14:02:17 +01:00
committed by Marge Bot
parent d474cc935e
commit a358890667
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/freedreno/ir3/ir3_shader.c
View File

@@ -750,6 +750,8 @@ find_input_reg_id(struct ir3_shader_variant *so, uint32_t input_idx)
if (so->type != MESA_SHADER_FRAGMENT || !so->ir || VALIDREG(reg))
return reg;
reg = INVALID_REG;
/* In FS we don't know into which register the input is loaded
* until the shader is scanned for the input load instructions.
*/
@@ -758,16 +760,27 @@ find_input_reg_id(struct ir3_shader_variant *so, uint32_t input_idx)
if (instr->opc == OPC_FLAT_B || instr->opc == OPC_BARY_F ||
instr->opc == OPC_LDLV) {
if (instr->srcs[0]->flags & IR3_REG_IMMED) {
unsigned inloc = instr->srcs[0]->uim_val;
if (inloc == so->inputs[input_idx].inloc) {
unsigned inloc = so->inputs[input_idx].inloc;
unsigned instr_inloc = instr->srcs[0]->uim_val;
unsigned size = util_bitcount(so->inputs[input_idx].compmask);
if (instr_inloc == inloc) {
return instr->dsts[0]->num;
}
if (instr_inloc > inloc && instr_inloc < (inloc + size)) {
reg = MIN2(reg, instr->dsts[0]->num);
}
if (instr->dsts[0]->flags & IR3_REG_EI) {
return reg;
}
}
}
}
}
return INVALID_REG;
return reg;
}
void