Mesa (master): aco: allow divergent mbcnt_amd masks

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 23488c35152c58a3f15bde6ade658959de94ff9a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=23488c35152c58a3f15bde6ade658959de94ff9a

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Mon Dec 14 13:18:39 2020 +0000

aco: allow divergent mbcnt_amd masks

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Daniel Schürmann <daniel at schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8085>

---

 src/amd/compiler/aco_instruction_selection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index f7a33054a41..4fcdad199d3 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -131,7 +131,7 @@ Temp emit_mbcnt(isel_context *ctx, Temp dst, Operand mask = Operand(), Operand b
 {
    Builder bld(ctx->program, ctx->block);
    assert(mask.isUndefined() || mask.isTemp() || (mask.isFixed() && mask.physReg() == exec));
-   assert(mask.isUndefined() || mask.regClass() == bld.lm);
+   assert(mask.isUndefined() || mask.bytes() == bld.lm.bytes());
 
    if (ctx->program->wave_size == 32) {
       Operand mask_lo = mask.isUndefined() ? Operand(-1u) : mask;