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

nir/lower_images: extract from clover

Browse Source 
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17334>
This commit is contained in:
Karol Herbst
2022-07-02 18:50:55 +02:00
committed by Marge Bot
parent 01500198a6
commit 31ed24cec7
4 changed files with 172 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/nir/meson.build
View File

@@ -138,6 +138,7 @@ files_libnir = files(
'nir_lower_bool_to_bitsize.c',
'nir_lower_bool_to_float.c',
'nir_lower_bool_to_int32.c',
'nir_lower_cl_images.c',
'nir_lower_clamp_color_outputs.c',
'nir_lower_clip.c',
'nir_lower_clip_cull_distance_arrays.c',

1
src/compiler/nir/nir.h
View File

@@ -5434,6 +5434,7 @@ bool nir_lower_ssa_defs_to_regs_block(nir_block *block);
bool nir_rematerialize_derefs_in_use_blocks_impl(nir_function_impl *impl);
bool nir_lower_samplers(nir_shader *shader);
bool nir_lower_cl_images(nir_shader *shader);
bool nir_lower_ssbo(nir_shader *shader);
typedef struct nir_lower_printf_options {

169
src/compiler/nir/nir_lower_cl_images.c Normal file
View File

@@ -0,0 +1,169 @@
/* SPDX-License-Identifier: MIT */
#include "nir.h"
#include "nir_builder.h"
bool
nir_lower_cl_images(nir_shader *shader)
{
nir_function_impl *impl = nir_shader_get_entrypoint(shader);
ASSERTED int last_loc = -1;
int num_rd_images = 0, num_wr_images = 0;
nir_foreach_image_variable(var, shader) {
/* Assume they come in order */
assert(var->data.location > last_loc);
last_loc = var->data.location;
if (var->data.access & ACCESS_NON_WRITEABLE)
var->data.driver_location = num_rd_images++;
else
var->data.driver_location = num_wr_images++;
}
shader->info.num_textures = num_rd_images;
BITSET_ZERO(shader->info.textures_used);
if (num_rd_images)
BITSET_SET_RANGE(shader->info.textures_used, 0, num_rd_images - 1);
BITSET_ZERO(shader->info.images_used);
if (num_wr_images)
BITSET_SET_RANGE(shader->info.images_used, 0, num_wr_images - 1);
shader->info.num_images = num_wr_images;
last_loc = -1;
int num_samplers = 0;
nir_foreach_uniform_variable(var, shader) {
if (var->type == glsl_bare_sampler_type()) {
/* Assume they come in order */
assert(var->data.location > last_loc);
last_loc = var->data.location;
var->data.driver_location = num_samplers++;
} else {
/* CL shouldn't have any sampled images */
assert(!glsl_type_is_sampler(var->type));
}
}
BITSET_ZERO(shader->info.samplers_used);
if (num_samplers)
BITSET_SET_RANGE(shader->info.samplers_used, 0, num_samplers - 1);
nir_builder b;
nir_builder_init(&b, impl);
bool progress = false;
nir_foreach_block_reverse(block, impl) {
nir_foreach_instr_reverse_safe(instr, block) {
switch (instr->type) {
case nir_instr_type_deref: {
nir_deref_instr *deref = nir_instr_as_deref(instr);
if (deref->deref_type != nir_deref_type_var)
break;
if (!glsl_type_is_image(deref->type) &&
!glsl_type_is_sampler(deref->type))
break;
b.cursor = nir_instr_remove(&deref->instr);
nir_ssa_def *loc =
nir_imm_intN_t(&b, deref->var->data.driver_location,
deref->dest.ssa.bit_size);
nir_ssa_def_rewrite_uses(&deref->dest.ssa, loc);
progress = true;
break;
}
case nir_instr_type_tex: {
nir_tex_instr *tex = nir_instr_as_tex(instr);
unsigned count = 0;
for (unsigned i = 0; i < tex->num_srcs; i++) {
if (tex->src[i].src_type == nir_tex_src_texture_deref ||
tex->src[i].src_type == nir_tex_src_sampler_deref) {
nir_deref_instr *deref = nir_src_as_deref(tex->src[i].src);
if (deref->deref_type == nir_deref_type_var) {
/* In this case, we know the actual variable */
if (tex->src[i].src_type == nir_tex_src_texture_deref)
tex->texture_index = deref->var->data.driver_location;
else
tex->sampler_index = deref->var->data.driver_location;
/* This source gets discarded */
nir_instr_rewrite_src(&tex->instr, &tex->src[i].src,
NIR_SRC_INIT);
continue;
} else {
assert(tex->src[i].src.is_ssa);
b.cursor = nir_before_instr(&tex->instr);
/* Back-ends expect a 32-bit thing, not 64-bit */
nir_ssa_def *offset = nir_u2u32(&b, tex->src[i].src.ssa);
if (tex->src[i].src_type == nir_tex_src_texture_deref)
tex->src[count].src_type = nir_tex_src_texture_offset;
else
tex->src[count].src_type = nir_tex_src_sampler_offset;
nir_instr_rewrite_src(&tex->instr, &tex->src[count].src,
nir_src_for_ssa(offset));
}
} else {
/* If we've removed a source, move this one down */
if (count != i) {
assert(count < i);
tex->src[count].src_type = tex->src[i].src_type;
nir_instr_move_src(&tex->instr, &tex->src[count].src,
&tex->src[i].src);
}
}
count++;
}
tex->num_srcs = count;
progress = true;
break;
}
case nir_instr_type_intrinsic: {
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
switch (intrin->intrinsic) {
case nir_intrinsic_image_deref_load:
case nir_intrinsic_image_deref_store:
case nir_intrinsic_image_deref_atomic_add:
case nir_intrinsic_image_deref_atomic_imin:
case nir_intrinsic_image_deref_atomic_umin:
case nir_intrinsic_image_deref_atomic_imax:
case nir_intrinsic_image_deref_atomic_umax:
case nir_intrinsic_image_deref_atomic_and:
case nir_intrinsic_image_deref_atomic_or:
case nir_intrinsic_image_deref_atomic_xor:
case nir_intrinsic_image_deref_atomic_exchange:
case nir_intrinsic_image_deref_atomic_comp_swap:
case nir_intrinsic_image_deref_atomic_fadd:
case nir_intrinsic_image_deref_atomic_inc_wrap:
case nir_intrinsic_image_deref_atomic_dec_wrap:
case nir_intrinsic_image_deref_size:
case nir_intrinsic_image_deref_samples: {
assert(intrin->src[0].is_ssa);
b.cursor = nir_before_instr(&intrin->instr);
/* Back-ends expect a 32-bit thing, not 64-bit */
nir_ssa_def *offset = nir_u2u32(&b, intrin->src[0].ssa);
nir_rewrite_image_intrinsic(intrin, offset, false);
progress = true;
break;
}
default:
break;
}
break;
}
default:
break;
}
}
}
if (progress) {
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
} else {
nir_metadata_preserve(impl, nir_metadata_all);
}
return progress;
}

169
src/gallium/frontends/clover/nir/invocation.cpp
View File

@@ -99,173 +99,6 @@ clover_nir_add_image_uniforms(nir_shader *shader)
}
}
static bool
clover_nir_lower_images(nir_shader *shader)
{
nir_function_impl *impl = nir_shader_get_entrypoint(shader);
ASSERTED int last_loc = -1;
int num_rd_images = 0, num_wr_images = 0;
nir_foreach_image_variable(var, shader) {
/* Assume they come in order */
assert(var->data.location > last_loc);
last_loc = var->data.location;
if (var->data.access & ACCESS_NON_WRITEABLE)
var->data.driver_location = num_rd_images++;
else
var->data.driver_location = num_wr_images++;
}
shader->info.num_textures = num_rd_images;
BITSET_ZERO(shader->info.textures_used);
if (num_rd_images)
BITSET_SET_RANGE(shader->info.textures_used, 0, num_rd_images - 1);
BITSET_ZERO(shader->info.images_used);
if (num_wr_images)
BITSET_SET_RANGE(shader->info.images_used, 0, num_wr_images - 1);
shader->info.num_images = num_wr_images;
last_loc = -1;
int num_samplers = 0;
nir_foreach_uniform_variable(var, shader) {
if (var->type == glsl_bare_sampler_type()) {
/* Assume they come in order */
assert(var->data.location > last_loc);
last_loc = var->data.location;
/* TODO: Constant samplers */
var->data.driver_location = num_samplers++;
} else {
/* CL shouldn't have any sampled images */
assert(!glsl_type_is_sampler(var->type));
}
}
BITSET_ZERO(shader->info.samplers_used);
if (num_samplers)
BITSET_SET_RANGE(shader->info.samplers_used, 0, num_samplers - 1);
nir_builder b;
nir_builder_init(&b, impl);
bool progress = false;
nir_foreach_block_reverse(block, impl) {
nir_foreach_instr_reverse_safe(instr, block) {
switch (instr->type) {
case nir_instr_type_deref: {
nir_deref_instr *deref = nir_instr_as_deref(instr);
if (deref->deref_type != nir_deref_type_var)
break;
if (!glsl_type_is_image(deref->type) &&
!glsl_type_is_sampler(deref->type))
break;
b.cursor = nir_instr_remove(&deref->instr);
nir_ssa_def *loc =
nir_imm_intN_t(&b, deref->var->data.driver_location,
deref->dest.ssa.bit_size);
nir_ssa_def_rewrite_uses(&deref->dest.ssa, loc);
progress = true;
break;
}
case nir_instr_type_tex: {
nir_tex_instr *tex = nir_instr_as_tex(instr);
unsigned count = 0;
for (unsigned i = 0; i < tex->num_srcs; i++) {
if (tex->src[i].src_type == nir_tex_src_texture_deref ||
tex->src[i].src_type == nir_tex_src_sampler_deref) {
nir_deref_instr *deref = nir_src_as_deref(tex->src[i].src);
if (deref->deref_type == nir_deref_type_var) {
/* In this case, we know the actual variable */
if (tex->src[i].src_type == nir_tex_src_texture_deref)
tex->texture_index = deref->var->data.driver_location;
else
tex->sampler_index = deref->var->data.driver_location;
/* This source gets discarded */
nir_instr_rewrite_src(&tex->instr, &tex->src[i].src,
NIR_SRC_INIT);
continue;
} else {
assert(tex->src[i].src.is_ssa);
b.cursor = nir_before_instr(&tex->instr);
/* Back-ends expect a 32-bit thing, not 64-bit */
nir_ssa_def *offset = nir_u2u32(&b, tex->src[i].src.ssa);
if (tex->src[i].src_type == nir_tex_src_texture_deref)
tex->src[count].src_type = nir_tex_src_texture_offset;
else
tex->src[count].src_type = nir_tex_src_sampler_offset;
nir_instr_rewrite_src(&tex->instr, &tex->src[count].src,
nir_src_for_ssa(offset));
}
} else {
/* If we've removed a source, move this one down */
if (count != i) {
assert(count < i);
tex->src[count].src_type = tex->src[i].src_type;
nir_instr_move_src(&tex->instr, &tex->src[count].src,
&tex->src[i].src);
}
}
count++;
}
tex->num_srcs = count;
progress = true;
break;
}
case nir_instr_type_intrinsic: {
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
switch (intrin->intrinsic) {
case nir_intrinsic_image_deref_load:
case nir_intrinsic_image_deref_store:
case nir_intrinsic_image_deref_atomic_add:
case nir_intrinsic_image_deref_atomic_imin:
case nir_intrinsic_image_deref_atomic_umin:
case nir_intrinsic_image_deref_atomic_imax:
case nir_intrinsic_image_deref_atomic_umax:
case nir_intrinsic_image_deref_atomic_and:
case nir_intrinsic_image_deref_atomic_or:
case nir_intrinsic_image_deref_atomic_xor:
case nir_intrinsic_image_deref_atomic_exchange:
case nir_intrinsic_image_deref_atomic_comp_swap:
case nir_intrinsic_image_deref_atomic_fadd:
case nir_intrinsic_image_deref_atomic_inc_wrap:
case nir_intrinsic_image_deref_atomic_dec_wrap:
case nir_intrinsic_image_deref_size:
case nir_intrinsic_image_deref_samples: {
assert(intrin->src[0].is_ssa);
b.cursor = nir_before_instr(&intrin->instr);
/* Back-ends expect a 32-bit thing, not 64-bit */
nir_ssa_def *offset = nir_u2u32(&b, intrin->src[0].ssa);
nir_rewrite_image_intrinsic(intrin, offset, false);
progress = true;
break;
}
default:
break;
}
break;
}
default:
break;
}
}
}
if (progress) {
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
} else {
nir_metadata_preserve(impl, nir_metadata_all);
}
return progress;
}
struct clover_lower_nir_state {
std::vector<binary::argument> &args;
uint32_t global_dims;
@@ -543,7 +376,7 @@ binary clover::nir::spirv_to_nir(const binary &mod, const device &dev,
NIR_PASS_V(nir, nir_opt_deref);
NIR_PASS_V(nir, nir_lower_readonly_images_to_tex, false);
NIR_PASS_V(nir, clover_nir_lower_images);
NIR_PASS_V(nir, nir_lower_cl_images);
NIR_PASS_V(nir, nir_lower_memcpy);
/* use offsets for kernel inputs (uniform) */