diff options
| author | Paulo Zanoni <[email protected]> | 2020-02-28 15:16:07 -0800 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-03-03 00:36:10 +0000 |
| commit | 9e5ce30da7fa3f1cc3badfd348e5f8fda1bbacb2 (patch) | |
| tree | a9012da10ad19a85c5bd89fab9536ba0ef9412a6 /src/gallium | |
| parent | 1efe139cad150072985db02227be947aec532e2b (diff) | |
intel: fix the gen 12 compute shader scratch IDs
This is the same idea as "intel: fix the gen 11 compute shader scratch
IDs".
The number of EUs on TGL is not the same as ICL, but the
MEDIA_VFE_STATE restrictions stay the same, so adapt the code to it.
Also, consider the base configuration instead of what we read from the
Kernel.
According to Mark, this fixes the following piglit tests on TGL:
piglit.spec.arb_compute_shader.execution.shared-atomicmax-uint.tglm64
piglit.spec.arb_compute_shader.execution.shared-atomicmax-int.tglm64
piglit.spec.intel_shader_atomic_float_minmax.execution.shared-atomicmax-float.tglm64
v2: s/ICL+/Gen11+/ (Jason).
Cc: [email protected]
Tested-by: Mark Janes <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Reviewed-by: Lionel Landwerlin <[email protected]>
Signed-off-by: Paulo Zanoni <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4006>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/iris/iris_program.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index 701cfa20aea..d7e470b4238 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -2054,11 +2054,13 @@ iris_get_scratch_space(struct iris_context *ice, * * This hack is no longer necessary on Gen11+. * - * For, ICL, scratch space allocation is based on the number of threads + * For, Gen11+, scratch space allocation is based on the number of threads * in the base configuration. */ unsigned subslice_total = screen->subslice_total; - if (devinfo->gen == 11) + if (devinfo->gen >= 12) + subslice_total = devinfo->num_subslices[0]; + else if (devinfo->gen == 11) subslice_total = 8; else if (devinfo->gen < 11) subslice_total = 4 * devinfo->num_slices; @@ -2067,7 +2069,10 @@ iris_get_scratch_space(struct iris_context *ice, if (!*bop) { unsigned scratch_ids_per_subslice = devinfo->max_cs_threads; - if (devinfo->gen >= 11) { + if (devinfo->gen >= 12) { + /* Same as ICL below, but with 16 EUs. */ + scratch_ids_per_subslice = 16 * 8; + } else if (devinfo->gen == 11) { /* The MEDIA_VFE_STATE docs say: * * "Starting with this configuration, the Maximum Number of |