On Thu, Aug 13, 2015 at 01:31:24PM -0700, Jesse Barnes wrote: > There was a lot of duplication going on... Mark as basic while we're at > it as these should never fail. > > Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> > --- > tests/Makefile.sources | 1 + > tests/gem_storedw_loop.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 182 insertions(+) > create mode 100644 tests/gem_storedw_loop.c > > diff --git a/tests/Makefile.sources b/tests/Makefile.sources > index b9a4cb4..cdcee33 100644 > --- a/tests/Makefile.sources > +++ b/tests/Makefile.sources > @@ -138,6 +138,7 @@ TESTS_progs = \ > gem_seqno_wrap \ > gem_set_tiling_vs_gtt \ > gem_set_tiling_vs_pwrite \ > + gem_storedw_loop \ > gem_storedw_loop_blt \ > gem_storedw_loop_bsd \ > gem_storedw_loop_render \ Why not remove the old ones while at it? This just means more gunk in the overall igt set. Also please update .gitignore here for these ... > diff --git a/tests/gem_storedw_loop.c b/tests/gem_storedw_loop.c > new file mode 100644 > index 0000000..e4ed35d > --- /dev/null > +++ b/tests/gem_storedw_loop.c > @@ -0,0 +1,181 @@ > +/* > + * Copyright © 2009 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: > + * Eric Anholt <eric@xxxxxxxxxx> > + * Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> (based on gem_bad_blit.c) > + * > + */ > + > +#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 "intel_chipset.h" > + > +IGT_TEST_DESCRIPTION("Basic CS check using MI_STORE_DATA_IMM."); > + > +#define LOCAL_I915_EXEC_VEBOX (4<<0) > + > +static drm_intel_bufmgr *bufmgr; > +struct intel_batchbuffer *batch; > +static drm_intel_bo *target_buffer; > +static int has_ppgtt = 0; > +static int devid; > + > +/* > + * Testcase: Basic bsd MI check using MI_STORE_DATA_IMM > + */ > + > +static void > +emit_store_dword_imm(drm_intel_bo *dest, uint32_t val) > +{ > + int cmd; > + cmd = MI_STORE_DWORD_IMM; > + if (!has_ppgtt) > + cmd |= MI_MEM_VIRTUAL; > + > + BEGIN_BATCH(4, 0); > + OUT_BATCH(cmd); > + if (batch->gen >= 8) { > + OUT_RELOC(dest, I915_GEM_DOMAIN_INSTRUCTION, > + I915_GEM_DOMAIN_INSTRUCTION, 0); > + OUT_BATCH(val); > + } else { > + OUT_BATCH(0); /* reserved */ > + OUT_RELOC(dest, I915_GEM_DOMAIN_INSTRUCTION, > + I915_GEM_DOMAIN_INSTRUCTION, 0); > + OUT_BATCH(val); > + } > + ADVANCE_BATCH(); > +} > + > +static void > +store_dword_loop(int ring, int count, int divider) > +{ > + int i, val = 0; > + uint32_t *buf; > + > + igt_info("running storedw loop on render with stall every %i batch\n", divider); > + > + for (i = 0; i < SLOW_QUICK(0x2000, 0x10); i++) { > + emit_store_dword_imm(target_buffer, val); > + intel_batchbuffer_flush_on_ring(batch, ring); > + > + if (i % divider != 0) > + goto cont; > + > + drm_intel_bo_map(target_buffer, 0); > + > + buf = target_buffer->virtual; > + igt_assert_f(buf[0] == val, > + "value mismatch: cur 0x%08x, stored 0x%08x\n", > + buf[0], val); > + > + drm_intel_bo_unmap(target_buffer); > + > +cont: > + val++; > + } > + > + drm_intel_bo_map(target_buffer, 0); > + buf = target_buffer->virtual; > + > + igt_info("completed %d writes successfully, current value: 0x%08x\n", i, > + buf[0]); > + drm_intel_bo_unmap(target_buffer); > +} > + > +static void > +store_test(int ring, int count) > +{ > + drm_intel_bufmgr_gem_enable_reuse(bufmgr); > + > + batch = intel_batchbuffer_alloc(bufmgr, devid); > + igt_assert(batch); > + > + target_buffer = drm_intel_bo_alloc(bufmgr, "target bo", 4096, 4096); > + igt_assert(target_buffer); > + > + store_dword_loop(ring, count, 1); > + store_dword_loop(ring, count, 2); > + if (!igt_run_in_simulation()) { > + store_dword_loop(ring, count, 3); > + store_dword_loop(ring, count, 5); > + } > + > + drm_intel_bo_unreference(target_buffer); > + intel_batchbuffer_free(batch); > + drm_intel_bufmgr_destroy(bufmgr); > +} > + > +struct ring { > + const char *name; > + int id; > +} rings[] = { > + { "bsd", I915_EXEC_BSD }, > + { "render", I915_EXEC_RENDER }, > + { "blt", I915_EXEC_BLT }, > + { "vebox", I915_EXEC_VEBOX }, > +}; > + > +igt_main > +{ > + int fd, i; > + > + igt_fixture { > + fd = drm_open_any(); > + devid = intel_get_drm_devid(fd); > + > + bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); > + igt_assert(bufmgr); > + > + has_ppgtt = gem_uses_aliasing_ppgtt(fd); > + > + igt_skip_on_f(intel_gen(devid) < 6, > + "MI_STORE_DATA can only use GTT address on gen4+/g33 and " > + "needs snoopable mem on pre-gen6\n"); > + > + /* This only works with ppgtt */ > + igt_require(has_ppgtt); > + } > + > + for (i = 0; i < ARRAY_SIZE(rings); i++) { > + igt_subtest_f("basic-%s", rings[i].name) > + store_test(rings[i].id, 16*1024); > + > + igt_subtest_f("long-%s", rings[i].name) > + store_test(rings[i].id, 1024*1024); > + } > + > + close(fd); > +} > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx