Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxxxxxxxx> writes: > On 10/03/2020 22:26, Chris Wilson wrote: >> Quoting Francisco Jerez (2020-03-10 21:41:55) >>> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c >>> index b9b3f78f1324..a5d7a80b826d 100644 >>> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c >>> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c >>> @@ -1577,6 +1577,11 @@ static void execlists_submit_ports(struct intel_engine_cs *engine) >>> /* we need to manually load the submit queue */ >>> if (execlists->ctrl_reg) >>> writel(EL_CTRL_LOAD, execlists->ctrl_reg); >>> + >>> + if (execlists_num_ports(execlists) > 1 && >> pending[1] is always defined, the minimum submission is one slot, with >> pending[1] as the sentinel NULL. >> >>> + execlists->pending[1] && >>> + !atomic_xchg(&execlists->overload, 1)) >>> + intel_gt_pm_active_begin(&engine->i915->gt); >> >> engine->gt >> >>> } >>> >>> static bool ctx_single_port_submission(const struct intel_context *ce) >>> @@ -2213,6 +2218,12 @@ cancel_port_requests(struct intel_engine_execlists * const execlists) >>> clear_ports(execlists->inflight, ARRAY_SIZE(execlists->inflight)); >>> >>> WRITE_ONCE(execlists->active, execlists->inflight); >>> + >>> + if (atomic_xchg(&execlists->overload, 0)) { >>> + struct intel_engine_cs *engine = >>> + container_of(execlists, typeof(*engine), execlists); >>> + intel_gt_pm_active_end(&engine->i915->gt); >>> + } >>> } >>> >>> static inline void >>> @@ -2386,6 +2397,9 @@ static void process_csb(struct intel_engine_cs *engine) >>> /* port0 completed, advanced to port1 */ >>> trace_ports(execlists, "completed", execlists->active); >>> >>> + if (atomic_xchg(&execlists->overload, 0)) >>> + intel_gt_pm_active_end(&engine->i915->gt); >> >> So this looses track if we preempt a dual-ELSP submission with a >> single-ELSP submission (and never go back to dual). >> >> If you move this to the end of the loop and check >> >> if (!execlists->active[1] && atomic_xchg(&execlists->overload, 0)) >> intel_gt_pm_active_end(engine->gt); >> >> so that it covers both preemption/promotion and completion. >> >> However, that will fluctuate quite rapidly. (And runs the risk of >> exceeding the sentinel.) >> >> An alternative approach would be to couple along >> schedule_in/schedule_out >> >> atomic_set(overload, -1); >> >> __execlists_schedule_in: >> if (!atomic_fetch_inc(overload) >> intel_gt_pm_active_begin(engine->gt); >> __execlists_schedule_out: >> if (!atomic_dec_return(overload) >> intel_gt_pm_active_end(engine->gt); >> >> which would mean we are overloaded as soon as we try to submit an >> overlapping ELSP. > > Putting it this low-level into submission code also would not work well > with GuC. > I wrote a patch at some point that added calls to intel_gt_pm_active_begin() and intel_gt_pm_active_end() to the GuC submission code in order to obtain a similar effect. However people requested me to leave GuC submission alone for the moment in order to avoid interference with SLPC. At some point it might make sense to hook this up in combination with SLPC, because SLPC doesn't provide much of a CPU energy efficiency advantage in comparison to this series. > How about we try to keep some accounting one level higher, as the i915 > scheduler is passing requests on to the backend for execution? > > Or number of runnable contexts, if the distinction between contexts and > requests is better for this purpose. > > Problematic bit in going one level higher though is that the exit point > is less precisely coupled to the actual state. Or maybe with aggressive > engine retire we have nowadays it wouldn't be a problem. > The main advantage of instrumenting the execlists submission code at a low level is that it gives us visibility over the number of ELSP ports pending execution, which can cause the performance of the workload to be substantially more or less latency-sensitive. GuC submission shouldn't care about this variable, so it kind of makes sense for its behavior to be slightly different. Anyway if we're willing to give up the accuracy of keeping track of this at a low level (and give GuC submission exactly the same treatment) it should be possible to move the tracking one level up. > Regards, > > Tvrtko > Thank you.
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx