fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 04:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir/load_store_vectorize: fix combining stores with aliasing loads between

Browse source 
v2: add test

Fixes: ce9205c03b ('nir: add a load/store vectorization pass')
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev> (v1)
Reviewed-by: Connor Abbott <cwabbott0@gmail.com> (v2)
This commit is contained in:
Rhys Perry 2019-12-03 10:48:18 +00:00
parent 637c5a1dd9
commit 3e67aa2e4e
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/compiler/nir/nir_opt_load_store_vectorize.c
View file

@ -989,13 +989,13 @@ check_for_aliasing(struct vectorize_ctx *ctx, struct entry *first, struct entry
unsigned mode_index = ffs(mode) - 1;
if (first->is_store) {
/* find first store that aliases "first" */
/* find first entry that aliases "first" */
list_for_each_entry_from(struct entry, next, first, &ctx->entries[mode_index], head) {
if (next == first)
continue;
if (next == second)
return false;
if (next->is_store && may_alias(first, next))
if (may_alias(first, next))
return true;
}
} else {

14
src/compiler/nir/tests/load_store_vectorizer_tests.cpp
View file

@ -620,6 +620,20 @@ TEST_F(nir_load_store_vectorize_test, ssbo_load_identical_store_identical)
ASSERT_EQ(count_intrinsics(nir_intrinsic_load_ssbo), 2);
}
TEST_F(nir_load_store_vectorize_test, ssbo_store_identical_load_identical)
{
create_store(nir_var_mem_ssbo, 0, 0, 0x1);
create_load(nir_var_mem_ssbo, 0, 0, 0x2);
create_store(nir_var_mem_ssbo, 0, 0, 0x3);
nir_validate_shader(b->shader, NULL);
ASSERT_EQ(count_intrinsics(nir_intrinsic_store_ssbo), 2);
EXPECT_FALSE(run_vectorizer(nir_var_mem_ssbo));
ASSERT_EQ(count_intrinsics(nir_intrinsic_store_ssbo), 2);
}
/* if nir_opt_load_store_vectorize were implemented like many load/store
* optimization passes are (for example, nir_opt_combine_stores and
* nir_opt_copy_prop_vars) and stopped tracking a load when an aliasing store is