From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org Cc: igt-dev@lists.freedesktop.org Subject: Re: [igt-dev] [PATCH i-g-t 09/24] i915/gem_exec_big: Add a single shot test Date: Tue, 26 Mar 2019 10:06:37 +0000 [thread overview] Message-ID: <af9bf171-30dd-3ccb-19a5-419793f0fcde@linux.intel.com> (raw) In-Reply-To: <20190322092155.1656-9-chris@chris-wilson.co.uk> On 22/03/2019 09:21, Chris Wilson wrote: > CI complains that the exhaustive test of trying every size up to the > limit is too slow, so add a simple test that tries to submit one > extreme batch buffer and check all the relocations land. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105555 > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > --- > tests/i915/gem_exec_big.c | 70 ++++++++++++++++++++++++++++++------ > tests/intel-ci/blacklist.txt | 1 + > 2 files changed, 60 insertions(+), 11 deletions(-) > > diff --git a/tests/i915/gem_exec_big.c b/tests/i915/gem_exec_big.c > index a15672f66..015f59e29 100644 > --- a/tests/i915/gem_exec_big.c > +++ b/tests/i915/gem_exec_big.c > @@ -71,7 +71,7 @@ static void exec1(int fd, uint32_t handle, uint64_t reloc_ofs, unsigned flags, c > gem_exec[0].relocs_ptr = to_user_pointer(gem_reloc); > gem_exec[0].alignment = 0; > gem_exec[0].offset = 0; > - gem_exec[0].flags = 0; > + gem_exec[0].flags = EXEC_OBJECT_SUPPORTS_48B_ADDRESS; > gem_exec[0].rsvd1 = 0; > gem_exec[0].rsvd2 = 0; > > @@ -154,12 +154,11 @@ static void execN(int fd, uint32_t handle, uint64_t batch_size, unsigned flags, > gem_exec[0].handle = handle; > gem_exec[0].relocation_count = nreloc; > gem_exec[0].relocs_ptr = to_user_pointer(gem_reloc); > + gem_exec[0].flags = EXEC_OBJECT_SUPPORTS_48B_ADDRESS; > > memset(&execbuf, 0, sizeof(execbuf)); > execbuf.buffers_ptr = to_user_pointer(gem_exec); > execbuf.buffer_count = 1; > - execbuf.batch_start_offset = 0; > - execbuf.batch_len = 8; > execbuf.flags = flags; > > /* Avoid hitting slowpaths in the reloc processing which might yield a > @@ -197,16 +196,10 @@ static void execN(int fd, uint32_t handle, uint64_t batch_size, unsigned flags, > #undef reloc_ofs > } > > -igt_simple_main > +static void exhaustive(int fd) > { > uint32_t batch[2] = {MI_BATCH_BUFFER_END}; > uint64_t batch_size, max, ggtt_max, reloc_ofs; > - int fd; > - > - fd = drm_open_driver(DRIVER_INTEL); > - igt_require_gem(fd); > - > - use_64bit_relocs = intel_gen(intel_get_drm_devid(fd)) >= 8; > > max = 3 * gem_aperture_size(fd) / 4; > ggtt_max = 3 * gem_global_aperture_size(fd) / 4; > @@ -258,6 +251,61 @@ igt_simple_main > else > batch_size *= 2; > } > +} > + > +static void single(int i915) > +{ > + const uint32_t bbe = MI_BATCH_BUFFER_END; > + uint64_t batch_size, limit; > + uint32_t handle; > + void *ptr; > + > + batch_size = (intel_get_avail_ram_mb() - 128) << 20; /* CI slack */ Slack big enough? Sounds risky.. > + limit = gem_aperture_size(i915) - (256 << 10); /* low pages reserved */ > + if (!gem_uses_full_ppgtt(i915)) > + limit = 3 * limit / 4; > + > + batch_size = min(batch_size, limit); > + batch_size = ALIGN(batch_size, 4096); > + igt_info("Submitting a %'"PRId64"MiB batch, %saperture size %'"PRId64"MiB\n", > + batch_size >> 20, > + gem_uses_full_ppgtt(i915) ? "" : "shared ", > + gem_aperture_size(i915) >> 20); > + intel_require_memory(1, batch_size, CHECK_RAM); > + > + handle = gem_create(i915, batch_size); > + gem_write(i915, handle, 0, &bbe, sizeof(bbe)); > + > + if (!FORCE_PREAD_PWRITE && gem_has_llc(i915)) > + ptr = __gem_mmap__cpu(i915, handle, 0, batch_size, PROT_READ); > + else if (!FORCE_PREAD_PWRITE && gem_mmap__has_wc(i915)) > + ptr = __gem_mmap__wc(i915, handle, 0, batch_size, PROT_READ); > + else > + ptr = NULL; > + > + execN(i915, handle, batch_size, 0, ptr); > + > + if (ptr) > + munmap(ptr, batch_size); > +} > + > +igt_main > +{ > + int i915 = -1; > + > + igt_fixture { > + i915 = drm_open_driver(DRIVER_INTEL); > + igt_require_gem(i915); > + > + use_64bit_relocs = intel_gen(intel_get_drm_devid(i915)) >= 8; > + } > + > + igt_subtest("single") > + single(i915); > + > + igt_subtest("exhaustive") > + exhaustive(i915); > > - close(fd); > + igt_fixture > + close(i915); > } > diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt > index a2101ae71..ae61efe3f 100644 > --- a/tests/intel-ci/blacklist.txt > +++ b/tests/intel-ci/blacklist.txt > @@ -28,6 +28,7 @@ igt@gem_ctx_thrash(@.*)? > igt@gem_evict_alignment(@.*)? > igt@gem_evict_everything(@.*)? > igt@gem_exec_alignment@(?!.*single).* > +igt@gem_exec_big@(?!.*single).* > igt@gem_exec_capture@many-(?!4K-).* > igt@gem_exec_fence@(?!.*basic).* > igt@gem_exec_flush@(?!.*basic).* > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Regards, Tvrtko _______________________________________________ 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: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org Cc: igt-dev@lists.freedesktop.org Subject: Re: [igt-dev] [PATCH i-g-t 09/24] i915/gem_exec_big: Add a single shot test Date: Tue, 26 Mar 2019 10:06:37 +0000 [thread overview] Message-ID: <af9bf171-30dd-3ccb-19a5-419793f0fcde@linux.intel.com> (raw) In-Reply-To: <20190322092155.1656-9-chris@chris-wilson.co.uk> On 22/03/2019 09:21, Chris Wilson wrote: > CI complains that the exhaustive test of trying every size up to the > limit is too slow, so add a simple test that tries to submit one > extreme batch buffer and check all the relocations land. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105555 > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > --- > tests/i915/gem_exec_big.c | 70 ++++++++++++++++++++++++++++++------ > tests/intel-ci/blacklist.txt | 1 + > 2 files changed, 60 insertions(+), 11 deletions(-) > > diff --git a/tests/i915/gem_exec_big.c b/tests/i915/gem_exec_big.c > index a15672f66..015f59e29 100644 > --- a/tests/i915/gem_exec_big.c > +++ b/tests/i915/gem_exec_big.c > @@ -71,7 +71,7 @@ static void exec1(int fd, uint32_t handle, uint64_t reloc_ofs, unsigned flags, c > gem_exec[0].relocs_ptr = to_user_pointer(gem_reloc); > gem_exec[0].alignment = 0; > gem_exec[0].offset = 0; > - gem_exec[0].flags = 0; > + gem_exec[0].flags = EXEC_OBJECT_SUPPORTS_48B_ADDRESS; > gem_exec[0].rsvd1 = 0; > gem_exec[0].rsvd2 = 0; > > @@ -154,12 +154,11 @@ static void execN(int fd, uint32_t handle, uint64_t batch_size, unsigned flags, > gem_exec[0].handle = handle; > gem_exec[0].relocation_count = nreloc; > gem_exec[0].relocs_ptr = to_user_pointer(gem_reloc); > + gem_exec[0].flags = EXEC_OBJECT_SUPPORTS_48B_ADDRESS; > > memset(&execbuf, 0, sizeof(execbuf)); > execbuf.buffers_ptr = to_user_pointer(gem_exec); > execbuf.buffer_count = 1; > - execbuf.batch_start_offset = 0; > - execbuf.batch_len = 8; > execbuf.flags = flags; > > /* Avoid hitting slowpaths in the reloc processing which might yield a > @@ -197,16 +196,10 @@ static void execN(int fd, uint32_t handle, uint64_t batch_size, unsigned flags, > #undef reloc_ofs > } > > -igt_simple_main > +static void exhaustive(int fd) > { > uint32_t batch[2] = {MI_BATCH_BUFFER_END}; > uint64_t batch_size, max, ggtt_max, reloc_ofs; > - int fd; > - > - fd = drm_open_driver(DRIVER_INTEL); > - igt_require_gem(fd); > - > - use_64bit_relocs = intel_gen(intel_get_drm_devid(fd)) >= 8; > > max = 3 * gem_aperture_size(fd) / 4; > ggtt_max = 3 * gem_global_aperture_size(fd) / 4; > @@ -258,6 +251,61 @@ igt_simple_main > else > batch_size *= 2; > } > +} > + > +static void single(int i915) > +{ > + const uint32_t bbe = MI_BATCH_BUFFER_END; > + uint64_t batch_size, limit; > + uint32_t handle; > + void *ptr; > + > + batch_size = (intel_get_avail_ram_mb() - 128) << 20; /* CI slack */ Slack big enough? Sounds risky.. > + limit = gem_aperture_size(i915) - (256 << 10); /* low pages reserved */ > + if (!gem_uses_full_ppgtt(i915)) > + limit = 3 * limit / 4; > + > + batch_size = min(batch_size, limit); > + batch_size = ALIGN(batch_size, 4096); > + igt_info("Submitting a %'"PRId64"MiB batch, %saperture size %'"PRId64"MiB\n", > + batch_size >> 20, > + gem_uses_full_ppgtt(i915) ? "" : "shared ", > + gem_aperture_size(i915) >> 20); > + intel_require_memory(1, batch_size, CHECK_RAM); > + > + handle = gem_create(i915, batch_size); > + gem_write(i915, handle, 0, &bbe, sizeof(bbe)); > + > + if (!FORCE_PREAD_PWRITE && gem_has_llc(i915)) > + ptr = __gem_mmap__cpu(i915, handle, 0, batch_size, PROT_READ); > + else if (!FORCE_PREAD_PWRITE && gem_mmap__has_wc(i915)) > + ptr = __gem_mmap__wc(i915, handle, 0, batch_size, PROT_READ); > + else > + ptr = NULL; > + > + execN(i915, handle, batch_size, 0, ptr); > + > + if (ptr) > + munmap(ptr, batch_size); > +} > + > +igt_main > +{ > + int i915 = -1; > + > + igt_fixture { > + i915 = drm_open_driver(DRIVER_INTEL); > + igt_require_gem(i915); > + > + use_64bit_relocs = intel_gen(intel_get_drm_devid(i915)) >= 8; > + } > + > + igt_subtest("single") > + single(i915); > + > + igt_subtest("exhaustive") > + exhaustive(i915); > > - close(fd); > + igt_fixture > + close(i915); > } > diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt > index a2101ae71..ae61efe3f 100644 > --- a/tests/intel-ci/blacklist.txt > +++ b/tests/intel-ci/blacklist.txt > @@ -28,6 +28,7 @@ igt@gem_ctx_thrash(@.*)? > igt@gem_evict_alignment(@.*)? > igt@gem_evict_everything(@.*)? > igt@gem_exec_alignment@(?!.*single).* > +igt@gem_exec_big@(?!.*single).* > igt@gem_exec_capture@many-(?!4K-).* > igt@gem_exec_fence@(?!.*basic).* > igt@gem_exec_flush@(?!.*basic).* > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Regards, Tvrtko _______________________________________________ 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-26 10:06 UTC|newest] Thread overview: 113+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-22 9:21 [PATCH i-g-t 01/24] i915/gem_exec_latency: Measure the latency of context switching Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-22 9:21 ` [PATCH i-g-t 02/24] lib: Add GPU power measurement Chris Wilson 2019-03-22 9:21 ` [Intel-gfx] " Chris Wilson 2019-03-26 8:36 ` [igt-dev] " Tvrtko Ursulin 2019-03-26 8:36 ` Tvrtko Ursulin 2019-03-26 8:49 ` Chris Wilson 2019-03-26 8:49 ` Chris Wilson 2019-03-26 9:18 ` [PATCH i-g-t v2] " Chris Wilson 2019-03-26 9:18 ` [igt-dev] " Chris Wilson 2019-03-26 9:52 ` Tvrtko Ursulin 2019-03-26 9:52 ` Tvrtko Ursulin 2019-03-26 10:06 ` Chris Wilson 2019-03-26 10:06 ` Chris Wilson 2019-03-22 9:21 ` [PATCH i-g-t 03/24] i915/gem_exec_schedule: Measure semaphore power consumption Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-26 8:46 ` Tvrtko Ursulin 2019-03-26 8:46 ` [Intel-gfx] " Tvrtko Ursulin 2019-03-26 9:23 ` Chris Wilson 2019-03-26 9:23 ` Chris Wilson 2019-03-22 9:21 ` [PATCH i-g-t 04/24] i915/gem_exec_whisper: Measure total power consumed Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-26 8:47 ` Tvrtko Ursulin 2019-03-26 8:47 ` Tvrtko Ursulin 2019-03-22 9:21 ` [PATCH i-g-t 05/24] i915/gem_exec_schedule: Verify that using HW semaphores doesn't block Chris Wilson 2019-03-22 9:21 ` [Intel-gfx] " Chris Wilson 2019-03-26 9:19 ` [igt-dev] " Tvrtko Ursulin 2019-03-26 9:19 ` Tvrtko Ursulin 2019-03-26 10:03 ` Chris Wilson 2019-03-26 10:03 ` [Intel-gfx] " Chris Wilson 2019-03-22 9:21 ` [PATCH i-g-t 06/24] i915/gem_exec_nop: poll-sequential requires ordering between rings Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-26 9:38 ` Tvrtko Ursulin 2019-03-26 9:38 ` Tvrtko Ursulin 2019-03-22 9:21 ` [PATCH i-g-t 07/24] i915/gem_sync: Make switch-default asymmetric Chris Wilson 2019-03-22 9:21 ` [Intel-gfx] " Chris Wilson 2019-03-26 9:57 ` [igt-dev] " Tvrtko Ursulin 2019-03-26 9:57 ` [Intel-gfx] " Tvrtko Ursulin 2019-03-22 9:21 ` [PATCH i-g-t 08/24] i915/gem_ctx_param: Remove kneecapping Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-26 9:58 ` Tvrtko Ursulin 2019-03-26 9:58 ` Tvrtko Ursulin 2019-03-22 9:21 ` [PATCH i-g-t 09/24] i915/gem_exec_big: Add a single shot test Chris Wilson 2019-03-22 9:21 ` [Intel-gfx] " Chris Wilson 2019-03-26 10:06 ` Tvrtko Ursulin [this message] 2019-03-26 10:06 ` [igt-dev] " Tvrtko Ursulin 2019-03-26 10:21 ` Chris Wilson 2019-03-26 10:21 ` Chris Wilson 2019-03-22 9:21 ` [PATCH i-g-t 10/24] kms_fence_pin_leak: Ask for the GPU before use Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-26 10:10 ` Tvrtko Ursulin 2019-03-26 10:10 ` Tvrtko Ursulin 2019-03-22 9:21 ` [PATCH i-g-t 11/24] drm-uapi: Import i915_drm.h upto 53073249452d Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-22 9:21 ` [PATCH i-g-t 12/24] lib/i915: Improve gem_context error messages Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-26 10:14 ` Tvrtko Ursulin 2019-03-26 10:14 ` Tvrtko Ursulin 2019-03-22 9:21 ` [PATCH i-g-t 13/24] i915/gem_ctx_param: Test set/get (copy) VM Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-26 10:22 ` Tvrtko Ursulin 2019-03-26 10:22 ` Tvrtko Ursulin 2019-03-26 10:33 ` Tvrtko Ursulin 2019-03-26 10:33 ` Tvrtko Ursulin 2019-03-26 10:51 ` Chris Wilson 2019-03-26 10:51 ` Chris Wilson 2019-03-22 9:21 ` [PATCH i-g-t 14/24] i915/gem_ctx_create: Basic checks for constructor properties Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-26 10:46 ` Tvrtko Ursulin 2019-03-26 10:46 ` Tvrtko Ursulin 2019-03-26 11:06 ` Chris Wilson 2019-03-26 11:06 ` [Intel-gfx] " Chris Wilson 2019-03-22 9:21 ` [PATCH i-g-t 15/24] i915: Add gem_vm_create Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-26 11:21 ` Tvrtko Ursulin 2019-03-26 11:21 ` Tvrtko Ursulin 2019-03-26 11:37 ` Chris Wilson 2019-03-26 11:37 ` Chris Wilson 2019-03-26 11:48 ` Tvrtko Ursulin 2019-03-26 11:48 ` Tvrtko Ursulin 2019-03-26 14:11 ` Chris Wilson 2019-03-26 14:11 ` Chris Wilson 2019-03-22 9:21 ` [PATCH i-g-t 16/24] drm-uapi: Import i915_drm.h upto 364df3d04d51 Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-22 9:21 ` [PATCH i-g-t 17/24] i915: Add gem_ctx_clone Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-26 15:44 ` Tvrtko Ursulin 2019-03-26 15:44 ` Tvrtko Ursulin 2019-03-26 15:49 ` Chris Wilson 2019-03-26 15:49 ` Chris Wilson 2019-03-26 15:54 ` Chris Wilson 2019-03-26 15:54 ` Chris Wilson 2019-03-22 9:21 ` [PATCH i-g-t 18/24] i915: Exercise creating context with shared GTT Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-22 9:21 ` [PATCH i-g-t 19/24] i915/gem_ctx_switch: Exercise queues Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-22 9:21 ` [PATCH i-g-t 20/24] i915/gem_exec_whisper: Fork all-engine tests one-per-engine Chris Wilson 2019-03-22 9:21 ` [Intel-gfx] " Chris Wilson 2019-03-22 9:21 ` [PATCH i-g-t 21/24] i915/gem_exec_whisper: debugfs/next_seqno is defunct Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-22 9:21 ` [PATCH i-g-t 22/24] i915: Add gem_ctx_engines Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-22 16:40 ` Andi Shyti 2019-03-22 16:40 ` [igt-dev] " Andi Shyti 2019-03-22 16:48 ` Chris Wilson 2019-03-22 16:48 ` [igt-dev] " Chris Wilson 2019-03-22 9:21 ` [PATCH i-g-t 23/24] i915: Add gem_exec_balancer Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-22 9:21 ` [PATCH i-g-t 24/24] i915/gem_exec_balancer: Exercise bonded pairs Chris Wilson 2019-03-22 9:21 ` [igt-dev] " Chris Wilson 2019-03-22 10:22 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,01/24] i915/gem_exec_latency: Measure the latency of context switching Patchwork 2019-03-23 6:38 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork 2019-03-26 11:00 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,01/24] i915/gem_exec_latency: Measure the latency of context switching (rev2) 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=af9bf171-30dd-3ccb-19a5-419793f0fcde@linux.intel.com \ --to=tvrtko.ursulin@linux.intel.com \ --cc=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.