From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] drm/i915/selftests: Refactor sibling selection
Date: Mon, 18 May 2020 11:38:11 +0100 [thread overview]
Message-ID: <c82c986c-6de6-b229-0ac6-8b2135894e52@linux.intel.com> (raw)
In-Reply-To: <20200518102911.3463-1-chris@chris-wilson.co.uk>
On 18/05/2020 11:29, Chris Wilson wrote:
> Tvrtko spotted that some selftests were using 'break' not 'continue',
> which will fail for discontiguous engine layouts such as on Icelake
> (which may have vcs0 and vcs2).
>
> Reported-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> drivers/gpu/drm/i915/gt/selftest_lrc.c | 68 ++++++++++----------------
> 1 file changed, 27 insertions(+), 41 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c
> index 824f99c4cc7c..94854a467e66 100644
> --- a/drivers/gpu/drm/i915/gt/selftest_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c
> @@ -3600,13 +3600,30 @@ static int nop_virtual_engine(struct intel_gt *gt,
> return err;
> }
>
> +static unsigned int select_siblings(struct intel_gt *gt,
> + unsigned int class,
> + struct intel_engine_cs **siblings)
> +{
> + unsigned int n = 0;
> + unsigned int inst;
> +
> + for (inst = 0; inst <= MAX_ENGINE_INSTANCE; inst++) {
> + if (!gt->engine_class[class][inst])
> + continue;
> +
> + siblings[n++] = gt->engine_class[class][inst];
> + }
> +
> + return n;
> +}
> +
> static int live_virtual_engine(void *arg)
> {
> struct intel_gt *gt = arg;
> struct intel_engine_cs *siblings[MAX_ENGINE_INSTANCE + 1];
> struct intel_engine_cs *engine;
> enum intel_engine_id id;
> - unsigned int class, inst;
> + unsigned int class;
> int err;
>
> if (intel_uc_uses_guc_submission(>->uc))
> @@ -3624,13 +3641,7 @@ static int live_virtual_engine(void *arg)
> for (class = 0; class <= MAX_ENGINE_CLASS; class++) {
> int nsibling, n;
>
> - nsibling = 0;
> - for (inst = 0; inst <= MAX_ENGINE_INSTANCE; inst++) {
> - if (!gt->engine_class[class][inst])
> - continue;
> -
> - siblings[nsibling++] = gt->engine_class[class][inst];
> - }
> + nsibling = select_siblings(gt, class, siblings);
> if (nsibling < 2)
> continue;
>
> @@ -3739,7 +3750,7 @@ static int live_virtual_mask(void *arg)
> {
> struct intel_gt *gt = arg;
> struct intel_engine_cs *siblings[MAX_ENGINE_INSTANCE + 1];
> - unsigned int class, inst;
> + unsigned int class;
> int err;
>
> if (intel_uc_uses_guc_submission(>->uc))
> @@ -3748,13 +3759,7 @@ static int live_virtual_mask(void *arg)
> for (class = 0; class <= MAX_ENGINE_CLASS; class++) {
> unsigned int nsibling;
>
> - nsibling = 0;
> - for (inst = 0; inst <= MAX_ENGINE_INSTANCE; inst++) {
> - if (!gt->engine_class[class][inst])
> - break;
> -
> - siblings[nsibling++] = gt->engine_class[class][inst];
> - }
> + nsibling = select_siblings(gt, class, siblings);
> if (nsibling < 2)
> continue;
>
> @@ -3876,7 +3881,7 @@ static int live_virtual_preserved(void *arg)
> {
> struct intel_gt *gt = arg;
> struct intel_engine_cs *siblings[MAX_ENGINE_INSTANCE + 1];
> - unsigned int class, inst;
> + unsigned int class;
>
> /*
> * Check that the context image retains non-privileged (user) registers
> @@ -3894,13 +3899,7 @@ static int live_virtual_preserved(void *arg)
> for (class = 0; class <= MAX_ENGINE_CLASS; class++) {
> int nsibling, err;
>
> - nsibling = 0;
> - for (inst = 0; inst <= MAX_ENGINE_INSTANCE; inst++) {
> - if (!gt->engine_class[class][inst])
> - continue;
> -
> - siblings[nsibling++] = gt->engine_class[class][inst];
> - }
> + nsibling = select_siblings(gt, class, siblings);
> if (nsibling < 2)
> continue;
>
> @@ -4111,7 +4110,7 @@ static int live_virtual_bond(void *arg)
> };
> struct intel_gt *gt = arg;
> struct intel_engine_cs *siblings[MAX_ENGINE_INSTANCE + 1];
> - unsigned int class, inst;
> + unsigned int class;
> int err;
>
> if (intel_uc_uses_guc_submission(>->uc))
> @@ -4121,14 +4120,7 @@ static int live_virtual_bond(void *arg)
> const struct phase *p;
> int nsibling;
>
> - nsibling = 0;
> - for (inst = 0; inst <= MAX_ENGINE_INSTANCE; inst++) {
> - if (!gt->engine_class[class][inst])
> - break;
> -
> - GEM_BUG_ON(nsibling == ARRAY_SIZE(siblings));
> - siblings[nsibling++] = gt->engine_class[class][inst];
> - }
> + nsibling = select_siblings(gt, class, siblings);
> if (nsibling < 2)
> continue;
>
> @@ -4266,7 +4258,7 @@ static int live_virtual_reset(void *arg)
> {
> struct intel_gt *gt = arg;
> struct intel_engine_cs *siblings[MAX_ENGINE_INSTANCE + 1];
> - unsigned int class, inst;
> + unsigned int class;
>
> /*
> * Check that we handle a reset event within a virtual engine.
> @@ -4284,13 +4276,7 @@ static int live_virtual_reset(void *arg)
> for (class = 0; class <= MAX_ENGINE_CLASS; class++) {
> int nsibling, err;
>
> - nsibling = 0;
> - for (inst = 0; inst <= MAX_ENGINE_INSTANCE; inst++) {
> - if (!gt->engine_class[class][inst])
> - continue;
> -
> - siblings[nsibling++] = gt->engine_class[class][inst];
> - }
> + nsibling = select_siblings(gt, class, siblings);
> if (nsibling < 2)
> continue;
>
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-05-18 10:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-18 10:29 [Intel-gfx] [PATCH] drm/i915/selftests: Refactor sibling selection Chris Wilson
2020-05-18 10:38 ` Tvrtko Ursulin [this message]
2020-05-18 13:35 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2020-05-18 15:45 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c82c986c-6de6-b229-0ac6-8b2135894e52@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).