flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-09 08:56:11 +00:00
Code Issues Releases Wiki Activity

igt/gem_evict_everything: Move assertion

Browse Source 
If we move the assertion from out of the callback, we can get a much
more useful error message.

References: https://bugs.freedesktop.org/show_bug.cgi?id=79573
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2014-06-03 07:31:49 +01:00
parent 21fb118f3b
commit a384e55b49
3 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/eviction_common.c
View File

@ -36,8 +36,8 @@ struct igt_eviction_test_ops
{ {
uint32_t (*create)(int fd, int size); uint32_t (*create)(int fd, int size);
void (*close)(int fd, uint32_t bo); void (*close)(int fd, uint32_t bo);
void (*copy)(int fd, uint32_t dst, uint32_t src, int (*copy)(int fd, uint32_t dst, uint32_t src,
uint32_t *all_bo, int nr_bos, int error); uint32_t *all_bo, int nr_bos);
void (*clear)(int fd, uint32_t bo, int size); void (*clear)(int fd, uint32_t bo, int size);
}; };
@ -76,6 +76,7 @@ static int minor_evictions(int fd, struct igt_eviction_test_ops *ops,
total_surfaces = (uint64_t)intel_get_total_ram_mb() * 9 /10 * 1024 *1024 / surface_size; total_surfaces = (uint64_t)intel_get_total_ram_mb() * 9 /10 * 1024 *1024 / surface_size;
igt_require(nr_surfaces < total_surfaces); igt_require(nr_surfaces < total_surfaces);
igt_require(total_surfaces * surface_size > gem_aperture_size(fd));
bo = malloc((nr_surfaces + total_surfaces)*sizeof(*bo)); bo = malloc((nr_surfaces + total_surfaces)*sizeof(*bo));
igt_assert(bo); igt_assert(bo);
@ -85,12 +86,15 @@ static int minor_evictions(int fd, struct igt_eviction_test_ops *ops,
sel = bo + n; sel = bo + n;
for (fail = 0, m = 0; fail < 10; fail++) { for (fail = 0, m = 0; fail < 10; fail++) {
int ret;
for (pass = 0; pass < 100; pass++) { for (pass = 0; pass < 100; pass++) {
for (n = 0; n < nr_surfaces; n++, m += 7) for (n = 0; n < nr_surfaces; n++, m += 7)
sel[n] = bo[m%total_surfaces]; sel[n] = bo[m%total_surfaces];
ops->copy(fd, sel[0], sel[1], sel, nr_surfaces, 0); ret = ops->copy(fd, sel[0], sel[1], sel, nr_surfaces);
igt_assert(ret == 0);
} }
ops->copy(fd, bo[0], bo[0], bo, total_surfaces, ENOSPC); ret = ops->copy(fd, bo[0], bo[0], bo, total_surfaces);
igt_assert(ret == ENOSPC);
} }
for (n = 0; n < total_surfaces; n++) for (n = 0; n < total_surfaces; n++)
@ -105,6 +109,7 @@ static int major_evictions(int fd, struct igt_eviction_test_ops *ops,
{ {
int n, m, loop; int n, m, loop;
uint32_t *bo; uint32_t *bo;
int ret;
igt_require(intel_check_memory(nr_surfaces, surface_size, CHECK_RAM)); igt_require(intel_check_memory(nr_surfaces, surface_size, CHECK_RAM));
@ -116,7 +121,8 @@ static int major_evictions(int fd, struct igt_eviction_test_ops *ops,
for (loop = 0, m = 0; loop < 100; loop++, m += 17) { for (loop = 0, m = 0; loop < 100; loop++, m += 17) {
n = m % nr_surfaces; n = m % nr_surfaces;
ops->copy(fd, bo[n], bo[n], &bo[n], 1, 0); ret = ops->copy(fd, bo[n], bo[n], &bo[n], 1);
igt_assert(ret == 0);
} }
for (n = 0; n < nr_surfaces; n++) for (n = 0; n < nr_surfaces; n++)
@ -132,7 +138,7 @@ static int swapping_evictions(int fd, struct igt_eviction_test_ops *ops,
int trash_surfaces) int trash_surfaces)
{ {
uint32_t *bo; uint32_t *bo;
int i, n, pass; int i, n, pass, ret;
igt_require(intel_check_memory(working_surfaces, surface_size, CHECK_RAM)); igt_require(intel_check_memory(working_surfaces, surface_size, CHECK_RAM));
@ -151,7 +157,8 @@ static int swapping_evictions(int fd, struct igt_eviction_test_ops *ops,
igt_permute_array(bo, trash_surfaces, exchange_uint32_t); igt_permute_array(bo, trash_surfaces, exchange_uint32_t);
for (pass = 0; pass < 100; pass++) { for (pass = 0; pass < 100; pass++) {
ops->copy(fd, bo[0], bo[1], bo, working_surfaces, 0); ret = ops->copy(fd, bo[0], bo[1], bo, working_surfaces);
igt_assert(ret == 0);
} }
} }
@ -169,7 +176,7 @@ static int forking_evictions(int fd, struct igt_eviction_test_ops *ops,
int trash_surfaces, unsigned flags) int trash_surfaces, unsigned flags)
{ {
uint32_t *bo; uint32_t *bo;
int n, pass, l; int n, pass, l, ret;
int num_threads = sysconf(_SC_NPROCESSORS_ONLN); int num_threads = sysconf(_SC_NPROCESSORS_ONLN);
int bo_count; int bo_count;
@ -216,7 +223,8 @@ static int forking_evictions(int fd, struct igt_eviction_test_ops *ops,
} }
for (pass = 0; pass < num_passes; pass++) { for (pass = 0; pass < num_passes; pass++) {
ops->copy(realfd, bo[0], bo[1], bo, working_surfaces, 0); ret = ops->copy(realfd, bo[0], bo[1], bo, working_surfaces);
igt_assert(ret == 0);
for (l = 0; l < working_surfaces && for (l = 0; l < working_surfaces &&
(flags & FORKING_EVICTIONS_MEMORY_PRESSURE); (flags & FORKING_EVICTIONS_MEMORY_PRESSURE);

7
tests/gem_evict_everything.c
View File

@ -51,8 +51,8 @@
#define HEIGHT 256 #define HEIGHT 256
#define WIDTH 1024 #define WIDTH 1024
static void static int
copy(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo, int error) copy(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo)
{ {
uint32_t batch[12]; uint32_t batch[12];
struct drm_i915_gem_relocation_entry reloc[2]; struct drm_i915_gem_relocation_entry reloc[2];
@ -122,10 +122,11 @@ copy(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo, int error)
ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec); ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &exec);
if (ret) if (ret)
ret = errno; ret = errno;
igt_assert(ret == error);
gem_close(fd, handle); gem_close(fd, handle);
free(obj); free(obj);
return ret;
} }
static void clear(int fd, uint32_t handle, int size) static void clear(int fd, uint32_t handle, int size)

8
tests/gem_userptr_blits.c
View File

@ -223,8 +223,8 @@ copy(int fd, uint32_t dst, uint32_t src, unsigned int error)
gem_close(fd, handle); gem_close(fd, handle);
} }
static void static int
blit(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo, int error) blit(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo)
{ {
uint32_t batch[12]; uint32_t batch[12];
struct drm_i915_gem_relocation_entry reloc[2]; struct drm_i915_gem_relocation_entry reloc[2];
@ -297,10 +297,10 @@ blit(int fd, uint32_t dst, uint32_t src, uint32_t *all_bo, int n_bo, int error)
if (ret) if (ret)
ret = errno; ret = errno;
igt_assert(ret == error);
gem_close(fd, handle); gem_close(fd, handle);
free(obj); free(obj);
return ret;
} }
static uint32_t static uint32_t