From: Chris Wilson <chris@chris-wilson.co.uk> To: intel-gfx@lists.freedesktop.org Cc: igt-dev@lists.freedesktop.org Subject: [PATCH i-g-t 20/25] i915/gem_exec_whisper: Fork all-engine tests one-per-engine Date: Thu, 14 Mar 2019 14:19:34 +0000 [thread overview] Message-ID: <20190314141939.26246-20-chris@chris-wilson.co.uk> (raw) In-Reply-To: <20190314141939.26246-1-chris@chris-wilson.co.uk> Add a new mode for some more stress, submit the all-engines tests simultaneously, a stream per engine. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- tests/i915/gem_exec_whisper.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/tests/i915/gem_exec_whisper.c b/tests/i915/gem_exec_whisper.c index d3e0b0ba2..d5afc8119 100644 --- a/tests/i915/gem_exec_whisper.c +++ b/tests/i915/gem_exec_whisper.c @@ -88,6 +88,7 @@ static void verify_reloc(int fd, uint32_t handle, #define SYNC 0x40 #define PRIORITY 0x80 #define QUEUES 0x100 +#define ALL 0x200 struct hang { struct drm_i915_gem_exec_object2 obj; @@ -199,6 +200,7 @@ static void whisper(int fd, unsigned engine, unsigned flags) uint64_t old_offset; int i, n, loc; int debugfs; + int nchild; if (flags & PRIORITY) { igt_require(gem_scheduler_enabled(fd)); @@ -215,6 +217,7 @@ static void whisper(int fd, unsigned engine, unsigned flags) engines[nengine++] = engine; } } else { + igt_assert(!(flags & ALL)); igt_require(gem_has_ring(fd, engine)); igt_require(gem_can_store_dword(fd, engine)); engines[nengine++] = engine; @@ -233,11 +236,22 @@ static void whisper(int fd, unsigned engine, unsigned flags) if (flags & HANG) init_hang(&hang); + nchild = 1; + if (flags & FORKED) + nchild *= sysconf(_SC_NPROCESSORS_ONLN); + if (flags & ALL) + nchild *= nengine; + intel_detect_and_clear_missed_interrupts(fd); gpu_power_read(&power, &sample[0]); - igt_fork(child, flags & FORKED ? sysconf(_SC_NPROCESSORS_ONLN) : 1) { + igt_fork(child, nchild) { unsigned int pass; + if (flags & ALL) { + engines[0] = engines[child % nengine]; + nengine = 1; + } + memset(&scratch, 0, sizeof(scratch)); scratch.handle = gem_create(fd, 4096); scratch.flags = EXEC_OBJECT_WRITE; @@ -341,7 +355,7 @@ static void whisper(int fd, unsigned engine, unsigned flags) igt_until_timeout(150) { uint64_t offset; - if (!(flags & FORKED)) + if (nchild == 1) write_seqno(debugfs, pass); if (flags & HANG) @@ -382,8 +396,8 @@ static void whisper(int fd, unsigned engine, unsigned flags) gem_write(fd, batches[1023].handle, loc, &pass, sizeof(pass)); for (n = 1024; --n >= 1; ) { + uint32_t handle[2] = {}; int this_fd = fd; - uint32_t handle[2]; execbuf.buffers_ptr = to_user_pointer(&batches[n-1]); reloc_migrations += batches[n-1].offset != inter[n].presumed_offset; @@ -550,7 +564,7 @@ igt_main { "queues-sync", QUEUES | SYNC }, { NULL } }; - int fd; + int fd = -1; igt_fixture { fd = drm_open_driver_master(DRIVER_INTEL); @@ -561,9 +575,12 @@ igt_main igt_fork_hang_detector(fd); } - for (const struct mode *m = modes; m->name; m++) + for (const struct mode *m = modes; m->name; m++) { igt_subtest_f("%s", m->name) whisper(fd, ALL_ENGINES, m->flags); + igt_subtest_f("%s-all", m->name) + whisper(fd, ALL_ENGINES, m->flags | ALL); + } for (const struct intel_execution_engine *e = intel_execution_engines; e->name; e++) { -- 2.20.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Chris Wilson <chris@chris-wilson.co.uk> To: intel-gfx@lists.freedesktop.org Cc: igt-dev@lists.freedesktop.org Subject: [igt-dev] [PATCH i-g-t 20/25] i915/gem_exec_whisper: Fork all-engine tests one-per-engine Date: Thu, 14 Mar 2019 14:19:34 +0000 [thread overview] Message-ID: <20190314141939.26246-20-chris@chris-wilson.co.uk> (raw) In-Reply-To: <20190314141939.26246-1-chris@chris-wilson.co.uk> Add a new mode for some more stress, submit the all-engines tests simultaneously, a stream per engine. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- tests/i915/gem_exec_whisper.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/tests/i915/gem_exec_whisper.c b/tests/i915/gem_exec_whisper.c index d3e0b0ba2..d5afc8119 100644 --- a/tests/i915/gem_exec_whisper.c +++ b/tests/i915/gem_exec_whisper.c @@ -88,6 +88,7 @@ static void verify_reloc(int fd, uint32_t handle, #define SYNC 0x40 #define PRIORITY 0x80 #define QUEUES 0x100 +#define ALL 0x200 struct hang { struct drm_i915_gem_exec_object2 obj; @@ -199,6 +200,7 @@ static void whisper(int fd, unsigned engine, unsigned flags) uint64_t old_offset; int i, n, loc; int debugfs; + int nchild; if (flags & PRIORITY) { igt_require(gem_scheduler_enabled(fd)); @@ -215,6 +217,7 @@ static void whisper(int fd, unsigned engine, unsigned flags) engines[nengine++] = engine; } } else { + igt_assert(!(flags & ALL)); igt_require(gem_has_ring(fd, engine)); igt_require(gem_can_store_dword(fd, engine)); engines[nengine++] = engine; @@ -233,11 +236,22 @@ static void whisper(int fd, unsigned engine, unsigned flags) if (flags & HANG) init_hang(&hang); + nchild = 1; + if (flags & FORKED) + nchild *= sysconf(_SC_NPROCESSORS_ONLN); + if (flags & ALL) + nchild *= nengine; + intel_detect_and_clear_missed_interrupts(fd); gpu_power_read(&power, &sample[0]); - igt_fork(child, flags & FORKED ? sysconf(_SC_NPROCESSORS_ONLN) : 1) { + igt_fork(child, nchild) { unsigned int pass; + if (flags & ALL) { + engines[0] = engines[child % nengine]; + nengine = 1; + } + memset(&scratch, 0, sizeof(scratch)); scratch.handle = gem_create(fd, 4096); scratch.flags = EXEC_OBJECT_WRITE; @@ -341,7 +355,7 @@ static void whisper(int fd, unsigned engine, unsigned flags) igt_until_timeout(150) { uint64_t offset; - if (!(flags & FORKED)) + if (nchild == 1) write_seqno(debugfs, pass); if (flags & HANG) @@ -382,8 +396,8 @@ static void whisper(int fd, unsigned engine, unsigned flags) gem_write(fd, batches[1023].handle, loc, &pass, sizeof(pass)); for (n = 1024; --n >= 1; ) { + uint32_t handle[2] = {}; int this_fd = fd; - uint32_t handle[2]; execbuf.buffers_ptr = to_user_pointer(&batches[n-1]); reloc_migrations += batches[n-1].offset != inter[n].presumed_offset; @@ -550,7 +564,7 @@ igt_main { "queues-sync", QUEUES | SYNC }, { NULL } }; - int fd; + int fd = -1; igt_fixture { fd = drm_open_driver_master(DRIVER_INTEL); @@ -561,9 +575,12 @@ igt_main igt_fork_hang_detector(fd); } - for (const struct mode *m = modes; m->name; m++) + for (const struct mode *m = modes; m->name; m++) { igt_subtest_f("%s", m->name) whisper(fd, ALL_ENGINES, m->flags); + igt_subtest_f("%s-all", m->name) + whisper(fd, ALL_ENGINES, m->flags | ALL); + } for (const struct intel_execution_engine *e = intel_execution_engines; e->name; e++) { -- 2.20.1 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2019-03-14 14:19 UTC|newest] Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-14 14:19 [PATCH i-g-t 01/25] i915/gem_create: Always try to create an object of at least one page Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 02/25] lib/i915: Pretty print HW semaphores Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 03/25] lib: Add GPU power measurement Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 04/25] i915/gem_exec_schedule: Measure semaphore power consumption Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 05/25] i915/gem_exec_whisper: Measure total power consumed Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 06/25] i915/gem_exec_schedule: Verify that using HW semaphores doesn't block Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 07/25] i915/gem_exec_nop: poll-sequential requires ordering between rings Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 08/25] i915/gem_sync: Make switch-default asymmetric Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 09/25] i915/gem_ctx_param: Remove kneecapping Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 10/25] i915/gem_exec_big: Add a single shot test Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 11/25] kms_fence_pin_leak: Ask for the GPU before use Chris Wilson 2019-03-14 14:19 ` [Intel-gfx] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 12/25] drm-uapi: Import i915_drm.h upto 364df3d04d51 Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 13/25] lib/i915: Improve gem_context error messages Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 14/25] i915/gem_ctx_param: Test set/get (copy) VM Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 15/25] i915/gem_ctx_create: Basic checks for constructor properties Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 16/25] i915: Add gem_ctx_clone Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 17/25] i915: Add gem_vm_create Chris Wilson 2019-03-14 14:19 ` [Intel-gfx] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 18/25] i915: Exercise creating context with shared GTT Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 19/25] i915/gem_ctx_switch: Exercise queues Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` Chris Wilson [this message] 2019-03-14 14:19 ` [igt-dev] [PATCH i-g-t 20/25] i915/gem_exec_whisper: Fork all-engine tests one-per-engine Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 21/25] i915/gem_exec_whisper: debugfs/next_seqno is defunct Chris Wilson 2019-03-14 14:19 ` [Intel-gfx] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 22/25] i915: Add gem_ctx_engines Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 23/25] i915: Add gem_exec_balancer Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 24/25] i915/gem_exec_balancer: Exercise bonded pairs Chris Wilson 2019-03-14 14:19 ` [igt-dev] " Chris Wilson 2019-03-14 14:19 ` [PATCH i-g-t 25/25] i915/gem_exec_latency: Measure the latency of context switching Chris Wilson 2019-03-14 14:19 ` [Intel-gfx] " Chris Wilson 2019-03-14 15:01 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,01/25] i915/gem_create: Always try to create an object of at least one page Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190314141939.26246-20-chris@chris-wilson.co.uk \ --to=chris@chris-wilson.co.uk \ --cc=igt-dev@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.