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

nir: Rename get_buffer_size to get_ssbo_size

Browse Source 
This makes it explicit that this intrinsic is only for SSBOs.  For the
v3dv driver, we'll be adding a get_ubo_size intrinsic and we want to be
able to distinguish between the two.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6812>
This commit is contained in:
Jason Ekstrand
2020-09-22 03:24:45 -05:00
committed by Marge Bot
parent f100cf0d30
commit 9750164c09
25 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/amd/compiler/aco_instruction_selection.cpp
View File

@@ -6208,7 +6208,7 @@ void visit_atomic_ssbo(isel_context *ctx, nir_intrinsic_instr *instr)
ctx->block->instructions.emplace_back(std::move(mubuf));
}
void visit_get_buffer_size(isel_context *ctx, nir_intrinsic_instr *instr) {
void visit_get_ssbo_size(isel_context *ctx, nir_intrinsic_instr *instr) {
Temp index = convert_pointer_to_64_bit(ctx, get_ssa_temp(ctx, instr->src[0].ssa));
Builder bld(ctx->program, ctx->block);
@@ -7414,8 +7414,8 @@ void visit_intrinsic(isel_context *ctx, nir_intrinsic_instr *instr)
case nir_intrinsic_store_scratch:
visit_store_scratch(ctx, instr);
break;
case nir_intrinsic_get_buffer_size:
visit_get_buffer_size(ctx, instr);
case nir_intrinsic_get_ssbo_size:
visit_get_ssbo_size(ctx, instr);
break;
case nir_intrinsic_scoped_barrier:
emit_scoped_barrier(ctx, instr);

2
src/amd/compiler/aco_instruction_selection_setup.cpp
View File

@@ -896,7 +896,7 @@ void init_context(isel_context *ctx, nir_shader *shader)
case nir_intrinsic_load_num_subgroups:
case nir_intrinsic_load_first_vertex:
case nir_intrinsic_load_base_instance:
case nir_intrinsic_get_buffer_size:
case nir_intrinsic_get_ssbo_size:
case nir_intrinsic_vote_all:
case nir_intrinsic_vote_any:
case nir_intrinsic_read_first_invocation:

6
src/amd/llvm/ac_nir_to_llvm.c
View File

@@ -1569,7 +1569,7 @@ static LLVMValueRef visit_load_push_constant(struct ac_nir_context *ctx, nir_int
return LLVMBuildLoad(ctx->ac.builder, ptr, "");
}
static LLVMValueRef visit_get_buffer_size(struct ac_nir_context *ctx,
static LLVMValueRef visit_get_ssbo_size(struct ac_nir_context *ctx,
const nir_intrinsic_instr *instr)
{
LLVMValueRef index = get_src(ctx, instr->src[0]);
@@ -3716,8 +3716,8 @@ static void visit_intrinsic(struct ac_nir_context *ctx, nir_intrinsic_instr *ins
case nir_intrinsic_load_ubo:
result = visit_load_ubo_buffer(ctx, instr);
break;
case nir_intrinsic_get_buffer_size:
result = visit_get_buffer_size(ctx, instr);
case nir_intrinsic_get_ssbo_size:
result = visit_get_ssbo_size(ctx, instr);
break;
case nir_intrinsic_load_deref:
result = visit_load_var(ctx, instr);

2
src/broadcom/compiler/nir_to_vir.c
View File

@@ -2150,7 +2150,7 @@ ntq_emit_intrinsic(struct v3d_compile *c, nir_intrinsic_instr *instr)
v3d40_vir_emit_image_load_store(c, instr);
break;
case nir_intrinsic_get_buffer_size:
case nir_intrinsic_get_ssbo_size:
ntq_store_dest(c, &instr->dest, 0,
vir_uniform(c, QUNIFORM_GET_BUFFER_SIZE,
nir_src_as_uint(instr->src[0])));

2
src/compiler/glsl/glsl_to_nir.cpp
View File

@@ -2090,7 +2090,7 @@ nir_visitor::visit(ir_expression *ir)
case ir_unop_get_buffer_size: {
nir_intrinsic_instr *load = nir_intrinsic_instr_create(
this->shader,
nir_intrinsic_get_buffer_size);
nir_intrinsic_get_ssbo_size);
load->num_components = ir->type->vector_elements;
load->src[0] = nir_src_for_ssa(evaluate_rvalue(ir->operands[0]));
unsigned bit_size = glsl_get_bit_size(ir->type);

2
src/compiler/nir/nir_divergence_analysis.c
View File

@@ -267,7 +267,7 @@ visit_intrinsic(nir_intrinsic_instr *instr, struct divergence_state *state)
case nir_intrinsic_image_samples:
case nir_intrinsic_image_deref_samples:
case nir_intrinsic_bindless_image_samples:
case nir_intrinsic_get_buffer_size:
case nir_intrinsic_get_ssbo_size:
case nir_intrinsic_image_size:
case nir_intrinsic_image_deref_size:
case nir_intrinsic_bindless_image_size:

4
src/compiler/nir/nir_intrinsics.py
View File

@@ -194,9 +194,9 @@ intrinsic("interp_deref_at_vertex", src_comp=[1, 1], dest_comp=0,
intrinsic("deref_buffer_array_length", src_comp=[-1], dest_comp=1,
flags=[CAN_ELIMINATE, CAN_REORDER])
# Ask the driver for the size of a given buffer. It takes the buffer index
# Ask the driver for the size of a given SSBO. It takes the buffer index
# as source.
intrinsic("get_buffer_size", src_comp=[-1], dest_comp=1,
intrinsic("get_ssbo_size", src_comp=[-1], dest_comp=1,
flags=[CAN_ELIMINATE, CAN_REORDER])
# a barrier is an intrinsic with no inputs/outputs but which can't be moved

3
src/compiler/nir/nir_lower_io.c
View File

@@ -1653,6 +1653,7 @@ lower_explicit_io_array_length(nir_builder *b, nir_intrinsic_instr *intrin,
assert(glsl_type_is_array(deref->type));
assert(glsl_get_length(deref->type) == 0);
assert(deref->mode == nir_var_mem_ssbo);
unsigned stride = glsl_get_explicit_stride(deref->type);
assert(stride > 0);
@@ -1661,7 +1662,7 @@ lower_explicit_io_array_length(nir_builder *b, nir_intrinsic_instr *intrin,
nir_ssa_def *offset = addr_to_offset(b, addr, addr_format);
nir_intrinsic_instr *bsize =
nir_intrinsic_instr_create(b->shader, nir_intrinsic_get_buffer_size);
nir_intrinsic_instr_create(b->shader, nir_intrinsic_get_ssbo_size);
bsize->src[0] = nir_src_for_ssa(index);
nir_ssa_dest_init(&bsize->instr, &bsize->dest, 1, 32, NULL);
nir_builder_instr_insert(b, &bsize->instr);

2
src/compiler/spirv/vtn_variables.c
View File

@@ -2818,7 +2818,7 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode,
nir_intrinsic_instr *instr =
nir_intrinsic_instr_create(b->nb.shader,
nir_intrinsic_get_buffer_size);
nir_intrinsic_get_ssbo_size);
instr->src[0] = nir_src_for_ssa(ptr->block_index);
nir_ssa_dest_init(&instr->instr, &instr->dest, 1, 32, NULL);
nir_builder_instr_insert(&b->nb, &instr->instr);

2
src/freedreno/ir3/ir3_compiler_nir.c
View File

@@ -1678,7 +1678,7 @@ emit_intrinsic(struct ir3_context *ctx, nir_intrinsic_instr *intr)
ctx->so->no_earlyz = true;
ctx->funcs->emit_intrinsic_store_ssbo(ctx, intr);
break;
case nir_intrinsic_get_buffer_size:
case nir_intrinsic_get_ssbo_size:
emit_intrinsic_ssbo_size(ctx, intr, dst);
break;
case nir_intrinsic_ssbo_atomic_add_ir3:

2
src/freedreno/ir3/ir3_nir.c
View File

@@ -524,7 +524,7 @@ ir3_nir_scan_driver_consts(nir_shader *shader,
unsigned idx;
switch (intr->intrinsic) {
case nir_intrinsic_get_buffer_size:
case nir_intrinsic_get_ssbo_size:
if (ir3_bindless_resource(intr->src[0]))
break;
idx = nir_src_as_uint(intr->src[0]);

6
src/freedreno/ir3/ir3_shader.h
View File

@@ -127,7 +127,7 @@ struct ir3_ubo_analysis_state {
* be required, rather than allocating worst-case const space, we scan the
* shader and allocate consts as-needed:
*
* + SSBO sizes: only needed if shader has a get_buffer_size intrinsic
* + SSBO sizes: only needed if shader has a get_ssbo_size intrinsic
* for a given SSBO
*
* + Image dimensions: needed to calculate pixel offset, but only for
@@ -171,9 +171,9 @@ struct ir3_const_state {
} offsets;
struct {
uint32_t mask; /* bitmask of SSBOs that have get_buffer_size */
uint32_t mask; /* bitmask of SSBOs that have get_ssbo_size */
uint32_t count; /* number of consts allocated */
/* one const allocated per SSBO which has get_buffer_size,
/* one const allocated per SSBO which has get_ssbo_size,
* ssbo_sizes.off[ssbo_id] is offset from start of ssbo_sizes
* consts:
*/

2
src/freedreno/vulkan/tu_shader.c
View File

@@ -387,7 +387,7 @@ lower_intrinsic(nir_builder *b, nir_intrinsic_instr *instr,
case nir_intrinsic_ssbo_atomic_fmin:
case nir_intrinsic_ssbo_atomic_fmax:
case nir_intrinsic_ssbo_atomic_fcomp_swap:
case nir_intrinsic_get_buffer_size:
case nir_intrinsic_get_ssbo_size:
lower_ssbo_ubo_intrinsic(b, instr);
return true;

8
src/gallium/auxiliary/gallivm/lp_bld_nir.c
View File

@@ -1083,12 +1083,12 @@ static void visit_store_ssbo(struct lp_build_nir_context *bld_base,
bld_base->store_mem(bld_base, writemask, nc, bitsize, idx, offset, val);
}
static void visit_get_buffer_size(struct lp_build_nir_context *bld_base,
static void visit_get_ssbo_size(struct lp_build_nir_context *bld_base,
nir_intrinsic_instr *instr,
LLVMValueRef result[NIR_MAX_VEC_COMPONENTS])
{
LLVMValueRef idx = get_src(bld_base, instr->src[0]);
result[0] = bld_base->get_buffer_size(bld_base, idx);
result[0] = bld_base->get_ssbo_size(bld_base, idx);
}
static void visit_ssbo_atomic(struct lp_build_nir_context *bld_base,
@@ -1446,8 +1446,8 @@ static void visit_intrinsic(struct lp_build_nir_context *bld_base,
case nir_intrinsic_store_ssbo:
visit_store_ssbo(bld_base, instr);
break;
case nir_intrinsic_get_buffer_size:
visit_get_buffer_size(bld_base, instr, result);
case nir_intrinsic_get_ssbo_size:
visit_get_ssbo_size(bld_base, instr, result);
break;
case nir_intrinsic_load_vertex_id:
case nir_intrinsic_load_primitive_id:

2
src/gallium/auxiliary/gallivm/lp_bld_nir.h
View File

@@ -110,7 +110,7 @@ struct lp_build_nir_context
struct lp_img_params *params);
void (*image_size)(struct lp_build_nir_context *bld_base,
struct lp_sampler_size_query_params *params);
LLVMValueRef (*get_buffer_size)(struct lp_build_nir_context *bld_base,
LLVMValueRef (*get_ssbo_size)(struct lp_build_nir_context *bld_base,
LLVMValueRef index);
void (*load_var)(struct lp_build_nir_context *bld_base,

4
src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c
View File

@@ -1252,7 +1252,7 @@ static void emit_barrier(struct lp_build_nir_context *bld_base)
LLVMPositionBuilderAtEnd(gallivm->builder, resume);
}
static LLVMValueRef emit_get_buffer_size(struct lp_build_nir_context *bld_base,
static LLVMValueRef emit_get_ssbo_size(struct lp_build_nir_context *bld_base,
LLVMValueRef index)
{
struct gallivm_state *gallivm = bld_base->base.gallivm;
@@ -1890,7 +1890,7 @@ void lp_build_nir_soa(struct gallivm_state *gallivm,
bld.bld_base.end_primitive = end_primitive;
bld.bld_base.load_mem = emit_load_mem;
bld.bld_base.store_mem = emit_store_mem;
bld.bld_base.get_buffer_size = emit_get_buffer_size;
bld.bld_base.get_ssbo_size = emit_get_ssbo_size;
bld.bld_base.atomic_mem = emit_atomic_mem;
bld.bld_base.barrier = emit_barrier;
bld.bld_base.image_op = emit_image_op;

4
src/gallium/drivers/iris/iris_program.c
View File

@@ -879,7 +879,7 @@ iris_setup_binding_table(const struct gen_device_info *devinfo,
mark_used_with_src(bt, &intrin->src[1], IRIS_SURFACE_GROUP_SSBO);
break;
case nir_intrinsic_get_buffer_size:
case nir_intrinsic_get_ssbo_size:
case nir_intrinsic_ssbo_atomic_add:
case nir_intrinsic_ssbo_atomic_imin:
case nir_intrinsic_ssbo_atomic_umin:
@@ -984,7 +984,7 @@ iris_setup_binding_table(const struct gen_device_info *devinfo,
}
break;
case nir_intrinsic_get_buffer_size:
case nir_intrinsic_get_ssbo_size:
case nir_intrinsic_ssbo_atomic_add:
case nir_intrinsic_ssbo_atomic_imin:
case nir_intrinsic_ssbo_atomic_umin:

2
src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
View File

@@ -1997,7 +1997,7 @@ Converter::visit(nir_intrinsic_instr *insn)
}
break;
}
case nir_intrinsic_get_buffer_size: {
case nir_intrinsic_get_ssbo_size: {
LValues &newDefs = convert(&insn->dest);
const DataType dType = getDType(insn);
Value *indirectBuffer;

2
src/gallium/drivers/r600/sfn/sfn_emitssboinstruction.cpp
View File

@@ -98,7 +98,7 @@ bool EmitSSBOInstruction::do_emit(nir_instr* instr)
return emit_image_load(intr);
case nir_intrinsic_image_size:
return emit_image_size(intr);
case nir_intrinsic_get_buffer_size:
case nir_intrinsic_get_ssbo_size:
return emit_buffer_size(intr);
default:
return false;

2
src/intel/compiler/brw_fs_nir.cpp
View File

@@ -4750,7 +4750,7 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr
nir_emit_ssbo_atomic_float(bld, brw_aop_for_nir_intrinsic(instr), instr);
break;
case nir_intrinsic_get_buffer_size: {
case nir_intrinsic_get_ssbo_size: {
assert(nir_src_num_components(instr->src[0]) == 1);
unsigned ssbo_index = nir_src_is_const(instr->src[0]) ?
nir_src_as_uint(instr->src[0]) : 0;

2
src/intel/compiler/brw_vec4_nir.cpp
View File

@@ -437,7 +437,7 @@ vec4_visitor::nir_emit_intrinsic(nir_intrinsic_instr *instr)
break;
}
case nir_intrinsic_get_buffer_size: {
case nir_intrinsic_get_ssbo_size: {
assert(nir_src_num_components(instr->src[0]) == 1);
unsigned ssbo_index = nir_src_is_const(instr->src[0]) ?
nir_src_as_uint(instr->src[0]) : 0;

10
src/intel/vulkan/anv_nir_apply_pipeline_layout.c
View File

@@ -319,8 +319,8 @@ lower_direct_buffer_access(nir_function_impl *impl,
try_lower_direct_buffer_intrinsic(intrin, true, state);
break;
case nir_intrinsic_get_buffer_size: {
/* The get_buffer_size intrinsic always just takes a
case nir_intrinsic_get_ssbo_size: {
/* The get_ssbo_size intrinsic always just takes a
* index/reindex intrinsic.
*/
if (!find_descriptor_for_index_src(intrin->src[0], state))
@@ -674,7 +674,7 @@ lower_load_vulkan_descriptor(nir_intrinsic_instr *intrin,
}
static void
lower_get_buffer_size(nir_intrinsic_instr *intrin,
lower_get_ssbo_size(nir_intrinsic_instr *intrin,
struct apply_pipeline_layout_state *state)
{
if (_mesa_set_search(state->lowered_instrs, intrin))
@@ -1095,8 +1095,8 @@ apply_pipeline_layout_block(nir_block *block,
case nir_intrinsic_load_vulkan_descriptor:
lower_load_vulkan_descriptor(intrin, state);
break;
case nir_intrinsic_get_buffer_size:
lower_get_buffer_size(intrin, state);
case nir_intrinsic_get_ssbo_size:
lower_get_ssbo_size(intrin, state);
break;
case nir_intrinsic_image_deref_load:
case nir_intrinsic_image_deref_store:

2
src/panfrost/bifrost/bifrost_compile.c
View File

@@ -454,7 +454,7 @@ emit_intrinsic(bi_context *ctx, nir_intrinsic_instr *instr)
bi_emit_sysval(ctx, &instr->instr, 1, 0);
break;
case nir_intrinsic_get_buffer_size:
case nir_intrinsic_get_ssbo_size:
bi_emit_sysval(ctx, &instr->instr, 1, 8);
break;

2
src/panfrost/midgard/midgard_compile.c
View File

@@ -2006,7 +2006,7 @@ emit_intrinsic(compiler_context *ctx, nir_intrinsic_instr *instr)
emit_sysval_read(ctx, &instr->instr, 1, 0);
break;
case nir_intrinsic_get_buffer_size:
case nir_intrinsic_get_ssbo_size:
emit_sysval_read(ctx, &instr->instr, 1, 8);
break;

2
src/panfrost/util/pan_sysval.c
View File

@@ -59,7 +59,7 @@ panfrost_nir_sysval_for_intrinsic(nir_intrinsic_instr *instr)
case nir_intrinsic_load_num_work_groups:
return PAN_SYSVAL_NUM_WORK_GROUPS;
case nir_intrinsic_load_ssbo_address:
case nir_intrinsic_get_buffer_size:
case nir_intrinsic_get_ssbo_size:
return panfrost_sysval_for_ssbo(instr);
case nir_intrinsic_load_sampler_lod_parameters_pan:
return panfrost_sysval_for_sampler(instr);