From fef7d3c73e15c532fadd249e63d920cd2b709a05 Mon Sep 17 00:00:00 2001 From: Arcady Goldmints-Orlov Date: Mon, 11 May 2020 18:31:49 -0500 Subject: [PATCH] intel/compiler: fix alignment assert in nir_emit_intrinsic Fixes: c643979228 (intel/fs: Choose memory message type based on bit size) Fixes: dEQP-VK.subgroups.ballot_broadcast.compute.subgroupbroadcast_i8vec2 Reviewed-by: Jason Ekstrand Part-of: (cherry picked from commit 95fd950d35717dda29cb7876ac2f2b7852eff1c4) --- .pick_status.json | 2 +- src/intel/compiler/brw_fs_nir.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 275b0896a45..4bec5a0ba00 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -274,7 +274,7 @@ "description": "intel/compiler: fix alignment assert in nir_emit_intrinsic", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "c6439792287f11f25cb2b62d699f52daefe54a44" }, diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp index e3149f6254c..5182c07f462 100644 --- a/src/intel/compiler/brw_fs_nir.cpp +++ b/src/intel/compiler/brw_fs_nir.cpp @@ -4873,7 +4873,7 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr assert(nir_src_num_components(instr->src[0]) == 1); assert(nir_src_bit_size(instr->src[0]) <= 32); assert(nir_intrinsic_write_mask(instr) == 1); - assert(nir_intrinsic_align(instr) > 1); + assert(nir_intrinsic_align(instr) > 0); if (nir_src_bit_size(instr->src[0]) == 32 && nir_intrinsic_align(instr) >= 4) { srcs[SURFACE_LOGICAL_SRC_DATA] = data;