public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: "Summers, Stuart" <stuart.summers@intel.com>
To: "intel-gfx@lists.freedesktop.org"
	<intel-gfx@lists.freedesktop.org>,
	"chris@chris-wilson.co.uk" <chris@chris-wilson.co.uk>
Subject: Re: [PATCH 09/11] drm/i915: Refactor instdone loops on new subslice functions
Date: Wed, 21 Aug 2019 23:32:55 +0000	[thread overview]
Message-ID: <1566430370.128584.13.camel@intel.com> (raw)
In-Reply-To: <156642819393.20466.11132905257582857588@skylake-alporthouse-com>

On Wed, 2019-08-21 at 23:56 +0100, Chris Wilson wrote:
> Quoting Stuart Summers (2019-08-21 00:05:42)
> > diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h
> > b/drivers/gpu/drm/i915/gt/intel_engine_types.h
> > index a82cea95c2f2..99bee06cdbdb 100644
> > --- a/drivers/gpu/drm/i915/gt/intel_engine_types.h
> > +++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h
> > @@ -576,20 +576,19 @@ intel_engine_is_virtual(const struct
> > intel_engine_cs *engine)
> >         return engine->flags & I915_ENGINE_IS_VIRTUAL;
> >  }
> >  
> > -#define instdone_slice_mask(dev_priv__) \
> > -       (IS_GEN(dev_priv__, 7) ? \
> > -        1 : RUNTIME_INFO(dev_priv__)->sseu.slice_mask)
> > -
> > -#define instdone_subslice_mask(dev_priv__) \
> > -       (IS_GEN(dev_priv__, 7) ? \
> > -        1 : RUNTIME_INFO(dev_priv__)->sseu.subslice_mask[0])
> > -
> > -#define for_each_instdone_slice_subslice(dev_priv__, slice__,
> > subslice__) \
> > -       for ((slice__) = 0, (subslice__) = 0; \
> > -            (slice__) < I915_MAX_SLICES; \
> > -            (subslice__) = ((subslice__) + 1) < I915_MAX_SUBSLICES
> > ? (subslice__) + 1 : 0, \
> > -              (slice__) += ((subslice__) == 0)) \
> > -               for_each_if((BIT(slice__) &
> > instdone_slice_mask(dev_priv__)) && \
> > -                           (BIT(subslice__) &
> > instdone_subslice_mask(dev_priv__)))
> > -
> > +#define instdone_has_slice(dev_priv___, sseu___, slice___) \
> > +       ((IS_GEN(dev_priv___, 7) ? 1 : ((sseu___)->slice_mask)) & \
> > +       BIT(slice___))
> 
>        ((IS_GEN(dev_priv___, 7) ? 1 : \
>        ((sseu___)->slice_mask)) & BIT(slice___))
> 
> That split is marginally easier to read

Makes sense, and I agree what I have is a little ugly... I'll change in
the next revision.

> 
> So much for hoping the gen7 special case just disappears.
> 
> > +#define instdone_has_subslice(dev_priv__, sseu__, slice__,
> > subslice__) \
> > +       (IS_GEN(dev_priv__, 7) ? (1 & BIT(subslice__)) : \
> > +        intel_sseu_has_subslice(sseu__, 0, subslice__))
> > +
> > +#define for_each_instdone_slice_subslice(dev_priv_, sseu_, slice_,
> > subslice_) \
> > +       for ((slice_) = 0, (subslice_) = 0; (slice_) <
> > I915_MAX_SLICES; \
> > +            (subslice_) = ((subslice_) + 1) % I915_MAX_SUBSLICES,
> > \
> > +            (slice_) += ((subslice_) == 0)) \
> > +               for_each_if((instdone_has_slice(dev_priv_, sseu_,
> > slice_)) && \
> > +                           (instdone_has_subslice(dev_priv_,
> > sseu_, slice_, \
> > +                                                   subslice_)))
> 
> That was less convoluted than I was expecting from previous skims.
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

Thanks!

-Stuart

> -Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2019-08-22 14:36 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-20 23:05 [PATCH 00/11] Refactor to expand subslice mask (rev 2) Stuart Summers
2019-08-20 23:05 ` [PATCH 01/11] drm/i915: Use variable for debugfs device status Stuart Summers
2019-08-20 23:05 ` [PATCH 02/11] drm/i915: Add function to set SSEU info per platform Stuart Summers
2019-08-20 23:05 ` [PATCH 03/11] drm/i915: Add subslice stride runtime parameter Stuart Summers
2019-08-20 23:05 ` [PATCH 04/11] drm/i915: Add EU " Stuart Summers
2019-08-20 23:05 ` [PATCH 05/11] drm/i915: Use local variables for subslice_mask for device info Stuart Summers
2019-08-21 22:31   ` Chris Wilson
2019-08-20 23:05 ` [PATCH 06/11] drm/i915: Add function to set subslices Stuart Summers
2019-08-21 22:32   ` Chris Wilson
2019-08-21 22:37     ` Summers, Stuart
2019-08-20 23:05 ` [PATCH 07/11] drm/i915: Use subslice stride to set subslices for a given slice Stuart Summers
2019-08-21 22:36   ` Chris Wilson
2019-08-21 22:46     ` Summers, Stuart
2019-08-20 23:05 ` [PATCH 08/11] drm/i915: Add function to determine if a slice has a subslice Stuart Summers
2019-08-20 23:05 ` [PATCH 09/11] drm/i915: Refactor instdone loops on new subslice functions Stuart Summers
2019-08-21 22:56   ` Chris Wilson
2019-08-21 23:32     ` Summers, Stuart [this message]
2019-08-20 23:05 ` [PATCH 10/11] drm/i915: Add new function to copy subslices for a slice Stuart Summers
2019-08-21 22:41   ` Chris Wilson
2019-08-22 16:36     ` Summers, Stuart
2019-08-20 23:05 ` [PATCH 11/11] drm/i915: Expand subslice mask Stuart Summers
2019-08-21 22:49   ` Chris Wilson
2019-08-22  0:01     ` Summers, Stuart
2019-08-20 23:59 ` ✗ Fi.CI.CHECKPATCH: warning for Refactor to expand subslice mask (rev 2) Patchwork
2019-08-21  0:02 ` ✗ Fi.CI.SPARSE: " Patchwork
2019-08-21  0:20 ` ✓ Fi.CI.BAT: success " Patchwork
2019-08-21 15:15 ` ✓ Fi.CI.IGT: " Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2019-08-22 18:32 [PATCH 00/11] " Stuart Summers
2019-08-22 18:32 ` [PATCH 09/11] drm/i915: Refactor instdone loops on new subslice functions Stuart Summers
2019-08-23 16:02 [PATCH 00/11] Refactor to expand subslice mask (rev 2) Stuart Summers
2019-08-23 16:03 ` [PATCH 09/11] drm/i915: Refactor instdone loops on new subslice functions Stuart Summers

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=1566430370.128584.13.camel@intel.com \
    --to=stuart.summers@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