diff options
| author | Marek Olšák <[email protected]> | 2020-01-08 21:52:26 -0500 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2020-01-28 08:54:24 -0800 |
| commit | f19e18858b2fe275332c41411d8ee229ded8e56b (patch) | |
| tree | f20782bb3ad898021d74d5cd4e67d9ce962dd40d | |
| parent | 5a79184ee73bba10a633eb6b406c0dec1afe3f20 (diff) | |
radeonsi: work around an LLVM crash when using llvm.amdgcn.icmp.i64.i1
Cc: 19.2 19.3 <[email protected]>
Acked-by: Pierre-Eric Pelloux-Prayer <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3338>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3338>
(cherry picked from commit 8ff8e68e422a5c6b9ab26eaa56eff5c27a642d2e)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_compute_prim_discard.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 7158345a1da..b8eb8469077 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3352,7 +3352,7 @@ "description": "radeonsi: work around an LLVM crash when using llvm.amdgcn.icmp.i64.i1", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/radeonsi/si_compute_prim_discard.c b/src/gallium/drivers/radeonsi/si_compute_prim_discard.c index 34e6d344486..ecd32b0c81a 100644 --- a/src/gallium/drivers/radeonsi/si_compute_prim_discard.c +++ b/src/gallium/drivers/radeonsi/si_compute_prim_discard.c @@ -702,6 +702,7 @@ void si_build_prim_discard_compute_shader(struct si_shader_context *ctx) vp_scale, vp_translate, smallprim_precision, &options); + ac_build_optimization_barrier(&ctx->ac, &accepted); LLVMValueRef accepted_threadmask = ac_get_i1_sgpr_mask(&ctx->ac, accepted); /* Count the number of active threads by doing bitcount(accepted). */ |