@@ -30,8 +30,9 @@
#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
-#include <sys/stat.h>
+#include <sched.h>
#include <sys/ioctl.h>
+#include <sys/stat.h>
#include <sys/time.h>
#include <drm.h>
@@ -479,10 +480,11 @@ static uint32_t read_result(int timeline, uint32_t *map, int idx)
return map[idx];
}
-static void independent(int i915)
+static void independent(int i915, const struct intel_execution_engine2 *e)
{
-#define RCS_TIMESTAMP (0x2000 + 0x358)
+#define RCS_TIMESTAMP (mmio_base + 0x358)
const unsigned int gen = intel_gen(intel_get_drm_devid(i915));
+ unsigned int mmio_base = gem_engine_mmio_base(i915, e->name);
const int has_64bit_reloc = gen >= 8;
I915_DEFINE_CONTEXT_PARAM_ENGINES(engines , I915_EXEC_RING_MASK + 1);
struct drm_i915_gem_context_param param = {
@@ -499,21 +501,25 @@ static void independent(int i915)
int timeline = sw_sync_timeline_create();
uint32_t last, *map;
- igt_require(gen >= 6); /* No per-engine TIMESTAMP on older gen */
- igt_require(gem_scheduler_enabled(i915));
+ igt_require(mmio_base);
{
struct drm_i915_gem_execbuffer2 execbuf = {
.buffers_ptr = to_user_pointer(&results),
.buffer_count = 1,
.rsvd1 = param.ctx_id,
+ .flags = e->flags,
};
gem_write(i915, results.handle, 0, &bbe, sizeof(bbe));
gem_execbuf(i915, &execbuf);
results.flags = EXEC_OBJECT_PINNED;
}
- memset(&engines, 0, sizeof(engines)); /* All rcs0 */
+ memset(&engines, 0, sizeof(engines));
+ for (int i = 0; i < I915_EXEC_RING_MASK + 1; i++) {
+ engine_class(&engines, i) = e->class;
+ engine_instance(&engines, i) = e->instance;
+ }
gem_context_set_param(i915, ¶m);
gem_set_caching(i915, results.handle, I915_CACHING_CACHED);
@@ -573,6 +579,39 @@ static void independent(int i915)
gem_context_destroy(i915, param.ctx_id);
}
+static void independent_all(int i915)
+{
+ const struct intel_execution_engine2 *e;
+ igt_spin_t *spin = NULL;
+
+ igt_require(gem_scheduler_enabled(i915));
+ igt_require(intel_gen(intel_get_drm_devid(i915) >= 6));
+
+ __for_each_physical_engine(i915, e) {
+ if (spin) {
+ spin->execbuf.flags &= ~63;
+ spin->execbuf.flags |= e->flags;
+ gem_execbuf(i915, &spin->execbuf);
+ } else {
+ spin = igt_spin_new(i915, .engine = e->flags,
+ .flags = (IGT_SPIN_NO_PREEMPTION |
+ IGT_SPIN_POLL_RUN));
+ }
+ }
+ igt_require(spin);
+ igt_spin_busywait_until_started(spin);
+
+ __for_each_physical_engine(i915, e) {
+ if (!gem_engine_mmio_base(i915, e->name))
+ continue;
+ igt_fork(child, 1)
+ independent(i915, e);
+ }
+ sched_yield();
+ igt_spin_free(i915, spin);
+ igt_waitchildren();
+}
+
static void libapi(int i915)
{
I915_DEFINE_CONTEXT_PARAM_ENGINES(engines, 64) = {};
@@ -643,6 +682,7 @@ static void libapi(int i915)
igt_main
{
+ const struct intel_execution_engine2 *e;
int i915 = -1;
igt_fixture {
@@ -673,8 +713,18 @@ igt_main
igt_subtest("execute-allforone")
execute_allforone(i915);
- igt_subtest("independent")
- independent(i915);
+ igt_subtest_with_dynamic("independent") {
+ igt_require(gem_scheduler_enabled(i915));
+ igt_require(intel_gen(intel_get_drm_devid(i915) >= 6));
+ __for_each_physical_engine(i915, e) {
+ igt_dynamic_f("%s", e->name)
+ independent(i915, e);
+ }
+ }
+
+ igt_subtest("independent-all") {
+ independent_all(i915);
+ }
igt_subtest("libapi")
libapi(i915);
Run the 'independent' subtest on all all engines. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- tests/i915/gem_ctx_engines.c | 66 +++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 8 deletions(-)