Mesa (master): aco: vectorize global loads/stores
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Apr 24 19:01:31 UTC 2020
Module: Mesa
Branch: master
Commit: deea4b7c5aae064145f788cb408001a40526a18d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=deea4b7c5aae064145f788cb408001a40526a18d
Author: Rhys Perry <pendingchaos02 at gmail.com>
Date: Thu Apr 16 20:15:00 2020 +0100
aco: vectorize global loads/stores
Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Daniel Schürmann <daniel at schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4639>
---
src/amd/compiler/aco_instruction_selection_setup.cpp | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp b/src/amd/compiler/aco_instruction_selection_setup.cpp
index 08f8782e8fa..14d08ff7153 100644
--- a/src/amd/compiler/aco_instruction_selection_setup.cpp
+++ b/src/amd/compiler/aco_instruction_selection_setup.cpp
@@ -698,6 +698,9 @@ mem_vectorize_callback(unsigned align, unsigned bit_size,
return false;
switch (low->intrinsic) {
+ case nir_intrinsic_load_global:
+ case nir_intrinsic_store_global:
+ return align % 4 == 0;
case nir_intrinsic_store_ssbo:
if (low->src[0].ssa->bit_size < 32 || high->src[0].ssa->bit_size < 32)
return false;
@@ -1032,18 +1035,23 @@ setup_nir(isel_context *ctx, nir_shader *nir)
setup_variables(ctx, nir);
/* optimize and lower memory operations */
+ if (nir_lower_explicit_io(nir, nir_var_mem_global, nir_address_format_64bit_global)) {
+ nir_opt_constant_folding(nir);
+ nir_opt_cse(nir);
+ }
+
bool lower_to_scalar = false;
bool lower_pack = false;
if (nir_opt_load_store_vectorize(nir,
(nir_variable_mode)(nir_var_mem_ssbo | nir_var_mem_ubo |
- nir_var_mem_push_const | nir_var_mem_shared),
+ nir_var_mem_push_const | nir_var_mem_shared |
+ nir_var_mem_global),
mem_vectorize_callback)) {
lower_to_scalar = true;
lower_pack = true;
}
if (nir->info.stage != MESA_SHADER_COMPUTE)
nir_lower_io(nir, (nir_variable_mode)(nir_var_shader_in | nir_var_shader_out), type_size, (nir_lower_io_options)0);
- nir_lower_explicit_io(nir, nir_var_mem_global, nir_address_format_64bit_global);
if (lower_to_scalar)
nir_lower_alu_to_scalar(nir, NULL, NULL);
More information about the mesa-commit
mailing list