fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 19:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/bi: Drop 64-bit constant support

Browse source 
We don't support 64-bit clauses and don't intend to (v6 only, v7 doesn't
support them) so this is irrelevant.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7206>
This commit is contained in:
Alyssa Rosenzweig 2020-10-14 21:16:10 -04:00 • committed by Marge Bot
parent d2bfcba54d
commit 82a62a6f33
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/panfrost/bifrost/bi_pack.c
View file

@ -72,7 +72,7 @@ bi_pack_header(bi_clause *clause, bi_clause *next_1, bi_clause *next_2, bool tdd
* sources directly. */ * sources directly. */
static unsigned static unsigned
bi_lookup_constant(bi_clause *clause, uint64_t cons, bool *hi, bool b64) bi_lookup_constant(bi_clause *clause, uint32_t cons, bool *hi)
{ {
uint64_t want = (cons >> 4); uint64_t want = (cons >> 4);
@ -85,15 +85,13 @@ bi_lookup_constant(bi_clause *clause, uint64_t cons, bool *hi, bool b64)
clause->constants[i] >> 36 clause->constants[i] >> 36
}; };
/* For <64-bit mode, we treat lo/hi separately */ /* Treat lo/hi separately */
if (!b64)
candidates[0] &= (0xFFFFFFFF >> 4); candidates[0] &= (0xFFFFFFFF >> 4);
if (candidates[0] == want) if (candidates[0] == want)
return i; return i;
if (candidates[1] == want && !b64) { if (candidates[1] == want) {
*hi = true; *hi = true;
return i; return i;
} }
@ -152,9 +150,8 @@ bi_assign_fau_idx_single(bi_registers *regs,
continue; continue;
bool hi = false; bool hi = false;
bool b64 = nir_alu_type_get_type_size(ins->src_types[s]) > 32; uint32_t cons = bi_get_immediate(ins, s);
uint64_t cons = bi_get_immediate(ins, s); unsigned idx = bi_lookup_constant(clause, cons, &hi);
unsigned idx = bi_lookup_constant(clause, cons, &hi, b64);
unsigned lo = clause->constants[idx] & 0xF; unsigned lo = clause->constants[idx] & 0xF;
unsigned f = bi_constant_field(idx) | lo; unsigned f = bi_constant_field(idx) | lo;