Module: Mesa Branch: main Commit: c24a635d1cf1cd538c503a37c2a3535409a01e46 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c24a635d1cf1cd538c503a37c2a3535409a01e46
Author: Alejandro Piñeiro <apinhe...@igalia.com> Date: Wed Oct 4 13:30:13 2023 +0200 broadcom/compiler: add v3d_pack_unnormalized_coordinates helper So far we were packing by hand unnormalized coordinates at the V3D41_TMU_CONFIG_PARAMETER_1 pack structure. To get this working we hardcoded V3D_VERSION to 41 at v3dv_uniforms, that works for v71 because the structure are the same. But that is somewhat ugly, and will not work if a new hw generation have a different structure. Additionally, we found that for v3d this will be also needed. So this commit adds a helper on the compiler. For now, and to simplify it also use just one method for both generations. This solves the problem of the same code needed on both v3d and v3dv. But the idea is that in the future we need a similar need, but the structure different on each generation, it would have used a similar approach to other generation dependent function calls (like v3d40_vir_emit_tex), having the implementation on a source file that can safely include the hw generation headers. Reviewed-by: Iago Toral Quiroga <ito...@igalia.com> Reviewed-by: Eric Engestrom <e...@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25544> --- src/broadcom/compiler/meson.build | 1 + src/broadcom/compiler/v3d_compiler.h | 4 +++ src/broadcom/compiler/v3d_packing.c | 50 ++++++++++++++++++++++++++++++++++++ src/broadcom/vulkan/v3dv_uniforms.c | 16 ++---------- 4 files changed, 57 insertions(+), 14 deletions(-) diff --git a/src/broadcom/compiler/meson.build b/src/broadcom/compiler/meson.build index 2d38b2dd938..453af22aecc 100644 --- a/src/broadcom/compiler/meson.build +++ b/src/broadcom/compiler/meson.build @@ -43,6 +43,7 @@ libbroadcom_compiler_files = files( 'v3d_nir_lower_logic_ops.c', 'v3d_nir_lower_scratch.c', 'v3d_nir_lower_txf_ms.c', + 'v3d_packing.c', ) libbroadcom_compiler = static_library( diff --git a/src/broadcom/compiler/v3d_compiler.h b/src/broadcom/compiler/v3d_compiler.h index 095b33c03b8..78f6c0c0db9 100644 --- a/src/broadcom/compiler/v3d_compiler.h +++ b/src/broadcom/compiler/v3d_compiler.h @@ -1077,6 +1077,10 @@ v3d_compute_vpm_config(struct v3d_device_info *devinfo, struct v3d_gs_prog_data *gs, struct vpm_config *vpm_cfg_bin, struct vpm_config *vpm_cfg); +void +v3d_pack_unnormalized_coordinates(struct v3d_device_info *devinfo, + uint32_t *p1_packed, + bool unnormalized_coordinates); static inline bool vir_has_uniform(struct qinst *inst) diff --git a/src/broadcom/compiler/v3d_packing.c b/src/broadcom/compiler/v3d_packing.c new file mode 100644 index 00000000000..46643edd5e6 --- /dev/null +++ b/src/broadcom/compiler/v3d_packing.c @@ -0,0 +1,50 @@ +/* + * Copyright © 2023 Raspberry Pi Ltd + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include "v3d_compiler.h" + +#define __gen_user_data void +#define __gen_address_type uint32_t +#define __gen_address_offset(reloc) (*reloc) +#define __gen_emit_reloc(cl, reloc) +#define __gen_unpack_address(cl, s, e) (__gen_unpack_uint(cl, s, e) << (31 - (e - s))) +#include "cle/v3d_packet_v42_pack.h" + + +/* Typically, this method would wrap calling version-specific variant of this + * method, but as TMU_CONFIG_PARAMETER_1 doesn't change between v42 and v71, + * we can assume that p1_packed is the same struct, and use the same method. + */ +void +v3d_pack_unnormalized_coordinates(struct v3d_device_info *devinfo, + uint32_t *p1_packed, + bool unnormalized_coordinates) +{ + assert(devinfo->ver == 71 || devinfo->ver == 42); + + struct V3D42_TMU_CONFIG_PARAMETER_1 p1_unpacked; + V3D42_TMU_CONFIG_PARAMETER_1_unpack((uint8_t *)p1_packed, &p1_unpacked); + p1_unpacked.unnormalized_coordinates = unnormalized_coordinates; + V3D42_TMU_CONFIG_PARAMETER_1_pack(NULL, (uint8_t *)p1_packed, + &p1_unpacked); +} diff --git a/src/broadcom/vulkan/v3dv_uniforms.c b/src/broadcom/vulkan/v3dv_uniforms.c index 098bfb64821..3e311eb76ec 100644 --- a/src/broadcom/vulkan/v3dv_uniforms.c +++ b/src/broadcom/vulkan/v3dv_uniforms.c @@ -27,15 +27,6 @@ #include "v3dv_private.h" -/* The only version specific structure that we need is - * TMU_CONFIG_PARAMETER_1. This didn't seem to change significantly from - * previous V3D versions and we don't expect that to change, so for now let's - * just hardcode the V3D version here. - */ -#define V3D_VERSION 41 -#include "broadcom/common/v3d_macros.h" -#include "broadcom/cle/v3dx_pack.h" - /* Our Vulkan resource indices represent indices in descriptor maps which * include all shader stages, so we need to size the arrays below * accordingly. For now we only support a maximum of 3 stages: VS, GS, FS. @@ -223,11 +214,8 @@ write_tmu_p1(struct v3dv_cmd_buffer *cmd_buffer, /* Set unnormalized coordinates flag from sampler object */ uint32_t p1_packed = v3d_unit_data_get_offset(data); if (sampler->unnormalized_coordinates) { - struct V3DX(TMU_CONFIG_PARAMETER_1) p1_unpacked; - V3DX(TMU_CONFIG_PARAMETER_1_unpack)((uint8_t *)&p1_packed, &p1_unpacked); - p1_unpacked.unnormalized_coordinates = true; - V3DX(TMU_CONFIG_PARAMETER_1_pack)(NULL, (uint8_t *)&p1_packed, - &p1_unpacked); + v3d_pack_unnormalized_coordinates(&cmd_buffer->device->devinfo, &p1_packed, + sampler->unnormalized_coordinates); } cl_aligned_u32(uniforms, sampler_state_reloc.bo->offset +
