* [PATCH 1/4] igt/gem_stolen: Verifying extended gem_create ioctl
2015-12-22 10:07 [PATCH v6 0/4] Tests for verifying the old and extended GEM_CREATE ioctl ankitprasad.r.sharma
@ 2015-12-22 10:07 ` ankitprasad.r.sharma
2015-12-22 10:07 ` [PATCH 2/4] igt/gem_pread: Support to verify pread/pwrite for non-shmem backed obj ankitprasad.r.sharma
` (2 subsequent siblings)
3 siblings, 0 replies; 10+ messages in thread
From: ankitprasad.r.sharma @ 2015-12-22 10:07 UTC (permalink / raw)
To: intel-gfx; +Cc: Ankitprasad Sharma, akash.goel
From: Ankitprasad Sharma <ankitprasad.r.sharma@intel.com>
This patch adds the testcases for verifying the new extended
gem_create ioctl. By means of this extended ioctl, memory
placement of the GEM object can be specified, i.e. either
shmem or stolen memory.
These testcases include functional tests and interface tests for
testing the gem_create ioctl call for stolen memory placement
v2: Testing pread/pwrite functionality for stolen backed objects,
added local struct for extended gem_create and gem_get_aperture,
until headers catch up (Chris)
v3: Removed get_aperture related functions, extended gem_pread
to compare speeds for user pages with and without page faults,
unexposed local_gem_create struct, changed gem_create_stolen
usage (Chris)
v4: Splitting patch to remove changes from gem_pread/gem_pwrite
to another patch (Ankit)
v5: Fixed Rebase conflicts (Ankit)
Added IGT_TEST_DESCRIPTION (Thomas Wood)
v6: Added __gem_create_stolen for user to handle error, updated
gem_create_stolen to align with gem_create function, corrected
fill_purge test (out of bound access), added testcase to validate
allocating of more than 32 bit sized buffers (Tvrtko)
v7: Removed unused variables, Corrected comments & formatting (Tvrtko)
Signed-off-by: Ankitprasad Sharma <ankitprasad.r.sharma at intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
lib/ioctl_wrappers.c | 72 ++++++++++
lib/ioctl_wrappers.h | 13 ++
tests/Makefile.sources | 1 +
tests/gem_stolen.c | 360 +++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 446 insertions(+)
create mode 100644 tests/gem_stolen.c
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index a269d0f..0489272 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -389,6 +389,78 @@ void gem_sync(int fd, uint32_t handle)
I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT);
}
+bool gem_create__has_stolen_support(int fd)
+{
+ static int has_stolen_support = -1;
+ struct drm_i915_getparam gp;
+ int val = -1;
+
+ if (has_stolen_support < 0) {
+ memset(&gp, 0, sizeof(gp));
+ gp.param = 36; /* CREATE_VERSION */
+ gp.value = &val;
+
+ /* Do we have the extended gem_create_ioctl? */
+ ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
+ has_stolen_support = val >= 2;
+ }
+
+ return has_stolen_support;
+}
+
+struct local_i915_gem_create_v2 {
+ uint64_t size;
+ uint32_t handle;
+ uint32_t pad;
+#define I915_CREATE_PLACEMENT_STOLEN (1<<0)
+ uint32_t flags;
+};
+
+#define LOCAL_IOCTL_I915_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_CREATE, struct local_i915_gem_create_v2)
+uint32_t __gem_create_stolen(int fd, uint64_t size)
+{
+ struct local_i915_gem_create_v2 create;
+ int ret;
+
+ memset(&create, 0, sizeof(create));
+ create.handle = 0;
+ create.size = size;
+ create.flags = I915_CREATE_PLACEMENT_STOLEN;
+ ret = drmIoctl(fd, LOCAL_IOCTL_I915_GEM_CREATE, &create);
+
+ if (ret < 0)
+ return 0;
+
+ errno = 0;
+ return create.handle;
+}
+
+/**
+ * gem_create_stolen:
+ * @fd: open i915 drm file descriptor
+ * @size: desired size of the buffer
+ *
+ * This wraps the new GEM_CREATE ioctl, which allocates a new gem buffer
+ * object of @size and placement in stolen memory region.
+ *
+ * Returns: The file-private handle of the created buffer object
+ */
+
+uint32_t gem_create_stolen(int fd, uint64_t size)
+{
+ struct local_i915_gem_create_v2 create;
+
+ memset(&create, 0, sizeof(create));
+ create.handle = 0;
+ create.size = size;
+ create.flags = I915_CREATE_PLACEMENT_STOLEN;
+ do_ioctl(fd, LOCAL_IOCTL_I915_GEM_CREATE, &create);
+ igt_assert(create.handle);
+
+ return create.handle;
+}
+
+
uint32_t __gem_create(int fd, int size)
{
struct drm_i915_gem_create create;
diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h
index bc5d4bd..ff1584a 100644
--- a/lib/ioctl_wrappers.h
+++ b/lib/ioctl_wrappers.h
@@ -56,6 +56,9 @@ void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t leng
void gem_set_domain(int fd, uint32_t handle,
uint32_t read_domains, uint32_t write_domain);
void gem_sync(int fd, uint32_t handle);
+bool gem_create__has_stolen_support(int fd);
+uint32_t __gem_create_stolen(int fd, uint64_t size);
+uint32_t gem_create_stolen(int fd, uint64_t size);
uint32_t __gem_create(int fd, int size);
uint32_t gem_create(int fd, uint64_t size);
void gem_execbuf(int fd, struct drm_i915_gem_execbuffer2 *execbuf);
@@ -67,6 +70,16 @@ bool gem_mmap__has_wc(int fd);
void *gem_mmap__wc(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot);
/**
+ * gem_require_stolen_support:
+ * @fd: open i915 drm file descriptor
+ *
+ * Test macro to query whether support for allocating objects from stolen
+ * memory is available. Automatically skips through igt_require() if not.
+ */
+#define gem_require_stolen_support(fd) \
+ igt_require(gem_create__has_stolen_support(fd))
+
+/**
* gem_require_mmap_wc:
* @fd: open i915 drm file descriptor
*
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index b9479cc..324cbb5 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -55,6 +55,7 @@ TESTS_progs_M = \
gem_reset_stats \
gem_ringfill \
gem_set_tiling_vs_blt \
+ gem_stolen \
gem_storedw_batches_loop \
gem_streaming_writes \
gem_tiled_blits \
diff --git a/tests/gem_stolen.c b/tests/gem_stolen.c
new file mode 100644
index 0000000..5dc2117
--- /dev/null
+++ b/tests/gem_stolen.c
@@ -0,0 +1,360 @@
+/*
+ * Copyright © 2015 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:
+ * Ankitprasad Sharma <ankitprasad.r.sharma at intel.com>
+ *
+ */
+
+/** @file gem_create_stolen.c
+ *
+ * This is a test for the extended gem_create ioctl, that includes allocation
+ * of object from stolen memory.
+ *
+ * The goal is to simply ensure the basics work, and invalid input combinations
+ * are rejected.
+ */
+
+#include <stdlib.h>
+#include <sys/ioctl.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 <getopt.h>
+
+#include <drm.h>
+
+#include "ioctl_wrappers.h"
+#include "intel_bufmgr.h"
+#include "intel_batchbuffer.h"
+#include "intel_io.h"
+#include "intel_chipset.h"
+#include "igt_aux.h"
+#include "drmtest.h"
+#include "drm.h"
+#include "i915_drm.h"
+
+IGT_TEST_DESCRIPTION("This test verifies the exetended gem_create ioctl,"
+ " that includes allocation of obj from stolen region");
+#define CLEAR(s) memset(&s, 0, sizeof(s))
+#define SIZE 1024*1024
+#define DWORD_SIZE 4
+#define DATA 0xdead
+#define LARGE_SIZE 0xffffffff
+#define MAX_OBJECTS 100
+
+static drm_intel_bufmgr *bufmgr;
+static struct intel_batchbuffer *batch;
+
+static void verify_copy_op(drm_intel_bo *src, drm_intel_bo *dest)
+{
+ uint32_t *virt, i, ret;
+ /* Fill the src BO with dwords */
+ ret = drm_intel_gem_bo_map_gtt(src);
+ igt_assert(!ret);
+
+ virt = src->virtual;
+ for (i = 0; i < SIZE/DWORD_SIZE; i++)
+ virt[i] = i;
+
+ intel_copy_bo(batch, dest, src, SIZE);
+
+ ret = drm_intel_gem_bo_map_gtt(dest);
+ igt_assert(!ret);
+
+ virt = dest->virtual;
+ /* verify */
+ for (i = 0; i < SIZE/DWORD_SIZE; i++)
+ igt_assert_eq(virt[i], i);
+
+ drm_intel_bo_unmap(src);
+ drm_intel_bo_unmap(dest);
+}
+
+static void stolen_pwrite(int fd)
+{
+ drm_intel_bo *bo;
+ uint32_t buf[SIZE/DWORD_SIZE];
+ uint32_t handle = 0;
+ uint32_t *virt;
+ int i, ret = 0;
+
+ for (i = 0; i < SIZE/DWORD_SIZE; i++)
+ buf[i] = DATA;
+
+ gem_require_stolen_support(fd);
+
+ handle = gem_create_stolen(fd, SIZE);
+
+ gem_write(fd, handle, 0, buf, SIZE);
+ bo = gem_handle_to_libdrm_bo(bufmgr, fd, "bo", handle);
+
+ ret = drm_intel_gem_bo_map_gtt(bo);
+ igt_assert(!ret);
+
+ virt = bo->virtual;
+
+ for (i = 0; i < SIZE/DWORD_SIZE; i++)
+ igt_assert_eq(virt[i], DATA);
+
+ drm_intel_bo_unmap(bo);
+ drm_intel_bo_unreference(bo);
+ gem_close(fd, handle);
+}
+
+static void stolen_pread(int fd)
+{
+ drm_intel_bo *bo;
+ uint32_t buf[SIZE/DWORD_SIZE];
+ uint32_t handle = 0;
+ uint32_t *virt;
+ int i, ret = 0;
+
+ CLEAR(buf);
+
+ gem_require_stolen_support(fd);
+
+ handle = gem_create_stolen(fd, SIZE);
+
+ bo = gem_handle_to_libdrm_bo(bufmgr, fd, "bo", handle);
+
+ ret = drm_intel_gem_bo_map_gtt(bo);
+ igt_assert(!ret);
+
+ virt = bo->virtual;
+
+ for (i = 0; i < SIZE/DWORD_SIZE; i++)
+ virt[i] = DATA;
+
+ drm_intel_bo_unmap(bo);
+ drm_intel_bo_unreference(bo);
+
+ gem_read(fd, handle, 0, buf, SIZE);
+
+ for (i = 0; i < SIZE/DWORD_SIZE; i++)
+ igt_assert_eq(buf[i], DATA);
+
+ gem_close(fd, handle);
+}
+
+static void copy_test(int fd)
+{
+ drm_intel_bo *src, *dest;
+ uint32_t src_handle = 0, dest_handle = 0;
+
+ gem_require_stolen_support(fd);
+
+ src_handle = gem_create_stolen(fd, SIZE);
+ dest_handle = gem_create_stolen(fd, SIZE);
+
+ src = gem_handle_to_libdrm_bo(bufmgr, fd, "src_bo", src_handle);
+ dest = gem_handle_to_libdrm_bo(bufmgr, fd, "dst_bo", dest_handle);
+
+ igt_assert(src != NULL);
+ igt_assert(dest != NULL);
+
+ verify_copy_op(src, dest);
+
+ drm_intel_bo_unreference(src);
+ drm_intel_bo_unreference(dest);
+ gem_close(fd, src_handle);
+ gem_close(fd, dest_handle);
+}
+
+static void verify_object_clear(int fd)
+{
+ drm_intel_bo *bo;
+ uint32_t handle = 0;
+ uint32_t *virt;
+ int i, ret;
+
+ gem_require_stolen_support(fd);
+
+ handle = gem_create_stolen(fd, SIZE);
+
+ bo = gem_handle_to_libdrm_bo(bufmgr, fd, "verify_bo", handle);
+ igt_assert(bo != NULL);
+
+ ret = drm_intel_gem_bo_map_gtt(bo);
+ igt_assert(!ret);
+
+ /* Verify if the BO is zeroed */
+ virt = bo->virtual;
+ for (i = 0; i < SIZE / DWORD_SIZE; i++)
+ igt_assert(!virt[i]);
+
+ drm_intel_bo_unmap(bo);
+ drm_intel_bo_unreference(bo);
+ gem_close(fd, handle);
+}
+
+static void stolen_large_obj_alloc(int fd)
+{
+ uint32_t handle = 0;
+
+ gem_require_stolen_support(fd);
+ handle = __gem_create_stolen(fd, (unsigned long long) LARGE_SIZE + 4096);
+ igt_assert(!handle);
+}
+
+static void stolen_fill_purge_test(int fd)
+{
+ drm_intel_bo *bo;
+ int obj_count = 0, i = 0;
+ int _ret = 0, j = 0;
+ uint32_t handle[MAX_OBJECTS];
+ uint32_t new_handle;
+ uint32_t *virt;
+ int retained;
+
+ gem_require_stolen_support(fd);
+
+ /* Exhaust Stolen space */
+ do {
+ handle[i] = __gem_create_stolen(fd, SIZE);
+ if (handle[i] != 0) {
+ bo = gem_handle_to_libdrm_bo(bufmgr, fd,
+ "verify_bo", handle[i]);
+ igt_assert(bo != NULL);
+
+ _ret = drm_intel_gem_bo_map_gtt(bo);
+ igt_assert(!_ret);
+
+ virt = bo->virtual;
+ for (j = 0; j < SIZE/DWORD_SIZE; j++)
+ virt[j] = DATA;
+
+ drm_intel_bo_unmap(bo);
+ drm_intel_bo_unreference(bo);
+
+ obj_count++;
+ }
+
+ i++;
+ } while (handle[i-1] && i < MAX_OBJECTS);
+
+ igt_assert(obj_count > 0);
+
+ /* Mark all stolen objects purgeable */
+ for (i = 0; i < obj_count; i++)
+ retained = gem_madvise(fd, handle[i], I915_MADV_DONTNEED);
+
+ /* Try to allocate one more object */
+ new_handle = gem_create_stolen(fd, SIZE);
+
+ /* Check if the retained object's memory contents are intact */
+ for (i = 0; i < obj_count; i++) {
+ retained = gem_madvise(fd, handle[i], I915_MADV_WILLNEED);
+ if (retained) {
+ bo = gem_handle_to_libdrm_bo(bufmgr, fd,
+ "verify_bo", handle[i]);
+ igt_assert(bo != NULL);
+
+ _ret = drm_intel_gem_bo_map_gtt(bo);
+ igt_assert(!_ret);
+
+ virt = bo->virtual;
+ for (j = 0; j < SIZE/DWORD_SIZE; j++)
+ igt_assert_eq(virt[j], DATA);
+
+ drm_intel_bo_unmap(bo);
+ drm_intel_bo_unreference(bo);
+ }
+ }
+
+ gem_close(fd, new_handle);
+ for (i = 0; i < obj_count; i++)
+ gem_close(fd, handle[i]);
+}
+
+static void
+stolen_no_mmap(int fd)
+{
+ void *addr;
+ uint32_t handle = 0;
+
+ gem_require_stolen_support(fd);
+
+ handle = gem_create_stolen(fd, SIZE);
+
+ addr = gem_mmap__cpu(fd, handle, 0, SIZE, PROT_READ | PROT_WRITE);
+ igt_assert(addr == NULL);
+
+ gem_close(fd, handle);
+}
+
+igt_main
+{
+ int fd;
+ uint32_t devid;
+
+ igt_skip_on_simulation();
+
+ igt_fixture {
+ fd = drm_open_any();
+ devid = intel_get_drm_devid(fd);
+
+ bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
+ batch = intel_batchbuffer_alloc(bufmgr, devid);
+ }
+
+ igt_subtest("stolen-clear")
+ verify_object_clear(fd);
+
+ /*
+ * stolen mem special cases - checking for non cpu mappable
+ */
+ igt_subtest("stolen-no-mmap")
+ stolen_no_mmap(fd);
+
+ /* checking for pread/pwrite interfaces */
+ igt_subtest("stolen-pwrite")
+ stolen_pwrite(fd);
+
+ igt_subtest("stolen-pread")
+ stolen_pread(fd);
+
+ /* Functional Test - blt copy */
+ igt_subtest("stolen-copy")
+ copy_test(fd);
+
+ igt_subtest("large-object-alloc")
+ stolen_large_obj_alloc(fd);
+
+ /* Filling stolen completely and marking all the objects
+ * purgeable. Then trying to add one more object, to verify
+ * the purging logic.
+ * Again marking all objects WILLNEED and verifying the
+ * contents of the retained objects.
+ */
+ igt_subtest("stolen-fill-purge")
+ stolen_fill_purge_test(fd);
+
+ igt_fixture {
+ intel_batchbuffer_free(batch);
+ drm_intel_bufmgr_destroy(bufmgr);
+ }
+}
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/4] igt/gem_pread: Support to verify pread/pwrite for non-shmem backed obj
2015-12-22 10:07 [PATCH v6 0/4] Tests for verifying the old and extended GEM_CREATE ioctl ankitprasad.r.sharma
2015-12-22 10:07 ` [PATCH 1/4] igt/gem_stolen: Verifying extended gem_create ioctl ankitprasad.r.sharma
@ 2015-12-22 10:07 ` ankitprasad.r.sharma
2015-12-22 10:07 ` [PATCH 3/4] igt/gem_create: Test to validate parameters for GEM_CREATE ioctl ankitprasad.r.sharma
2015-12-22 10:07 ` [PATCH 4/4] igt/gem_stolen: Verify contents of stolen-backed objects across hibernation ankitprasad.r.sharma
3 siblings, 0 replies; 10+ messages in thread
From: ankitprasad.r.sharma @ 2015-12-22 10:07 UTC (permalink / raw)
To: intel-gfx; +Cc: Ankitprasad Sharma, akash.goel
From: Ankitprasad Sharma <ankitprasad.r.sharma@intel.com>
This patch adds support to verify pread/pwrite for non-shmem backed
objects. It also shows the pread/pwrite speed.
It also tests speeds for pread with and without user side page faults
v2: Fixed Rebase conflicts (Ankit)
v3: Precalculating values to avoid redundant function calls (Dave)
Replaced igt_subtest by igt_subtest_f, added asserts for mmap, corrected
indentation (Tvrtko)
v4: Updated data types to avoid redundant type conversions (Tvrtko)
Corrected pagefault-pread time calculation (Ankit)
Signed-off-by: Ankitprasad Sharma <ankitprasad.r.sharma at intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
tests/gem_pread.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++++----
tests/gem_pwrite.c | 55 ++++++++++++++++++++++++---
2 files changed, 150 insertions(+), 13 deletions(-)
diff --git a/tests/gem_pread.c b/tests/gem_pread.c
index cc83948..41553b8 100644
--- a/tests/gem_pread.c
+++ b/tests/gem_pread.c
@@ -41,6 +41,10 @@
#include "drmtest.h"
#define OBJECT_SIZE 16384
+#define LARGE_OBJECT_SIZE 1024 * 1024
+#define KGRN "\x1B[32m"
+#define KRED "\x1B[31m"
+#define KNRM "\x1B[0m"
static void do_gem_read(int fd, uint32_t handle, void *buf, int len, int loops)
{
@@ -76,12 +80,16 @@ static const char *bytes_per_sec(char *buf, double v)
uint32_t *src, dst;
+uint32_t *dst_user, src_stolen, large_stolen;
+uint32_t *stolen_pf_user, *stolen_nopf_user;
int fd, count;
int main(int argc, char **argv)
{
int object_size = 0;
- uint32_t buf[20];
+ double usecs;
+ char buf[100];
+ char* bps;
const struct {
int level;
const char *name;
@@ -106,6 +114,8 @@ int main(int argc, char **argv)
dst = gem_create(fd, object_size);
src = malloc(object_size);
+ src_stolen = gem_create_stolen(fd, object_size);
+ dst_user = malloc(object_size);
}
igt_subtest("normal") {
@@ -115,10 +125,10 @@ int main(int argc, char **argv)
gettimeofday(&start, NULL);
do_gem_read(fd, dst, src, object_size, count);
gettimeofday(&end, NULL);
+ usecs = elapsed(&start, &end, count);
+ bps = bytes_per_sec(buf, object_size/usecs*1e6);
igt_info("Time to pread %d bytes x %6d: %7.3fµs, %s\n",
- object_size, count,
- elapsed(&start, &end, count),
- bytes_per_sec((char *)buf, object_size/elapsed(&start, &end, count)*1e6));
+ object_size, count, usecs, bps);
fflush(stdout);
}
}
@@ -133,18 +143,102 @@ int main(int argc, char **argv)
gettimeofday(&start, NULL);
do_gem_read(fd, dst, src, object_size, count);
gettimeofday(&end, NULL);
+ usecs = elapsed(&start, &end, count);
+ bps = bytes_per_sec(buf, object_size/usecs*1e6);
igt_info("Time to %s pread %d bytes x %6d: %7.3fµs, %s\n",
- c->name, object_size, count,
- elapsed(&start, &end, count),
- bytes_per_sec((char *)buf, object_size/elapsed(&start, &end, count)*1e6));
+ c->name, object_size, count, usecs, bps);
fflush(stdout);
}
}
}
+ igt_subtest("stolen-normal") {
+ for (count = 1; count <= 1<<17; count <<= 1) {
+ struct timeval start, end;
+
+ gettimeofday(&start, NULL);
+ do_gem_read(fd, src_stolen, dst_user, object_size, count);
+ gettimeofday(&end, NULL);
+ usecs = elapsed(&start, &end, count);
+ bps = bytes_per_sec(buf, object_size/usecs*1e6);
+ igt_info("Time to pread %d bytes x %6d: %7.3fµs, %s\n",
+ object_size, count, usecs, bps);
+ fflush(stdout);
+ }
+ }
+ for (c = cache; c->level != -1; c++) {
+ igt_subtest_f("stolen-%s", c->name) {
+ gem_set_caching(fd, src_stolen, c->level);
+
+ for (count = 1; count <= 1<<17; count <<= 1) {
+ struct timeval start, end;
+
+ gettimeofday(&start, NULL);
+ do_gem_read(fd, src_stolen, dst_user,
+ object_size, count);
+ gettimeofday(&end, NULL);
+ usecs = elapsed(&start, &end, count);
+ bps = bytes_per_sec(buf, object_size/usecs*1e6);
+ igt_info("Time to stolen-%s pread %d bytes x %6d: %7.3fµs, %s\n",
+ c->name, object_size, count, usecs, bps);
+ fflush(stdout);
+ }
+ }
+ }
+
+ /* List the time taken in pread operation for stolen objects, with
+ * and without the overhead of page fault handling on accessing the
+ * user space buffer
+ */
+ igt_subtest("pagefault-pread") {
+ large_stolen = gem_create_stolen(fd, LARGE_OBJECT_SIZE);
+ stolen_nopf_user = (uint32_t *) mmap(NULL, LARGE_OBJECT_SIZE,
+ PROT_WRITE,
+ MAP_ANONYMOUS|MAP_PRIVATE,
+ -1, 0);
+ igt_assert(stolen_nopf_user);
+
+ for (count = 1; count <= 10; count ++) {
+ struct timeval start, end;
+ double t_elapsed = 0;
+
+ gettimeofday(&start, NULL);
+ do_gem_read(fd, large_stolen, stolen_nopf_user,
+ LARGE_OBJECT_SIZE, 1);
+ gettimeofday(&end, NULL);
+ t_elapsed = elapsed(&start, &end, count);
+ bps = bytes_per_sec(buf, object_size/t_elapsed*1e6);
+ igt_info("Pagefault-N - Time to pread %d bytes: %7.3fµs, %s\n",
+ LARGE_OBJECT_SIZE, t_elapsed, bps);
+
+ stolen_pf_user = (uint32_t *) mmap(NULL, LARGE_OBJECT_SIZE,
+ PROT_WRITE,
+ MAP_ANONYMOUS|MAP_PRIVATE,
+ -1, 0);
+ igt_assert(stolen_pf_user);
+
+ gettimeofday(&start, NULL);
+ do_gem_read(fd, large_stolen, stolen_pf_user,
+ LARGE_OBJECT_SIZE, 1);
+ gettimeofday(&end, NULL);
+ usecs = elapsed(&start, &end, count);
+ bps = bytes_per_sec(buf, object_size/usecs*1e6);
+ igt_info("Pagefault-Y - Time to pread %d bytes: %7.3fµs, %s%s%s\n",
+ LARGE_OBJECT_SIZE, usecs,
+ t_elapsed < usecs ? KGRN : KRED, bps, KNRM);
+ fflush(stdout);
+ munmap(stolen_pf_user, LARGE_OBJECT_SIZE);
+ }
+ munmap(stolen_nopf_user, LARGE_OBJECT_SIZE);
+ gem_close(fd, large_stolen);
+ }
+
+
igt_fixture {
free(src);
gem_close(fd, dst);
+ free(dst_user);
+ gem_close(fd, src_stolen);
close(fd);
}
diff --git a/tests/gem_pwrite.c b/tests/gem_pwrite.c
index 5b6a77f..23509c5 100644
--- a/tests/gem_pwrite.c
+++ b/tests/gem_pwrite.c
@@ -135,12 +135,15 @@ static void test_big_gtt(int fd, int scale)
}
uint32_t *src, dst;
+uint32_t *src_user, dst_stolen;
int fd;
int main(int argc, char **argv)
{
int object_size = 0;
- uint32_t buf[20];
+ double usecs;
+ char* bps;
+ char buf[100];
int count;
const struct {
int level;
@@ -167,6 +170,8 @@ int main(int argc, char **argv)
dst = gem_create(fd, object_size);
src = malloc(object_size);
+ dst_stolen = gem_create_stolen(fd, object_size);
+ src_user = malloc(object_size);
}
igt_subtest("normal") {
@@ -176,10 +181,10 @@ int main(int argc, char **argv)
gettimeofday(&start, NULL);
do_gem_write(fd, dst, src, object_size, count);
gettimeofday(&end, NULL);
+ usecs = elapsed(&start, &end, count);
+ bps = bytes_per_sec(buf, object_size/usecs*1e6);
igt_info("Time to pwrite %d bytes x %6d: %7.3fµs, %s\n",
- object_size, count,
- elapsed(&start, &end, count),
- bytes_per_sec((char *)buf, object_size/elapsed(&start, &end, count)*1e6));
+ object_size, count, usecs, bps);
fflush(stdout);
}
}
@@ -194,10 +199,46 @@ int main(int argc, char **argv)
gettimeofday(&start, NULL);
do_gem_write(fd, dst, src, object_size, count);
gettimeofday(&end, NULL);
+ usecs = elapsed(&start, &end, count);
+ bps = bytes_per_sec(buf, object_size/usecs*1e6);
igt_info("Time to %s pwrite %d bytes x %6d: %7.3fµs, %s\n",
+ c->name, object_size, count, usecs, bps);
+ fflush(stdout);
+ }
+ }
+ }
+
+ igt_subtest("stolen-normal") {
+ for (count = 1; count <= 1<<17; count <<= 1) {
+ struct timeval start, end;
+
+ gettimeofday(&start, NULL);
+ do_gem_write(fd, dst_stolen, src_user,
+ object_size, count);
+ gettimeofday(&end, NULL);
+ usecs = elapsed(&start, &end, count);
+ bps = bytes_per_sec(buf, object_size/usecs*1e6);
+ igt_info("Time to pwrite %d bytes x %6d: %7.3fµs, %s\n",
+ object_size, count, usecs, bps);
+ fflush(stdout);
+ }
+ }
+
+ for (c = cache; c->level != -1; c++) {
+ igt_subtest_f("stolen-%s", c->name) {
+ gem_set_caching(fd, dst, c->level);
+ for (count = 1; count <= 1<<17; count <<= 1) {
+ struct timeval start, end;
+
+ gettimeofday(&start, NULL);
+ do_gem_write(fd, dst_stolen, src_user,
+ object_size, count);
+ gettimeofday(&end, NULL);
+ bps = bytes_per_sec(buf,
+ object_size/usecs*1e6);
+ igt_info("Time to stolen-%s pwrite %d bytes x %6d: %7.3fµs, %s\n",
c->name, object_size, count,
- elapsed(&start, &end, count),
- bytes_per_sec((char *)buf, object_size/elapsed(&start, &end, count)*1e6));
+ usecs, bps);
fflush(stdout);
}
}
@@ -206,6 +247,8 @@ int main(int argc, char **argv)
igt_fixture {
free(src);
gem_close(fd, dst);
+ free(src_user);
+ gem_close(fd, dst_stolen);
}
igt_subtest("big-cpu")
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/4] igt/gem_create: Test to validate parameters for GEM_CREATE ioctl
2015-12-22 10:07 [PATCH v6 0/4] Tests for verifying the old and extended GEM_CREATE ioctl ankitprasad.r.sharma
2015-12-22 10:07 ` [PATCH 1/4] igt/gem_stolen: Verifying extended gem_create ioctl ankitprasad.r.sharma
2015-12-22 10:07 ` [PATCH 2/4] igt/gem_pread: Support to verify pread/pwrite for non-shmem backed obj ankitprasad.r.sharma
@ 2015-12-22 10:07 ` ankitprasad.r.sharma
2015-12-22 10:07 ` [PATCH 4/4] igt/gem_stolen: Verify contents of stolen-backed objects across hibernation ankitprasad.r.sharma
3 siblings, 0 replies; 10+ messages in thread
From: ankitprasad.r.sharma @ 2015-12-22 10:07 UTC (permalink / raw)
To: intel-gfx; +Cc: Ankitprasad Sharma, akash.goel
From: Ankitprasad Sharma <ankitprasad.r.sharma@intel.com>
This test validates the two parameters (size and flags) GEM_CREATE ioctl.
v2: Added IGT_TEST_DESCRIPTION (Thomas Wood)
v3: Removed use of hard coded values, updated comments (Tvrtko)
v4: Removed over-use of macros, updated with multiples of PAGE_SIZE (Tvrtko)
Signed-off-by: Ankitprasad Sharma <ankitprasad.r.sharma at intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
tests/Makefile.sources | 1 +
tests/gem_create.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 167 insertions(+)
create mode 100644 tests/gem_create.c
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 324cbb5..f5790df 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -15,6 +15,7 @@ TESTS_progs_M = \
gem_close_race \
gem_concurrent_blit \
gem_concurrent_all \
+ gem_create \
gem_cs_tlb \
gem_ctx_param_basic \
gem_ctx_bad_exec \
diff --git a/tests/gem_create.c b/tests/gem_create.c
new file mode 100644
index 0000000..8f32072
--- /dev/null
+++ b/tests/gem_create.c
@@ -0,0 +1,166 @@
+/*
+ * Copyright © 2015 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:
+ * Ankitprasad Sharma <ankitprasad.r.sharma at intel.com>
+ *
+ */
+
+/** @file gem_create.c
+ *
+ * This is a test for the extended and old gem_create ioctl, that
+ * includes allocation of object from stolen memory and shmem.
+ *
+ * The goal is to simply ensure that basics work and invalid input
+ * combinations are rejected.
+ */
+
+#include <stdlib.h>
+#include <sys/ioctl.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 <getopt.h>
+
+#include <drm.h>
+
+#include "ioctl_wrappers.h"
+#include "intel_bufmgr.h"
+#include "intel_batchbuffer.h"
+#include "intel_io.h"
+#include "intel_chipset.h"
+#include "igt_aux.h"
+#include "drmtest.h"
+#include "drm.h"
+#include "i915_drm.h"
+
+IGT_TEST_DESCRIPTION("This is a test for the extended & old gem_create ioctl,"
+ " that includes allocation of object from stolen memory"
+ " and shmem.");
+
+#define CLEAR(s) memset(&s, 0, sizeof(s))
+#define PAGE_SIZE 4096
+
+struct local_i915_gem_create_v2 {
+ uint64_t size;
+ uint32_t handle;
+ uint32_t pad;
+#define I915_CREATE_PLACEMENT_STOLEN (1<<0)
+ uint32_t flags;
+} create;
+
+#define LOCAL_IOCTL_I915_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_CREATE, struct local_i915_gem_create_v2)
+
+static void invalid_flag_test(int fd)
+{
+ int ret;
+
+ gem_require_stolen_support(fd);
+
+ create.handle = 0;
+ create.size = PAGE_SIZE;
+ create.flags = ~I915_CREATE_PLACEMENT_STOLEN;
+ ret = drmIoctl(fd, LOCAL_IOCTL_I915_GEM_CREATE, &create);
+
+ igt_assert(ret <= 0);
+
+ create.flags = ~0;
+ ret = drmIoctl(fd, LOCAL_IOCTL_I915_GEM_CREATE, &create);
+
+ igt_assert(ret <= 0);
+}
+
+static void invalid_size_test(int fd)
+{
+ int handle;
+
+ handle = __gem_create(fd, 0);
+ igt_assert(!handle);
+}
+
+/*
+ * Creating an object with non-aligned size and trying to access it with an
+ * offset, which is greater than the requested size but smaller than the
+ * object's last page boundary. pwrite here must be successful.
+ */
+static void valid_nonaligned_size(int fd)
+{
+ int handle;
+ char buf[PAGE_SIZE];
+
+ handle = gem_create(fd, PAGE_SIZE / 2);
+
+ gem_write(fd, handle, PAGE_SIZE / 2, buf, PAGE_SIZE / 2);
+
+ gem_close(fd, handle);
+}
+
+/*
+ * Creating an object with non-aligned size and trying to access it with an
+ * offset, which is greater than the requested size and larger than the
+ * object's last page boundary. pwrite here must fail.
+ */
+static void invalid_nonaligned_size(int fd)
+{
+ int handle;
+ char buf[PAGE_SIZE];
+ struct drm_i915_gem_pwrite gem_pwrite;
+
+ handle = gem_create(fd, PAGE_SIZE / 2);
+
+ CLEAR(gem_pwrite);
+ gem_pwrite.handle = handle;
+ gem_pwrite.offset = PAGE_SIZE / 2;
+ gem_pwrite.size = PAGE_SIZE;
+ gem_pwrite.data_ptr = (uintptr_t)buf;
+ /* This should fail. Hence cannot use gem_write. */
+ igt_assert(drmIoctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &gem_pwrite));
+
+ gem_close(fd, handle);
+}
+
+igt_main
+{
+ int fd = -1;
+
+ igt_skip_on_simulation();
+
+ igt_fixture {
+ fd = drm_open_any();
+ }
+
+ igt_subtest("stolen-invalid-flag")
+ invalid_flag_test(fd);
+
+ igt_subtest("create-invalid-size")
+ invalid_size_test(fd);
+
+ igt_subtest("create-valid-nonaligned")
+ valid_nonaligned_size(fd);
+
+ igt_subtest("create-invalid-nonaligned")
+ invalid_nonaligned_size(fd);
+}
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 4/4] igt/gem_stolen: Verify contents of stolen-backed objects across hibernation
2015-12-22 10:07 [PATCH v6 0/4] Tests for verifying the old and extended GEM_CREATE ioctl ankitprasad.r.sharma
` (2 preceding siblings ...)
2015-12-22 10:07 ` [PATCH 3/4] igt/gem_create: Test to validate parameters for GEM_CREATE ioctl ankitprasad.r.sharma
@ 2015-12-22 10:07 ` ankitprasad.r.sharma
2015-12-22 16:00 ` Tvrtko Ursulin
3 siblings, 1 reply; 10+ messages in thread
From: ankitprasad.r.sharma @ 2015-12-22 10:07 UTC (permalink / raw)
To: intel-gfx; +Cc: Ankitprasad Sharma, akash.goel
From: Ankitprasad Sharma <ankitprasad.r.sharma@intel.com>
This patch verifies if the contents of the stolen backed object were
preserved across hibernation. This is to validate kernel changes related
to moving stolen-backed objects to shmem on hibernation.
v2: Added comment, Use igt_assert_eq() instead of igt_assert(), Made loops
more readable (Tvrtko)
Signed-off-by: Ankitprasad Sharma <ankitprasad.r.sharma@intel.com>
---
tests/gem_stolen.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 98 insertions(+)
diff --git a/tests/gem_stolen.c b/tests/gem_stolen.c
index 5dc2117..8a0bcb7 100644
--- a/tests/gem_stolen.c
+++ b/tests/gem_stolen.c
@@ -290,6 +290,101 @@ static void stolen_fill_purge_test(int fd)
gem_close(fd, handle[i]);
}
+static void stolen_hibernate(int fd)
+{
+ drm_intel_bo *bo;
+ drm_intel_bo *src, *dest;
+ int obj_count = 0, i = 0;
+ int ret, j;
+ uint32_t handle[MAX_OBJECTS], src_handle;
+ uint32_t *virt;
+
+ gem_require_stolen_support(fd);
+
+ src_handle = gem_create(fd, SIZE);
+ src = gem_handle_to_libdrm_bo(bufmgr, fd,
+ "bo", src_handle);
+ igt_assert(src != NULL);
+
+ ret = drm_intel_gem_bo_map_gtt(src);
+ igt_assert_eq(ret, 0);
+
+ virt = src->virtual;
+ for (j = 0; j < SIZE/DWORD_SIZE; j++) {
+ igt_assert_eq(virt[j], 0);
+ virt[j] = j;
+ }
+
+ drm_intel_bo_unmap(src);
+ /* Exhaust Stolen space */
+ for (i = 0; i < MAX_OBJECTS; i++) {
+ handle[i] = __gem_create_stolen(fd, SIZE);
+ if (!handle[i])
+ break;
+
+ bo = gem_handle_to_libdrm_bo(bufmgr, fd,
+ "verify_bo", handle[i]);
+ igt_assert(bo != NULL);
+ ret = drm_intel_gem_bo_map_gtt(bo);
+ igt_assert_eq(ret, 0);
+
+ virt = bo->virtual;
+ for (j = 0; j < SIZE/DWORD_SIZE; j++)
+ igt_assert_eq(virt[j], 0);
+
+ drm_intel_bo_unmap(bo);
+ drm_intel_bo_unreference(bo);
+
+ obj_count++;
+ }
+
+ /* Assert if atleast one object is allocated from stolen, that
+ * is good enough to verify the content preservation across
+ * hibernation.
+ */
+ igt_assert(obj_count > 0);
+
+ /* Copy data to all stolen backed objects */
+ for (i = 0; i < obj_count; i++) {
+ dest = gem_handle_to_libdrm_bo(bufmgr, fd,
+ "dst_bo", handle[i]);
+ igt_assert(dest != NULL);
+ intel_copy_bo(batch, dest, src, SIZE);
+ ret = drm_intel_gem_bo_map_gtt(dest);
+ igt_assert_eq(ret, 0);
+ virt = dest->virtual;
+ for (j = 0; j < SIZE/DWORD_SIZE; j++)
+ igt_assert_eq(virt[j], j);
+
+ drm_intel_bo_unmap(dest);
+ drm_intel_bo_unreference(dest);
+ }
+
+ drm_intel_bo_unreference(src);
+
+ igt_system_hibernate_autoresume();
+ /* Check if the object's memory contents are intact
+ * across hibernation.
+ */
+ for (i = 0; i < obj_count; i++) {
+ bo = gem_handle_to_libdrm_bo(bufmgr, fd,
+ "verify_bo", handle[i]);
+ igt_assert(bo != NULL);
+ ret = drm_intel_gem_bo_map_gtt(bo);
+ igt_assert_eq(ret, 0);
+ virt = bo->virtual;
+ for (j = 0; j < SIZE/DWORD_SIZE; j++)
+ igt_assert_eq(virt[j], DATA);
+
+ drm_intel_bo_unmap(bo);
+ drm_intel_bo_unreference(bo);
+ }
+
+ gem_close(fd, src_handle);
+ for (i = 0; i < obj_count; i++)
+ gem_close(fd, handle[i]);
+}
+
static void
stolen_no_mmap(int fd)
{
@@ -353,6 +448,9 @@ igt_main
igt_subtest("stolen-fill-purge")
stolen_fill_purge_test(fd);
+ igt_subtest("stolen-hibernate")
+ stolen_hibernate(fd);
+
igt_fixture {
intel_batchbuffer_free(batch);
drm_intel_bufmgr_destroy(bufmgr);
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 4/4] igt/gem_stolen: Verify contents of stolen-backed objects across hibernation
2015-12-22 10:07 ` [PATCH 4/4] igt/gem_stolen: Verify contents of stolen-backed objects across hibernation ankitprasad.r.sharma
@ 2015-12-22 16:00 ` Tvrtko Ursulin
2015-12-22 16:17 ` Chris Wilson
0 siblings, 1 reply; 10+ messages in thread
From: Tvrtko Ursulin @ 2015-12-22 16:00 UTC (permalink / raw)
To: ankitprasad.r.sharma, intel-gfx; +Cc: akash.goel
On 22/12/15 10:07, ankitprasad.r.sharma@intel.com wrote:
> From: Ankitprasad Sharma <ankitprasad.r.sharma@intel.com>
>
> This patch verifies if the contents of the stolen backed object were
> preserved across hibernation. This is to validate kernel changes related
> to moving stolen-backed objects to shmem on hibernation.
>
> v2: Added comment, Use igt_assert_eq() instead of igt_assert(), Made loops
> more readable (Tvrtko)
>
> Signed-off-by: Ankitprasad Sharma <ankitprasad.r.sharma@intel.com>
> ---
> tests/gem_stolen.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 98 insertions(+)
>
> diff --git a/tests/gem_stolen.c b/tests/gem_stolen.c
> index 5dc2117..8a0bcb7 100644
> --- a/tests/gem_stolen.c
> +++ b/tests/gem_stolen.c
> @@ -290,6 +290,101 @@ static void stolen_fill_purge_test(int fd)
> gem_close(fd, handle[i]);
> }
>
> +static void stolen_hibernate(int fd)
> +{
> + drm_intel_bo *bo;
> + drm_intel_bo *src, *dest;
> + int obj_count = 0, i = 0;
> + int ret, j;
> + uint32_t handle[MAX_OBJECTS], src_handle;
> + uint32_t *virt;
> +
> + gem_require_stolen_support(fd);
> +
> + src_handle = gem_create(fd, SIZE);
> + src = gem_handle_to_libdrm_bo(bufmgr, fd,
> + "bo", src_handle);
> + igt_assert(src != NULL);
> +
> + ret = drm_intel_gem_bo_map_gtt(src);
> + igt_assert_eq(ret, 0);
> +
> + virt = src->virtual;
> + for (j = 0; j < SIZE/DWORD_SIZE; j++) {
> + igt_assert_eq(virt[j], 0);
> + virt[j] = j;
> + }
> +
> + drm_intel_bo_unmap(src);
> + /* Exhaust Stolen space */
> + for (i = 0; i < MAX_OBJECTS; i++) {
> + handle[i] = __gem_create_stolen(fd, SIZE);
> + if (!handle[i])
> + break;
> +
> + bo = gem_handle_to_libdrm_bo(bufmgr, fd,
> + "verify_bo", handle[i]);
> + igt_assert(bo != NULL);
> + ret = drm_intel_gem_bo_map_gtt(bo);
> + igt_assert_eq(ret, 0);
> +
> + virt = bo->virtual;
> + for (j = 0; j < SIZE/DWORD_SIZE; j++)
> + igt_assert_eq(virt[j], 0);
> +
> + drm_intel_bo_unmap(bo);
> + drm_intel_bo_unreference(bo);
> +
> + obj_count++;
> + }
> +
> + /* Assert if atleast one object is allocated from stolen, that
> + * is good enough to verify the content preservation across
> + * hibernation.
> + */
> + igt_assert(obj_count > 0);
> +
> + /* Copy data to all stolen backed objects */
> + for (i = 0; i < obj_count; i++) {
> + dest = gem_handle_to_libdrm_bo(bufmgr, fd,
> + "dst_bo", handle[i]);
> + igt_assert(dest != NULL);
> + intel_copy_bo(batch, dest, src, SIZE);
> + ret = drm_intel_gem_bo_map_gtt(dest);
> + igt_assert_eq(ret, 0);
> + virt = dest->virtual;
> + for (j = 0; j < SIZE/DWORD_SIZE; j++)
> + igt_assert_eq(virt[j], j);
> +
> + drm_intel_bo_unmap(dest);
> + drm_intel_bo_unreference(dest);
> + }
> +
> + drm_intel_bo_unreference(src);
> +
> + igt_system_hibernate_autoresume();
> + /* Check if the object's memory contents are intact
> + * across hibernation.
> + */
> + for (i = 0; i < obj_count; i++) {
> + bo = gem_handle_to_libdrm_bo(bufmgr, fd,
> + "verify_bo", handle[i]);
> + igt_assert(bo != NULL);
> + ret = drm_intel_gem_bo_map_gtt(bo);
> + igt_assert_eq(ret, 0);
> + virt = bo->virtual;
> + for (j = 0; j < SIZE/DWORD_SIZE; j++)
> + igt_assert_eq(virt[j], DATA);
How did it pass this assert?
I'll assume you actually ran the test and just managed to send the wrong
version out. :)
> +
> + drm_intel_bo_unmap(bo);
> + drm_intel_bo_unreference(bo);
> + }
> +
> + gem_close(fd, src_handle);
> + for (i = 0; i < obj_count; i++)
> + gem_close(fd, handle[i]);
> +}
> +
> static void
> stolen_no_mmap(int fd)
> {
> @@ -353,6 +448,9 @@ igt_main
> igt_subtest("stolen-fill-purge")
> stolen_fill_purge_test(fd);
>
> + igt_subtest("stolen-hibernate")
> + stolen_hibernate(fd);
> +
> igt_fixture {
> intel_batchbuffer_free(batch);
> drm_intel_bufmgr_destroy(bufmgr);
>
Fix the above assert and you can put:
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 4/4] igt/gem_stolen: Verify contents of stolen-backed objects across hibernation
2015-12-22 16:00 ` Tvrtko Ursulin
@ 2015-12-22 16:17 ` Chris Wilson
0 siblings, 0 replies; 10+ messages in thread
From: Chris Wilson @ 2015-12-22 16:17 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: ankitprasad.r.sharma, intel-gfx, akash.goel
On Tue, Dec 22, 2015 at 04:00:51PM +0000, Tvrtko Ursulin wrote:
>
>
> On 22/12/15 10:07, ankitprasad.r.sharma@intel.com wrote:
> >From: Ankitprasad Sharma <ankitprasad.r.sharma@intel.com>
> >
> >This patch verifies if the contents of the stolen backed object were
> >preserved across hibernation. This is to validate kernel changes related
> >to moving stolen-backed objects to shmem on hibernation.
> >
> >v2: Added comment, Use igt_assert_eq() instead of igt_assert(), Made loops
> >more readable (Tvrtko)
> >
> >Signed-off-by: Ankitprasad Sharma <ankitprasad.r.sharma@intel.com>
> >---
> > tests/gem_stolen.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 98 insertions(+)
> >
> >diff --git a/tests/gem_stolen.c b/tests/gem_stolen.c
> >index 5dc2117..8a0bcb7 100644
> >--- a/tests/gem_stolen.c
> >+++ b/tests/gem_stolen.c
> >@@ -290,6 +290,101 @@ static void stolen_fill_purge_test(int fd)
> > gem_close(fd, handle[i]);
> > }
> >
> >+static void stolen_hibernate(int fd)
> >+{
> >+ drm_intel_bo *bo;
> >+ drm_intel_bo *src, *dest;
> >+ int obj_count = 0, i = 0;
> >+ int ret, j;
> >+ uint32_t handle[MAX_OBJECTS], src_handle;
> >+ uint32_t *virt;
> >+
> >+ gem_require_stolen_support(fd);
> >+
> >+ src_handle = gem_create(fd, SIZE);
> >+ src = gem_handle_to_libdrm_bo(bufmgr, fd,
> >+ "bo", src_handle);
Why? Just use gem_map__gtt.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread