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

nir: Validate image atomic formats

Browse Source 
GLSL requires that image atomics have formats and there are rules about
things matching properly.  We should enforce those in NIR unless we have
reason to do otherwise.

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7509>
This commit is contained in:
Jason Ekstrand
2020-03-17 17:37:46 -05:00
committed by Marge Bot
parent 72f1c9aef5
commit b725fbd191
1 changed files with 75 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/compiler/nir/nir_validate.c
View File

@@ -553,6 +553,24 @@ vectorized_intrinsic(nir_intrinsic_instr *intr)
return false;
}
/** Returns the image format or PIPE_FORMAT_COUNT for incomplete derefs
*
* We use PIPE_FORMAT_COUNT for incomplete derefs because PIPE_FORMAT_NONE
* indicates that we found the variable but it has no format specified.
*/
static enum pipe_format
image_intrin_format(nir_intrinsic_instr *instr)
{
if (nir_intrinsic_has_format(instr))
return nir_intrinsic_format(instr);
nir_variable *var = nir_intrinsic_get_var(instr, 0);
if (var == NULL)
return PIPE_FORMAT_COUNT;
return var->data.image.format;
}
static void
validate_intrinsic_instr(nir_intrinsic_instr *instr, validate_state *state)
{
@@ -676,6 +694,63 @@ validate_intrinsic_instr(nir_intrinsic_instr *instr, validate_state *state)
util_bitcount(nir_intrinsic_memory_modes(instr)) == 1);
break;
case nir_intrinsic_image_deref_atomic_add:
case nir_intrinsic_image_deref_atomic_imin:
case nir_intrinsic_image_deref_atomic_umin:
case nir_intrinsic_image_deref_atomic_imax:
case nir_intrinsic_image_deref_atomic_umax:
case nir_intrinsic_image_deref_atomic_and:
case nir_intrinsic_image_deref_atomic_or:
case nir_intrinsic_image_deref_atomic_xor:
case nir_intrinsic_image_deref_atomic_comp_swap:
case nir_intrinsic_image_atomic_add:
case nir_intrinsic_image_atomic_imin:
case nir_intrinsic_image_atomic_umin:
case nir_intrinsic_image_atomic_imax:
case nir_intrinsic_image_atomic_umax:
case nir_intrinsic_image_atomic_and:
case nir_intrinsic_image_atomic_or:
case nir_intrinsic_image_atomic_xor:
case nir_intrinsic_image_atomic_comp_swap:
case nir_intrinsic_bindless_image_atomic_add:
case nir_intrinsic_bindless_image_atomic_imin:
case nir_intrinsic_bindless_image_atomic_umin:
case nir_intrinsic_bindless_image_atomic_imax:
case nir_intrinsic_bindless_image_atomic_umax:
case nir_intrinsic_bindless_image_atomic_and:
case nir_intrinsic_bindless_image_atomic_or:
case nir_intrinsic_bindless_image_atomic_xor:
case nir_intrinsic_bindless_image_atomic_comp_swap: {
enum pipe_format format = image_intrin_format(instr);
validate_assert(state, format == PIPE_FORMAT_COUNT ||
format == PIPE_FORMAT_R32_UINT ||
format == PIPE_FORMAT_R32_SINT);
validate_assert(state, nir_dest_bit_size(instr->dest) == 32);
break;
}
case nir_intrinsic_image_deref_atomic_exchange:
case nir_intrinsic_image_atomic_exchange:
case nir_intrinsic_bindless_image_atomic_exchange: {
enum pipe_format format = image_intrin_format(instr);
validate_assert(state, format == PIPE_FORMAT_COUNT ||
format == PIPE_FORMAT_R32_UINT ||
format == PIPE_FORMAT_R32_SINT ||
format == PIPE_FORMAT_R32_FLOAT);
validate_assert(state, nir_dest_bit_size(instr->dest) == 32);
break;
}
case nir_intrinsic_image_deref_atomic_fadd:
case nir_intrinsic_image_atomic_fadd:
case nir_intrinsic_bindless_image_atomic_fadd: {
enum pipe_format format = image_intrin_format(instr);
validate_assert(state, format == PIPE_FORMAT_COUNT ||
format == PIPE_FORMAT_R32_FLOAT);
validate_assert(state, nir_dest_bit_size(instr->dest) == 32);
break;
}
default:
break;
}