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

intel/nir: Plumb devinfo through lower_mem_access_bit_sizes

Browse Source 
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
This commit is contained in:
Jason Ekstrand
2019-02-28 10:02:03 -06:00
committed by Jason Ekstrand
parent 1dff48af05
commit e2297699de
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/intel/compiler/brw_nir.c
View File

@@ -814,7 +814,7 @@ brw_postprocess_nir(nir_shader *nir, const struct brw_compiler *compiler,
UNUSED bool progress; /* Written by OPT */ UNUSED bool progress; /* Written by OPT */
OPT(brw_nir_lower_mem_access_bit_sizes); OPT(brw_nir_lower_mem_access_bit_sizes, devinfo);
do { do {
progress = false; progress = false;

3
src/intel/compiler/brw_nir.h
View File

@@ -128,7 +128,8 @@ void brw_nir_rewrite_image_intrinsic(nir_intrinsic_instr *intrin,
void brw_nir_rewrite_bindless_image_intrinsic(nir_intrinsic_instr *intrin, void brw_nir_rewrite_bindless_image_intrinsic(nir_intrinsic_instr *intrin,
nir_ssa_def *handle); nir_ssa_def *handle);
bool brw_nir_lower_mem_access_bit_sizes(nir_shader *shader); bool brw_nir_lower_mem_access_bit_sizes(nir_shader *shader,
const struct gen_device_info *devinfo);
void brw_postprocess_nir(nir_shader *nir, void brw_postprocess_nir(nir_shader *nir,
const struct brw_compiler *compiler, const struct brw_compiler *compiler,

18
src/intel/compiler/brw_nir_lower_mem_access_bit_sizes.c
View File

@@ -74,7 +74,8 @@ dup_mem_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin,
} }
static bool static bool
lower_mem_load_bit_size(nir_builder *b, nir_intrinsic_instr *intrin) lower_mem_load_bit_size(nir_builder *b, nir_intrinsic_instr *intrin,
const struct gen_device_info *devinfo)
{ {
assert(intrin->dest.is_ssa); assert(intrin->dest.is_ssa);
if (intrin->dest.ssa.bit_size == 32) if (intrin->dest.ssa.bit_size == 32)
@@ -140,7 +141,8 @@ lower_mem_load_bit_size(nir_builder *b, nir_intrinsic_instr *intrin)
} }
static bool static bool
lower_mem_store_bit_size(nir_builder *b, nir_intrinsic_instr *intrin) lower_mem_store_bit_size(nir_builder *b, nir_intrinsic_instr *intrin,
const struct gen_device_info *devinfo)
{ {
assert(intrin->src[0].is_ssa); assert(intrin->src[0].is_ssa);
nir_ssa_def *value = intrin->src[0].ssa; nir_ssa_def *value = intrin->src[0].ssa;
@@ -223,7 +225,8 @@ lower_mem_store_bit_size(nir_builder *b, nir_intrinsic_instr *intrin)
} }
static bool static bool
lower_mem_access_bit_sizes_impl(nir_function_impl *impl) lower_mem_access_bit_sizes_impl(nir_function_impl *impl,
const struct gen_device_info *devinfo)
{ {
bool progress = false; bool progress = false;
@@ -242,14 +245,14 @@ lower_mem_access_bit_sizes_impl(nir_function_impl *impl)
case nir_intrinsic_load_global: case nir_intrinsic_load_global:
case nir_intrinsic_load_ssbo: case nir_intrinsic_load_ssbo:
case nir_intrinsic_load_shared: case nir_intrinsic_load_shared:
if (lower_mem_load_bit_size(&b, intrin)) if (lower_mem_load_bit_size(&b, intrin, devinfo))
progress = true; progress = true;
break; break;
case nir_intrinsic_store_global: case nir_intrinsic_store_global:
case nir_intrinsic_store_ssbo: case nir_intrinsic_store_ssbo:
case nir_intrinsic_store_shared: case nir_intrinsic_store_shared:
if (lower_mem_store_bit_size(&b, intrin)) if (lower_mem_store_bit_size(&b, intrin, devinfo))
progress = true; progress = true;
break; break;
@@ -284,12 +287,13 @@ lower_mem_access_bit_sizes_impl(nir_function_impl *impl)
* handle in hardware and with a trivial write-mask. * handle in hardware and with a trivial write-mask.
*/ */
bool bool
brw_nir_lower_mem_access_bit_sizes(nir_shader *shader) brw_nir_lower_mem_access_bit_sizes(nir_shader *shader,
const struct gen_device_info *devinfo)
{ {
bool progress = false; bool progress = false;
nir_foreach_function(func, shader) { nir_foreach_function(func, shader) {
if (func->impl && lower_mem_access_bit_sizes_impl(func->impl)) if (func->impl && lower_mem_access_bit_sizes_impl(func->impl, devinfo))
progress = true; progress = true;
} }