drm/i915/guc: Add basic GuC multi-lrc selftest
Add very basic (single submission) multi-lrc selftest. Signed-off-by: Matthew Brost <matthew.brost@intel.com> Reviewed-by: John Harrison <John.C.Harrison@Intel.com> Signed-off-by: John Harrison <John.C.Harrison@Intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20211014172005.27155-19-matthew.brost@intel.com
This commit is contained in:
parent
0d7502fcd4
commit
f9d72092cb
|
@ -3954,4 +3954,5 @@ bool intel_guc_virtual_engine_has_heartbeat(const struct intel_engine_cs *ve)
|
||||||
|
|
||||||
#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
|
#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
|
||||||
#include "selftest_guc.c"
|
#include "selftest_guc.c"
|
||||||
|
#include "selftest_guc_multi_lrc.c"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -0,0 +1,179 @@
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
/*
|
||||||
|
* Copyright <EFBFBD><EFBFBD> 2019 Intel Corporation
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "selftests/igt_spinner.h"
|
||||||
|
#include "selftests/igt_reset.h"
|
||||||
|
#include "selftests/intel_scheduler_helpers.h"
|
||||||
|
#include "gt/intel_engine_heartbeat.h"
|
||||||
|
#include "gem/selftests/mock_context.h"
|
||||||
|
|
||||||
|
static void logical_sort(struct intel_engine_cs **engines, int num_engines)
|
||||||
|
{
|
||||||
|
struct intel_engine_cs *sorted[MAX_ENGINE_INSTANCE + 1];
|
||||||
|
int i, j;
|
||||||
|
|
||||||
|
for (i = 0; i < num_engines; ++i)
|
||||||
|
for (j = 0; j < MAX_ENGINE_INSTANCE + 1; ++j) {
|
||||||
|
if (engines[j]->logical_mask & BIT(i)) {
|
||||||
|
sorted[i] = engines[j];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
memcpy(*engines, *sorted,
|
||||||
|
sizeof(struct intel_engine_cs *) * num_engines);
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct intel_context *
|
||||||
|
multi_lrc_create_parent(struct intel_gt *gt, u8 class,
|
||||||
|
unsigned long flags)
|
||||||
|
{
|
||||||
|
struct intel_engine_cs *siblings[MAX_ENGINE_INSTANCE + 1];
|
||||||
|
struct intel_engine_cs *engine;
|
||||||
|
enum intel_engine_id id;
|
||||||
|
int i = 0;
|
||||||
|
|
||||||
|
for_each_engine(engine, gt, id) {
|
||||||
|
if (engine->class != class)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
siblings[i++] = engine;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (i <= 1)
|
||||||
|
return ERR_PTR(0);
|
||||||
|
|
||||||
|
logical_sort(siblings, i);
|
||||||
|
|
||||||
|
return intel_engine_create_parallel(siblings, 1, i);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void multi_lrc_context_unpin(struct intel_context *ce)
|
||||||
|
{
|
||||||
|
struct intel_context *child;
|
||||||
|
|
||||||
|
GEM_BUG_ON(!intel_context_is_parent(ce));
|
||||||
|
|
||||||
|
for_each_child(ce, child)
|
||||||
|
intel_context_unpin(child);
|
||||||
|
intel_context_unpin(ce);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void multi_lrc_context_put(struct intel_context *ce)
|
||||||
|
{
|
||||||
|
GEM_BUG_ON(!intel_context_is_parent(ce));
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Only the parent gets the creation ref put in the uAPI, the parent
|
||||||
|
* itself is responsible for creation ref put on the children.
|
||||||
|
*/
|
||||||
|
intel_context_put(ce);
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct i915_request *
|
||||||
|
multi_lrc_nop_request(struct intel_context *ce)
|
||||||
|
{
|
||||||
|
struct intel_context *child;
|
||||||
|
struct i915_request *rq, *child_rq;
|
||||||
|
int i = 0;
|
||||||
|
|
||||||
|
GEM_BUG_ON(!intel_context_is_parent(ce));
|
||||||
|
|
||||||
|
rq = intel_context_create_request(ce);
|
||||||
|
if (IS_ERR(rq))
|
||||||
|
return rq;
|
||||||
|
|
||||||
|
i915_request_get(rq);
|
||||||
|
i915_request_add(rq);
|
||||||
|
|
||||||
|
for_each_child(ce, child) {
|
||||||
|
child_rq = intel_context_create_request(child);
|
||||||
|
if (IS_ERR(child_rq))
|
||||||
|
goto child_error;
|
||||||
|
|
||||||
|
if (++i == ce->parallel.number_children)
|
||||||
|
set_bit(I915_FENCE_FLAG_SUBMIT_PARALLEL,
|
||||||
|
&child_rq->fence.flags);
|
||||||
|
i915_request_add(child_rq);
|
||||||
|
}
|
||||||
|
|
||||||
|
return rq;
|
||||||
|
|
||||||
|
child_error:
|
||||||
|
i915_request_put(rq);
|
||||||
|
|
||||||
|
return ERR_PTR(-ENOMEM);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int __intel_guc_multi_lrc_basic(struct intel_gt *gt, unsigned int class)
|
||||||
|
{
|
||||||
|
struct intel_context *parent;
|
||||||
|
struct i915_request *rq;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
parent = multi_lrc_create_parent(gt, class, 0);
|
||||||
|
if (IS_ERR(parent)) {
|
||||||
|
pr_err("Failed creating contexts: %ld", PTR_ERR(parent));
|
||||||
|
return PTR_ERR(parent);
|
||||||
|
} else if (!parent) {
|
||||||
|
pr_debug("Not enough engines in class: %d", class);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
rq = multi_lrc_nop_request(parent);
|
||||||
|
if (IS_ERR(rq)) {
|
||||||
|
ret = PTR_ERR(rq);
|
||||||
|
pr_err("Failed creating requests: %d", ret);
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = intel_selftest_wait_for_rq(rq);
|
||||||
|
if (ret)
|
||||||
|
pr_err("Failed waiting on request: %d", ret);
|
||||||
|
|
||||||
|
i915_request_put(rq);
|
||||||
|
|
||||||
|
if (ret >= 0) {
|
||||||
|
ret = intel_gt_wait_for_idle(gt, HZ * 5);
|
||||||
|
if (ret < 0)
|
||||||
|
pr_err("GT failed to idle: %d\n", ret);
|
||||||
|
}
|
||||||
|
|
||||||
|
out:
|
||||||
|
multi_lrc_context_unpin(parent);
|
||||||
|
multi_lrc_context_put(parent);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int intel_guc_multi_lrc_basic(void *arg)
|
||||||
|
{
|
||||||
|
struct intel_gt *gt = arg;
|
||||||
|
unsigned int class;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
for (class = 0; class < MAX_ENGINE_CLASS + 1; ++class) {
|
||||||
|
ret = __intel_guc_multi_lrc_basic(gt, class);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int intel_guc_multi_lrc_live_selftests(struct drm_i915_private *i915)
|
||||||
|
{
|
||||||
|
static const struct i915_subtest tests[] = {
|
||||||
|
SUBTEST(intel_guc_multi_lrc_basic),
|
||||||
|
};
|
||||||
|
struct intel_gt *gt = &i915->gt;
|
||||||
|
|
||||||
|
if (intel_gt_is_wedged(gt))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (!intel_uc_uses_guc_submission(>->uc))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
return intel_gt_live_subtests(tests, gt);
|
||||||
|
}
|
|
@ -48,5 +48,6 @@ selftest(ring_submission, intel_ring_submission_live_selftests)
|
||||||
selftest(perf, i915_perf_live_selftests)
|
selftest(perf, i915_perf_live_selftests)
|
||||||
selftest(slpc, intel_slpc_live_selftests)
|
selftest(slpc, intel_slpc_live_selftests)
|
||||||
selftest(guc, intel_guc_live_selftests)
|
selftest(guc, intel_guc_live_selftests)
|
||||||
|
selftest(guc_multi_lrc, intel_guc_multi_lrc_live_selftests)
|
||||||
/* Here be dragons: keep last to run last! */
|
/* Here be dragons: keep last to run last! */
|
||||||
selftest(late_gt_pm, intel_gt_pm_late_selftests)
|
selftest(late_gt_pm, intel_gt_pm_late_selftests)
|
||||||
|
|
Loading…
Reference in New Issue