Mesa (main): intel/compiler: Rename brw_nir_lower_image_load_store to brw_nir_lower_storage_image

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: b5514a22366f7ef80b1c2e6d2d29d65a272c31fb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b5514a22366f7ef80b1c2e6d2d29d65a272c31fb

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Wed Feb  3 11:34:46 2021 -0800

intel/compiler: Rename brw_nir_lower_image_load_store to brw_nir_lower_storage_image

Reworks:
 * Add crocus

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9466>

---

 src/gallium/drivers/crocus/crocus_program.c                         | 2 +-
 src/gallium/drivers/iris/iris_program.c                             | 2 +-
 src/intel/compiler/brw_nir.h                                        | 6 +++---
 ...w_nir_lower_image_load_store.c => brw_nir_lower_storage_image.c} | 6 +++---
 src/intel/compiler/meson.build                                      | 2 +-
 src/intel/vulkan/anv_pipeline.c                                     | 2 +-
 src/mesa/drivers/dri/i965/brw_program.c                             | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/gallium/drivers/crocus/crocus_program.c b/src/gallium/drivers/crocus/crocus_program.c
index d96edb7152d..0d69d80ed2c 100644
--- a/src/gallium/drivers/crocus/crocus_program.c
+++ b/src/gallium/drivers/crocus/crocus_program.c
@@ -2698,7 +2698,7 @@ crocus_create_uncompiled_shader(struct pipe_context *ctx,
 
    brw_preprocess_nir(screen->compiler, nir, NULL);
 
-   NIR_PASS_V(nir, brw_nir_lower_image_load_store, devinfo, false);
+   NIR_PASS_V(nir, brw_nir_lower_storage_image, devinfo, false);
    NIR_PASS_V(nir, crocus_lower_storage_image_derefs);
 
    nir_sweep(nir);
diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c
index ddf252eb8c2..ac7fdf3e9ec 100644
--- a/src/gallium/drivers/iris/iris_program.c
+++ b/src/gallium/drivers/iris/iris_program.c
@@ -2289,7 +2289,7 @@ iris_create_uncompiled_shader(struct iris_screen *screen,
 
    brw_preprocess_nir(screen->compiler, nir, NULL);
 
-   NIR_PASS_V(nir, brw_nir_lower_image_load_store, devinfo,
+   NIR_PASS_V(nir, brw_nir_lower_storage_image, devinfo,
               &ish->uses_atomic_load_store);
    NIR_PASS_V(nir, iris_lower_storage_image_derefs);
 
diff --git a/src/intel/compiler/brw_nir.h b/src/intel/compiler/brw_nir.h
index 7a8b3051090..51104640113 100644
--- a/src/intel/compiler/brw_nir.h
+++ b/src/intel/compiler/brw_nir.h
@@ -122,9 +122,9 @@ bool brw_nir_lower_conversions(nir_shader *nir);
 
 bool brw_nir_lower_scoped_barriers(nir_shader *nir);
 
-bool brw_nir_lower_image_load_store(nir_shader *nir,
-                                    const struct intel_device_info *devinfo,
-                                    bool *uses_atomic_load_store);
+bool brw_nir_lower_storage_image(nir_shader *nir,
+                                 const struct intel_device_info *devinfo,
+                                 bool *uses_atomic_load_store);
 void brw_nir_rewrite_image_intrinsic(nir_intrinsic_instr *intrin,
                                      nir_ssa_def *index);
 void brw_nir_rewrite_bindless_image_intrinsic(nir_intrinsic_instr *intrin,
diff --git a/src/intel/compiler/brw_nir_lower_image_load_store.c b/src/intel/compiler/brw_nir_lower_storage_image.c
similarity index 99%
rename from src/intel/compiler/brw_nir_lower_image_load_store.c
rename to src/intel/compiler/brw_nir_lower_storage_image.c
index 4ac6dada4a1..682ae13dedb 100644
--- a/src/intel/compiler/brw_nir_lower_image_load_store.c
+++ b/src/intel/compiler/brw_nir_lower_storage_image.c
@@ -675,9 +675,9 @@ lower_image_size_instr(nir_builder *b,
 }
 
 bool
-brw_nir_lower_image_load_store(nir_shader *shader,
-                               const struct intel_device_info *devinfo,
-                               bool *uses_atomic_load_store)
+brw_nir_lower_storage_image(nir_shader *shader,
+                            const struct intel_device_info *devinfo,
+                            bool *uses_atomic_load_store)
 {
    bool progress = false;
 
diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build
index 1417a9e4aa9..471ea2c3a68 100644
--- a/src/intel/compiler/meson.build
+++ b/src/intel/compiler/meson.build
@@ -84,12 +84,12 @@ libintel_compiler_files = files(
   'brw_nir_lower_conversions.c',
   'brw_nir_lower_cs_intrinsics.c',
   'brw_nir_lower_alpha_to_coverage.c',
-  'brw_nir_lower_image_load_store.c',
   'brw_nir_lower_intersection_shader.c',
   'brw_nir_lower_mem_access_bit_sizes.c',
   'brw_nir_lower_rt_intrinsics.c',
   'brw_nir_lower_scoped_barriers.c',
   'brw_nir_lower_shader_calls.c',
+  'brw_nir_lower_storage_image.c',
   'brw_nir_opt_peephole_ffma.c',
   'brw_nir_rt.h',
   'brw_nir_rt.c',
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index 599da83c40d..8e0767feec6 100644
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -876,7 +876,7 @@ anv_pipeline_lower_nir(struct anv_pipeline *pipeline,
 
    nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));
 
-   NIR_PASS_V(nir, brw_nir_lower_image_load_store, compiler->devinfo, NULL);
+   NIR_PASS_V(nir, brw_nir_lower_storage_image, compiler->devinfo, NULL);
 
    NIR_PASS_V(nir, nir_lower_explicit_io, nir_var_mem_global,
               nir_address_format_64bit_global);
diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c
index 7fb887cc373..0265fd73ea0 100644
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -186,7 +186,7 @@ brw_nir_lower_resources(nir_shader *nir, struct gl_shader_program *shader_prog,
    BITSET_COPY(prog->info.textures_used, prog->nir->info.textures_used);
    BITSET_COPY(prog->info.textures_used_by_txf, prog->nir->info.textures_used_by_txf);
 
-   NIR_PASS_V(prog->nir, brw_nir_lower_image_load_store, devinfo, NULL);
+   NIR_PASS_V(prog->nir, brw_nir_lower_storage_image, devinfo, NULL);
 
    if (prog->nir->info.stage == MESA_SHADER_COMPUTE &&
        shader_prog->data->spirv) {