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 5/8] i915/gem_exec_big: Add a single shot test Date: Sun, 17 Feb 2019 14:35:53 +0000 [thread overview] Message-ID: <20190217143556.9482-5-chris@chris-wilson.co.uk> (raw) In-Reply-To: <20190217143556.9482-1-chris@chris-wilson.co.uk> 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 */ + 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 f9ad47ea0..9a1dd0e63 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).* -- 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 5/8] i915/gem_exec_big: Add a single shot test Date: Sun, 17 Feb 2019 14:35:53 +0000 [thread overview] Message-ID: <20190217143556.9482-5-chris@chris-wilson.co.uk> (raw) In-Reply-To: <20190217143556.9482-1-chris@chris-wilson.co.uk> 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 */ + 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 f9ad47ea0..9a1dd0e63 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).* -- 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-02-17 14:35 UTC|newest] Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-17 14:35 [PATCH i-g-t 1/8] i915/gem_eio: Check that context create fails when wedged Chris Wilson 2019-02-17 14:35 ` [Intel-gfx] " Chris Wilson 2019-02-17 14:35 ` [PATCH i-g-t 2/8] i915/gem_eio: Check we only ban the context Chris Wilson 2019-02-17 14:35 ` [igt-dev] " Chris Wilson 2019-02-19 16:53 ` Antonio Argenziano 2019-02-19 16:53 ` Antonio Argenziano 2019-02-19 17:05 ` Chris Wilson 2019-02-19 17:05 ` Chris Wilson 2019-02-19 17:11 ` [PATCH i-g-t] " Chris Wilson 2019-02-19 17:11 ` [Intel-gfx] " Chris Wilson 2019-02-19 17:27 ` Antonio Argenziano 2019-02-19 17:27 ` [igt-dev] " Antonio Argenziano 2019-02-17 14:35 ` [PATCH i-g-t 3/8] lib: Restore the i915.reset modparam before cleaning up Chris Wilson 2019-02-17 14:35 ` [Intel-gfx] " Chris Wilson 2019-02-19 18:22 ` [igt-dev] " Antonio Argenziano 2019-02-19 18:22 ` Antonio Argenziano 2019-02-19 21:03 ` Chris Wilson 2019-02-19 21:03 ` Chris Wilson 2019-02-17 14:35 ` [PATCH i-g-t 4/8] i915/gem_create: Verify that all new objects are clear Chris Wilson 2019-02-17 14:35 ` [igt-dev] " Chris Wilson 2019-02-17 14:35 ` Chris Wilson [this message] 2019-02-17 14:35 ` [igt-dev] [PATCH i-g-t 5/8] i915/gem_exec_big: Add a single shot test Chris Wilson 2019-02-17 14:35 ` [PATCH i-g-t 6/8] i915/gem_exec_parse: Switch to a fixed timeout for basic-allocations Chris Wilson 2019-02-17 14:35 ` [Intel-gfx] " Chris Wilson 2019-03-06 11:50 ` [igt-dev] " Tvrtko Ursulin 2019-03-06 11:50 ` Tvrtko Ursulin 2019-02-17 14:35 ` [PATCH i-g-t 7/8] kms_fence_pin_leak: Ask for the GPU before use Chris Wilson 2019-02-17 14:35 ` [igt-dev] " Chris Wilson 2019-02-17 14:35 ` [PATCH i-g-t 8/8] kms_fence_pin_leak: Move beneath i915/ Chris Wilson 2019-02-17 14:35 ` [Intel-gfx] " Chris Wilson 2019-02-18 13:37 ` Arkadiusz Hiler 2019-02-18 13:37 ` [igt-dev] " Arkadiusz Hiler 2019-02-18 13:42 ` Chris Wilson 2019-02-18 13:42 ` [igt-dev] " Chris Wilson 2019-02-18 13:43 ` Chris Wilson 2019-02-18 13:43 ` [igt-dev] " Chris Wilson 2019-02-18 14:01 ` Arkadiusz Hiler 2019-02-18 14:01 ` [igt-dev] " Arkadiusz Hiler 2019-02-18 14:08 ` Chris Wilson 2019-02-18 14:08 ` [igt-dev] " Chris Wilson 2019-02-18 14:19 ` Arkadiusz Hiler 2019-02-18 14:19 ` [igt-dev] " Arkadiusz Hiler 2019-02-17 15:22 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/8] i915/gem_eio: Check that context create fails when wedged Patchwork 2019-02-17 18:24 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork 2019-02-19 16:53 ` [PATCH i-g-t 1/8] " Antonio Argenziano 2019-02-19 16:53 ` [igt-dev] [Intel-gfx] " Antonio Argenziano 2019-02-19 17:36 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/8] i915/gem_eio: Check that context create fails when wedged (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=20190217143556.9482-5-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.