KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qetnaviv: nir: use new immediates when possible 

Note it can still be improved a bit:
* Use alu swizzle to determine if src is scalar
* Take into account new immediates in the multiple uniform src lowering

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
This commit is contained in:
Jonathan Marek 2019-09-12 16:07:14 -04:00
parent 95fa799c86
commit d446134d2a
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.h
View File

@ -75,7 +75,9 @@ struct state {
static inline hw_src
src_swizzle(hw_src src, unsigned swizzle)
{
src.swiz = inst_swiz_compose(src.swiz, swizzle);
if (src.rgroup != INST_RGROUP_IMMEDIATE)
src.swiz = inst_swiz_compose(src.swiz, swizzle);
return src;
}
@ -114,6 +116,24 @@ const_add(uint64_t *c, uint64_t value)
static hw_src
const_src(struct state *state, nir_const_value *value, unsigned num_components)
{
/* use inline immediates if possible */
if (state->c->specs->halti >= 2 && num_components == 1 &&
value[0].u64 >> 32 == ETNA_IMMEDIATE_CONSTANT) {
uint32_t bits = value[0].u32;
/* "float" - shifted by 12 */
if ((bits & 0xfff) == 0)
return etna_immediate_src(0, bits >> 12);
/* "unsigned" - raw 20 bit value */
if (bits < (1 << 20))
return etna_immediate_src(2, bits);
/* "signed" - sign extended 20-bit (sign included) value */
if (bits >= 0xfff80000)
return etna_immediate_src(1, bits);
}
unsigned i;
int swiz = -1;
for (i = 0; swiz < 0; i++) {