[PATCH 1/2] lib/gpu_cmds: expose num_threads_in_tg parameter for tests
Gwan-gyeong Mun
gwan-gyeong.mun at intel.com
Mon Jun 2 12:54:09 UTC 2025
Can you add a routine to check the maximum number of threads that can be
used per thread group for each platform?
And the reset looks fine.
G.G.
On 5/26/25 3:13 AM, Jan Maslak wrote:
> Expose parameter num_threads_in_tg in (gen8|xehp)_fill_interface_descriptor
> functions, so that it can be set from the tests.
> Also update rest of the code to accommodate this change, passing in
> the default value - 1.
>
> Signed-off-by: Jan Maslak <jan.maslak at intel.com>
> ---
> lib/gpgpu_fill.c | 6 +++---
> lib/gpgpu_shader.c | 16 ++++++++++------
> lib/gpgpu_shader.h | 1 +
> lib/gpu_cmds.c | 8 +++++---
> lib/gpu_cmds.h | 4 +++-
> lib/media_fill.c | 4 ++--
> lib/media_spin.c | 4 ++--
> tests/intel/xe_eudebug_online.c | 2 +-
> tests/intel/xe_exec_sip.c | 2 +-
> tests/intel/xe_exec_sip_eudebug.c | 2 +-
> tests/intel/xe_exec_store.c | 2 +-
> 11 files changed, 30 insertions(+), 21 deletions(-)
>
> diff --git a/lib/gpgpu_fill.c b/lib/gpgpu_fill.c
> index f83eee5f2..09408112c 100644
> --- a/lib/gpgpu_fill.c
> +++ b/lib/gpgpu_fill.c
> @@ -203,7 +203,7 @@ gen8_gpgpu_fillfunc(int i915,
> curbe_buffer = gen7_fill_curbe_buffer_data(ibb, color);
>
> interface_descriptor = gen8_fill_interface_descriptor(ibb, buf,
> - gen8_gpgpu_kernel, sizeof(gen8_gpgpu_kernel));
> + gen8_gpgpu_kernel, sizeof(gen8_gpgpu_kernel), 1);
>
> intel_bb_ptr_set(ibb, 0);
>
> @@ -254,7 +254,7 @@ __gen9_gpgpu_fillfunc(int i915,
>
> interface_descriptor = gen8_fill_interface_descriptor(ibb, buf,
> kernel,
> - kernel_size);
> + kernel_size, 1);
>
> intel_bb_ptr_set(ibb, 0);
>
> @@ -350,7 +350,7 @@ void xehp_gpgpu_fillfunc(int i915,
>
> kernel = __xehp_gpgpu_kernel(i915);
> xehp_fill_interface_descriptor(ibb, buf, kernel->instr,
> - kernel->size * 4, &idd);
> + kernel->size * 4, 1, &idd);
> gpgpu_shader_destroy(kernel);
>
> intel_bb_ptr_set(ibb, 0);
> diff --git a/lib/gpgpu_shader.c b/lib/gpgpu_shader.c
> index a63af0d23..b83e645e3 100644
> --- a/lib/gpgpu_shader.c
> +++ b/lib/gpgpu_shader.c
> @@ -99,6 +99,7 @@ static void
> __xelp_gpgpu_execfunc(struct intel_bb *ibb,
> struct intel_buf *target,
> unsigned int x_dim, unsigned int y_dim,
> + uint32_t num_threads_in_tg,
> struct gpgpu_shader *shdr,
> struct gpgpu_shader *sip,
> uint64_t ring, bool explicit_engine)
> @@ -113,7 +114,8 @@ __xelp_gpgpu_execfunc(struct intel_bb *ibb,
>
> interface_descriptor = gen8_fill_interface_descriptor(ibb, target,
> shdr->instr,
> - 4 * shdr->size);
> + 4 * shdr->size,
> + num_threads_in_tg);
> idd = intel_bb_ptr_get(ibb, interface_descriptor);
> idd->desc2.illegal_opcode_exception_enable = shdr->illegal_opcode_exception_enable;
>
> @@ -162,6 +164,7 @@ static void
> __xehp_gpgpu_execfunc(struct intel_bb *ibb,
> struct intel_buf *target,
> unsigned int x_dim, unsigned int y_dim,
> + uint32_t num_threads_in_tg,
> struct gpgpu_shader *shdr,
> struct gpgpu_shader *sip,
> uint64_t ring, bool explicit_engine)
> @@ -176,7 +179,7 @@ __xehp_gpgpu_execfunc(struct intel_bb *ibb,
> intel_bb_ptr_set(ibb, BATCH_STATE_SPLIT);
>
> xehp_fill_interface_descriptor(ibb, target, shdr->instr,
> - 4 * shdr->size, &idd);
> + 4 * shdr->size, num_threads_in_tg, &idd);
> idd.desc2.illegal_opcode_exception_enable = shdr->illegal_opcode_exception_enable;
>
> if (shdr->vrt != VRT_DISABLED)
> @@ -241,6 +244,7 @@ static void gpgpu_alloc_gpu_addr(struct intel_bb *ibb, struct intel_buf *target)
> void gpgpu_shader_exec(struct intel_bb *ibb,
> struct intel_buf *target,
> unsigned int x_dim, unsigned int y_dim,
> + uint32_t num_threads_in_tg,
> struct gpgpu_shader *shdr,
> struct gpgpu_shader *sip,
> uint64_t ring, bool explicit_engine)
> @@ -253,11 +257,11 @@ void gpgpu_shader_exec(struct intel_bb *ibb,
> gpgpu_alloc_gpu_addr(ibb, target);
>
> if (shdr->gen_ver >= 1250)
> - __xehp_gpgpu_execfunc(ibb, target, x_dim, y_dim, shdr, sip,
> - ring, explicit_engine);
> + __xehp_gpgpu_execfunc(ibb, target, x_dim, y_dim, num_threads_in_tg,
> + shdr, sip, ring, explicit_engine);
> else
> - __xelp_gpgpu_execfunc(ibb, target, x_dim, y_dim, shdr, sip,
> - ring, explicit_engine);
> + __xelp_gpgpu_execfunc(ibb, target, x_dim, y_dim, num_threads_in_tg,
> + shdr, sip, ring, explicit_engine);
> }
>
> /**
> diff --git a/lib/gpgpu_shader.h b/lib/gpgpu_shader.h
> index ca996d574..411ad6292 100644
> --- a/lib/gpgpu_shader.h
> +++ b/lib/gpgpu_shader.h
> @@ -60,6 +60,7 @@ void gpgpu_shader_dump(struct gpgpu_shader *shdr);
> void gpgpu_shader_exec(struct intel_bb *ibb,
> struct intel_buf *target,
> unsigned int x_dim, unsigned int y_dim,
> + uint32_t num_threads_in_tg,
> struct gpgpu_shader *shdr,
> struct gpgpu_shader *sip,
> uint64_t ring, bool explicit_engine);
> diff --git a/lib/gpu_cmds.c b/lib/gpu_cmds.c
> index a6a9247dc..5c6a6e632 100644
> --- a/lib/gpu_cmds.c
> +++ b/lib/gpu_cmds.c
> @@ -424,7 +424,8 @@ uint32_t
> gen8_fill_interface_descriptor(struct intel_bb *ibb,
> struct intel_buf *buf,
> const uint32_t kernel[][4],
> - size_t size)
> + size_t size,
> + uint32_t num_threads_in_tg)
> {
> struct gen8_interface_descriptor_data *idd;
> uint32_t offset;
> @@ -451,7 +452,7 @@ gen8_fill_interface_descriptor(struct intel_bb *ibb,
> idd->desc5.constant_urb_entry_read_offset = 0;
> idd->desc5.constant_urb_entry_read_length = 1; /* grf 1 */
>
> - idd->desc6.num_threads_in_tg = 1;
> + idd->desc6.num_threads_in_tg = num_threads_in_tg;
>
> intel_bb_ptr_add(ibb, sizeof(*idd));
>
> @@ -912,6 +913,7 @@ xehp_fill_interface_descriptor(struct intel_bb *ibb,
> struct intel_buf *dst,
> const uint32_t kernel[][4],
> size_t size,
> + uint32_t num_threads_in_tg,
> struct xehp_interface_descriptor_data *idd)
> {
> uint32_t binding_table_offset, kernel_offset;
> @@ -931,7 +933,7 @@ xehp_fill_interface_descriptor(struct intel_bb *ibb,
> idd->desc4.binding_table_entry_count = 0;
> idd->desc4.binding_table_pointer = (binding_table_offset >> 5);
>
> - idd->desc5.num_threads_in_tg = 1;
> + idd->desc5.num_threads_in_tg = num_threads_in_tg;
> }
>
> static uint32_t
> diff --git a/lib/gpu_cmds.h b/lib/gpu_cmds.h
> index 846d2122a..20e35f9bf 100644
> --- a/lib/gpu_cmds.h
> +++ b/lib/gpu_cmds.h
> @@ -55,7 +55,8 @@ uint32_t
> gen8_fill_interface_descriptor(struct intel_bb *ibb,
> struct intel_buf *buf,
> const uint32_t kernel[][4],
> - size_t size);
> + size_t size,
> + uint32_t num_threads_in_tg);
>
> uint32_t
> gen11_fill_interface_descriptor(struct intel_bb *ibb,
> @@ -121,6 +122,7 @@ xehp_fill_interface_descriptor(struct intel_bb *ibb,
> struct intel_buf *dst,
> const uint32_t kernel[][4],
> size_t size,
> + uint32_t num_threads_in_tg,
> struct xehp_interface_descriptor_data *idd);
>
> void
> diff --git a/lib/media_fill.c b/lib/media_fill.c
> index 88d83061a..a2f2e8666 100644
> --- a/lib/media_fill.c
> +++ b/lib/media_fill.c
> @@ -205,7 +205,7 @@ gen8_media_fillfunc(int i915,
> curbe_buffer = gen7_fill_curbe_buffer_data(ibb, color);
> interface_descriptor = gen8_fill_interface_descriptor(ibb, buf,
> gen8_media_kernel,
> - sizeof(gen8_media_kernel));
> + sizeof(gen8_media_kernel), 1);
> intel_bb_ptr_set(ibb, 0);
>
> /* media pipeline */
> @@ -250,7 +250,7 @@ __gen9_media_fillfunc(int i915,
> curbe_buffer = gen7_fill_curbe_buffer_data(ibb, color);
> interface_descriptor = gen8_fill_interface_descriptor(ibb, buf,
> kernel,
> - kernel_size);
> + kernel_size, 1);
> intel_bb_ptr_set(ibb, 0);
>
> /* media pipeline */
> diff --git a/lib/media_spin.c b/lib/media_spin.c
> index d2345d153..2b81e99d1 100644
> --- a/lib/media_spin.c
> +++ b/lib/media_spin.c
> @@ -109,7 +109,7 @@ gen8_media_spinfunc(int i915, struct intel_buf *buf, uint32_t spins)
>
> curbe_buffer = gen8_spin_curbe_buffer_data(ibb, spins);
> interface_descriptor = gen8_fill_interface_descriptor(ibb, buf,
> - spin_kernel, sizeof(spin_kernel));
> + spin_kernel, sizeof(spin_kernel), 1);
>
> intel_bb_ptr_set(ibb, 0);
>
> @@ -149,7 +149,7 @@ gen9_media_spinfunc(int i915, struct intel_buf *buf, uint32_t spins)
>
> curbe_buffer = gen8_spin_curbe_buffer_data(ibb, spins);
> interface_descriptor = gen8_fill_interface_descriptor(ibb, buf,
> - spin_kernel, sizeof(spin_kernel));
> + spin_kernel, sizeof(spin_kernel), 1);
>
> intel_bb_ptr_set(ibb, 0);
>
> diff --git a/tests/intel/xe_eudebug_online.c b/tests/intel/xe_eudebug_online.c
> index 1f72e3e44..3d138bdc3 100644
> --- a/tests/intel/xe_eudebug_online.c
> +++ b/tests/intel/xe_eudebug_online.c
> @@ -1115,7 +1115,7 @@ static void run_online_client(struct xe_eudebug_client *c)
> sip = get_sip(fd, c->flags);
>
> igt_nsec_elapsed(&ts);
> - gpgpu_shader_exec(ibb, buf, w_dim.x, w_dim.y, shader, sip, 0, 0);
> + gpgpu_shader_exec(ibb, buf, w_dim.x, w_dim.y, 1, shader, sip, 0, 0);
>
> gpgpu_shader_destroy(sip);
> gpgpu_shader_destroy(shader);
> diff --git a/tests/intel/xe_exec_sip.c b/tests/intel/xe_exec_sip.c
> index 062b80a08..c5e431670 100644
> --- a/tests/intel/xe_exec_sip.c
> +++ b/tests/intel/xe_exec_sip.c
> @@ -146,7 +146,7 @@ static uint32_t gpgpu_shader(int fd, struct intel_bb *ibb, enum shader_type shad
> struct gpgpu_shader *sip = get_sip(fd, sip_type, height / 2);
> struct gpgpu_shader *shader = get_shader(fd, shader_type);
>
> - gpgpu_shader_exec(ibb, buf, 1, threads, shader, sip, 0, 0);
> + gpgpu_shader_exec(ibb, buf, 1, threads, 1, shader, sip, 0, 0);
>
> if (sip)
> gpgpu_shader_destroy(sip);
> diff --git a/tests/intel/xe_exec_sip_eudebug.c b/tests/intel/xe_exec_sip_eudebug.c
> index e5b8ba418..b723b0b58 100644
> --- a/tests/intel/xe_exec_sip_eudebug.c
> +++ b/tests/intel/xe_exec_sip_eudebug.c
> @@ -138,7 +138,7 @@ static uint32_t gpgpu_shader(int fd, struct intel_bb *ibb, enum shader_type shad
> struct gpgpu_shader *sip = get_sip(fd, sip_type, shader_type, height / 2);
> struct gpgpu_shader *shader = get_shader(fd, shader_type);
>
> - gpgpu_shader_exec(ibb, buf, 1, threads, shader, sip, 0, 0);
> + gpgpu_shader_exec(ibb, buf, 1, threads, 1, shader, sip, 0, 0);
>
> if (sip)
> gpgpu_shader_destroy(sip);
> diff --git a/tests/intel/xe_exec_store.c b/tests/intel/xe_exec_store.c
> index bf22c3475..364169fdc 100644
> --- a/tests/intel/xe_exec_store.c
> +++ b/tests/intel/xe_exec_store.c
> @@ -390,7 +390,7 @@ static void long_shader(int fd, struct drm_xe_engine_class_instance *hwe,
> gpgpu_shader__nop(shader);
> gpgpu_shader__eot(shader);
>
> - gpgpu_shader_exec(ibb, buf, walker_dim_x, walker_dim_y, shader, NULL, 0, 0);
> + gpgpu_shader_exec(ibb, buf, walker_dim_x, walker_dim_y, 1, shader, NULL, 0, 0);
> intel_bb_sync(ibb);
>
> ptr = xe_bo_map(fd, ibb->handle, ibb->size);
More information about the igt-dev
mailing list