fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir: Add alignment to load_push_constant

Browse source 
Reviewed-by: Giancarlo Devich <gdevich@microsoft.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21029>
This commit is contained in:
Jesse Natalie 2023-01-31 16:20:31 -08:00 • committed by Marge Bot
parent 42267588d7
commit c0c2b60f1d
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/nir/nir_intrinsics.py
View file

@ -1037,7 +1037,7 @@ load("shared", [1], [BASE, ALIGN_MUL, ALIGN_OFFSET], [CAN_ELIMINATE])
# src[] = { offset }.
load("task_payload", [1], [BASE, ALIGN_MUL, ALIGN_OFFSET], [CAN_ELIMINATE])
# src[] = { offset }.
load("push_constant", [1], [BASE, RANGE], [CAN_ELIMINATE, CAN_REORDER])
load("push_constant", [1], [BASE, RANGE, ALIGN_MUL, ALIGN_OFFSET], [CAN_ELIMINATE, CAN_REORDER])
# src[] = { offset }.
load("constant", [1], [BASE, RANGE, ALIGN_MUL, ALIGN_OFFSET],
[CAN_ELIMINATE, CAN_REORDER])

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

@ -230,8 +230,8 @@ nir_load_store_vectorize_test::create_indirect_load(
}
int byte_size = (bit_size == 1 ? 32 : bit_size) / 8;
nir_intrinsic_set_align(load, byte_size, 0);
if (mode != nir_var_mem_push_const) {
nir_intrinsic_set_align(load, byte_size, 0);
nir_intrinsic_set_access(load, (gl_access_qualifier)access);
}
@ -1552,7 +1552,7 @@ TEST_F(nir_load_store_vectorize_test, push_const_load_separate_base)
nir_validate_shader(b->shader, NULL);
ASSERT_EQ(count_intrinsics(nir_intrinsic_load_push_constant), 2);
EXPECT_FALSE(run_vectorizer(nir_var_mem_push_const));
EXPECT_TRUE(run_vectorizer(nir_var_mem_push_const));
ASSERT_EQ(count_intrinsics(nir_intrinsic_load_push_constant), 2);
}
@ -1565,7 +1565,7 @@ TEST_F(nir_load_store_vectorize_test, push_const_load_separate_direct_direct)
nir_validate_shader(b->shader, NULL);
ASSERT_EQ(count_intrinsics(nir_intrinsic_load_push_constant), 2);
EXPECT_FALSE(run_vectorizer(nir_var_mem_push_const));
EXPECT_TRUE(run_vectorizer(nir_var_mem_push_const));
ASSERT_EQ(count_intrinsics(nir_intrinsic_load_push_constant), 2);
}
@ -1579,7 +1579,7 @@ TEST_F(nir_load_store_vectorize_test, push_const_load_separate_direct_indirect)
nir_validate_shader(b->shader, NULL);
ASSERT_EQ(count_intrinsics(nir_intrinsic_load_push_constant), 2);
EXPECT_FALSE(run_vectorizer(nir_var_mem_push_const));
EXPECT_TRUE(run_vectorizer(nir_var_mem_push_const));
ASSERT_EQ(count_intrinsics(nir_intrinsic_load_push_constant), 2);
}
@ -1595,7 +1595,7 @@ TEST_F(nir_load_store_vectorize_test, push_const_load_separate_indirect_indirect
nir_validate_shader(b->shader, NULL);
ASSERT_EQ(count_intrinsics(nir_intrinsic_load_push_constant), 2);
EXPECT_FALSE(run_vectorizer(nir_var_mem_push_const));
EXPECT_TRUE(run_vectorizer(nir_var_mem_push_const));
ASSERT_EQ(count_intrinsics(nir_intrinsic_load_push_constant), 2);
}