From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH I-g-t V2 1/2] tests: Add one ring sync case based on multi drm_fd to test ring semaphore sync under multi BSD rings Date: Wed, 23 Apr 2014 12:17:00 +0300 Message-ID: <1398244620.14362.2.camel@intelbox> References: <1397529528-7114-1-git-send-email-yakui.zhao@intel.com> <1397529528-7114-2-git-send-email-yakui.zhao@intel.com> <1398167524.21147.46.camel@intelbox> <20140422194451.GF10722@phenom.ffwll.local> <1398215599.2045.170.camel@genxdev-ykzhao.sh.intel.com> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1054725518==" Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 02B2D6EA2D for ; Wed, 23 Apr 2014 02:17:37 -0700 (PDT) In-Reply-To: <1398215599.2045.170.camel@genxdev-ykzhao.sh.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Zhao Yakui Cc: "intel-gfx@lists.freedesktop.org" List-Id: intel-gfx@lists.freedesktop.org --===============1054725518== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-FHErl46kXnF1NC7DKw29" --=-FHErl46kXnF1NC7DKw29 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2014-04-23 at 09:13 +0800, Zhao Yakui wrote: > On Tue, 2014-04-22 at 13:44 -0600, Daniel Vetter wrote: > > On Tue, Apr 22, 2014 at 02:52:04PM +0300, Imre Deak wrote: > > > On Tue, 2014-04-15 at 10:38 +0800, Zhao Yakui wrote: > > > > The Broadwell GT3 machine has two independent BSD rings in kernel d= river while > > > > it is transparent to the user-space driver. In such case it needs t= o check > > > > the ring sync between the two BSD rings. At the same time it also n= eeds to > > > > check the sync among the second BSD ring and the other rings. > > > >=20 > > > > Signed-off-by: Zhao Yakui > > > > --- > > > > 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 > > > >=20 > > > > diff --git a/tests/Makefile.sources b/tests/Makefile.sources > > > > index c957ace..7cd9ca8 100644 > > > > --- a/tests/Makefile.sources > > > > +++ b/tests/Makefile.sources > > > > @@ -105,6 +105,7 @@ TESTS_progs =3D \ > > > > 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 \ > > > > diff --git a/tests/gem_multi_bsd_sync_loop.c b/tests/gem_multi_bsd_= sync_loop.c > > > > new file mode 100644 > > > > index 0000000..7f5b832 > > > > --- /dev/null > > > > +++ b/tests/gem_multi_bsd_sync_loop.c > > > > @@ -0,0 +1,172 @@ > > > > +/* > > > > + * Copyright =C2=A9 2014 Intel Corporation > > > > + * > > > > + * Permission is hereby granted, free of charge, to any person obt= aining 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, su= blicense, > > > > + * and/or sell copies of the Software, and to permit persons to wh= om the > > > > + * Software is furnished to do so, subject to the following condit= ions: > > > > + * > > > > + * The above copyright notice and this permission notice (includin= g the next > > > > + * paragraph) shall be included in all copies or substantial porti= ons 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 MERCHAN= TABILITY, > > > > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EV= ENT SHALL > > > > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAG= ES 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 O= THER DEALINGS > > > > + * IN THE SOFTWARE. > > > > + * > > > > + * Authors: > > > > + * Daniel Vetter (based on gem_ring_sy= nc_loop_*.c) > > > > + * Zhao Yakui > > > > + * > > > > + */ > > > > + > > > > +#include > > > > +#include > > > > +#include > > > > +#include > > > > +#include > > > > +#include > > > > +#include > > > > +#include > > > > +#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" > > > > + > > > > +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<->ring sync using a dummy reloc > > > > + * > > > > + * Extremely efficient at catching missed irqs with semaphores=3D0= ... > > > > + */ > > > > + > > > > +#define MI_COND_BATCH_BUFFER_END (0x36<<23 | 1) > > > > +#define MI_DO_COMPARE (1<<21) > > > > + > > > > +static void > > > > +store_dword_loop(int fd) > > > > +{ > > > > + int i; > > > > + int num_rings =3D gem_get_num_rings(fd); > > > > + > > > > + srandom(0xdeadbeef); > > > > + > > > > + for (i =3D 0; i < SLOW_QUICK(0x100000, 10); i++) { > > > > + int ring, mindex; > > > > + ring =3D random() % num_rings + 1; > > > > + mindex =3D random() % NUM_FD; > > > > + batch =3D mbatch[mindex]; > > > > + if (ring =3D=3D 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); > > >=20 > > > This test looks the same as dummy_reloc_loop_random_ring_multi_fd() t= hat > > > you add in patch 2/2, except the above two calls. Unless I'm missing > > > something else .. Is there any reason why we don't want to make this > > > also a subtest of gem_dummy_reloc_loop.c to avoid duplicating all the > > > setup here? > >=20 > > Historical accident since for the other rings we also have this > > duplication between inter-ring sync tests and ring/cpu sync tests with > > dummy relocs. I don't mind really ;-) >=20 > Hi, Imre >=20 > So based on Daniel's reply, we will use the separated test case to > do inter-ring sync test. >=20 > Anyway, thanks for your comment. Ok, based on the above this is also: Reviewed-by: Imre Deak >=20 > Thanks. > Yakui >=20 > > -Daniel > >=20 > > >=20 > > > --Imre > > >=20 > > >=20 > > > > +} > > > > + > > > > +igt_simple_main > > > > +{ > > > > + int fd; > > > > + int devid; > > > > + int i; > > > > + > > > > + fd =3D drm_open_any(); > > > > + devid =3D intel_get_drm_devid(fd); > > > > + gem_require_ring(fd, I915_EXEC_BLT); > > > > + > > > > + > > > > + bufmgr =3D drm_intel_bufmgr_gem_init(fd, 4096); > > > > + igt_assert(bufmgr); > > > > + drm_intel_bufmgr_gem_enable_reuse(bufmgr); > > > > + > > > > + > > > > + target_buffer =3D drm_intel_bo_alloc(bufmgr, "target bo", 4096, 4= 096); > > > > + igt_assert(target_buffer); > > > > + > > > > + /* Create multiple drm_fd and map one gem_object among multi drm_= fd */ > > > > + { > > > > + 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 =3D 0; i < NUM_FD; i++) { > > > > + mfd[i] =3D 0; > > > > + mbufmgr[i] =3D NULL; > > > > + mbuffer[i] =3D NULL; > > > > + } > > > > + for (i =3D 0; i < NUM_FD; i++) { > > > > + sprintf(buffer_name, "Target buffer %d\n", i); > > > > + mfd[i] =3D drm_open_any(); > > > > + mbufmgr[i] =3D drm_intel_bufmgr_gem_init(mfd[i], 4096); > > > > + igt_assert(mbufmgr[i]); > > > > + drm_intel_bufmgr_gem_enable_reuse(mbufmgr[i]); > > > > + mbatch[i] =3D intel_batchbuffer_alloc(mbufmgr[i], devid); > > > > + igt_assert(mbufmgr[i]); > > > > + mbuffer[i] =3D intel_bo_gem_create_from_name(mbufmgr[i], buffer= _name, target_flink); > > > > + igt_assert(mbuffer[i]); > > > > + } > > > > + } > > > > + > > > > + store_dword_loop(fd); > > > > + > > > > + { > > > > + for (i =3D 0; i < NUM_FD; i++) { > > > > + dri_bo_unreference(mbuffer[i]); > > > > + intel_batchbuffer_free(mbatch[i]); > > > > + drm_intel_bufmgr_destroy(mbufmgr[i]); > > > > + close(mfd[i]); > > > > + } > > > > + } > > > > + drm_intel_bo_unreference(target_buffer); > > > > + drm_intel_bufmgr_destroy(bufmgr); > > > > + > > > > + close(fd); > > > > + return; > > > > + > > > > +fail_flink: > > > > + drm_intel_bo_unreference(target_buffer); > > > > + drm_intel_bufmgr_destroy(bufmgr); > > > > + > > > > + close(fd); > > > > +} > > >=20 > >=20 > >=20 > >=20 > > > _______________________________________________ > > > Intel-gfx mailing list > > > Intel-gfx@lists.freedesktop.org > > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > >=20 > >=20 >=20 >=20 --=-FHErl46kXnF1NC7DKw29 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQEcBAABAgAGBQJTV4UMAAoJEORIIAnNuWDF37kIAIiXqHYE6o6cbhklghJbM+DS 29WcoZYS+y7UiMLpQC1IkzUtZ2wze8NVobCSYWK/2wujY2+uV0UYHUBGZikinkmA VJQGG7NJzbly3Wgs2rA6MQUMkc9h8L5yxLpgaaGFr2joTFETM9q9P6XdIPJgsyPt 5uu5gN2sDjgnASTeQgz6ld0XfvWGx1b7rAyJyM5HO4Kqph5eWPxOmNIkUrakxAux Qzhyfhpyv9kVL602d117rW9jwUlPAF/DzMKqU2iHXKCUyZRkbqG3lXL5l1gLBhqh +/M+lV6FvWKpDYmp7nBr93pNuTAfKvpT5AHX649+QuWylh7oVWTp077C+fZ3jOU= =wF5b -----END PGP SIGNATURE----- --=-FHErl46kXnF1NC7DKw29-- --===============1054725518== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============1054725518==--