diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/eviction_common.c | 12 | ||||
| -rw-r--r-- | tests/gem_cpu_reloc.c | 2 | ||||
| -rw-r--r-- | tests/gem_evict_alignment.c | 4 | ||||
| -rw-r--r-- | tests/gem_evict_everything.c | 4 | ||||
| -rw-r--r-- | tests/gem_linear_blits.c | 4 | ||||
| -rw-r--r-- | tests/gem_tiled_blits.c | 4 | ||||
| -rw-r--r-- | tests/gem_tiled_swapping.c | 2 | ||||
| -rw-r--r-- | tests/gem_userptr_blits.c | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/tests/eviction_common.c b/tests/eviction_common.c index 03d8e8c7..52578e25 100644 --- a/tests/eviction_common.c +++ b/tests/eviction_common.c @@ -77,7 +77,7 @@ static int minor_evictions(int fd, struct igt_eviction_test_ops *ops, total_surfaces = gem_aperture_size(fd) / surface_size + 1; igt_require(nr_surfaces < total_surfaces); - igt_require(intel_check_memory(total_surfaces, surface_size, CHECK_RAM)); + intel_require_memory(total_surfaces, surface_size, CHECK_RAM); bo = malloc((nr_surfaces + total_surfaces)*sizeof(*bo)); igt_assert(bo); @@ -112,7 +112,7 @@ static int major_evictions(int fd, struct igt_eviction_test_ops *ops, uint32_t *bo; int ret; - igt_require(intel_check_memory(nr_surfaces, surface_size, CHECK_RAM)); + intel_require_memory(nr_surfaces, surface_size, CHECK_RAM); bo = malloc(nr_surfaces*sizeof(*bo)); igt_assert(bo); @@ -141,12 +141,12 @@ static int swapping_evictions(int fd, struct igt_eviction_test_ops *ops, uint32_t *bo; int i, n, pass, ret; - igt_require(intel_check_memory(working_surfaces, surface_size, CHECK_RAM)); + intel_require_memory(working_surfaces, surface_size, CHECK_RAM); if (trash_surfaces < working_surfaces) trash_surfaces = working_surfaces; - igt_require(intel_check_memory(trash_surfaces, surface_size, CHECK_RAM | CHECK_SWAP)); + intel_require_memory(trash_surfaces, surface_size, CHECK_RAM | CHECK_SWAP); bo = malloc(trash_surfaces*sizeof(*bo)); igt_assert(bo); @@ -179,7 +179,7 @@ static int forking_evictions(int fd, struct igt_eviction_test_ops *ops, int num_threads = sysconf(_SC_NPROCESSORS_ONLN); int bo_count; - igt_require(intel_check_memory(working_surfaces, surface_size, CHECK_RAM)); + intel_require_memory(working_surfaces, surface_size, CHECK_RAM); if (flags & FORKING_EVICTIONS_SWAPPING) { bo_count = trash_surfaces; @@ -190,7 +190,7 @@ static int forking_evictions(int fd, struct igt_eviction_test_ops *ops, bo_count = working_surfaces; igt_assert(working_surfaces <= bo_count); - igt_require(intel_check_memory(bo_count, surface_size, CHECK_RAM | CHECK_SWAP)); + intel_require_memory(bo_count, surface_size, CHECK_RAM | CHECK_SWAP); bo = malloc(bo_count*sizeof(*bo)); igt_assert(bo); diff --git a/tests/gem_cpu_reloc.c b/tests/gem_cpu_reloc.c index e7e0fc73..1413ebfc 100644 --- a/tests/gem_cpu_reloc.c +++ b/tests/gem_cpu_reloc.c @@ -183,7 +183,7 @@ igt_simple_main if (igt_run_in_simulation()) count = 10; - igt_require(intel_check_memory(1+count, 4096, CHECK_RAM)); + intel_require_memory(1+count, 4096, CHECK_RAM); handles = malloc (count * sizeof(uint32_t)); igt_assert(handles); diff --git a/tests/gem_evict_alignment.c b/tests/gem_evict_alignment.c index e814f36c..e2d42a04 100644 --- a/tests/gem_evict_alignment.c +++ b/tests/gem_evict_alignment.c @@ -134,7 +134,7 @@ static void minor_evictions(int fd, int size, int count) uint32_t *bo, *sel; int n, m, alignment, pass, fail; - igt_require(intel_check_memory(2*count, size, CHECK_RAM)); + intel_require_memory(2 * count, size, CHECK_RAM); bo = malloc(3*count*sizeof(*bo)); igt_assert(bo); @@ -164,7 +164,7 @@ static void major_evictions(int fd, int size, int count) int n, m, loop, alignment, max; uint32_t *bo; - igt_require(intel_check_memory(count, size, CHECK_RAM)); + intel_require_memory(count, size, CHECK_RAM); bo = malloc(count*sizeof(*bo)); igt_assert(bo); diff --git a/tests/gem_evict_everything.c b/tests/gem_evict_everything.c index db802373..4b7768c1 100644 --- a/tests/gem_evict_everything.c +++ b/tests/gem_evict_everything.c @@ -151,7 +151,7 @@ static void test_forking_evictions(int fd, int size, int count, int trash_count; trash_count = intel_get_total_ram_mb() * 11 / 10; - igt_require(intel_check_memory(trash_count, size, CHECK_RAM | CHECK_SWAP)); + intel_require_memory(trash_count, size, CHECK_RAM | CHECK_SWAP); forking_evictions(fd, &fault_ops, size, count, trash_count, flags); } @@ -161,7 +161,7 @@ static void test_swapping_evictions(int fd, int size, int count) int trash_count; trash_count = intel_get_total_ram_mb() * 11 / 10; - igt_require(intel_check_memory(trash_count, size, CHECK_RAM | CHECK_SWAP)); + intel_require_memory(trash_count, size, CHECK_RAM | CHECK_SWAP); swapping_evictions(fd, &fault_ops, size, count, trash_count); } diff --git a/tests/gem_linear_blits.c b/tests/gem_linear_blits.c index 0ef583f6..78c539ae 100644 --- a/tests/gem_linear_blits.c +++ b/tests/gem_linear_blits.c @@ -268,7 +268,7 @@ int main(int argc, char **argv) count = 3 * gem_aperture_size(fd) / (1024*1024) / 2; igt_require(count > 1); - igt_require(intel_check_memory(count, sizeof(linear), CHECK_RAM)); + intel_require_memory(count, sizeof(linear), CHECK_RAM); run_test(fd, count); } @@ -279,7 +279,7 @@ int main(int argc, char **argv) count = 3 * gem_aperture_size(fd) / (1024*1024) / 2; igt_require(count > 1); - igt_require(intel_check_memory(count, sizeof(linear), CHECK_RAM)); + intel_require_memory(count, sizeof(linear), CHECK_RAM); igt_fork_signal_helper(); run_test(fd, count); igt_stop_signal_helper(); diff --git a/tests/gem_tiled_blits.c b/tests/gem_tiled_blits.c index 02a46958..76d256f4 100644 --- a/tests/gem_tiled_blits.c +++ b/tests/gem_tiled_blits.c @@ -218,7 +218,7 @@ int main(int argc, char **argv) count = 3 * gem_aperture_size(fd) / (1024*1024) / 2; count += (count & 1) == 0; - igt_require(intel_check_memory(count, 1024*1024, CHECK_RAM)); + intel_require_memory(count, 1024*1024, CHECK_RAM); run_test(count); } @@ -230,7 +230,7 @@ int main(int argc, char **argv) count = 3 * gem_aperture_size(fd) / (1024*1024) / 2; count += (count & 1) == 0; - igt_require(intel_check_memory(count, 1024*1024, CHECK_RAM)); + intel_require_memory(count, 1024*1024, CHECK_RAM); igt_fork_signal_helper(); run_test(count); diff --git a/tests/gem_tiled_swapping.c b/tests/gem_tiled_swapping.c index add0c5ad..4520d473 100644 --- a/tests/gem_tiled_swapping.c +++ b/tests/gem_tiled_swapping.c @@ -169,7 +169,7 @@ igt_simple_main (long)intel_get_avail_ram_mb(), (long)intel_get_total_ram_mb(), (long)intel_get_total_swap_mb()); - igt_require(intel_check_memory(count, 1024*1024, CHECK_RAM | CHECK_SWAP)); + intel_require_memory(count, 1024*1024, CHECK_RAM | CHECK_SWAP); for (n = 0; n < count; n++) { bo_handles[n] = create_bo_and_fill(fd); diff --git a/tests/gem_userptr_blits.c b/tests/gem_userptr_blits.c index 35394531..886a6299 100644 --- a/tests/gem_userptr_blits.c +++ b/tests/gem_userptr_blits.c @@ -891,7 +891,7 @@ static int test_coherency(int fd, int count) uint32_t start = 0; int i, ret; - igt_require(intel_check_memory(count, sizeof(linear), CHECK_RAM)); + intel_require_memory(count, sizeof(linear), CHECK_RAM); igt_info("Using 2x%d 1MiB buffers\n", count); ret = posix_memalign((void **)&memory, PAGE_SIZE, count*sizeof(linear)); |