[igt-dev] [PATCH i-g-t 20/81] tests/gem_exec_whisper: Convert to intel_ctx_t (v2)
Jason Ekstrand
jason at jlekstrand.net
Wed Jul 7 14:43:08 UTC 2021
v2 (Ashutosh Dixit):
- Restore CREATE_FLAGS_SINGLE_TIMELINE for queues
Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit at intel.com>
---
lib/i915/gem_context.c | 17 +++++++
lib/i915/gem_context.h | 1 +
tests/i915/gem_exec_whisper.c | 88 +++++++++++++++++++++++------------
3 files changed, 76 insertions(+), 30 deletions(-)
diff --git a/lib/i915/gem_context.c b/lib/i915/gem_context.c
index 1dda09243..87dcbc6e8 100644
--- a/lib/i915/gem_context.c
+++ b/lib/i915/gem_context.c
@@ -209,6 +209,23 @@ void gem_context_destroy(int fd, uint32_t ctx_id)
igt_assert_eq(__gem_context_destroy(fd, ctx_id), 0);
}
+static bool __gem_context_has_flag(int i915, unsigned int flags)
+{
+ uint32_t ctx = 0;
+
+ __gem_context_create_ext(i915, flags, 0, &ctx);
+ if (ctx)
+ gem_context_destroy(i915, ctx);
+
+ errno = 0;
+ return ctx;
+}
+
+bool gem_context_has_single_timeline(int i915)
+{
+ return __gem_context_has_flag(i915, I915_CONTEXT_CREATE_FLAGS_SINGLE_TIMELINE);
+}
+
int __gem_context_get_param(int fd, struct drm_i915_gem_context_param *p)
{
int err = 0;
diff --git a/lib/i915/gem_context.h b/lib/i915/gem_context.h
index 91bb9e7f2..6e2226d27 100644
--- a/lib/i915/gem_context.h
+++ b/lib/i915/gem_context.h
@@ -59,6 +59,7 @@ bool gem_has_queues(int i915);
bool gem_has_contexts(int fd);
void gem_require_contexts(int fd);
+bool gem_context_has_single_timeline(int i915);
void gem_context_require_bannable(int fd);
void gem_context_require_param(int fd, uint64_t param);
diff --git a/tests/i915/gem_exec_whisper.c b/tests/i915/gem_exec_whisper.c
index a9d3fa05e..d16409203 100644
--- a/tests/i915/gem_exec_whisper.c
+++ b/tests/i915/gem_exec_whisper.c
@@ -29,12 +29,14 @@
#include "i915/gem.h"
#include "i915/gem_create.h"
+#include "i915/gem_vm.h"
#include "igt.h"
#include "igt_debugfs.h"
#include "igt_rapl.h"
#include "igt_gt.h"
#include "igt_rand.h"
#include "igt_sysfs.h"
+#include "intel_ctx.h"
#define ENGINE_MASK (I915_EXEC_RING_MASK | I915_EXEC_BSD_MASK)
@@ -82,13 +84,14 @@ static void verify_reloc(int fd, uint32_t handle,
#define BASIC 0x400
struct hang {
+ const intel_ctx_t *ctx;
struct drm_i915_gem_exec_object2 obj;
struct drm_i915_gem_relocation_entry reloc;
struct drm_i915_gem_execbuffer2 execbuf;
int fd;
};
-static void init_hang(struct hang *h, int fd)
+static void init_hang(struct hang *h, int fd, const intel_ctx_cfg_t *cfg)
{
uint32_t *batch;
int i, gen;
@@ -98,6 +101,13 @@ static void init_hang(struct hang *h, int fd)
gen = intel_gen(intel_get_drm_devid(h->fd));
+ if (gem_has_contexts(fd)) {
+ h->ctx = intel_ctx_create(h->fd, cfg);
+ h->execbuf.rsvd1 = h->ctx->id;
+ } else {
+ h->ctx = NULL;
+ }
+
memset(&h->execbuf, 0, sizeof(h->execbuf));
h->execbuf.buffers_ptr = to_user_pointer(&h->obj);
h->execbuf.buffer_count = 1;
@@ -157,6 +167,7 @@ static void submit_hang(struct hang *h, unsigned *engines, int nengine, unsigned
static void fini_hang(struct hang *h)
{
+ intel_ctx_destroy(h->fd, h->ctx);
close(h->fd);
}
@@ -166,7 +177,8 @@ static void ctx_set_random_priority(int fd, uint32_t ctx)
gem_context_set_priority(fd, ctx, prio);
}
-static void whisper(int fd, unsigned engine, unsigned flags)
+static void whisper(int fd, const intel_ctx_t *ctx,
+ unsigned engine, unsigned flags)
{
const uint32_t bbe = MI_BATCH_BUFFER_END;
const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
@@ -180,7 +192,8 @@ static void whisper(int fd, unsigned engine, unsigned flags)
const struct intel_execution_engine2 *e;
struct hang hang;
int fds[64];
- uint32_t contexts[64];
+ intel_ctx_cfg_t local_cfg;
+ const intel_ctx_t *contexts[64];
unsigned nengine;
uint32_t batch[16];
unsigned int relocations = 0;
@@ -204,7 +217,7 @@ static void whisper(int fd, unsigned engine, unsigned flags)
nengine = 0;
if (engine == ALL_ENGINES) {
- __for_each_physical_engine(fd, e) {
+ for_each_ctx_engine(fd, ctx, e) {
if (gem_class_can_store_dword(fd, e->class))
engines[nengine++] = e->flags;
}
@@ -220,11 +233,13 @@ static void whisper(int fd, unsigned engine, unsigned flags)
if (flags & CONTEXTS)
gem_require_contexts(fd);
- if (flags & QUEUES)
- igt_require(gem_has_queues(fd));
+ if (flags & QUEUES) {
+ igt_require(gem_has_vm(fd));
+ igt_require(gem_context_has_single_timeline(fd));
+ }
if (flags & HANG)
- init_hang(&hang, fd);
+ init_hang(&hang, fd, &ctx->cfg);
nchild = 1;
if (flags & FORKED)
@@ -273,6 +288,7 @@ static void whisper(int fd, unsigned engine, unsigned flags)
execbuf.flags |= I915_EXEC_NO_RELOC;
if (gen < 6)
execbuf.flags |= I915_EXEC_SECURE;
+ execbuf.rsvd1 = ctx->id;
igt_require(__gem_execbuf(fd, &execbuf) == 0);
scratch = tmp[0];
store = tmp[1];
@@ -294,18 +310,21 @@ static void whisper(int fd, unsigned engine, unsigned flags)
igt_assert(loc == sizeof(uint32_t) * i);
batch[++i] = MI_BATCH_BUFFER_END;
- if (flags & CONTEXTS) {
- for (n = 0; n < 64; n++)
- contexts[n] = gem_context_clone_with_engines(fd, 0);
- }
- if (flags & QUEUES) {
- for (n = 0; n < 64; n++)
- contexts[n] = gem_queue_create(fd);
- }
if (flags & FDS) {
for (n = 0; n < 64; n++) {
fds[n] = gem_reopen_driver(fd);
- gem_context_copy_engines(fd, 0, fds[n], 0);
+ }
+ }
+ if (flags & (CONTEXTS | QUEUES | FDS)) {
+ local_cfg = ctx->cfg;
+ if (flags & QUEUES) {
+ igt_assert(!(flags & FDS));
+ local_cfg.vm = gem_vm_create(fd);
+ local_cfg.flags |= I915_CONTEXT_CREATE_FLAGS_SINGLE_TIMELINE;
+ }
+ for (n = 0; n < 64; n++) {
+ int this_fd = (flags & FDS) ? fds[n] : fd;
+ contexts[n] = intel_ctx_create(this_fd, &local_cfg);
}
}
@@ -414,8 +433,8 @@ static void whisper(int fd, unsigned engine, unsigned flags)
execbuf.flags &= ~ENGINE_MASK;
execbuf.flags |= engines[rand() % nengine];
}
- if (flags & (CONTEXTS | QUEUES)) {
- execbuf.rsvd1 = contexts[rand() % 64];
+ if (flags & (CONTEXTS | QUEUES | FDS)) {
+ execbuf.rsvd1 = contexts[rand() % 64]->id;
if (flags & PRIORITY)
ctx_set_random_priority(this_fd, execbuf.rsvd1);
}
@@ -443,7 +462,7 @@ static void whisper(int fd, unsigned engine, unsigned flags)
}
}
execbuf.flags &= ~ENGINE_MASK;
- execbuf.rsvd1 = 0;
+ execbuf.rsvd1 = ctx->id;
execbuf.buffers_ptr = to_user_pointer(&tmp);
tmp[0] = tmp[1];
@@ -493,16 +512,22 @@ static void whisper(int fd, unsigned engine, unsigned flags)
gem_close(fd, scratch.handle);
gem_close(fd, store.handle);
+ if (flags & (CONTEXTS | QUEUES | FDS)) {
+ for (n = 0; n < 64; n++) {
+ int this_fd = (flags & FDS) ? fds[n] : fd;
+ intel_ctx_destroy(this_fd, contexts[n]);
+ }
+ if (local_cfg.vm) {
+ igt_assert(!(flags & FDS));
+ gem_vm_destroy(fd, local_cfg.vm);
+ }
+ }
+ for (n = 0; n < QLEN; n++)
+ gem_close(fd, batches[n].handle);
if (flags & FDS) {
for (n = 0; n < 64; n++)
close(fds[n]);
}
- if (flags & (CONTEXTS | QUEUES)) {
- for (n = 0; n < 64; n++)
- gem_context_destroy(fd, contexts[n]);
- }
- for (n = 0; n < QLEN; n++)
- gem_close(fd, batches[n].handle);
}
igt_waitchildren();
@@ -555,6 +580,7 @@ igt_main
{ NULL }
};
const struct intel_execution_engine2 *e;
+ const intel_ctx_t *ctx;
int fd = -1;
igt_fixture {
@@ -562,6 +588,7 @@ igt_main
igt_require_gem(fd);
igt_require(gem_can_store_dword(fd, 0));
gem_submission_print_method(fd);
+ ctx = intel_ctx_create_all_physical(fd);
igt_fork_hang_detector(fd);
}
@@ -569,10 +596,10 @@ igt_main
for (const struct mode *m = modes; m->name; m++) {
igt_subtest_f("%s%s",
m->flags & BASIC ? "basic-" : "", m->name)
- whisper(fd, ALL_ENGINES, m->flags);
+ whisper(fd, ctx, ALL_ENGINES, m->flags);
igt_subtest_f("%s%s-all",
m->flags & BASIC ? "basic-" : "", m->name)
- whisper(fd, ALL_ENGINES, m->flags | ALL);
+ whisper(fd, ctx, ALL_ENGINES, m->flags | ALL);
}
for (const struct mode *m = modes; m->name; m++) {
@@ -580,12 +607,12 @@ igt_main
continue;
igt_subtest_with_dynamic_f("%s", m->name) {
- __for_each_physical_engine(fd, e) {
+ for_each_ctx_engine(fd, ctx, e) {
if (!gem_class_can_store_dword(fd, e->class))
continue;
igt_dynamic_f("%s", e->name)
- whisper(fd, e->flags, m->flags);
+ whisper(fd, ctx, e->flags, m->flags);
}
}
}
@@ -599,11 +626,12 @@ igt_main
if (m->flags & INTERRUPTIBLE)
continue;
igt_subtest_f("hang-%s", m->name)
- whisper(fd, ALL_ENGINES, m->flags | HANG);
+ whisper(fd, ctx, ALL_ENGINES, m->flags | HANG);
}
}
igt_fixture {
+ intel_ctx_destroy(fd, ctx);
close(fd);
}
}
--
2.31.1
More information about the igt-dev
mailing list