From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [Intel gfx][i-g-t PATCH 1/4] tests: add gem_media_fill Date: Fri, 29 Nov 2013 09:02:06 +0100 Message-ID: <20131129080206.GT27344@phenom.ffwll.local> References: <1385708236-29833-1-git-send-email-haihao.xiang@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ea0-f180.google.com (mail-ea0-f180.google.com [209.85.215.180]) by gabe.freedesktop.org (Postfix) with ESMTP id 487ECFAC95 for ; Fri, 29 Nov 2013 00:01:23 -0800 (PST) Received: by mail-ea0-f180.google.com with SMTP id f15so6372256eak.25 for ; Fri, 29 Nov 2013 00:01:22 -0800 (PST) Content-Disposition: inline In-Reply-To: <1385708236-29833-1-git-send-email-haihao.xiang@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: "Xiang, Haihao" Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Nov 29, 2013 at 02:57:13PM +0800, Xiang, Haihao wrote: > From: "Xiang, Haihao" > = > It is to check whether media pipeline on render ring works. Codes > are copied and modified from the rendercopy case which uses 3D pipeline. > However media pipeline is simpler than 3D pipeline and there is few chang= es > between gen6,gen7 and gen8 > = > Signed-off-by: Xiang, Haihao Really awesome. This should also help in writing crazy multi-ring tests which check correctness. I don't have any clue about media stuff, so please let someone else from your team quickly review it before you push. Otherwise lgtm. -Daniel > --- > lib/Makefile.sources | 2 + > lib/media_fill.c | 9 ++++ > lib/media_fill.h | 50 ++++++++++++++++++ > tests/Makefile.sources | 1 + > tests/gem_media_fill.c | 132 ++++++++++++++++++++++++++++++++++++++++++= ++++++ > 5 files changed, 194 insertions(+) > create mode 100644 lib/media_fill.c > create mode 100644 lib/media_fill.h > create mode 100644 tests/gem_media_fill.c > = > diff --git a/lib/Makefile.sources b/lib/Makefile.sources > index 699621b..cad238a 100644 > --- a/lib/Makefile.sources > +++ b/lib/Makefile.sources > @@ -19,6 +19,8 @@ libintel_tools_la_SOURCES =3D \ > intel_mmio.c \ > intel_pci.c \ > intel_reg.h \ > + media_fill.c \ > + media_fill.h \ > rendercopy_i915.c \ > rendercopy_i830.c \ > gen6_render.h \ > diff --git a/lib/media_fill.c b/lib/media_fill.c > new file mode 100644 > index 0000000..8ee5db6 > --- /dev/null > +++ b/lib/media_fill.c > @@ -0,0 +1,9 @@ > +#include "i830_reg.h" > +#include "media_fill.h" > + > +media_fillfunc_t get_media_fillfunc(int devid) > +{ > + media_fillfunc_t fill =3D NULL; > + > + return fill; > +} > diff --git a/lib/media_fill.h b/lib/media_fill.h > new file mode 100644 > index 0000000..2e058cb > --- /dev/null > +++ b/lib/media_fill.h > @@ -0,0 +1,50 @@ > +#ifndef RENDE_MEDIA_FILL_H > +#define RENDE_MEDIA_FILL_H > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include "drm.h" > +#include "i915_drm.h" > +#include "drmtest.h" > +#include "intel_bufmgr.h" > +#include "intel_batchbuffer.h" > +#include "intel_gpu_tools.h" > + > +struct scratch_buf { > + drm_intel_bo *bo; > + uint32_t stride; > + uint32_t tiling; > + uint32_t *data; > + uint32_t *cpu_mapping; > + uint32_t size; > + unsigned num_tiles; > +}; > + > +static inline unsigned buf_width(struct scratch_buf *buf) > +{ > + return buf->stride/sizeof(uint8_t); > +} > + > +static inline unsigned buf_height(struct scratch_buf *buf) > +{ > + return buf->size/buf->stride; > +} > + > +typedef void (*media_fillfunc_t)(struct intel_batchbuffer *batch, > + struct scratch_buf *dst, > + unsigned x, unsigned y, > + unsigned width, unsigned height, > + uint8_t color); > + > +media_fillfunc_t get_media_fillfunc(int devid); > + > +#endif /* RENDE_MEDIA_FILL_H */ > diff --git a/tests/Makefile.sources b/tests/Makefile.sources > index d201809..0ff0e37 100644 > --- a/tests/Makefile.sources > +++ b/tests/Makefile.sources > @@ -87,6 +87,7 @@ TESTS_progs =3D \ > gem_largeobject \ > gem_lut_handle \ > gem_mmap_offset_exhaustion \ > + gem_media_fill \ > gem_pin \ > gem_pipe_control_store_loop \ > gem_reg_read \ > diff --git a/tests/gem_media_fill.c b/tests/gem_media_fill.c > new file mode 100644 > index 0000000..40b391d > --- /dev/null > +++ b/tests/gem_media_fill.c > @@ -0,0 +1,132 @@ > +/* > + * Copyright =A9 2013 Intel Corporation > + * > + * Permission is hereby granted, free of charge, to any person obtaining= a > + * copy of this software and associated documentation files (the "Softwa= re"), > + * to deal in the Software without restriction, including without limita= tion > + * the rights to use, copy, modify, merge, publish, distribute, sublicen= se, > + * 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, EXPRE= SS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILI= TY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SH= ALL > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR = OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISI= NG > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER D= EALINGS > + * IN THE SOFTWARE. > + * > + * Authors: > + * Damien Lespiau > + * Xiang, Haihao > + */ > + > +/* > + * This file is a basic test for the media_fill() function, a very simple > + * workload for the Media pipeline. > + */ > + > +#include > +#include > +#include > + > +#include "media_fill.h" > + > +#define WIDTH 64 > +#define STRIDE (WIDTH) > +#define HEIGHT 64 > +#define SIZE (HEIGHT*STRIDE) > + > +#define COLOR_C4 0xc4 > +#define COLOR_4C 0x4c > + > +typedef struct { > + int drm_fd; > + uint32_t devid; > + drm_intel_bufmgr *bufmgr; > + uint8_t linear[WIDTH * HEIGHT]; > +} data_t; > + > +static void scratch_buf_init(data_t *data, struct scratch_buf *buf, > + int width, int height, int stride, uint8_t color) > +{ > + drm_intel_bo *bo; > + int i; > + > + bo =3D drm_intel_bo_alloc(data->bufmgr, "", SIZE, 4096); > + for (i =3D 0; i < width * height; i++) > + data->linear[i] =3D color; > + gem_write(data->drm_fd, bo->handle, 0, data->linear, > + sizeof(data->linear)); > + > + buf->bo =3D bo; > + buf->stride =3D stride; > + buf->tiling =3D I915_TILING_NONE; > + buf->size =3D SIZE; > +} > + > +static void > +scratch_buf_check(data_t *data, struct scratch_buf *buf, int x, int y, > + uint8_t color) > +{ > + uint8_t val; > + > + gem_read(data->drm_fd, buf->bo->handle, 0, > + data->linear, sizeof(data->linear)); > + val =3D data->linear[y * WIDTH + x]; > + if (val !=3D color) { > + fprintf(stderr, "Expected 0x%02x, found 0x%02x at (%d,%d)\n", > + color, val, x, y); > + abort(); > + } > +} > + > +int main(int argc, char **argv) > +{ > + data_t data =3D {0, }; > + struct intel_batchbuffer *batch =3D NULL; > + struct scratch_buf dst; > + media_fillfunc_t media_fill =3D NULL; > + int i, j; > + > + igt_fixture { > + data.drm_fd =3D drm_open_any_render(); > + data.devid =3D intel_get_drm_devid(data.drm_fd); > + > + data.bufmgr =3D drm_intel_bufmgr_gem_init(data.drm_fd, 4096); > + igt_assert(data.bufmgr); > + > + media_fill =3D get_media_fillfunc(data.devid); > + > + igt_require_f(media_fill, > + "no media-fill function\n"); > + > + batch =3D intel_batchbuffer_alloc(data.bufmgr, data.devid); > + igt_assert(batch); > + } > + > + scratch_buf_init(&data, &dst, WIDTH, HEIGHT, STRIDE, COLOR_C4); > + > + for (i =3D 0; i < WIDTH; i++) { > + for (j =3D 0; j < HEIGHT; j++) { > + scratch_buf_check(&data, &dst, i, j, COLOR_C4); > + } > + } > + > + media_fill(batch, > + &dst, 0, 0, WIDTH / 2, HEIGHT / 2, > + COLOR_4C); > + > + for (i =3D 0; i < WIDTH; i++) { > + for (j =3D 0; j < HEIGHT; j++) { > + if (i < WIDTH / 2 && j < HEIGHT / 2) > + scratch_buf_check(&data, &dst, i, j, COLOR_4C); > + else > + scratch_buf_check(&data, &dst, i, j, COLOR_C4); > + } > + } > +} > -- = > 1.7.9.5 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch