Mesa (master): v3d: Emit the VCM_CACHE_SIZE packet.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Aug 6 20:07:12 UTC 2018
Module: Mesa
Branch: master
Commit: 1561e4984eb03d6946d19b820b83a96bbbd83b98
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1561e4984eb03d6946d19b820b83a96bbbd83b98
Author: Eric Anholt <eric at anholt.net>
Date: Thu Aug 2 12:23:02 2018 -0700
v3d: Emit the VCM_CACHE_SIZE packet.
This is needed to ensure that we don't get blocked waiting for VPM space
with bin/render overlapping.
Cc: "18.2" <mesa-stable at lists.freedesktop.org>
---
src/broadcom/cle/v3d_packet_v33.xml | 10 ++++++++++
src/broadcom/common/v3d_device_info.h | 7 ++++---
src/broadcom/compiler/v3d_compiler.h | 3 +++
src/broadcom/compiler/vir.c | 20 +++++++++++++++++++-
src/gallium/drivers/v3d/v3d_screen.c | 2 ++
src/gallium/drivers/v3d/v3dx_draw.c | 7 +++++++
6 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/src/broadcom/cle/v3d_packet_v33.xml b/src/broadcom/cle/v3d_packet_v33.xml
index 6ce8299e26..f471d542c5 100644
--- a/src/broadcom/cle/v3d_packet_v33.xml
+++ b/src/broadcom/cle/v3d_packet_v33.xml
@@ -528,6 +528,16 @@
<field name="number of attribute arrays" size="5" start="0" type="uint"/>
</packet>
+ <packet code="71" name="VCM Cache Size" min_ver="41">
+ <field name="Number of 16-vertex batches for rendering" size="4" start="4" type="uint"/>
+ <field name="Number of 16-vertex batches for binning" size="4" start="0" type="uint"/>
+ </packet>
+
+ <packet code="73" name="VCM Cache Size" max_ver="33">
+ <field name="Number of 16-vertex batches for rendering" size="4" start="4" type="uint"/>
+ <field name="Number of 16-vertex batches for binning" size="4" start="0" type="uint"/>
+ </packet>
+
<packet code="73" name="Transform Feedback Buffer" min_ver="41">
<field name="Buffer Address" size="32" start="32" type="address"/>
<field name="Buffer Size in 32-bit words" size="30" start="2" type="uint"/>
diff --git a/src/broadcom/common/v3d_device_info.h b/src/broadcom/common/v3d_device_info.h
index 5685c7a216..b0a2a02154 100644
--- a/src/broadcom/common/v3d_device_info.h
+++ b/src/broadcom/common/v3d_device_info.h
@@ -27,13 +27,14 @@
#include <stdint.h>
/**
- * Struct for tracking features of the V3D chip. This is where we'll store
- * boolean flags for features in a specific version, but for now it's just the
- * version
+ * Struct for tracking features of the V3D chip across driver and compiler.
*/
struct v3d_device_info {
/** Simple V3D version: major * 10 + minor */
uint8_t ver;
+
+ /** Size of the VPM, in bytes. */
+ int vpm_size;
};
#endif
diff --git a/src/broadcom/compiler/v3d_compiler.h b/src/broadcom/compiler/v3d_compiler.h
index 70edeed273..070e6a3aa5 100644
--- a/src/broadcom/compiler/v3d_compiler.h
+++ b/src/broadcom/compiler/v3d_compiler.h
@@ -648,6 +648,9 @@ struct v3d_vs_prog_data {
/* Total number of components written, for the shader state record. */
uint32_t vpm_output_size;
+
+ /* Value to be programmed in VCM_CACHE_SIZE. */
+ uint8_t vcm_cache_size;
};
struct v3d_fs_prog_data {
diff --git a/src/broadcom/compiler/vir.c b/src/broadcom/compiler/vir.c
index fc0b34d445..1c8223165c 100644
--- a/src/broadcom/compiler/vir.c
+++ b/src/broadcom/compiler/vir.c
@@ -756,10 +756,28 @@ uint64_t *v3d_compile_vs(const struct v3d_compiler *compiler,
if (prog_data->uses_iid)
prog_data->vpm_input_size++;
- /* Input/output segment size are in 8x32-bit multiples. */
+ /* Input/output segment size are in sectors (8 rows of 32 bits per
+ * channel).
+ */
prog_data->vpm_input_size = align(prog_data->vpm_input_size, 8) / 8;
prog_data->vpm_output_size = align(c->num_vpm_writes, 8) / 8;
+ /* Compute VCM cache size. We set up our program to take up less than
+ * half of the VPM, so that any set of bin and render programs won't
+ * run out of space. We need space for at least one input segment,
+ * and then allocate the rest to output segments (one for the current
+ * program, the rest to VCM). The valid range of the VCM cache size
+ * field is 1-4 16-vertex batches, but GFXH-1744 limits us to 2-4
+ * batches.
+ */
+ assert(c->devinfo->vpm_size);
+ int sector_size = 16 * sizeof(uint32_t) * 8;
+ int vpm_size_in_sectors = c->devinfo->vpm_size / sector_size;
+ int half_vpm = vpm_size_in_sectors / 2;
+ int vpm_output_batches = half_vpm - prog_data->vpm_input_size;
+ assert(vpm_output_batches >= 2);
+ prog_data->vcm_cache_size = CLAMP(vpm_output_batches - 1, 2, 4);
+
return v3d_return_qpu_insts(c, final_assembly_size);
}
diff --git a/src/gallium/drivers/v3d/v3d_screen.c b/src/gallium/drivers/v3d/v3d_screen.c
index 26c4154432..28334aeba4 100644
--- a/src/gallium/drivers/v3d/v3d_screen.c
+++ b/src/gallium/drivers/v3d/v3d_screen.c
@@ -585,6 +585,8 @@ v3d_get_device_info(struct v3d_screen *screen)
uint32_t minor = (ident1.value >> 0) & 0xf;
screen->devinfo.ver = major * 10 + minor;
+ screen->devinfo.vpm_size = (ident1.value >> 28 & 0xf) * 1024;
+
switch (screen->devinfo.ver) {
case 33:
case 41:
diff --git a/src/gallium/drivers/v3d/v3dx_draw.c b/src/gallium/drivers/v3d/v3dx_draw.c
index 479adb70fd..bfb4af13ce 100644
--- a/src/gallium/drivers/v3d/v3dx_draw.c
+++ b/src/gallium/drivers/v3d/v3dx_draw.c
@@ -306,6 +306,13 @@ v3d_emit_gl_shader_state(struct v3d_context *v3d,
}
}
+ cl_emit(&job->bcl, VCM_CACHE_SIZE, vcm) {
+ vcm.number_of_16_vertex_batches_for_binning =
+ v3d->prog.cs->prog_data.vs->vcm_cache_size;
+ vcm.number_of_16_vertex_batches_for_rendering =
+ v3d->prog.vs->prog_data.vs->vcm_cache_size;
+ }
+
cl_emit(&job->bcl, GL_SHADER_STATE, state) {
state.address = cl_address(job->indirect.bo, shader_rec_offset);
state.number_of_attribute_arrays = num_elements_to_emit;
More information about the mesa-commit
mailing list