[PATCH i-g-t 75/93] tests/i915/gem_ctx_create: Convert benchmarks to intel_ctx_t
Jason Ekstrand
jason at jlekstrand.net
Wed May 26 18:00:40 UTC 2021
Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
---
tests/i915/gem_ctx_create.c | 76 +++++++++++++++++++------------------
1 file changed, 40 insertions(+), 36 deletions(-)
diff --git a/tests/i915/gem_ctx_create.c b/tests/i915/gem_ctx_create.c
index 9a512a03..bc78162f 100644
--- a/tests/i915/gem_ctx_create.c
+++ b/tests/i915/gem_ctx_create.c
@@ -78,7 +78,8 @@ static double elapsed(const struct timespec *start,
return (end->tv_sec - start->tv_sec) + 1e-9*(end->tv_nsec - start->tv_nsec);
}
-static void files(int core, int timeout, const int ncpus)
+static void files(int core, const intel_ctx_cfg_t *cfg,
+ int timeout, const int ncpus)
{
const uint32_t bbe = MI_BATCH_BUFFER_END;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -97,18 +98,22 @@ static void files(int core, int timeout, const int ncpus)
igt_fork(child, ncpus) {
struct timespec start, end;
unsigned count = 0;
+ const intel_ctx_t *ctx;
int fd;
clock_gettime(CLOCK_MONOTONIC, &start);
do {
fd = gem_reopen_driver(core);
- gem_context_copy_engines(core, 0, fd, 0);
+
+ ctx = intel_ctx_create(fd, cfg);
+ execbuf.rsvd1 = ctx->id;
obj.handle = gem_open(fd, name);
execbuf.flags &= ~ENGINE_FLAGS;
execbuf.flags |= ppgtt_engines[count % ppgtt_nengine];
gem_execbuf(fd, &execbuf);
+ intel_ctx_destroy(fd, ctx);
close(fd);
count++;
@@ -125,7 +130,8 @@ static void files(int core, int timeout, const int ncpus)
gem_close(core, batch);
}
-static void active(int fd, const struct intel_execution_engine2 *e,
+static void active(int fd, const intel_ctx_cfg_t *cfg,
+ const struct intel_execution_engine2 *e,
int timeout, int ncpus)
{
const uint32_t bbe = MI_BATCH_BUFFER_END;
@@ -157,19 +163,19 @@ static void active(int fd, const struct intel_execution_engine2 *e,
if (ncpus < 0) {
igt_fork(child, ppgtt_nengine) {
unsigned long count = 0;
- int i915;
+ const intel_ctx_t *ctx;
- i915 = gem_reopen_driver(fd);
/*
* Ensure the gpu is idle by launching
* a nop execbuf and stalling for it
*/
- gem_quiescent_gpu(i915);
- gem_context_copy_engines(fd, 0, i915, 0);
+ gem_quiescent_gpu(fd);
if (ppgtt_engines[child] == e->flags)
continue;
+ ctx = intel_ctx_create(fd, cfg);
+ execbuf.rsvd1 = ctx->id;
execbuf.flags = ppgtt_engines[child];
while (!READ_ONCE(*shared)) {
@@ -182,6 +188,7 @@ static void active(int fd, const struct intel_execution_engine2 *e,
}
igt_debug("hog[%d]: cycles=%lu\n", child, count);
+ intel_ctx_destroy(fd, ctx);
}
ncpus = -ncpus;
}
@@ -189,33 +196,27 @@ static void active(int fd, const struct intel_execution_engine2 *e,
igt_fork(child, ncpus) {
struct timespec start, end;
unsigned count = 0;
- int i915;
- uint32_t ctx;
- i915 = gem_reopen_driver(fd);
/*
* Ensure the gpu is idle by launching
* a nop execbuf and stalling for it.
*/
- gem_quiescent_gpu(i915);
- ctx = gem_context_create(i915);
- gem_context_copy_engines(fd, 0, i915, ctx);
+ gem_quiescent_gpu(fd);
clock_gettime(CLOCK_MONOTONIC, &start);
do {
- execbuf.rsvd1 = gem_context_clone_with_engines(fd, ctx);
+ const intel_ctx_t *ctx = intel_ctx_create(fd, cfg);
+ execbuf.rsvd1 = ctx->id;
for (unsigned n = 0; n < nengine; n++) {
execbuf.flags = engines[n];
gem_execbuf(fd, &execbuf);
}
- gem_context_destroy(fd, execbuf.rsvd1);
+ intel_ctx_destroy(fd, ctx);
count++;
clock_gettime(CLOCK_MONOTONIC, &end);
} while (elapsed(&start, &end) < timeout);
- gem_context_destroy(fd, ctx);
-
gem_sync(fd, obj.handle);
clock_gettime(CLOCK_MONOTONIC, &end);
igt_info("[%d] Context creation + execution: %.3f us\n",
@@ -276,7 +277,8 @@ static uint64_t total_avail_mem(unsigned mode)
return total << 20;
}
-static void maximum(int fd, int ncpus, unsigned mode)
+static void maximum(int fd, const intel_ctx_cfg_t *cfg,
+ int ncpus, unsigned mode)
{
const uint32_t bbe = MI_BATCH_BUFFER_END;
struct drm_i915_gem_execbuffer2 execbuf;
@@ -299,9 +301,7 @@ static void maximum(int fd, int ncpus, unsigned mode)
err = -ENOMEM;
if (avail_mem > (count + 1) * ctx_size)
- err = __gem_context_clone(fd, 0,
- I915_CONTEXT_CLONE_ENGINES,
- 0, &ctx_id);
+ err = __gem_context_create(fd, &ctx_id);
if (err) {
igt_info("Created %lu contexts, before failing with '%s' [%d]\n",
count, strerror(-err), -err);
@@ -322,6 +322,7 @@ static void maximum(int fd, int ncpus, unsigned mode)
igt_fork(child, ncpus) {
struct timespec start, end;
+ const intel_ctx_t *ctx;
int i915;
i915 = gem_reopen_driver(fd);
@@ -330,7 +331,7 @@ static void maximum(int fd, int ncpus, unsigned mode)
* a nop execbuf and stalling for it.
*/
gem_quiescent_gpu(i915);
- gem_context_copy_engines(fd, 0, i915, 0);
+ ctx = intel_ctx_create(i915, cfg);
hars_petruska_f54_1_random_perturb(child);
obj[0].handle = gem_create(i915, 4096);
@@ -351,6 +352,7 @@ static void maximum(int fd, int ncpus, unsigned mode)
gem_sync(i915, obj[0].handle);
clock_gettime(CLOCK_MONOTONIC, &end);
gem_close(i915, obj[0].handle);
+ intel_ctx_destroy(i915, ctx);
igt_info("[%d] Context execution: %.3f us\n", child,
elapsed(&start, &end) / (3 * count * all_nengine) * 1e6);
@@ -560,6 +562,7 @@ igt_main
const int ncpus = sysconf(_SC_NPROCESSORS_ONLN);
struct drm_i915_gem_context_create create;
const struct intel_execution_engine2 *e;
+ intel_ctx_cfg_t cfg;
int fd = -1;
igt_fixture {
@@ -567,7 +570,8 @@ igt_main
igt_require_gem(fd);
gem_require_contexts(fd);
- __for_each_physical_engine(fd, e)
+ cfg = intel_ctx_cfg_all_physical(fd);
+ for_each_ctx_cfg_engine(fd, &cfg, e)
all_engines[all_nengine++] = e->flags;
igt_require(all_nengine);
@@ -597,39 +601,39 @@ igt_main
iris_pipeline(fd);
igt_subtest("maximum-mem")
- maximum(fd, ncpus, CHECK_RAM);
+ maximum(fd, &cfg, ncpus, CHECK_RAM);
igt_subtest("maximum-swap")
- maximum(fd, ncpus, CHECK_RAM | CHECK_SWAP);
+ maximum(fd, &cfg, ncpus, CHECK_RAM | CHECK_SWAP);
igt_subtest("basic-files")
- files(fd, 2, 1);
+ files(fd, &cfg, 2, 1);
igt_subtest("files")
- files(fd, 20, 1);
+ files(fd, &cfg, 20, 1);
igt_subtest("forked-files")
- files(fd, 20, ncpus);
+ files(fd, &cfg, 20, ncpus);
/* NULL value means all engines */
igt_subtest("active-all")
- active(fd, NULL, 20, 1);
+ active(fd, &cfg, NULL, 20, 1);
igt_subtest("forked-active-all")
- active(fd, NULL, 20, ncpus);
+ active(fd, &cfg, NULL, 20, ncpus);
igt_subtest_with_dynamic("active") {
- __for_each_physical_engine(fd, e) {
+ for_each_ctx_cfg_engine(fd, &cfg, e) {
igt_dynamic_f("%s", e->name)
- active(fd, e, 20, 1);
+ active(fd, &cfg, e, 20, 1);
}
}
igt_subtest_with_dynamic("forked-active") {
- __for_each_physical_engine(fd, e) {
+ for_each_ctx_cfg_engine(fd, &cfg, e) {
igt_dynamic_f("%s", e->name)
- active(fd, e, 20, ncpus);
+ active(fd, &cfg, e, 20, ncpus);
}
}
igt_subtest_with_dynamic("hog") {
- __for_each_physical_engine(fd, e) {
+ for_each_ctx_cfg_engine(fd, &cfg, e) {
igt_dynamic_f("%s", e->name)
- active(fd, e, 20, -1);
+ active(fd, &cfg, e, 20, -1);
}
}
--
2.31.1
More information about the Intel-gfx-trybot
mailing list