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

nir: Add alignment information to cast derefs

Browse Source 
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6472>
This commit is contained in:
Jason Ekstrand
2020-08-24 09:51:04 -05:00
committed by Marge Bot
parent a0b82c24b6
commit 878a8daca6
5 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/nir/nir.h
View File

@@ -1462,6 +1462,8 @@ typedef struct {
struct { struct {
unsigned ptr_stride; unsigned ptr_stride;
unsigned align_mul;
unsigned align_offset;
} cast; } cast;
}; };

2
src/compiler/nir/nir_clone.c
View File

@@ -339,6 +339,8 @@ clone_deref_instr(clone_state *state, const nir_deref_instr *deref)
case nir_deref_type_cast: case nir_deref_type_cast:
nderef->cast.ptr_stride = deref->cast.ptr_stride; nderef->cast.ptr_stride = deref->cast.ptr_stride;
nderef->cast.align_mul = deref->cast.align_mul;
nderef->cast.align_offset = deref->cast.align_offset;
break; break;
default: default:

6
src/compiler/nir/nir_instr_set.c
View File

@@ -172,6 +172,8 @@ hash_deref(uint32_t hash, const nir_deref_instr *instr)
case nir_deref_type_cast: case nir_deref_type_cast:
hash = HASH(hash, instr->cast.ptr_stride); hash = HASH(hash, instr->cast.ptr_stride);
hash = HASH(hash, instr->cast.align_mul);
hash = HASH(hash, instr->cast.align_offset);
break; break;
case nir_deref_type_var: case nir_deref_type_var:
@@ -619,7 +621,9 @@ nir_instrs_equal(const nir_instr *instr1, const nir_instr *instr2)
break; break;
case nir_deref_type_cast: case nir_deref_type_cast:
if (deref1->cast.ptr_stride != deref2->cast.ptr_stride) if (deref1->cast.ptr_stride != deref2->cast.ptr_stride ||
deref1->cast.align_mul != deref2->cast.align_mul ||
deref1->cast.align_offset != deref2->cast.align_offset)
return false; return false;
break; break;

4
src/compiler/nir/nir_serialize.c
View File

@@ -1037,6 +1037,8 @@ write_deref(write_ctx *ctx, const nir_deref_instr *deref)
case nir_deref_type_cast: case nir_deref_type_cast:
write_src(ctx, &deref->parent); write_src(ctx, &deref->parent);
blob_write_uint32(ctx->blob, deref->cast.ptr_stride); blob_write_uint32(ctx->blob, deref->cast.ptr_stride);
blob_write_uint32(ctx->blob, deref->cast.align_mul);
blob_write_uint32(ctx->blob, deref->cast.align_offset);
if (!header.deref.cast_type_same_as_last) { if (!header.deref.cast_type_same_as_last) {
encode_type_to_blob(ctx->blob, deref->type); encode_type_to_blob(ctx->blob, deref->type);
ctx->last_type = deref->type; ctx->last_type = deref->type;
@@ -1101,6 +1103,8 @@ read_deref(read_ctx *ctx, union packed_instr header)
case nir_deref_type_cast: case nir_deref_type_cast:
read_src(ctx, &deref->parent, &deref->instr); read_src(ctx, &deref->parent, &deref->instr);
deref->cast.ptr_stride = blob_read_uint32(ctx->blob); deref->cast.ptr_stride = blob_read_uint32(ctx->blob);
deref->cast.align_mul = blob_read_uint32(ctx->blob);
deref->cast.align_offset = blob_read_uint32(ctx->blob);
if (header.deref.cast_type_same_as_last) { if (header.deref.cast_type_same_as_last) {
deref->type = ctx->last_type; deref->type = ctx->last_type;
} else { } else {

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

@@ -418,6 +418,12 @@ validate_deref_instr(nir_deref_instr *instr, validate_state *state)
/* We just validate that the type and mode are there */ /* We just validate that the type and mode are there */
validate_assert(state, instr->mode); validate_assert(state, instr->mode);
validate_assert(state, instr->type); validate_assert(state, instr->type);
if (instr->cast.align_mul > 0) {
validate_assert(state, util_is_power_of_two_nonzero(instr->cast.align_mul));
validate_assert(state, instr->cast.align_offset < instr->cast.align_mul);
} else {
validate_assert(state, instr->cast.align_offset == 0);
}
} else { } else {
/* We require the parent to be SSA. This may be lifted in the future */ /* We require the parent to be SSA. This may be lifted in the future */
validate_assert(state, instr->parent.is_ssa); validate_assert(state, instr->parent.is_ssa);