OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pan/cs: Make the CS loop helpers more robust

Browse Source 
Always pass the loop object around so we can check that the current
block is the loop block, and provide syntactic sugor for unconditional
continue/break statements.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Reviewed-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31205>
This commit is contained in:
Boris Brezillon
2024-09-15 15:33:04 +02:00
committed by Marge Bot
parent 7e322396aa
commit e6ba99deda
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/panfrost/.clang-format
View File

@@ -36,7 +36,9 @@ ForEachMacros: [
'bi_foreach_ssa_dest',
'bi_foreach_ssa_src',
'bi_foreach_successor',
'cs_break',
'cs_case',
'cs_continue',
'cs_default',
'cs_emit',
'cs_match',

37
src/panfrost/lib/genxml/cs_builder.h
View File

@@ -833,35 +833,27 @@ cs_while_start(struct cs_builder *b, struct cs_loop *loop,
}
static inline void
cs_loop_continue(struct cs_builder *b, enum mali_cs_condition cond,
struct cs_index val)
cs_loop_conditional_continue(struct cs_builder *b, struct cs_loop *loop,
enum mali_cs_condition cond, struct cs_index val)
{
assert(b->blocks.cur);
struct cs_loop *loop = container_of(b->blocks.cur, struct cs_loop, block);
assert(b->blocks.cur == &loop->block);
cs_branch_label(b, &loop->start, cond, val);
cs_loop_diverge_ls_update(b, loop);
}
static inline void
cs_loop_break(struct cs_builder *b, enum mali_cs_condition cond,
struct cs_index val)
cs_loop_conditional_break(struct cs_builder *b, struct cs_loop *loop,
enum mali_cs_condition cond, struct cs_index val)
{
assert(b->blocks.cur);
struct cs_loop *loop = container_of(b->blocks.cur, struct cs_loop, block);
assert(b->blocks.cur == &loop->block);
cs_branch_label(b, &loop->end, cond, val);
cs_loop_diverge_ls_update(b, loop);
}
static inline void
cs_while_end(struct cs_builder *b)
cs_while_end(struct cs_builder *b, struct cs_loop *loop)
{
assert(b->blocks.cur);
struct cs_loop *loop = container_of(b->blocks.cur, struct cs_loop, block);
assert(b->blocks.cur == &loop->block);
cs_branch_label(b, &loop->start, loop->cond, loop->val);
cs_set_label(b, &loop->end);
@@ -878,10 +870,17 @@ cs_while_end(struct cs_builder *b)
}
}
#define cs_while(__b, cond, val) \
#define cs_while(__b, __cond, __val) \
for (struct cs_loop __loop_storage, \
*__loop = cs_while_start(__b, &__loop_storage, cond, val); \
__loop != NULL; cs_while_end(__b), __loop = NULL)
*__loop = cs_while_start(__b, &__loop_storage, __cond, __val); \
__loop != NULL; cs_while_end(__b, __loop), __loop = NULL)
#define cs_continue(__b) \
cs_loop_conditional_continue(__b, __loop, MALI_CS_CONDITION_ALWAYS, \
cs_undef())
#define cs_break(__b) \
cs_loop_conditional_break(__b, __loop, MALI_CS_CONDITION_ALWAYS, cs_undef())
/* Pseudoinstructions follow */

2
src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
View File

@@ -643,7 +643,7 @@ cs_render_desc_ringbuf_move_ptr(struct cs_builder *b, uint32_t size)
cs_while(b, MALI_CS_CONDITION_GEQUAL, scratch_reg) {
cs_add32(b, ptr_lo, ptr_lo, -RENDER_DESC_RINGBUF_SIZE);
cs_add32(b, pos, pos, -RENDER_DESC_RINGBUF_SIZE);
cs_loop_break(b, MALI_CS_CONDITION_ALWAYS, cs_undef());
cs_break(b);
}
cs_store(