X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fauxiliary%2Fgallivm%2Flp_bld_nir.c;h=f407f6204c045960ad62a9f03a9c9a748dc25422;hb=e5899c1e8818f7cfdd23c06c504009e5659794b7;hp=171d452ff0e98fc015a3e14bcd6294d2f74c81ec;hpb=be8a10e2651d362b61a5566092a13311ba1ffe26;p=mesa.git diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir.c b/src/gallium/auxiliary/gallivm/lp_bld_nir.c index 171d452ff0e..f407f6204c0 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_nir.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_nir.c @@ -353,8 +353,13 @@ static LLVMValueRef split_64bit(struct lp_build_nir_context *bld_base, LLVMValueRef shuffles2[LP_MAX_VECTOR_WIDTH/32]; int len = bld_base->base.type.length * 2; for (unsigned i = 0; i < bld_base->base.type.length; i++) { +#if UTIL_ARCH_LITTLE_ENDIAN shuffles[i] = lp_build_const_int32(gallivm, i * 2); shuffles2[i] = lp_build_const_int32(gallivm, (i * 2) + 1); +#else + shuffles[i] = lp_build_const_int32(gallivm, (i * 2) + 1); + shuffles2[i] = lp_build_const_int32(gallivm, (i * 2)); +#endif } src = LLVMBuildBitCast(gallivm->builder, src, LLVMVectorType(LLVMInt32TypeInContext(gallivm->context), len), ""); @@ -378,8 +383,13 @@ merge_64bit(struct lp_build_nir_context *bld_base, assert(len <= (2 * (LP_MAX_VECTOR_WIDTH/32))); for (i = 0; i < bld_base->base.type.length * 2; i+=2) { +#if UTIL_ARCH_LITTLE_ENDIAN shuffles[i] = lp_build_const_int32(gallivm, i / 2); shuffles[i + 1] = lp_build_const_int32(gallivm, i / 2 + bld_base->base.type.length); +#else + shuffles[i] = lp_build_const_int32(gallivm, i / 2 + bld_base->base.type.length); + shuffles[i + 1] = lp_build_const_int32(gallivm, i / 2); +#endif } return LLVMBuildShuffleVector(builder, input, input2, LLVMConstVector(shuffles, len), ""); } @@ -566,7 +576,7 @@ static LLVMValueRef do_alu_action(struct lp_build_nir_context *bld_base, case nir_op_fmax: result = lp_build_max(get_flt_bld(bld_base, src_bit_size[0]), src[0], src[1]); break; - case nir_op_fne32: + case nir_op_fneu32: result = fcmp32(bld_base, PIPE_FUNC_NOTEQUAL, src_bit_size[0], src); break; case nir_op_fneg: @@ -679,6 +689,7 @@ static LLVMValueRef do_alu_action(struct lp_build_nir_context *bld_base, result = lp_build_or(get_int_bld(bld_base, false, src_bit_size[0]), src[0], src[1]); break; + case nir_op_imod: case nir_op_irem: result = do_int_mod(bld_base, false, src_bit_size[0], src[0], src[1]); break; @@ -865,7 +876,7 @@ static void visit_load_const(struct lp_build_nir_context *bld_base, LLVMValueRef result[NIR_MAX_VEC_COMPONENTS]; struct lp_build_context *int_bld = get_int_bld(bld_base, true, instr->def.bit_size); for (unsigned i = 0; i < instr->def.num_components; i++) - result[i] = lp_build_const_int_vec(bld_base->base.gallivm, int_bld->type, instr->value[i].u64); + result[i] = lp_build_const_int_vec(bld_base->base.gallivm, int_bld->type, instr->def.bit_size == 32 ? instr->value[i].u32 : instr->value[i].u64); assign_ssa_dest(bld_base, &instr->def, result); } @@ -1009,6 +1020,19 @@ static void visit_load_ubo(struct lp_build_nir_context *bld_base, offset_is_uniform, idx, offset, result); } +static void visit_load_push_constant(struct lp_build_nir_context *bld_base, + nir_intrinsic_instr *instr, + LLVMValueRef result[4]) +{ + struct gallivm_state *gallivm = bld_base->base.gallivm; + LLVMValueRef offset = get_src(bld_base, instr->src[0]); + LLVMValueRef idx = lp_build_const_int32(gallivm, 0); + bool offset_is_uniform = nir_src_is_dynamically_uniform(instr->src[0]); + + bld_base->load_ubo(bld_base, nir_dest_num_components(instr->dest), nir_dest_bit_size(instr->dest), + offset_is_uniform, idx, offset, result); +} + static void visit_load_ssbo(struct lp_build_nir_context *bld_base, nir_intrinsic_instr *instr, @@ -1067,6 +1091,10 @@ static void visit_load_image(struct lp_build_nir_context *bld_base, LLVMValueRef coords[5]; struct lp_img_params params; const struct glsl_type *type = glsl_without_array(var->type); + unsigned const_index; + LLVMValueRef indir_index; + get_deref_offset(bld_base, deref, false, NULL, NULL, + &const_index, &indir_index); memset(¶ms, 0, sizeof(params)); params.target = glsl_sampler_to_pipe(glsl_get_sampler_dim(type), glsl_sampler_type_is_array(type)); @@ -1078,7 +1106,10 @@ static void visit_load_image(struct lp_build_nir_context *bld_base, params.coords = coords; params.outdata = result; params.img_op = LP_IMG_LOAD; - params.image_index = var->data.binding; + if (glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_MS) + params.ms_index = get_src(bld_base, instr->src[2]); + params.image_index = var->data.binding + (indir_index ? 0 : const_index); + params.image_index_offset = indir_index; bld_base->image_op(bld_base, ¶ms); } @@ -1094,6 +1125,10 @@ static void visit_store_image(struct lp_build_nir_context *bld_base, LLVMValueRef coords[5]; struct lp_img_params params; const struct glsl_type *type = glsl_without_array(var->type); + unsigned const_index; + LLVMValueRef indir_index; + get_deref_offset(bld_base, deref, false, NULL, NULL, + &const_index, &indir_index); memset(¶ms, 0, sizeof(params)); params.target = glsl_sampler_to_pipe(glsl_get_sampler_dim(type), glsl_sampler_type_is_array(type)); @@ -1107,8 +1142,11 @@ static void visit_store_image(struct lp_build_nir_context *bld_base, params.indata[i] = LLVMBuildExtractValue(builder, in_val, i, ""); params.indata[i] = LLVMBuildBitCast(builder, params.indata[i], bld_base->base.vec_type, ""); } + if (glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_MS) + params.ms_index = get_src(bld_base, instr->src[2]); params.img_op = LP_IMG_STORE; - params.image_index = var->data.binding; + params.image_index = var->data.binding + (indir_index ? 0 : const_index); + params.image_index_offset = indir_index; if (params.target == PIPE_TEXTURE_1D_ARRAY) coords[2] = coords[1]; @@ -1128,6 +1166,10 @@ static void visit_atomic_image(struct lp_build_nir_context *bld_base, LLVMValueRef in_val = get_src(bld_base, instr->src[3]); LLVMValueRef coords[5]; const struct glsl_type *type = glsl_without_array(var->type); + unsigned const_index; + LLVMValueRef indir_index; + get_deref_offset(bld_base, deref, false, NULL, NULL, + &const_index, &indir_index); memset(¶ms, 0, sizeof(params)); @@ -1169,6 +1211,8 @@ static void visit_atomic_image(struct lp_build_nir_context *bld_base, if (params.target == PIPE_TEXTURE_1D_ARRAY) coords[2] = coords[1]; params.coords = coords; + if (glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_MS) + params.ms_index = get_src(bld_base, instr->src[2]); if (instr->intrinsic == nir_intrinsic_image_deref_atomic_comp_swap) { LLVMValueRef cas_val = get_src(bld_base, instr->src[4]); params.indata[0] = in_val; @@ -1178,7 +1222,8 @@ static void visit_atomic_image(struct lp_build_nir_context *bld_base, params.outdata = result; params.img_op = (instr->intrinsic == nir_intrinsic_image_deref_atomic_comp_swap) ? LP_IMG_ATOMIC_CAS : LP_IMG_ATOMIC; - params.image_index = var->data.binding; + params.image_index = var->data.binding + (indir_index ? 0 : const_index); + params.image_index_offset = indir_index; bld_base->image_op(bld_base, ¶ms); } @@ -1191,9 +1236,37 @@ static void visit_image_size(struct lp_build_nir_context *bld_base, nir_deref_instr *deref = nir_instr_as_deref(instr->src[0].ssa->parent_instr); nir_variable *var = nir_deref_instr_get_variable(deref); struct lp_sampler_size_query_params params = { 0 }; - params.texture_unit = var->data.binding; - params.target = glsl_sampler_to_pipe(glsl_get_sampler_dim(var->type), glsl_sampler_type_is_array(var->type)); + unsigned const_index; + LLVMValueRef indir_index; + const struct glsl_type *type = glsl_without_array(var->type); + get_deref_offset(bld_base, deref, false, NULL, NULL, + &const_index, &indir_index); + params.texture_unit = var->data.binding + (indir_index ? 0 : const_index); + params.texture_unit_offset = indir_index; + params.target = glsl_sampler_to_pipe(glsl_get_sampler_dim(type), glsl_sampler_type_is_array(type)); + params.sizes_out = result; + + bld_base->image_size(bld_base, ¶ms); +} + +static void visit_image_samples(struct lp_build_nir_context *bld_base, + nir_intrinsic_instr *instr, + LLVMValueRef result[NIR_MAX_VEC_COMPONENTS]) +{ + nir_deref_instr *deref = nir_instr_as_deref(instr->src[0].ssa->parent_instr); + nir_variable *var = nir_deref_instr_get_variable(deref); + struct lp_sampler_size_query_params params = { 0 }; + unsigned const_index; + LLVMValueRef indir_index; + const struct glsl_type *type = glsl_without_array(var->type); + get_deref_offset(bld_base, deref, false, NULL, NULL, + &const_index, &indir_index); + + params.texture_unit = var->data.binding + (indir_index ? 0 : const_index); + params.texture_unit_offset = indir_index; + params.target = glsl_sampler_to_pipe(glsl_get_sampler_dim(type), glsl_sampler_type_is_array(type)); params.sizes_out = result; + params.samples_only = true; bld_base->image_size(bld_base, ¶ms); } @@ -1294,6 +1367,35 @@ static void visit_global_atomic(struct lp_build_nir_context *bld_base, bld_base->atomic_global(bld_base, instr->intrinsic, addr_bitsize, addr, val, val2, &result[0]); } +static void visit_interp(struct lp_build_nir_context *bld_base, + nir_intrinsic_instr *instr, + LLVMValueRef result[NIR_MAX_VEC_COMPONENTS]) +{ + struct gallivm_state *gallivm = bld_base->base.gallivm; + LLVMBuilderRef builder = gallivm->builder; + nir_deref_instr *deref = nir_instr_as_deref(instr->src[0].ssa->parent_instr); + unsigned num_components = nir_dest_num_components(instr->dest); + nir_variable *var = nir_deref_instr_get_variable(deref); + unsigned const_index; + LLVMValueRef indir_index; + LLVMValueRef offsets[2] = { NULL, NULL }; + get_deref_offset(bld_base, deref, false, NULL, NULL, + &const_index, &indir_index); + bool centroid = instr->intrinsic == nir_intrinsic_interp_deref_at_centroid; + bool sample = false; + if (instr->intrinsic == nir_intrinsic_interp_deref_at_offset) { + for (unsigned i = 0; i < 2; i++) { + offsets[i] = LLVMBuildExtractValue(builder, get_src(bld_base, instr->src[1]), i, ""); + offsets[i] = cast_type(bld_base, offsets[i], nir_type_float, 32); + } + } else if (instr->intrinsic == nir_intrinsic_interp_deref_at_sample) { + offsets[0] = get_src(bld_base, instr->src[1]); + offsets[0] = cast_type(bld_base, offsets[0], nir_type_int, 32); + sample = true; + } + bld_base->interp_at(bld_base, num_components, var, centroid, sample, const_index, indir_index, offsets, result); +} + static void visit_intrinsic(struct lp_build_nir_context *bld_base, nir_intrinsic_instr *instr) { @@ -1308,6 +1410,9 @@ static void visit_intrinsic(struct lp_build_nir_context *bld_base, case nir_intrinsic_load_ubo: visit_load_ubo(bld_base, instr, result); break; + case nir_intrinsic_load_push_constant: + visit_load_push_constant(bld_base, instr, result); + break; case nir_intrinsic_load_ssbo: visit_load_ssbo(bld_base, instr, result); break; @@ -1334,6 +1439,9 @@ static void visit_intrinsic(struct lp_build_nir_context *bld_base, case nir_intrinsic_load_tess_level_outer: case nir_intrinsic_load_tess_level_inner: case nir_intrinsic_load_patch_vertices_in: + case nir_intrinsic_load_sample_id: + case nir_intrinsic_load_sample_pos: + case nir_intrinsic_load_sample_mask_in: bld_base->sysval_intrin(bld_base, instr, result); break; case nir_intrinsic_load_helper_invocation: @@ -1382,6 +1490,9 @@ static void visit_intrinsic(struct lp_build_nir_context *bld_base, case nir_intrinsic_image_deref_size: visit_image_size(bld_base, instr, result); break; + case nir_intrinsic_image_deref_samples: + visit_image_samples(bld_base, instr, result); + break; case nir_intrinsic_load_shared: visit_shared_load(bld_base, instr, result); break; @@ -1403,6 +1514,7 @@ static void visit_intrinsic(struct lp_build_nir_context *bld_base, case nir_intrinsic_control_barrier: visit_barrier(bld_base); break; + case nir_intrinsic_group_memory_barrier: case nir_intrinsic_memory_barrier: case nir_intrinsic_memory_barrier_shared: case nir_intrinsic_memory_barrier_buffer: @@ -1429,11 +1541,17 @@ static void visit_intrinsic(struct lp_build_nir_context *bld_base, case nir_intrinsic_global_atomic_exchange: case nir_intrinsic_global_atomic_comp_swap: visit_global_atomic(bld_base, instr, result); + break; case nir_intrinsic_vote_all: case nir_intrinsic_vote_any: case nir_intrinsic_vote_ieq: bld_base->vote(bld_base, cast_type(bld_base, get_src(bld_base, instr->src[0]), nir_type_int, 32), instr, result); break; + case nir_intrinsic_interp_deref_at_offset: + case nir_intrinsic_interp_deref_at_centroid: + case nir_intrinsic_interp_deref_at_sample: + visit_interp(bld_base, instr, result); + break; default: assert(0); break; @@ -1445,15 +1563,18 @@ static void visit_intrinsic(struct lp_build_nir_context *bld_base, static void visit_txs(struct lp_build_nir_context *bld_base, nir_tex_instr *instr) { - struct lp_sampler_size_query_params params; + struct lp_sampler_size_query_params params = { 0 }; LLVMValueRef sizes_out[NIR_MAX_VEC_COMPONENTS]; LLVMValueRef explicit_lod = NULL; - + LLVMValueRef texture_unit_offset = NULL; for (unsigned i = 0; i < instr->num_srcs; i++) { switch (instr->src[i].src_type) { case nir_tex_src_lod: explicit_lod = cast_type(bld_base, get_src(bld_base, instr->src[i].src), nir_type_int, 32); break; + case nir_tex_src_texture_offset: + texture_unit_offset = get_src(bld_base, instr->src[i].src); + break; default: break; } @@ -1464,6 +1585,8 @@ static void visit_txs(struct lp_build_nir_context *bld_base, nir_tex_instr *inst params.explicit_lod = explicit_lod; params.is_sviewinfo = TRUE; params.sizes_out = sizes_out; + params.samples_only = (instr->op == nir_texop_texture_samples); + params.texture_unit_offset = texture_unit_offset; if (instr->op == nir_texop_query_levels) params.explicit_lod = bld_base->uint_bld.zero; @@ -1501,6 +1624,7 @@ static void visit_tex(struct lp_build_nir_context *bld_base, nir_tex_instr *inst unsigned sample_key = 0; nir_deref_instr *texture_deref_instr = NULL; nir_deref_instr *sampler_deref_instr = NULL; + LLVMValueRef texture_unit_offset = NULL; LLVMValueRef texel[NIR_MAX_VEC_COMPONENTS]; unsigned lod_src = 0; LLVMValueRef coord_undef = LLVMGetUndef(bld_base->base.int_vec_type); @@ -1508,7 +1632,7 @@ static void visit_tex(struct lp_build_nir_context *bld_base, nir_tex_instr *inst memset(¶ms, 0, sizeof(params)); enum lp_sampler_lod_property lod_property = LP_SAMPLER_LOD_SCALAR; - if (instr->op == nir_texop_txs || instr->op == nir_texop_query_levels) { + if (instr->op == nir_texop_txs || instr->op == nir_texop_query_levels || instr->op == nir_texop_texture_samples) { visit_txs(bld_base, instr); return; } @@ -1613,6 +1737,12 @@ static void visit_tex(struct lp_build_nir_context *bld_base, nir_tex_instr *inst sample_key |= LP_SAMPLER_FETCH_MS; ms_index = cast_type(bld_base, get_src(bld_base, instr->src[i].src), nir_type_int, 32); break; + + case nir_tex_src_texture_offset: + texture_unit_offset = get_src(bld_base, instr->src[i].src); + break; + case nir_tex_src_sampler_offset: + break; default: assert(0); break; @@ -1645,11 +1775,17 @@ static void visit_tex(struct lp_build_nir_context *bld_base, nir_tex_instr *inst coords[4] = lp_build_mul(&bld_base->base, coords[4], projector); } - uint32_t base_index = 0; - if (!texture_deref_instr) { + uint32_t samp_base_index = 0, tex_base_index = 0; + if (!sampler_deref_instr) { int samp_src_index = nir_tex_instr_src_index(instr, nir_tex_src_sampler_handle); if (samp_src_index == -1) { - base_index = instr->sampler_index; + samp_base_index = instr->sampler_index; + } + } + if (!texture_deref_instr) { + int tex_src_index = nir_tex_instr_src_index(instr, nir_tex_src_texture_handle); + if (tex_src_index == -1) { + tex_base_index = instr->texture_index; } } @@ -1668,8 +1804,9 @@ static void visit_tex(struct lp_build_nir_context *bld_base, nir_tex_instr *inst sample_key |= lod_property << LP_SAMPLER_LOD_PROPERTY_SHIFT; params.sample_key = sample_key; params.offsets = offsets; - params.texture_index = base_index; - params.sampler_index = base_index; + params.texture_index = tex_base_index; + params.texture_index_offset = texture_unit_offset; + params.sampler_index = samp_base_index; params.coords = coords; params.texel = texel; params.lod = explicit_lod; @@ -1847,9 +1984,9 @@ bool lp_build_nir_llvm( nir_convert_from_ssa(nir, true); nir_lower_locals_to_regs(nir); nir_remove_dead_derefs(nir); - nir_remove_dead_variables(nir, nir_var_function_temp); + nir_remove_dead_variables(nir, nir_var_function_temp, NULL); - nir_foreach_variable(variable, &nir->outputs) + nir_foreach_shader_out_variable(variable, nir) handle_shader_output_decl(bld_base, nir, variable); bld_base->regs = _mesa_hash_table_create(NULL, _mesa_hash_pointer,