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

Factor in kernel object overhead when checking available memory for tests

Browse Source 
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson
2014-05-28 09:01:56 +01:00
parent e4ba3b75e6
commit 321273ff76
5 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/eviction_common.c
+12 -13
View File
@@ -101,13 +101,12 @@ static int minor_evictions(int fd, struct igt_eviction_test_ops *ops,
}
static int major_evictions(int fd, struct igt_eviction_test_ops *ops,
int surface_size, int nr_surfaces)
int surface_size, int nr_surfaces)
{
int n, m, loop;
uint32_t *bo;
igt_require((uint64_t)nr_surfaces * surface_size / (1024 * 1024)
< intel_get_total_ram_mb() * 9 / 10);
igt_require(intel_check_memory(nr_surfaces, surface_size, CHECK_RAM));
bo = malloc(nr_surfaces*sizeof(*bo));
igt_assert(bo);
@@ -128,19 +127,20 @@ static int major_evictions(int fd, struct igt_eviction_test_ops *ops,
}
static int swapping_evictions(int fd, struct igt_eviction_test_ops *ops,
int surface_size,
int working_surfaces,
int trash_surfaces)
int surface_size,
int working_surfaces,
int trash_surfaces)
{
uint32_t *bo;
int i, n, pass;
igt_require((uint64_t)working_surfaces * surface_size / (1024 * 1024)
< intel_get_total_ram_mb() * 9 / 10);
igt_require(intel_check_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));
bo = malloc(trash_surfaces*sizeof(*bo));
igt_assert(bo);
@@ -173,19 +173,18 @@ static int forking_evictions(int fd, struct igt_eviction_test_ops *ops,
int num_threads = sysconf(_SC_NPROCESSORS_ONLN);
int bo_count;
igt_require((uint64_t)working_surfaces * surface_size / (1024 * 1024)
< intel_get_total_ram_mb() * 9 / 10);
igt_require(intel_check_memory(working_surfaces, surface_size, CHECK_RAM));
if (flags & FORKING_EVICTIONS_SWAPPING) {
igt_require(intel_get_total_ram_mb() / 4
< intel_get_total_swap_mb());
bo_count = trash_surfaces;
if (bo_count < working_surfaces)
bo_count = working_surfaces;
} else
bo_count = working_surfaces;
igt_require(intel_check_memory(bo_count, surface_size, CHECK_RAM | CHECK_SWAP));
bo = malloc(bo_count*sizeof(*bo));
igt_assert(bo);
tests/gem_evict_everything.c
+2 -2
View File
@@ -150,6 +150,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));
forking_evictions(fd, &fault_ops, size, count, trash_count, flags);
}
@@ -158,9 +159,8 @@ static void test_swapping_evictions(int fd, int size, int count)
{
int trash_count;
igt_require(intel_get_total_ram_mb() / 4 < intel_get_total_swap_mb());
trash_count = intel_get_total_ram_mb() * 11 / 10;
igt_require(intel_check_memory(trash_count, size, CHECK_RAM | CHECK_SWAP));
swapping_evictions(fd, &fault_ops, size, count, trash_count);
}
tests/gem_tiled_swapping.c
+1 -2
View File
@@ -171,8 +171,7 @@ igt_simple_main
(long)intel_get_avail_ram_mb(),
(long)intel_get_total_ram_mb(),
(long)intel_get_total_swap_mb());
igt_require(count < intel_get_avail_ram_mb() + intel_get_total_swap_mb());
igt_require(intel_check_memory(count, 1024*1024, CHECK_RAM | CHECK_SWAP));
for (n = 0; n < count; n++) {
bo_handles[n] = create_bo_and_fill(fd);