Tests: Add two test cases based on multi drm_fd to test sync
cover Tests: Add two test cases based on multi drm_fd to test sync
This follows Daniel's advice to add the two test cases based on multi drm_fd to test the ring sync and CPU<->GPU sync.
The Broadwell GT3 machine has two independent BSD rings that can be used to process the video commands. This is implemented in kernel driver and transparent to the user-space. But we still need to check the ring sync and CPU<->GPU sync for the second BSD ring. Two tests are created based on the multi drm_fds to test the sync. Multi drm_fd can assure that the second BSD ring has the opportunity to dispatch the GPU command.
Zhao Yakui (2):
tests: Add one ring sync case based on multi drm_fd to test ring
semaphore sync under multi BSD rings
tests: Add dummy_reloc test case based on multi drm_fd to test
CPU<->GPU sync under multi BSD rings
tests/Makefile.sources | 2 + tests/gem_dummy_reloc_multi_bsd.c | 258 +++++++++++++++++++++++++++++++++++++ tests/gem_multi_bsd_sync_loop.c | 172 +++++++++++++++++++++++++ 3 files changed, 432 insertions(+) create mode 100644 tests/gem_dummy_reloc_multi_bsd.c create mode 100644 tests/gem_multi_bsd_sync_loop.c
Signature · 1 line
1.7.10.1
PATCH 1/2 tests: Add one ring sync case based on multi drm_fd to test ring semaphore sync
The Broadwell GT3 machine has two independent BSD rings in kernel driver while it is transparent to the user-space driver. In such case it needs to check the ring sync between the two BSD rings. At the same time it also needs to check the sync among the second BSD ring and the other rings. Multi drm_fd can assure that the second BSD ring has the opportunity to dispatch the GPU command.
--- tests/Makefile.sources | 1 + tests/gem_multi_bsd_sync_loop.c | 172 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+) create mode 100644 tests/gem_multi_bsd_sync_loop.c
tests/Makefile.sources +1 -0
@@ -104,6 +104,7 @@ TESTS_progs = \ gem_render_tiled_blits \ gem_ring_sync_copy \ gem_ring_sync_loop \ + gem_multi_bsd_sync_loop \ gem_seqno_wrap \ gem_set_tiling_vs_gtt \ gem_set_tiling_vs_pwrite \
tests/gem_multi_bsd_sync_loop.c new file +172 -0
172 lines not on this page · raw message
Signature · 6 lines
1.7.10.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 tests: Add dummy_reloc test case based on multi drm_fd to test CPU<->GPU sync under multi BSD rings
In reply to Zhao YakuiThe Broadwell GT3 machine has two independent BSD rings in kernel driver while it is transparent to the user-space driver. In such case it needs to check the CPU<->GPU sync for the second BSD ring. Multi drm_fd can assure that the second BSD ring has the opportunity to dispatch the GPU command.
--- tests/Makefile.sources | 1 + tests/gem_dummy_reloc_multi_bsd.c | 258 +++++++++++++++++++++++++++++++++++++ 2 files changed, 259 insertions(+) create mode 100644 tests/gem_dummy_reloc_multi_bsd.c
tests/Makefile.sources +1 -0
@@ -105,6 +105,7 @@ TESTS_progs = \ gem_ring_sync_copy \ gem_ring_sync_loop \ gem_multi_bsd_sync_loop \ + gem_dummy_reloc_multi_bsd \ gem_seqno_wrap \ gem_set_tiling_vs_gtt \ gem_set_tiling_vs_pwrite \
tests/gem_dummy_reloc_multi_bsd.c new file +258 -0
258 lines not on this page · raw message
Signature · 6 lines
1.7.10.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH I-g-t 2/2] tests: Add dummy_reloc test case based on multi drm_fd to test CPU<->GPU sync under multi BSD rings
Quoted 9 lines · Zhao Yakui
The Broadwell GT3 machine has two independent BSD rings in kernel driver while it is transparent to the user-space driver. In such case it needs to check the CPU<->GPU sync for the second BSD ring. Multi
drm_fdcan assure that the second BSD ring has the opportunity to dispatch the GPU command.Signed-off-by Zhao Yakui <[email protected]>--- tests/Makefile.sources | 1 + tests/gem_dummy_reloc_multi_bsd.c | 258 +++++++++++++++++++++++++++++++++++++
I've meant that you add a new subtest to the existing gem_dummy_reloc test. With your patch here we essentially duplicate all the tests for the other rings.
tests/Makefile.sources TESTS_progs = \ · line 108
Quoted 12 lines
2 files changed, 259 insertions(+) create mode 100644 tests/gem_dummy_reloc_multi_bsd.ctests/Makefile.sources +1
-0@@ -105,6 +105,7 @@ TESTS_progs = \ gem_ring_sync_copy \ gem_ring_sync_loop \ gem_multi_bsd_sync_loop \ + gem_dummy_reloc_multi_bsd \
Tests with subtests must be added to the TESTS_progs_M variable, otherwise piglit won't be able to enumerate the subtests. That's just an fyi for the next testcase, like I've said here it's imo better to just add a new subtest.
Also you've forgotten to update .gitignore, when building with your patch git status shows some not-added binaries.
-Daniel
Quoted 274 lines
tests/Makefile.sources +0
-0gem_seqno_wrap \ gem_set_tiling_vs_gtt \ gem_set_tiling_vs_pwrite \tests/gem_dummy_reloc_multi_bsd.c new file +258
-0@@ -0,0 +1,258 @@ +/* +* Copyright © 2014 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +* +* Authors: +* Daniel Vetter <[email protected]> (based on gem_dummy_reloc_loop*.c) +* Zhao Yakui <[email protected]> +* +*/ + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <fcntl.h> +#include <inttypes.h> +#include <errno.h> +#include <sys/stat.h> +#include <sys/time.h> +#include "drm.h" +#include "ioctl_wrappers.h" +#include "drmtest.h" +#include "intel_bufmgr.h" +#include "intel_batchbuffer.h" +#include "intel_io.h" +#include "i830_reg.h" +#include "intel_chipset.h" + +#define LOCAL_I915_EXEC_VEBOX (4<<0) + +static drm_intel_bufmgr *bufmgr; +struct intel_batchbuffer *batch; +static drm_intel_bo *target_buffer; + +#define NUM_FD 50 + +static int mfd[NUM_FD ]; +static drm_intel_bufmgr *mbufmgr[NUM_FD ]; +static struct intel_batchbuffer *mbatch[NUM_FD ]; +static drm_intel_bo *mbuffer[NUM_FD ]; + + +/* +* Testcase: Basic check of ring<->cpu sync using a dummy reloc under multi-fd +* +* The last test (that randomly switches the ring) seems to be pretty effective +* at hitting the missed irq bug that's worked around with the HWSTAM irq write. +*/ + + +#define MI_COND_BATCH_BUFFER_END (0x36<<23 | 1) +#define MI_DO_COMPARE (1<<21) +static void +dummy_reloc_loop (int ring) +{ +int i; +srandom (0xdeadbeef ); + +for (i =0 ; i <0x100000 ; i++) { +int mindex =random () %NUM_FD ; + + batch = mbatch[mindex]; +if (ring ==I915_EXEC_RENDER ) { +BEGIN_BATCH (4 ); +OUT_BATCH (MI_COND_BATCH_BUFFER_END |MI_DO_COMPARE ); +OUT_BATCH (0xffffffff );/* compare dword */ +OUT_RELOC (mbuffer[mindex],I915_GEM_DOMAIN_RENDER , +I915_GEM_DOMAIN_RENDER ,0 ); +OUT_BATCH (MI_NOOP ); +ADVANCE_BATCH (); + }else { +BEGIN_BATCH (4 ); +OUT_BATCH (MI_FLUSH_DW |1 ); +OUT_RELOC (mbuffer[mindex],I915_GEM_DOMAIN_RENDER , +I915_GEM_DOMAIN_RENDER ,0 ); +OUT_BATCH (0 );/* reserved */ +OUT_BATCH (MI_NOOP | (1 <<22 ) | (0xf )); +ADVANCE_BATCH (); + } +intel_batchbuffer_flush_on_ring (batch, ring); + +drm_intel_bo_map (target_buffer,0 ); +// map to force completion +drm_intel_bo_unmap (target_buffer); + } +} + +static void +dummy_reloc_loop_random_ring (int num_rings) +{ +int i; + +srandom (0xdeadbeef ); + +for (i =0 ; i <0x100000 ; i++) { +int mindex; +int ring =random () % num_rings +1 ; + + mindex =random () %NUM_FD ; + + batch = mbatch[mindex]; +if (ring ==I915_EXEC_RENDER ) { +BEGIN_BATCH (4 ); +OUT_BATCH (MI_COND_BATCH_BUFFER_END |MI_DO_COMPARE ); +OUT_BATCH (0xffffffff );/* compare dword */ +OUT_RELOC (mbuffer[mindex],I915_GEM_DOMAIN_RENDER , +I915_GEM_DOMAIN_RENDER ,0 ); +OUT_BATCH (MI_NOOP ); +ADVANCE_BATCH (); + }else { +BEGIN_BATCH (4 ); +OUT_BATCH (MI_FLUSH_DW |1 ); +OUT_BATCH (0 );/* reserved */ +OUT_RELOC (mbuffer[mindex],I915_GEM_DOMAIN_RENDER , +I915_GEM_DOMAIN_RENDER ,0 ); +OUT_BATCH (MI_NOOP | (1 <<22 ) | (0xf )); +ADVANCE_BATCH (); + } +intel_batchbuffer_flush_on_ring (batch, ring); + +drm_intel_bo_map (target_buffer,0 ); +// map to force waiting on rendering +drm_intel_bo_unmap (target_buffer); + } +} + +int fd; +int devid; +int num_rings; + +igt_main +{ +igt_skip_on_simulation (); + + igt_fixture { + fd =drm_open_any (); + devid =intel_get_drm_devid (fd); + num_rings =gem_get_num_rings (fd); +/* Not yet implemented on pre-snb. */ +igt_require (HAS_BLT_RING (devid)); + + bufmgr =drm_intel_bufmgr_gem_init (fd,4096 ); +igt_assert (bufmgr); +drm_intel_bufmgr_gem_enable_reuse (bufmgr); + + target_buffer =drm_intel_bo_alloc (bufmgr,"target bo" ,4096 ,4096 ); +igt_assert (target_buffer); + } +/* Create multi drm_fd and map one gem object to multi gem_contexts */ + { +int i; +unsigned int target_flink; +char buffer_name[32 ]; +if (dri_bo_flink (target_buffer, &target_flink)) { +igt_assert (0 ); +printf ("fail to get flink for target buffer\n" ); + goto fail_flink; + } +for (i =0 ; i <NUM_FD ; i++) { + mfd[i] =0 ; + mbufmgr[i] =NULL ; + mbuffer[i] =NULL ; + } +for (i =0 ; i <NUM_FD ; i++) { +sprintf (buffer_name,"Target buffer %d\n" , i); + mfd[i] =drm_open_any (); + mbufmgr[i] =drm_intel_bufmgr_gem_init (mfd[i],4096 ); +igt_assert (mbufmgr[i]); +drm_intel_bufmgr_gem_enable_reuse (mbufmgr[i]); + mbatch[i] =intel_batchbuffer_alloc (mbufmgr[i], devid); +igt_assert (mbufmgr[i]); + mbuffer[i] =intel_bo_gem_create_from_name (mbufmgr[i], buffer_name, target_flink); +igt_assert (mbuffer[i]); + } + } + igt_subtest("render") { +printf ("running dummy loop on render\n" ); +dummy_reloc_loop (I915_EXEC_RENDER ); +printf ("dummy loop run on render completed\n" ); + } + + igt_subtest("bsd") { +gem_require_ring (fd,I915_EXEC_BSD ); +sleep (2 ); +printf ("running dummy loop on bsd\n" ); +dummy_reloc_loop (I915_EXEC_BSD ); +printf ("dummy loop run on bsd completed\n" ); + } + + igt_subtest("blt") { +gem_require_ring (fd,I915_EXEC_BLT ); +sleep (2 ); +printf ("running dummy loop on blt\n" ); +dummy_reloc_loop (I915_EXEC_BLT ); +printf ("dummy loop run on blt completed\n" ); + } + +#ifdef I915_EXEC_VEBOX + igt_subtest("vebox") { +gem_require_ring (fd,I915_EXEC_VEBOX ); +sleep (2 ); +printf ("running dummy loop on vebox\n" ); +dummy_reloc_loop (LOCAL_I915_EXEC_VEBOX ); +printf ("dummy loop run on vebox completed\n" ); + } +#endif + + igt_subtest("mixed") { +if (num_rings >1 ) { +sleep (2 ); +printf ("running dummy loop on random rings\n" ); +dummy_reloc_loop_random_ring (num_rings); +printf ("dummy loop run on random rings completed\n" ); + } + } + +/* Free the buffer/batchbuffer/buffer mgr for multi-fd */ + { +int i; +for (i =0 ; i <NUM_FD ; i++) { +dri_bo_unreference (mbuffer[i]); +intel_batchbuffer_free (mbatch[i]); +drm_intel_bufmgr_destroy (mbufmgr[i]); +close (mfd[i]); + } + } + igt_fixture { +drm_intel_bo_unreference (target_buffer); +drm_intel_bufmgr_destroy (bufmgr); + +close (fd); + } +return ; +fail_flink: + igt_fixture { +drm_intel_bo_unreference (target_buffer); +drm_intel_bufmgr_destroy (bufmgr); + +close (fd); + } +}Signature · 6 lines
1.7.10.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH I-g-t 2/2] tests: Add dummy_reloc test case based on multi drm_fd to test CPU<->GPU sync under multi BSD rings
Quoted 18 lines · Daniel Vetter
Quoted 9 lines · Zhao Yakui
The Broadwell GT3 machine has two independent BSD rings in kernel driver while it is transparent to the user-space driver. In such case it needs to check the CPU<->GPU sync for the second BSD ring. Multi
drm_fdcan assure that the second BSD ring has the opportunity to dispatch the GPU command.Signed-off-by Zhao Yakui <[email protected]>--- tests/Makefile.sources | 1 + tests/gem_dummy_reloc_multi_bsd.c | 258 +++++++++++++++++++++++++++++++++++++I've meant that you add a new subtest to the existing
gem_dummy_reloctest. With your patch here we essentially duplicate all the tests for the other rings.Quoted 3 lines
2 files changed, 259 insertions(+) create mode 100644 tests/gem_dummy_reloc_multi_bsd.c
Quoted 15 lines
tests/Makefile.sources TESTS_progs = \ · line 108
Quoted 9 lines
tests/Makefile.sources +1
-0@@ -105,6 +105,7 @@ TESTS_progs = \ gem_ring_sync_copy \ gem_ring_sync_loop \ gem_multi_bsd_sync_loop \ + gem_dummy_reloc_multi_bsd \Tests with subtests must be added to the
TESTS_progs_Mvariable, otherwise piglit won't be able to enumerate the subtests. That's just an fyi for the next testcase, like I've said here it's imo better to just add a new subtest.
Thanks for the rules about how to add the test with subtests.(Sorry that I don't know this rule)
OK. I will follow your comment to add it as subtests.
Thanks.
Yakui
Quoted 274 lines
Also you've forgotten to update .gitignore, when building with your patch git status shows some not-added binaries.
-DanielQuoted 270 lines
tests/Makefile.sources +0
-0gem_seqno_wrap \ gem_set_tiling_vs_gtt \ gem_set_tiling_vs_pwrite \tests/gem_dummy_reloc_multi_bsd.c new file +258
-0@@ -0,0 +1,258 @@ +/* +* Copyright © 2014 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +* +* Authors: +* Daniel Vetter <[email protected]> (based on gem_dummy_reloc_loop*.c) +* Zhao Yakui <[email protected]> +* +*/ + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <fcntl.h> +#include <inttypes.h> +#include <errno.h> +#include <sys/stat.h> +#include <sys/time.h> +#include "drm.h" +#include "ioctl_wrappers.h" +#include "drmtest.h" +#include "intel_bufmgr.h" +#include "intel_batchbuffer.h" +#include "intel_io.h" +#include "i830_reg.h" +#include "intel_chipset.h" + +#define LOCAL_I915_EXEC_VEBOX (4<<0) + +static drm_intel_bufmgr *bufmgr; +struct intel_batchbuffer *batch; +static drm_intel_bo *target_buffer; + +#define NUM_FD 50 + +static int mfd[NUM_FD ]; +static drm_intel_bufmgr *mbufmgr[NUM_FD ]; +static struct intel_batchbuffer *mbatch[NUM_FD ]; +static drm_intel_bo *mbuffer[NUM_FD ]; + + +/* +* Testcase: Basic check of ring<->cpu sync using a dummy reloc under multi-fd +* +* The last test (that randomly switches the ring) seems to be pretty effective +* at hitting the missed irq bug that's worked around with the HWSTAM irq write. +*/ + + +#define MI_COND_BATCH_BUFFER_END (0x36<<23 | 1) +#define MI_DO_COMPARE (1<<21) +static void +dummy_reloc_loop (int ring) +{ +int i; +srandom (0xdeadbeef ); + +for (i =0 ; i <0x100000 ; i++) { +int mindex =random () %NUM_FD ; + + batch = mbatch[mindex]; +if (ring ==I915_EXEC_RENDER ) { +BEGIN_BATCH (4 ); +OUT_BATCH (MI_COND_BATCH_BUFFER_END |MI_DO_COMPARE ); +OUT_BATCH (0xffffffff );/* compare dword */ +OUT_RELOC (mbuffer[mindex],I915_GEM_DOMAIN_RENDER , +I915_GEM_DOMAIN_RENDER ,0 ); +OUT_BATCH (MI_NOOP ); +ADVANCE_BATCH (); + }else { +BEGIN_BATCH (4 ); +OUT_BATCH (MI_FLUSH_DW |1 ); +OUT_RELOC (mbuffer[mindex],I915_GEM_DOMAIN_RENDER , +I915_GEM_DOMAIN_RENDER ,0 ); +OUT_BATCH (0 );/* reserved */ +OUT_BATCH (MI_NOOP | (1 <<22 ) | (0xf )); +ADVANCE_BATCH (); + } +intel_batchbuffer_flush_on_ring (batch, ring); + +drm_intel_bo_map (target_buffer,0 ); +// map to force completion +drm_intel_bo_unmap (target_buffer); + } +} + +static void +dummy_reloc_loop_random_ring (int num_rings) +{ +int i; + +srandom (0xdeadbeef ); + +for (i =0 ; i <0x100000 ; i++) { +int mindex; +int ring =random () % num_rings +1 ; + + mindex =random () %NUM_FD ; + + batch = mbatch[mindex]; +if (ring ==I915_EXEC_RENDER ) { +BEGIN_BATCH (4 ); +OUT_BATCH (MI_COND_BATCH_BUFFER_END |MI_DO_COMPARE ); +OUT_BATCH (0xffffffff );/* compare dword */ +OUT_RELOC (mbuffer[mindex],I915_GEM_DOMAIN_RENDER , +I915_GEM_DOMAIN_RENDER ,0 ); +OUT_BATCH (MI_NOOP ); +ADVANCE_BATCH (); + }else { +BEGIN_BATCH (4 ); +OUT_BATCH (MI_FLUSH_DW |1 ); +OUT_BATCH (0 );/* reserved */ +OUT_RELOC (mbuffer[mindex],I915_GEM_DOMAIN_RENDER , +I915_GEM_DOMAIN_RENDER ,0 ); +OUT_BATCH (MI_NOOP | (1 <<22 ) | (0xf )); +ADVANCE_BATCH (); + } +intel_batchbuffer_flush_on_ring (batch, ring); + +drm_intel_bo_map (target_buffer,0 ); +// map to force waiting on rendering +drm_intel_bo_unmap (target_buffer); + } +} + +int fd; +int devid; +int num_rings; + +igt_main +{ +igt_skip_on_simulation (); + + igt_fixture { + fd =drm_open_any (); + devid =intel_get_drm_devid (fd); + num_rings =gem_get_num_rings (fd); +/* Not yet implemented on pre-snb. */ +igt_require (HAS_BLT_RING (devid)); + + bufmgr =drm_intel_bufmgr_gem_init (fd,4096 ); +igt_assert (bufmgr); +drm_intel_bufmgr_gem_enable_reuse (bufmgr); + + target_buffer =drm_intel_bo_alloc (bufmgr,"target bo" ,4096 ,4096 ); +igt_assert (target_buffer); + } +/* Create multi drm_fd and map one gem object to multi gem_contexts */ + { +int i; +unsigned int target_flink; +char buffer_name[32 ]; +if (dri_bo_flink (target_buffer, &target_flink)) { +igt_assert (0 ); +printf ("fail to get flink for target buffer\n" ); + goto fail_flink; + } +for (i =0 ; i <NUM_FD ; i++) { + mfd[i] =0 ; + mbufmgr[i] =NULL ; + mbuffer[i] =NULL ; + } +for (i =0 ; i <NUM_FD ; i++) { +sprintf (buffer_name,"Target buffer %d\n" , i); + mfd[i] =drm_open_any (); + mbufmgr[i] =drm_intel_bufmgr_gem_init (mfd[i],4096 ); +igt_assert (mbufmgr[i]); +drm_intel_bufmgr_gem_enable_reuse (mbufmgr[i]); + mbatch[i] =intel_batchbuffer_alloc (mbufmgr[i], devid); +igt_assert (mbufmgr[i]); + mbuffer[i] =intel_bo_gem_create_from_name (mbufmgr[i], buffer_name, target_flink); +igt_assert (mbuffer[i]); + } + } + igt_subtest("render") { +printf ("running dummy loop on render\n" ); +dummy_reloc_loop (I915_EXEC_RENDER ); +printf ("dummy loop run on render completed\n" ); + } + + igt_subtest("bsd") { +gem_require_ring (fd,I915_EXEC_BSD ); +sleep (2 ); +printf ("running dummy loop on bsd\n" ); +dummy_reloc_loop (I915_EXEC_BSD ); +printf ("dummy loop run on bsd completed\n" ); + } + + igt_subtest("blt") { +gem_require_ring (fd,I915_EXEC_BLT ); +sleep (2 ); +printf ("running dummy loop on blt\n" ); +dummy_reloc_loop (I915_EXEC_BLT ); +printf ("dummy loop run on blt completed\n" ); + } + +#ifdef I915_EXEC_VEBOX + igt_subtest("vebox") { +gem_require_ring (fd,I915_EXEC_VEBOX ); +sleep (2 ); +printf ("running dummy loop on vebox\n" ); +dummy_reloc_loop (LOCAL_I915_EXEC_VEBOX ); +printf ("dummy loop run on vebox completed\n" ); + } +#endif + + igt_subtest("mixed") { +if (num_rings >1 ) { +sleep (2 ); +printf ("running dummy loop on random rings\n" ); +dummy_reloc_loop_random_ring (num_rings); +printf ("dummy loop run on random rings completed\n" ); + } + } + +/* Free the buffer/batchbuffer/buffer mgr for multi-fd */ + { +int i; +for (i =0 ; i <NUM_FD ; i++) { +dri_bo_unreference (mbuffer[i]); +intel_batchbuffer_free (mbatch[i]); +drm_intel_bufmgr_destroy (mbufmgr[i]); +close (mfd[i]); + } + } + igt_fixture { +drm_intel_bo_unreference (target_buffer); +drm_intel_bufmgr_destroy (bufmgr); + +close (fd); + } +return ; +fail_flink: + igt_fixture { +drm_intel_bo_unreference (target_buffer); +drm_intel_bufmgr_destroy (bufmgr); + +close (fd); + } +}Signature · 1 line
1.7.10.1
Quoted 5 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH I-g-t 2/2] tests: Add dummy_reloc test case based on multi drm_fd to test CPU<->GPU sync under multi BSD rings
In reply to Daniel VetterQuoted 18 lines · Daniel Vetter
Quoted 9 lines · Zhao Yakui
The Broadwell GT3 machine has two independent BSD rings in kernel driver while it is transparent to the user-space driver. In such case it needs to check the CPU<->GPU sync for the second BSD ring. Multi
drm_fdcan assure that the second BSD ring has the opportunity to dispatch the GPU command.Signed-off-by Zhao Yakui <[email protected]>--- tests/Makefile.sources | 1 + tests/gem_dummy_reloc_multi_bsd.c | 258 +++++++++++++++++++++++++++++++++++++I've meant that you add a new subtest to the existing
gem_dummy_reloctest. With your patch here we essentially duplicate all the tests for the other rings.Quoted 3 lines
2 files changed, 259 insertions(+) create mode 100644 tests/gem_dummy_reloc_multi_bsd.c
Quoted 15 lines
tests/Makefile.sources TESTS_progs = \ · line 108
Quoted 9 lines
tests/Makefile.sources +1
-0@@ -105,6 +105,7 @@ TESTS_progs = \ gem_ring_sync_copy \ gem_ring_sync_loop \ gem_multi_bsd_sync_loop \ + gem_dummy_reloc_multi_bsd \Tests with subtests must be added to the
TESTS_progs_Mvariable, otherwise piglit won't be able to enumerate the subtests. That's just an fyi for the next testcase, like I've said here it's imo better to just add a new subtest.
Thanks for the rules about how to add the test with subtests.(Sorry that I don't know this rule)
OK. I will follow your comment to add it as subtests.
Quoted 2 lines
Also you've forgotten to update .gitignore, when building with your patch git status shows some not-added binaries.
BTW: How do I update the .gitigonre?
In my test I usually use the following step to create the corresponding patches before sending and never update the .gitignore.
a. use quilt tool to create it
b. use git am to apply the corresponding patch on the working tree c. use git format-patch to get the corresponding patches that can
be sent by using git-send-email
Appreciate your helps.
Thanks.
Yakui
Quoted 272 lines
-Daniel
Quoted 270 lines
tests/Makefile.sources +0
-0gem_seqno_wrap \ gem_set_tiling_vs_gtt \ gem_set_tiling_vs_pwrite \tests/gem_dummy_reloc_multi_bsd.c new file +258
-0@@ -0,0 +1,258 @@ +/* +* Copyright © 2014 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +* +* Authors: +* Daniel Vetter <[email protected]> (based on gem_dummy_reloc_loop*.c) +* Zhao Yakui <[email protected]> +* +*/ + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <fcntl.h> +#include <inttypes.h> +#include <errno.h> +#include <sys/stat.h> +#include <sys/time.h> +#include "drm.h" +#include "ioctl_wrappers.h" +#include "drmtest.h" +#include "intel_bufmgr.h" +#include "intel_batchbuffer.h" +#include "intel_io.h" +#include "i830_reg.h" +#include "intel_chipset.h" + +#define LOCAL_I915_EXEC_VEBOX (4<<0) + +static drm_intel_bufmgr *bufmgr; +struct intel_batchbuffer *batch; +static drm_intel_bo *target_buffer; + +#define NUM_FD 50 + +static int mfd[NUM_FD ]; +static drm_intel_bufmgr *mbufmgr[NUM_FD ]; +static struct intel_batchbuffer *mbatch[NUM_FD ]; +static drm_intel_bo *mbuffer[NUM_FD ]; + + +/* +* Testcase: Basic check of ring<->cpu sync using a dummy reloc under multi-fd +* +* The last test (that randomly switches the ring) seems to be pretty effective +* at hitting the missed irq bug that's worked around with the HWSTAM irq write. +*/ + + +#define MI_COND_BATCH_BUFFER_END (0x36<<23 | 1) +#define MI_DO_COMPARE (1<<21) +static void +dummy_reloc_loop (int ring) +{ +int i; +srandom (0xdeadbeef ); + +for (i =0 ; i <0x100000 ; i++) { +int mindex =random () %NUM_FD ; + + batch = mbatch[mindex]; +if (ring ==I915_EXEC_RENDER ) { +BEGIN_BATCH (4 ); +OUT_BATCH (MI_COND_BATCH_BUFFER_END |MI_DO_COMPARE ); +OUT_BATCH (0xffffffff );/* compare dword */ +OUT_RELOC (mbuffer[mindex],I915_GEM_DOMAIN_RENDER , +I915_GEM_DOMAIN_RENDER ,0 ); +OUT_BATCH (MI_NOOP ); +ADVANCE_BATCH (); + }else { +BEGIN_BATCH (4 ); +OUT_BATCH (MI_FLUSH_DW |1 ); +OUT_RELOC (mbuffer[mindex],I915_GEM_DOMAIN_RENDER , +I915_GEM_DOMAIN_RENDER ,0 ); +OUT_BATCH (0 );/* reserved */ +OUT_BATCH (MI_NOOP | (1 <<22 ) | (0xf )); +ADVANCE_BATCH (); + } +intel_batchbuffer_flush_on_ring (batch, ring); + +drm_intel_bo_map (target_buffer,0 ); +// map to force completion +drm_intel_bo_unmap (target_buffer); + } +} + +static void +dummy_reloc_loop_random_ring (int num_rings) +{ +int i; + +srandom (0xdeadbeef ); + +for (i =0 ; i <0x100000 ; i++) { +int mindex; +int ring =random () % num_rings +1 ; + + mindex =random () %NUM_FD ; + + batch = mbatch[mindex]; +if (ring ==I915_EXEC_RENDER ) { +BEGIN_BATCH (4 ); +OUT_BATCH (MI_COND_BATCH_BUFFER_END |MI_DO_COMPARE ); +OUT_BATCH (0xffffffff );/* compare dword */ +OUT_RELOC (mbuffer[mindex],I915_GEM_DOMAIN_RENDER , +I915_GEM_DOMAIN_RENDER ,0 ); +OUT_BATCH (MI_NOOP ); +ADVANCE_BATCH (); + }else { +BEGIN_BATCH (4 ); +OUT_BATCH (MI_FLUSH_DW |1 ); +OUT_BATCH (0 );/* reserved */ +OUT_RELOC (mbuffer[mindex],I915_GEM_DOMAIN_RENDER , +I915_GEM_DOMAIN_RENDER ,0 ); +OUT_BATCH (MI_NOOP | (1 <<22 ) | (0xf )); +ADVANCE_BATCH (); + } +intel_batchbuffer_flush_on_ring (batch, ring); + +drm_intel_bo_map (target_buffer,0 ); +// map to force waiting on rendering +drm_intel_bo_unmap (target_buffer); + } +} + +int fd; +int devid; +int num_rings; + +igt_main +{ +igt_skip_on_simulation (); + + igt_fixture { + fd =drm_open_any (); + devid =intel_get_drm_devid (fd); + num_rings =gem_get_num_rings (fd); +/* Not yet implemented on pre-snb. */ +igt_require (HAS_BLT_RING (devid)); + + bufmgr =drm_intel_bufmgr_gem_init (fd,4096 ); +igt_assert (bufmgr); +drm_intel_bufmgr_gem_enable_reuse (bufmgr); + + target_buffer =drm_intel_bo_alloc (bufmgr,"target bo" ,4096 ,4096 ); +igt_assert (target_buffer); + } +/* Create multi drm_fd and map one gem object to multi gem_contexts */ + { +int i; +unsigned int target_flink; +char buffer_name[32 ]; +if (dri_bo_flink (target_buffer, &target_flink)) { +igt_assert (0 ); +printf ("fail to get flink for target buffer\n" ); + goto fail_flink; + } +for (i =0 ; i <NUM_FD ; i++) { + mfd[i] =0 ; + mbufmgr[i] =NULL ; + mbuffer[i] =NULL ; + } +for (i =0 ; i <NUM_FD ; i++) { +sprintf (buffer_name,"Target buffer %d\n" , i); + mfd[i] =drm_open_any (); + mbufmgr[i] =drm_intel_bufmgr_gem_init (mfd[i],4096 ); +igt_assert (mbufmgr[i]); +drm_intel_bufmgr_gem_enable_reuse (mbufmgr[i]); + mbatch[i] =intel_batchbuffer_alloc (mbufmgr[i], devid); +igt_assert (mbufmgr[i]); + mbuffer[i] =intel_bo_gem_create_from_name (mbufmgr[i], buffer_name, target_flink); +igt_assert (mbuffer[i]); + } + } + igt_subtest("render") { +printf ("running dummy loop on render\n" ); +dummy_reloc_loop (I915_EXEC_RENDER ); +printf ("dummy loop run on render completed\n" ); + } + + igt_subtest("bsd") { +gem_require_ring (fd,I915_EXEC_BSD ); +sleep (2 ); +printf ("running dummy loop on bsd\n" ); +dummy_reloc_loop (I915_EXEC_BSD ); +printf ("dummy loop run on bsd completed\n" ); + } + + igt_subtest("blt") { +gem_require_ring (fd,I915_EXEC_BLT ); +sleep (2 ); +printf ("running dummy loop on blt\n" ); +dummy_reloc_loop (I915_EXEC_BLT ); +printf ("dummy loop run on blt completed\n" ); + } + +#ifdef I915_EXEC_VEBOX + igt_subtest("vebox") { +gem_require_ring (fd,I915_EXEC_VEBOX ); +sleep (2 ); +printf ("running dummy loop on vebox\n" ); +dummy_reloc_loop (LOCAL_I915_EXEC_VEBOX ); +printf ("dummy loop run on vebox completed\n" ); + } +#endif + + igt_subtest("mixed") { +if (num_rings >1 ) { +sleep (2 ); +printf ("running dummy loop on random rings\n" ); +dummy_reloc_loop_random_ring (num_rings); +printf ("dummy loop run on random rings completed\n" ); + } + } + +/* Free the buffer/batchbuffer/buffer mgr for multi-fd */ + { +int i; +for (i =0 ; i <NUM_FD ; i++) { +dri_bo_unreference (mbuffer[i]); +intel_batchbuffer_free (mbatch[i]); +drm_intel_bufmgr_destroy (mbufmgr[i]); +close (mfd[i]); + } + } + igt_fixture { +drm_intel_bo_unreference (target_buffer); +drm_intel_bufmgr_destroy (bufmgr); + +close (fd); + } +return ; +fail_flink: + igt_fixture { +drm_intel_bo_unreference (target_buffer); +drm_intel_bufmgr_destroy (bufmgr); + +close (fd); + } +}Signature · 1 line
1.7.10.1
Quoted 5 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH I-g-t 2/2] tests: Add dummy_reloc test case based on multi drm_fd to test CPU<->GPU sync under multi BSD rings
Quoted 7 lines · Zhao Yakui
BTW: How do I update the .gitigonre?
In my test I usually use the following step to create the corresponding patches before sending and never update the .gitignore.
a. use quilt tool to create it
b. use git am to apply the corresponding patch on the working tree c. use git format-patch to get the corresponding patches that can
be sent by using git-send-email
It's a normal file in the corresponding directory. You can just edit it and add it to the patch.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH I-g-t 2/2] tests: Add dummy_reloc test case based on multi drm_fd to test CPU<->GPU sync under multi BSD rings
Quoted 11 lines · Daniel Vetter
Quoted 7 lines · Zhao Yakui
BTW: How do I update the .gitigonre?
In my test I usually use the following step to create the corresponding patches before sending and never update the .gitignore.
a. use quilt tool to create it
b. use git am to apply the corresponding patch on the working tree c. use git format-patch to get the corresponding patches that can
be sent by using git-send-emailIt's a normal file in the corresponding directory. You can just edit it and add it to the patch.
Thanks.
Yakui
Quoted 1 line
-Daniel