diff options
| author | Alyssa Rosenzweig <[email protected]> | 2020-03-18 11:54:25 -0400 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-03-19 03:23:07 +0000 |
| commit | 265169f48ada87fcea8e55dc4176954fb86d1153 (patch) | |
| tree | f17804f83e439517852a5be752bb5ba7c7ec64d2 /src | |
| parent | 1c0e786084f865d27b7be9d834855555fb0f049f (diff) | |
pan/bi: Generalize bi_get_src a bit
Allow it to work with ADD ops and stub out some immediate fetching
infrastructure (currently only works with 0).
Signed-off-by: Alyssa Rosenzweig <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4242>
Diffstat (limited to 'src')
| -rw-r--r-- | src/panfrost/bifrost/bi_pack.c | 41 |
1 files changed, 33 insertions, 8 deletions
diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c index a2bb6fed25c..2637f427cbb 100644 --- a/src/panfrost/bifrost/bi_pack.c +++ b/src/panfrost/bifrost/bi_pack.c @@ -259,18 +259,43 @@ bi_get_src_reg_port(struct bi_registers *regs, unsigned src) } static enum bifrost_packed_src -bi_get_fma_src(bi_instruction *ins, struct bi_registers *regs, unsigned s) +bi_get_src_const(struct bi_registers *regs, unsigned constant) +{ + if (regs->uniform_constant & (1 << 7)) + unreachable("Tried to get constant but loading uniforms"); + + unsigned loc = (regs->uniform_constant >> 4) & 0x7; + + if (loc != 0) + unreachable("TODO: constants in clauses"); + + unsigned lo = regs->uniform_constant & 0xF; + + if (lo == 0) { + if (constant != 0) + unreachable("Tried to load !0 in 0 slot"); + + return BIFROST_SRC_CONST_LO; + } else { + unreachable("Special slot is not a fixed immediate"); + } +} + +static enum bifrost_packed_src +bi_get_src(bi_instruction *ins, struct bi_registers *regs, unsigned s, bool is_fma) { unsigned src = ins->src[s]; if (src & BIR_INDEX_REGISTER) return bi_get_src_reg_port(regs, src); - else if (src & BIR_INDEX_ZERO) + else if (src & BIR_INDEX_ZERO && is_fma) return BIFROST_SRC_STAGE; + else if (src & BIR_INDEX_ZERO) + return bi_get_src_const(regs, 0); else if (src & BIR_INDEX_PASS) return src & ~BIR_INDEX_PASS; else - unreachable("Unknown src in FMA"); + unreachable("Unknown src"); } static unsigned @@ -280,9 +305,9 @@ bi_pack_fma_fma(bi_instruction *ins, struct bi_registers *regs) bool negate_mul = ins->src_neg[0] ^ ins->src_neg[1]; struct bifrost_fma_fma pack = { - .src0 = bi_get_fma_src(ins, regs, 0), - .src1 = bi_get_fma_src(ins, regs, 1), - .src2 = bi_get_fma_src(ins, regs, 2), + .src0 = bi_get_src(ins, regs, 0, true), + .src1 = bi_get_src(ins, regs, 1, true), + .src2 = bi_get_src(ins, regs, 2, true), .src0_abs = ins->src_abs[0], .src1_abs = ins->src_abs[1], .src2_abs = ins->src_abs[2], @@ -301,8 +326,8 @@ bi_pack_fma_add(bi_instruction *ins, struct bi_registers *regs) assert(ins->dest_type == nir_type_float32); struct bifrost_fma_add pack = { - .src0 = bi_get_fma_src(ins, regs, 0), - .src1 = bi_get_fma_src(ins, regs, 1), + .src0 = bi_get_src(ins, regs, 0, true), + .src1 = bi_get_src(ins, regs, 1, true), .src0_abs = ins->src_abs[0], .src1_abs = ins->src_abs[1], .src0_neg = ins->src_neg[0], |