[Mesa-dev] [ANNOUNCE] mesa 21.1.1
Hello everyone, The first bugfix release for the 21.1 branch is now available, containing mostly AMD and Intel changes as usual, but also a decent amount of ARM fixes and more. The next bugfix release is schedules for two weeks from now, on June 2nd. Cheers, Eric --- Abel García Dorta (2): i915g: add HW atomic counters as unsupported i915g: fix implicit fallthrough Alyssa Rosenzweig (3): panfrost: Don't clobber RT0 if RTn is disabled panfrost: Fix major flaw in BO cache nir/lower_fragcolor: Fix driver_location assignment Bas Nieuwenhuizen (1): radv: Use correct border swizzle on GFX9+. Boris Brezillon (2): panfrost: Relax the stride check when importing resources panfrost: Fix format definitions to match gallium expectations Caio Marcelo de Oliveira Filho (1): nir: Move shared_memory_explicit_layout bit into common shader_info Connor Abbott (1): freedreno/a6xx: Fix SP_GS_PRIM_SIZE for large sizes Daniel Schürmann (5): aco: fix additional register requirements for spilling driconf: set vk_x11_strict_image_count for Metro: Exodus aco/ra: prevent underflow register for p_create_vector operands radv: call nir_copy_prop() after load-store vectorization aco/ra: also prevent overflow register for p_create_vector operands Danylo Piliaiev (1): ir3: memory_barrier also controls shared memory access order Dave Airlie (2): gallivm: handle texture arrays in non-fragment shaders with lod. llvmpipe: fix non-multisampled rendering to multisampled framebuffer Dylan Baker (1): meson/vulkan: fix linkage on windows Emma Anholt (1): midgard: Fix type for vertex_builtin_arg() and compute_builtin_arg(). Eric Engestrom (11): .pick_status.json: Update to a1c56b80915a1105c5a62aa6ff3ac71c1edd143d .pick_status.json: Update to 584145ea882b710027ce620a5d505bd25ab284b1 .pick_status.json: Mark 6cac9c748eb81105b5cd7df32060ee8aae2b1e5f as denominated egl/x11: don't forget to exit the attrib list loop .pick_status.json: Update to e8640fef9089bb31a9e602a8894ae4fe84086118 .pick_status.json: Update to 0c30ad402d0011c957576681d2aaf9b2e68c318e .pick_status.json: Update to 6d56c16c9ceb864af6bb71d0bdcdd21064d94307 .pick_status.json: Update to e17e3df476ec0f3f537f0169ccd5488f27802bf6 .pick_status.json: Update to 5be00fe88abb618454e1c448e6e61c8dea49c27f docs: add release notes for 21.1.1 VERSION: bump for 21.1.1 Erik Faye-Lund (2): docs: do not generate redirects on error gallium/u_vbuf: avoid dereferencing NULL pointer Gert Wollny (1): compiler/nir: check whether var is an input in lower_fragcoord_wtrans Icecream95 (2): panfrost: Make pan_select_crc_rt a non-static function panfrost: Always write reloaded tiles when making CRC data valid James Park (1): vulkan: Support 32-bit "weak" symbols on MSVC Jordan Justen (4): bin/pick: Rename master branch to main intel/isl: Add Wa_22011186057 to disable CCS on ADL GT2 A0 intel/dev: Add device info for ADL GT2 intel: Add 2 ADL-S pci-ids Joshua Ashton (2): radv: Handle unnormalized samplers in YCbCr lowering venus: Fix zero-initialized fd causing apps to hang/crash Juan A. Suarez Romero (1): v3d: fix resource leak in error path Karol Herbst (1): clover/memory: fix data race in buffer subclasses Lionel Landwerlin (3): intel/mi_builder: fix resolve call anv: fix perf query pass with command buffer batching anv: handle spirv parsing failure Lucas Stach (1): etnaviv: fix vertex sampler setup Maksim Sisov (2): iris: export GEM handle with RDWR access rights i965: export GEM handle with RDWR access rights Marcin Ślusarz (1): nir: handle float atomics in nir_lower_memory_model Marek Olšák (1): Revert "gallium/u_threaded: align batches and call slots to 16 bytes" Mauro Rossi (1): android: nir: add nir_lower_fragcolor.c to Makefile.sources Michel Zou (4): gallium: fix uninitialized variable warning lavapipe: fix unused variable warning vulkan: fix duplicate win32 def meson: link vulkan_util with link_whole on mingw Mike Blumenkrantz (3): iris: refcount separate screen objects for resource tracking zink: stop overwriting buffer map pointers for stream uploader lavapipe: fix fencing when submitting multiple cmdbufs Nanley Chery (3): anv: Add clear_supported to anv_layout_to_aux_state anv: Avoid sampling some MCS surfaces with clear iris: Avoid sampling some MCS surfaces with clear Rhys Perry (1): aco/ra: initialize temp_in_scc earlier Samuel Pitoiset (3): radv: fix missing ITERATE_256 for D/S MSAA images that are TC-compat HTILE radv: fix extending the dirty bits to 64-bit nir/opt_access: fix getting variables in presence of similar bindings/desc Tapani Pälli (2): isl:
Re: [Mesa-dev] [Intel-gfx] [RFC 2/2] drm/doc/rfc: i915 new parallel submission uAPI plan
On Wed, May 19, 2021 at 01:10:04PM +0200, Daniel Vetter wrote: > On Tue, May 18, 2021 at 04:58:30PM -0700, Matthew Brost wrote: > > Add entry fpr i915 new parallel submission uAPI plan. > > > > v2: > > (Daniel Vetter): > > - Expand logical order explaination > > - Add dummy header > > - Only allow N BBs in execbuf IOCTL > > - Configure parallel submission per slot not per gem context > > > > Cc: Tvrtko Ursulin > > Cc: Tony Ye > > CC: Carl Zhang > > Cc: Daniel Vetter > > Cc: Jason Ekstrand > > Signed-off-by: Matthew Brost > > --- > > Documentation/gpu/rfc/i915_parallel_execbuf.h | 144 ++ > > Documentation/gpu/rfc/i915_scheduler.rst | 53 ++- > > 2 files changed, 196 insertions(+), 1 deletion(-) > > create mode 100644 Documentation/gpu/rfc/i915_parallel_execbuf.h > > > > diff --git a/Documentation/gpu/rfc/i915_parallel_execbuf.h > > b/Documentation/gpu/rfc/i915_parallel_execbuf.h > > new file mode 100644 > > index ..8c64b983ccad > > --- /dev/null > > +++ b/Documentation/gpu/rfc/i915_parallel_execbuf.h > > @@ -0,0 +1,144 @@ > > +#define I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT 2 /* see > > i915_context_engines_parallel_submit */ > > + > > +/* > > + * i915_context_engines_parallel_submit: > > + * > > + * Setup a slot to allow multiple BBs to be submitted in a single execbuf > > IOCTL. > > + * Those BBs will then be scheduled to run on the GPU in parallel. Multiple > > + * hardware contexts are created internally in the i915 run these BBs. > > Once a > > + * slot is configured for N BBs only N BBs can be submitted in each execbuf > > + * IOCTL and this is implict behavior (e.g. the user doesn't tell the > > execbuf > > + * IOCTL there are N BBs, the execbuf IOCTL know how many BBs there are > > based on > > + * the slots configuration). > > + * > > + * Their are two currently defined ways to control the placement of the > > + * hardware contexts on physical engines: default behavior (no flags) and > > + * I915_PARALLEL_IMPLICT_BONDS (a flag). More flags may be added the in the > > + * future as new hardware / use cases arise. Details of how to use this > > + * interface below above the flags. > > + * > > + * Returns -EINVAL if hardware context placement configuration invalid or > > if the > > + * placement configuration isn't supported on the platform / submission > > + * interface. > > + * Returns -ENODEV if extension isn't supported on the platform / > > submission > > + * inteface. > > + */ > > +struct i915_context_engines_parallel_submit { > > + struct i915_user_extension base; > > + > > + __u16 engine_index; /* slot for parallel engine */ > > + __u16 width;/* number of contexts per parallel engine */ > > + __u16 num_siblings; /* number of siblings per context */ > > + __u16 mbz16; > > Ok the big picture looks reasonable now, the flags still confuse me. > Yea, it is a bit confusing. > > +/* > > + * Default placement behvavior (currently unsupported): > > + * > > + * Rather than restricting parallel submission to a single class with a > > + * logically contiguous placement (I915_PARALLEL_IMPLICT_BONDS), add a > > mode that > > + * enables parallel submission across multiple engine classes. In this > > case each > > + * context's logical engine mask indicates where that context can placed. > > It is > > + * implied in this mode that all contexts have mutual exclusive placement > > (e.g. > > + * if one context is running CS0 no other contexts can run on CS0). > > + * > > + * Example 1 pseudo code: > > + * CSX[Y] = engine class X, logical instance Y > > + * INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE > > + * set_engines(INVALID) > > + * set_parallel(engine_index=0, width=2, num_siblings=2, > > + * engines=CS0[0],CS0[1],CS1[0],CS1[1]) > > + * > > + * Results in the following valid placements: > > + * CS0[0], CS1[0] > > + * CS0[0], CS1[1] > > + * CS0[1], CS1[0] > > + * CS0[1], CS1[1] > > + * > > + * This can also be though of as 2 virtual engines: > > + * VE[0] = CS0[0], CS0[1] > > + * VE[1] = CS1[0], CS1[1] > > + * > > + * Example 2 pseudo code: > > + * CS[X] = generic engine of same class, logical instance X > > + * INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE > > + * set_engines(INVALID) > > + * set_parallel(engine_index=0, width=2, num_siblings=3, > > + * engines=CS[0],CS[1],CS[2],CS[0],CS[1],CS[2]) > > + * > > + * Results in the following valid placements: > > + * CS[0], CS[1] > > + * CS[0], CS[2] > > + * CS[1], CS[0] > > + * CS[1], CS[2] > > + * CS[2], CS[0] > > + * CS[2], CS[1] > > + * > > + * > > + * This can also be though of as 2 virtual engines: > > + * VE[0] = CS[0], CS[1], CS[2] > > + * VE[1] = CS[0], CS[1], CS[2] > > + > > + * This enables a use case where all engines are created equally, we don't > > care > > + * where they are scheduled, we just want a certain number of resources, > > for > > + * those resources to be scheduled
Re: [Mesa-dev] [RFC 2/2] drm/doc/rfc: i915 new parallel submission uAPI plan
On Wed, May 19, 2021 at 01:45:39PM +0200, Christian König wrote: > Oh, yeah we call that gang submit on the AMD side. > > Had already some internal discussions how to implement this, but so far > couldn't figure out how to cleanly introduce that into the DRM scheduler. > > Can you briefly describe in a few words how that is supposed to work on the > Intel side? > Sure, I've done a quick PoC internally and have been able to hook this into the DRM scheduler. Basically each BB still maps to a single job as each job is somewhat unique (e.g. each job has its own ring, lrc, seqno, etc...). However all the jobs configured to run in parallel map to a single sched_entity which maintains the order each job was generated from the execbuf IOCTL (1 - N). When the backend receives jobs 1 to N - 1 it basically just updates some internal state. When the backend sees job N (last job) it actually does the submit for jobs 1 - N which with GuC submission is a simple command moving the LRC tail of the N jobs. Daniel has suggested that we create a single job for the NN BBs but that would be huge rework to the internals of the i915 and likely won't happen by the time this code first lands. Also worth noting one way a job isn't really a treated individually is the excl slot with dma-resv. In that case we create a composite fence of all jobs (dma_fence_array). Matt > Thanks, > Christian. > > Am 19.05.21 um 01:58 schrieb Matthew Brost: > > Add entry fpr i915 new parallel submission uAPI plan. > > > > v2: > > (Daniel Vetter): > >- Expand logical order explaination > >- Add dummy header > >- Only allow N BBs in execbuf IOCTL > >- Configure parallel submission per slot not per gem context > > > > Cc: Tvrtko Ursulin > > Cc: Tony Ye > > CC: Carl Zhang > > Cc: Daniel Vetter > > Cc: Jason Ekstrand > > Signed-off-by: Matthew Brost > > --- > > Documentation/gpu/rfc/i915_parallel_execbuf.h | 144 ++ > > Documentation/gpu/rfc/i915_scheduler.rst | 53 ++- > > 2 files changed, 196 insertions(+), 1 deletion(-) > > create mode 100644 Documentation/gpu/rfc/i915_parallel_execbuf.h > > > > diff --git a/Documentation/gpu/rfc/i915_parallel_execbuf.h > > b/Documentation/gpu/rfc/i915_parallel_execbuf.h > > new file mode 100644 > > index ..8c64b983ccad > > --- /dev/null > > +++ b/Documentation/gpu/rfc/i915_parallel_execbuf.h > > @@ -0,0 +1,144 @@ > > +#define I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT 2 /* see > > i915_context_engines_parallel_submit */ > > + > > +/* > > + * i915_context_engines_parallel_submit: > > + * > > + * Setup a slot to allow multiple BBs to be submitted in a single execbuf > > IOCTL. > > + * Those BBs will then be scheduled to run on the GPU in parallel. Multiple > > + * hardware contexts are created internally in the i915 run these BBs. > > Once a > > + * slot is configured for N BBs only N BBs can be submitted in each execbuf > > + * IOCTL and this is implict behavior (e.g. the user doesn't tell the > > execbuf > > + * IOCTL there are N BBs, the execbuf IOCTL know how many BBs there are > > based on > > + * the slots configuration). > > + * > > + * Their are two currently defined ways to control the placement of the > > + * hardware contexts on physical engines: default behavior (no flags) and > > + * I915_PARALLEL_IMPLICT_BONDS (a flag). More flags may be added the in the > > + * future as new hardware / use cases arise. Details of how to use this > > + * interface below above the flags. > > + * > > + * Returns -EINVAL if hardware context placement configuration invalid or > > if the > > + * placement configuration isn't supported on the platform / submission > > + * interface. > > + * Returns -ENODEV if extension isn't supported on the platform / > > submission > > + * inteface. > > + */ > > +struct i915_context_engines_parallel_submit { > > + struct i915_user_extension base; > > + > > + __u16 engine_index; /* slot for parallel engine */ > > + __u16 width;/* number of contexts per parallel engine */ > > + __u16 num_siblings; /* number of siblings per context */ > > + __u16 mbz16; > > +/* > > + * Default placement behvavior (currently unsupported): > > + * > > + * Rather than restricting parallel submission to a single class with a > > + * logically contiguous placement (I915_PARALLEL_IMPLICT_BONDS), add a > > mode that > > + * enables parallel submission across multiple engine classes. In this > > case each > > + * context's logical engine mask indicates where that context can placed. > > It is > > + * implied in this mode that all contexts have mutual exclusive placement > > (e.g. > > + * if one context is running CS0 no other contexts can run on CS0). > > + * > > + * Example 1 pseudo code: > > + * CSX[Y] = engine class X, logical instance Y > > + * INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE > > + * set_engines(INVALID) > > + * set_parallel(engine_index=0, width=2, num_siblings=2,
Re: [Mesa-dev] [Intel-gfx] [RFC 2/2] drm/doc/rfc: i915 new parallel submission uAPI plan
On 19/05/2021 12:10, Daniel Vetter wrote: On Tue, May 18, 2021 at 04:58:30PM -0700, Matthew Brost wrote: Add entry fpr i915 new parallel submission uAPI plan. v2: (Daniel Vetter): - Expand logical order explaination - Add dummy header - Only allow N BBs in execbuf IOCTL - Configure parallel submission per slot not per gem context Cc: Tvrtko Ursulin Cc: Tony Ye CC: Carl Zhang Cc: Daniel Vetter Cc: Jason Ekstrand Signed-off-by: Matthew Brost --- Documentation/gpu/rfc/i915_parallel_execbuf.h | 144 ++ Documentation/gpu/rfc/i915_scheduler.rst | 53 ++- 2 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 Documentation/gpu/rfc/i915_parallel_execbuf.h diff --git a/Documentation/gpu/rfc/i915_parallel_execbuf.h b/Documentation/gpu/rfc/i915_parallel_execbuf.h new file mode 100644 index ..8c64b983ccad --- /dev/null +++ b/Documentation/gpu/rfc/i915_parallel_execbuf.h @@ -0,0 +1,144 @@ +#define I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT 2 /* see i915_context_engines_parallel_submit */ + +/* + * i915_context_engines_parallel_submit: + * + * Setup a slot to allow multiple BBs to be submitted in a single execbuf IOCTL. + * Those BBs will then be scheduled to run on the GPU in parallel. Multiple + * hardware contexts are created internally in the i915 run these BBs. Once a + * slot is configured for N BBs only N BBs can be submitted in each execbuf + * IOCTL and this is implict behavior (e.g. the user doesn't tell the execbuf + * IOCTL there are N BBs, the execbuf IOCTL know how many BBs there are based on + * the slots configuration). + * + * Their are two currently defined ways to control the placement of the + * hardware contexts on physical engines: default behavior (no flags) and + * I915_PARALLEL_IMPLICT_BONDS (a flag). More flags may be added the in the + * future as new hardware / use cases arise. Details of how to use this + * interface below above the flags. + * + * Returns -EINVAL if hardware context placement configuration invalid or if the + * placement configuration isn't supported on the platform / submission + * interface. + * Returns -ENODEV if extension isn't supported on the platform / submission + * inteface. + */ +struct i915_context_engines_parallel_submit { + struct i915_user_extension base; + + __u16 engine_index; /* slot for parallel engine */ + __u16 width;/* number of contexts per parallel engine */ + __u16 num_siblings; /* number of siblings per context */ + __u16 mbz16; Ok the big picture looks reasonable now, the flags still confuse me. +/* + * Default placement behvavior (currently unsupported): + * + * Rather than restricting parallel submission to a single class with a + * logically contiguous placement (I915_PARALLEL_IMPLICT_BONDS), add a mode that + * enables parallel submission across multiple engine classes. In this case each + * context's logical engine mask indicates where that context can placed. It is + * implied in this mode that all contexts have mutual exclusive placement (e.g. + * if one context is running CS0 no other contexts can run on CS0). + * + * Example 1 pseudo code: + * CSX[Y] = engine class X, logical instance Y + * INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE + * set_engines(INVALID) + * set_parallel(engine_index=0, width=2, num_siblings=2, + * engines=CS0[0],CS0[1],CS1[0],CS1[1]) + * + * Results in the following valid placements: + * CS0[0], CS1[0] + * CS0[0], CS1[1] + * CS0[1], CS1[0] + * CS0[1], CS1[1] + * + * This can also be though of as 2 virtual engines: + * VE[0] = CS0[0], CS0[1] + * VE[1] = CS1[0], CS1[1] + * + * Example 2 pseudo code: + * CS[X] = generic engine of same class, logical instance X + * INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE + * set_engines(INVALID) + * set_parallel(engine_index=0, width=2, num_siblings=3, + * engines=CS[0],CS[1],CS[2],CS[0],CS[1],CS[2]) + * + * Results in the following valid placements: + * CS[0], CS[1] + * CS[0], CS[2] + * CS[1], CS[0] + * CS[1], CS[2] + * CS[2], CS[0] + * CS[2], CS[1] + * + * + * This can also be though of as 2 virtual engines: + * VE[0] = CS[0], CS[1], CS[2] + * VE[1] = CS[0], CS[1], CS[2] + + * This enables a use case where all engines are created equally, we don't care + * where they are scheduled, we just want a certain number of resources, for + * those resources to be scheduled in parallel, and possibly across multiple + * engine classes. + */ So I don't really get what this does compared to setting the flag below. Is this just about running the batchbuffers the wrong way round, i.e. if you have (simplest case) width=2, num_sibglings=1, engines=CS[0], CS[1] Then both CS[0], CS[1] and CS[1], CS[0] are possible options for running 2 batches? Iow, the backend is allowed to run the batchbuffers the wrong way round, which gains us nothing, since we assume the batches take equally long
Re: [Mesa-dev] [RFC 2/2] drm/doc/rfc: i915 new parallel submission uAPI plan
śr., 19 maj 2021 o 01:41 Matthew Brost napisał(a): > > Add entry fpr i915 new parallel submission uAPI plan. s/fpr/for/ > > v2: > (Daniel Vetter): > - Expand logical order explaination > - Add dummy header > - Only allow N BBs in execbuf IOCTL > - Configure parallel submission per slot not per gem context > > Cc: Tvrtko Ursulin > Cc: Tony Ye > CC: Carl Zhang > Cc: Daniel Vetter > Cc: Jason Ekstrand > Signed-off-by: Matthew Brost > --- > Documentation/gpu/rfc/i915_parallel_execbuf.h | 144 ++ > Documentation/gpu/rfc/i915_scheduler.rst | 53 ++- > 2 files changed, 196 insertions(+), 1 deletion(-) > create mode 100644 Documentation/gpu/rfc/i915_parallel_execbuf.h > > diff --git a/Documentation/gpu/rfc/i915_parallel_execbuf.h > b/Documentation/gpu/rfc/i915_parallel_execbuf.h > new file mode 100644 > index ..8c64b983ccad > --- /dev/null > +++ b/Documentation/gpu/rfc/i915_parallel_execbuf.h > @@ -0,0 +1,144 @@ > +#define I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT 2 /* see > i915_context_engines_parallel_submit */ > + > +/* > + * i915_context_engines_parallel_submit: > + * > + * Setup a slot to allow multiple BBs to be submitted in a single execbuf > IOCTL. > + * Those BBs will then be scheduled to run on the GPU in parallel. Multiple > + * hardware contexts are created internally in the i915 run these BBs. Once a > + * slot is configured for N BBs only N BBs can be submitted in each execbuf > + * IOCTL and this is implict behavior (e.g. the user doesn't tell the execbuf > + * IOCTL there are N BBs, the execbuf IOCTL know how many BBs there are > based on > + * the slots configuration). > + * > + * Their are two currently defined ways to control the placement of the s/Their/There/ > + * hardware contexts on physical engines: default behavior (no flags) and > + * I915_PARALLEL_IMPLICT_BONDS (a flag). More flags may be added the in the IMPLICIT? This typo is repeated multiple times s/the in the/in the/ > + * future as new hardware / use cases arise. Details of how to use this > + * interface below above the flags. "below above"? :) > + * > + * Returns -EINVAL if hardware context placement configuration invalid or if > the is invalid > + * placement configuration isn't supported on the platform / submission > + * interface. > + * Returns -ENODEV if extension isn't supported on the platform / submission > + * inteface. > + */ > +struct i915_context_engines_parallel_submit { > + struct i915_user_extension base; > + > + __u16 engine_index; /* slot for parallel engine */ > + __u16 width;/* number of contexts per parallel engine */ > + __u16 num_siblings; /* number of siblings per context */ > + __u16 mbz16; > +/* > + * Default placement behvavior (currently unsupported): behavior > + * > + * Rather than restricting parallel submission to a single class with a > + * logically contiguous placement (I915_PARALLEL_IMPLICT_BONDS), add a mode > that > + * enables parallel submission across multiple engine classes. In this case > each > + * context's logical engine mask indicates where that context can placed. It > is can be placed > + * implied in this mode that all contexts have mutual exclusive placement > (e.g. > + * if one context is running CS0 no other contexts can run on CS0). > + * > + * Example 1 pseudo code: > + * CSX[Y] = engine class X, logical instance Y > + * INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE > + * set_engines(INVALID) > + * set_parallel(engine_index=0, width=2, num_siblings=2, > + * engines=CS0[0],CS0[1],CS1[0],CS1[1]) > + * > + * Results in the following valid placements: > + * CS0[0], CS1[0] > + * CS0[0], CS1[1] > + * CS0[1], CS1[0] > + * CS0[1], CS1[1] > + * > + * This can also be though of as 2 virtual engines: thought (This typo repeats multiple times) > + * VE[0] = CS0[0], CS0[1] > + * VE[1] = CS1[0], CS1[1] > + * > + * Example 2 pseudo code: > + * CS[X] = generic engine of same class, logical instance X > + * INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE > + * set_engines(INVALID) > + * set_parallel(engine_index=0, width=2, num_siblings=3, > + * engines=CS[0],CS[1],CS[2],CS[0],CS[1],CS[2]) > + * > + * Results in the following valid placements: > + * CS[0], CS[1] > + * CS[0], CS[2] > + * CS[1], CS[0] > + * CS[1], CS[2] > + * CS[2], CS[0] > + * CS[2], CS[1] > + * > + * > + * This can also be though of as 2 virtual engines: > + * VE[0] = CS[0], CS[1], CS[2] > + * VE[1] = CS[0], CS[1], CS[2] > + > + * This enables a use case where all engines are created equally, we don't > care > + * where they are scheduled, we just want a certain number of resources, for > + * those resources to be scheduled in parallel, and possibly across multiple > + * engine classes. > + */ > + > +/* > + * I915_PARALLEL_IMPLICT_BONDS - Create implict bonds between each context. > + * Each context must have the same number
Re: [Mesa-dev] [RFC 2/2] drm/doc/rfc: i915 new parallel submission uAPI plan
Oh, yeah we call that gang submit on the AMD side. Had already some internal discussions how to implement this, but so far couldn't figure out how to cleanly introduce that into the DRM scheduler. Can you briefly describe in a few words how that is supposed to work on the Intel side? Thanks, Christian. Am 19.05.21 um 01:58 schrieb Matthew Brost: Add entry fpr i915 new parallel submission uAPI plan. v2: (Daniel Vetter): - Expand logical order explaination - Add dummy header - Only allow N BBs in execbuf IOCTL - Configure parallel submission per slot not per gem context Cc: Tvrtko Ursulin Cc: Tony Ye CC: Carl Zhang Cc: Daniel Vetter Cc: Jason Ekstrand Signed-off-by: Matthew Brost --- Documentation/gpu/rfc/i915_parallel_execbuf.h | 144 ++ Documentation/gpu/rfc/i915_scheduler.rst | 53 ++- 2 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 Documentation/gpu/rfc/i915_parallel_execbuf.h diff --git a/Documentation/gpu/rfc/i915_parallel_execbuf.h b/Documentation/gpu/rfc/i915_parallel_execbuf.h new file mode 100644 index ..8c64b983ccad --- /dev/null +++ b/Documentation/gpu/rfc/i915_parallel_execbuf.h @@ -0,0 +1,144 @@ +#define I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT 2 /* see i915_context_engines_parallel_submit */ + +/* + * i915_context_engines_parallel_submit: + * + * Setup a slot to allow multiple BBs to be submitted in a single execbuf IOCTL. + * Those BBs will then be scheduled to run on the GPU in parallel. Multiple + * hardware contexts are created internally in the i915 run these BBs. Once a + * slot is configured for N BBs only N BBs can be submitted in each execbuf + * IOCTL and this is implict behavior (e.g. the user doesn't tell the execbuf + * IOCTL there are N BBs, the execbuf IOCTL know how many BBs there are based on + * the slots configuration). + * + * Their are two currently defined ways to control the placement of the + * hardware contexts on physical engines: default behavior (no flags) and + * I915_PARALLEL_IMPLICT_BONDS (a flag). More flags may be added the in the + * future as new hardware / use cases arise. Details of how to use this + * interface below above the flags. + * + * Returns -EINVAL if hardware context placement configuration invalid or if the + * placement configuration isn't supported on the platform / submission + * interface. + * Returns -ENODEV if extension isn't supported on the platform / submission + * inteface. + */ +struct i915_context_engines_parallel_submit { + struct i915_user_extension base; + + __u16 engine_index; /* slot for parallel engine */ + __u16 width;/* number of contexts per parallel engine */ + __u16 num_siblings; /* number of siblings per context */ + __u16 mbz16; +/* + * Default placement behvavior (currently unsupported): + * + * Rather than restricting parallel submission to a single class with a + * logically contiguous placement (I915_PARALLEL_IMPLICT_BONDS), add a mode that + * enables parallel submission across multiple engine classes. In this case each + * context's logical engine mask indicates where that context can placed. It is + * implied in this mode that all contexts have mutual exclusive placement (e.g. + * if one context is running CS0 no other contexts can run on CS0). + * + * Example 1 pseudo code: + * CSX[Y] = engine class X, logical instance Y + * INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE + * set_engines(INVALID) + * set_parallel(engine_index=0, width=2, num_siblings=2, + * engines=CS0[0],CS0[1],CS1[0],CS1[1]) + * + * Results in the following valid placements: + * CS0[0], CS1[0] + * CS0[0], CS1[1] + * CS0[1], CS1[0] + * CS0[1], CS1[1] + * + * This can also be though of as 2 virtual engines: + * VE[0] = CS0[0], CS0[1] + * VE[1] = CS1[0], CS1[1] + * + * Example 2 pseudo code: + * CS[X] = generic engine of same class, logical instance X + * INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE + * set_engines(INVALID) + * set_parallel(engine_index=0, width=2, num_siblings=3, + * engines=CS[0],CS[1],CS[2],CS[0],CS[1],CS[2]) + * + * Results in the following valid placements: + * CS[0], CS[1] + * CS[0], CS[2] + * CS[1], CS[0] + * CS[1], CS[2] + * CS[2], CS[0] + * CS[2], CS[1] + * + * + * This can also be though of as 2 virtual engines: + * VE[0] = CS[0], CS[1], CS[2] + * VE[1] = CS[0], CS[1], CS[2] + + * This enables a use case where all engines are created equally, we don't care + * where they are scheduled, we just want a certain number of resources, for + * those resources to be scheduled in parallel, and possibly across multiple + * engine classes. + */ + +/* + * I915_PARALLEL_IMPLICT_BONDS - Create implict bonds between each context. + * Each context must have the same number sibling and bonds are implictly create + * of the siblings. + * + * All of the below examples are in logical space. + * + * Example 1 pseudo code:
Re: [Mesa-dev] [Intel-gfx] [RFC 2/2] drm/doc/rfc: i915 new parallel submission uAPI plan
On Tue, May 18, 2021 at 04:58:30PM -0700, Matthew Brost wrote: > Add entry fpr i915 new parallel submission uAPI plan. > > v2: > (Daniel Vetter): > - Expand logical order explaination > - Add dummy header > - Only allow N BBs in execbuf IOCTL > - Configure parallel submission per slot not per gem context > > Cc: Tvrtko Ursulin > Cc: Tony Ye > CC: Carl Zhang > Cc: Daniel Vetter > Cc: Jason Ekstrand > Signed-off-by: Matthew Brost > --- > Documentation/gpu/rfc/i915_parallel_execbuf.h | 144 ++ > Documentation/gpu/rfc/i915_scheduler.rst | 53 ++- > 2 files changed, 196 insertions(+), 1 deletion(-) > create mode 100644 Documentation/gpu/rfc/i915_parallel_execbuf.h > > diff --git a/Documentation/gpu/rfc/i915_parallel_execbuf.h > b/Documentation/gpu/rfc/i915_parallel_execbuf.h > new file mode 100644 > index ..8c64b983ccad > --- /dev/null > +++ b/Documentation/gpu/rfc/i915_parallel_execbuf.h > @@ -0,0 +1,144 @@ > +#define I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT 2 /* see > i915_context_engines_parallel_submit */ > + > +/* > + * i915_context_engines_parallel_submit: > + * > + * Setup a slot to allow multiple BBs to be submitted in a single execbuf > IOCTL. > + * Those BBs will then be scheduled to run on the GPU in parallel. Multiple > + * hardware contexts are created internally in the i915 run these BBs. Once a > + * slot is configured for N BBs only N BBs can be submitted in each execbuf > + * IOCTL and this is implict behavior (e.g. the user doesn't tell the execbuf > + * IOCTL there are N BBs, the execbuf IOCTL know how many BBs there are > based on > + * the slots configuration). > + * > + * Their are two currently defined ways to control the placement of the > + * hardware contexts on physical engines: default behavior (no flags) and > + * I915_PARALLEL_IMPLICT_BONDS (a flag). More flags may be added the in the > + * future as new hardware / use cases arise. Details of how to use this > + * interface below above the flags. > + * > + * Returns -EINVAL if hardware context placement configuration invalid or if > the > + * placement configuration isn't supported on the platform / submission > + * interface. > + * Returns -ENODEV if extension isn't supported on the platform / submission > + * inteface. > + */ > +struct i915_context_engines_parallel_submit { > + struct i915_user_extension base; > + > + __u16 engine_index; /* slot for parallel engine */ > + __u16 width;/* number of contexts per parallel engine */ > + __u16 num_siblings; /* number of siblings per context */ > + __u16 mbz16; Ok the big picture looks reasonable now, the flags still confuse me. > +/* > + * Default placement behvavior (currently unsupported): > + * > + * Rather than restricting parallel submission to a single class with a > + * logically contiguous placement (I915_PARALLEL_IMPLICT_BONDS), add a mode > that > + * enables parallel submission across multiple engine classes. In this case > each > + * context's logical engine mask indicates where that context can placed. It > is > + * implied in this mode that all contexts have mutual exclusive placement > (e.g. > + * if one context is running CS0 no other contexts can run on CS0). > + * > + * Example 1 pseudo code: > + * CSX[Y] = engine class X, logical instance Y > + * INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE > + * set_engines(INVALID) > + * set_parallel(engine_index=0, width=2, num_siblings=2, > + * engines=CS0[0],CS0[1],CS1[0],CS1[1]) > + * > + * Results in the following valid placements: > + * CS0[0], CS1[0] > + * CS0[0], CS1[1] > + * CS0[1], CS1[0] > + * CS0[1], CS1[1] > + * > + * This can also be though of as 2 virtual engines: > + * VE[0] = CS0[0], CS0[1] > + * VE[1] = CS1[0], CS1[1] > + * > + * Example 2 pseudo code: > + * CS[X] = generic engine of same class, logical instance X > + * INVALID = I915_ENGINE_CLASS_INVALID, I915_ENGINE_CLASS_INVALID_NONE > + * set_engines(INVALID) > + * set_parallel(engine_index=0, width=2, num_siblings=3, > + * engines=CS[0],CS[1],CS[2],CS[0],CS[1],CS[2]) > + * > + * Results in the following valid placements: > + * CS[0], CS[1] > + * CS[0], CS[2] > + * CS[1], CS[0] > + * CS[1], CS[2] > + * CS[2], CS[0] > + * CS[2], CS[1] > + * > + * > + * This can also be though of as 2 virtual engines: > + * VE[0] = CS[0], CS[1], CS[2] > + * VE[1] = CS[0], CS[1], CS[2] > + > + * This enables a use case where all engines are created equally, we don't > care > + * where they are scheduled, we just want a certain number of resources, for > + * those resources to be scheduled in parallel, and possibly across multiple > + * engine classes. > + */ So I don't really get what this does compared to setting the flag below. Is this just about running the batchbuffers the wrong way round, i.e. if you have (simplest case) width=2, num_sibglings=1, engines=CS[0], CS[1] Then both CS[0], CS[1] and CS[1], CS[0] are possible