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

pan/va: Move VA_NUM_GENERAL_SLOTS to common 

This definition is a hardware property. It's not specific to the flow control
insertion pass, so move it to common code where other passes can use it.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17091>
This commit is contained in:
Alyssa Rosenzweig 2022-06-16 16:38:35 -04:00 committed by Marge Bot
parent d9c03df584
commit 35fcf8d3d7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/panfrost/bifrost/valhall/va_insert_flow.c
View File

@ -54,7 +54,6 @@
* be a performance penalty.
*/
#define BI_NUM_GENERAL_SLOTS 3
#define BI_NUM_REGISTERS 64
/*
@ -429,7 +428,7 @@ va_insert_flow_control_nops(bi_context *ctx)
* waits on general slots. The dataflow analysis should be ignoring
* the special slots #6 and #7, which are handled separately.
*/
assert((I->flow & ~BITFIELD_MASK(BI_NUM_GENERAL_SLOTS)) == 0);
assert((I->flow & ~BITFIELD_MASK(VA_NUM_GENERAL_SLOTS)) == 0);
bi_flow(ctx, bi_before_instr(I), I->flow);
I->flow = 0;

2
src/panfrost/bifrost/valhall/valhall.h
View File

@ -34,6 +34,8 @@
extern "C" {
#endif
#define VA_NUM_GENERAL_SLOTS 3
extern const uint32_t valhall_immediates[32];
enum va_size {