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

nir: Add nir_opt_load_store_update_alignments.

Browse Source 
New pass that shares code with nir_opt_load_store_vectorize but
it only updates the alignment of load/store instructions.

It is useful before running other passes which may
potentially destroy that information (eg. by removing some
instructions from which the alignment may be deduced).

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29210>
This commit is contained in:
Timur Kristóf
2024-05-17 00:35:32 +02:00
committed by Marge Bot
parent 0b582449f0
commit c1d38b0b37
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5665,6 +5665,7 @@ typedef struct {
} nir_load_store_vectorize_options; } nir_load_store_vectorize_options;
bool nir_opt_load_store_vectorize(nir_shader *shader, const nir_load_store_vectorize_options *options); bool nir_opt_load_store_vectorize(nir_shader *shader, const nir_load_store_vectorize_options *options);
bool nir_opt_load_store_update_alignments(nir_shader *shader);
typedef bool (*nir_lower_shader_calls_should_remat_func)(nir_instr *instr, void *data); typedef bool (*nir_lower_shader_calls_should_remat_func)(nir_instr *instr, void *data);

37
src/compiler/nir/nir_opt_load_store_vectorize.c
View File

@@ -337,7 +337,6 @@ add_to_entry_key(nir_scalar *offset_defs, uint64_t *offset_defs_mul,
static struct entry_key * static struct entry_key *
create_entry_key_from_deref(void *mem_ctx, create_entry_key_from_deref(void *mem_ctx,
struct vectorize_ctx *ctx,
nir_deref_path *path, nir_deref_path *path,
uint64_t *offset_base) uint64_t *offset_base)
{ {
@@ -525,11 +524,11 @@ calc_alignment(struct entry *entry)
} }
static struct entry * static struct entry *
create_entry(struct vectorize_ctx *ctx, create_entry(void *mem_ctx,
const struct intrinsic_info *info, const struct intrinsic_info *info,
nir_intrinsic_instr *intrin) nir_intrinsic_instr *intrin)
{ {
struct entry *entry = rzalloc(ctx, struct entry); struct entry *entry = rzalloc(mem_ctx, struct entry);
entry->intrin = intrin; entry->intrin = intrin;
entry->instr = &intrin->instr; entry->instr = &intrin->instr;
entry->info = info; entry->info = info;
@@ -539,7 +538,7 @@ create_entry(struct vectorize_ctx *ctx,
entry->deref = nir_src_as_deref(intrin->src[entry->info->deref_src]); entry->deref = nir_src_as_deref(intrin->src[entry->info->deref_src]);
nir_deref_path path; nir_deref_path path;
nir_deref_path_init(&path, entry->deref, NULL); nir_deref_path_init(&path, entry->deref, NULL);
entry->key = create_entry_key_from_deref(entry, ctx, &path, &entry->offset); entry->key = create_entry_key_from_deref(entry, &path, &entry->offset);
nir_deref_path_finish(&path); nir_deref_path_finish(&path);
} else { } else {
nir_def *base = entry->info->base_src >= 0 ? intrin->src[entry->info->base_src].ssa : NULL; nir_def *base = entry->info->base_src >= 0 ? intrin->src[entry->info->base_src].ssa : NULL;
@@ -1472,3 +1471,33 @@ nir_opt_load_store_vectorize(nir_shader *shader, const nir_load_store_vectorize_
ralloc_free(ctx); ralloc_free(ctx);
return progress; return progress;
} }
static bool
opt_load_store_update_alignments_callback(struct nir_builder *b,
nir_intrinsic_instr *intrin,
UNUSED void *s)
{
if (!nir_intrinsic_has_align_mul(intrin))
return false;
const struct intrinsic_info *info = get_info(intrin->intrinsic);
if (!info)
return false;
struct entry *entry = create_entry(NULL, info, intrin);
const bool progress = update_align(entry);
ralloc_free(entry);
return progress;
}
bool
nir_opt_load_store_update_alignments(nir_shader *shader)
{
return nir_shader_intrinsics_pass(shader,
opt_load_store_update_alignments_callback,
nir_metadata_block_index |
nir_metadata_dominance |
nir_metadata_live_defs |
nir_metadata_instr_index, NULL);
}