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

pan/va: Use boring names for FAU special pages 1/3 

There's no magic underlying interpretation, be.. uniform.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15364>
This commit is contained in:
Alyssa Rosenzweig 2022-03-13 14:08:17 -04:00 committed by Marge Bot
parent 76159ee379
commit 31a171d92d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/panfrost/bifrost/valhall/ISA.xml
View File

@ -94,7 +94,7 @@
<value name="Return from shader">return</value>
</enum>
<enum name="Thread storage pointers">
<enum name="FAU special page 1">
<desc>
Situated between the immediates hard-coded in the hardware and the
uniforms defined purely in software, Valhall has a some special
@ -120,7 +120,7 @@
<reserved/>
</enum>
<enum name="Thread identification">
<enum name="FAU special page 3">
<desc>
Situated between the immediates hard-coded in the hardware and the
uniforms defined purely in software, Valhall has a some special

8
src/panfrost/bifrost/valhall/asm.py
View File

@ -116,12 +116,12 @@ def encode_source(op, fau):
return (val & 0x3F) | 0x80
elif op[0] == 'i':
return int(op[3:]) | 0xC0
elif op in enums['thread_storage_pointers'].bare_values:
idx = 32 + (enums['thread_storage_pointers'].bare_values.index(op) << 1)
elif op in enums['fau_special_page_1'].bare_values:
idx = 32 + (enums['fau_special_page_1'].bare_values.index(op) << 1)
fau.set_page(1)
return idx | 0xC0
elif op in enums['thread_identification'].bare_values:
idx = 32 + (enums['thread_identification'].bare_values.index(op) << 1)
elif op in enums['fau_special_page_3'].bare_values:
idx = 32 + (enums['fau_special_page_3'].bare_values.index(op) << 1)
fau.set_page(3)
return idx | 0xC0
elif op.startswith('0x'):

4
src/panfrost/bifrost/valhall/disasm.py
View File

@ -86,10 +86,10 @@ va_print_src(FILE *fp, uint8_t src, unsigned fau_page)
else
fprintf(fp, "unk:%X", value);
} else if (fau_page == 1) {
fputs(valhall_thread_storage_pointers[(value - 0x20) >> 1] + 1, fp);
fputs(valhall_fau_special_page_1[(value - 0x20) >> 1] + 1, fp);
fprintf(fp, ".w%u", value & 1);
} else if (fau_page == 3) {
fputs(valhall_thread_identification[(value - 0x20) >> 1] + 1, fp);
fputs(valhall_fau_special_page_3[(value - 0x20) >> 1] + 1, fp);
fprintf(fp, ".w%u", value & 1);
} else {
fprintf(fp, "unk:%X", value);