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

gem_flink_race/prime_self_import: Improve test reliability

Browse Source 
gem_flink_race and prime_self_import have subtests which read the
number of open gem objects from debugfs to determine if objects have
leaked during the test. However the test can fail sporadically if
the number of gem objects changes due to other process activity.
This patch introduces a change to check the number of gem objects
several times to filter out any fluctuations.

v2: Moved the common code to a library and made the loop android
specific (Daniel Vetter)
v3: Renamed get_stable_obj_count -> igt_get_stable_obj_count

Signed-off-by: Derek Morton <derek.j.morton@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
This commit is contained in:
Derek Morton
2015-12-14 09:59:17 +00:00
committed by Daniel Vetter
parent 5a8d063e42
commit 3953d2dd22
4 changed files with 73 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/gem_flink_race.c
+3 -22
View File
@@ -44,28 +44,11 @@ IGT_TEST_DESCRIPTION("Check for flink/open vs. gem close races.");
* in the flink name and corresponding reference getting leaked.
*/
/* We want lockless and I'm to lazy to dig out an atomic libarary. On x86 this
/* We want lockless and I'm to lazy to dig out an atomic library. On x86 this
* works, too. */
volatile int pls_die = 0;
int fd;
static int get_object_count(void)
{
FILE *file;
int scanned, ret;
igt_drop_caches_set(DROP_RETIRE | DROP_ACTIVE);
file = igt_debugfs_fopen("i915_gem_objects", "r");
scanned = fscanf(file, "%i objects", &ret);
igt_assert_eq(scanned, 1);
igt_debug("Reports %d objects\n", ret);
return ret;
}
static void *thread_fn_flink_name(void *p)
{
struct drm_gem_open open_struct;
@@ -164,8 +147,7 @@ static void test_flink_close(void)
* up the counts */
fake = drm_open_driver(DRIVER_INTEL);
gem_quiescent_gpu(fake);
obj_count = get_object_count();
obj_count = igt_get_stable_obj_count(fake);
num_threads = sysconf(_SC_NPROCESSORS_ONLN);
@@ -190,8 +172,7 @@ static void test_flink_close(void)
close(fd);
gem_quiescent_gpu(fake);
obj_count = get_object_count() - obj_count;
obj_count = igt_get_stable_obj_count(fake) - obj_count;
igt_info("leaked %i objects\n", obj_count);
tests/prime_self_import.c
+6 -25
View File
@@ -47,7 +47,7 @@
#include "drm.h"
IGT_TEST_DESCRIPTION("Check whether prime import/export works on the same"
" device.");
" device... but with different fds.");
#define BO_SIZE (16*1024)
@@ -157,7 +157,7 @@ static void test_with_one_bo_two_files(void)
dma_buf_fd2 = prime_handle_to_fd(fd2, handle_open);
handle_import = prime_fd_to_handle(fd2, dma_buf_fd2);
/* dma-buf selfimporting an flink bo should give the same handle */
/* dma-buf self importing an flink bo should give the same handle */
igt_assert_eq_u32(handle_import, handle_open);
close(fd1);
@@ -211,21 +211,6 @@ static void test_with_one_bo(void)
check_bo(fd2, handle_import1, fd2, handle_import1);
}
static int get_object_count(void)
{
FILE *file;
int ret, scanned;
igt_drop_caches_set(DROP_RETIRE | DROP_ACTIVE);
file = igt_debugfs_fopen("i915_gem_objects", "r");
scanned = fscanf(file, "%i objects", &ret);
igt_assert_eq(scanned, 1);
return ret;
}
static void *thread_fn_reimport_vs_close(void *p)
{
struct drm_gem_close close_bo;
@@ -258,8 +243,7 @@ static void test_reimport_close_race(void)
* up the counts */
fake = drm_open_driver(DRIVER_INTEL);
gem_quiescent_gpu(fake);
obj_count = get_object_count();
obj_count = igt_get_stable_obj_count(fake);
num_threads = sysconf(_SC_NPROCESSORS_ONLN);
@@ -290,8 +274,7 @@ static void test_reimport_close_race(void)
close(fds[0]);
close(fds[1]);
gem_quiescent_gpu(fake);
obj_count = get_object_count() - obj_count;
obj_count = igt_get_stable_obj_count(fake) - obj_count;
igt_info("leaked %i objects\n", obj_count);
@@ -350,8 +333,7 @@ static void test_export_close_race(void)
* up the counts */
fake = drm_open_driver(DRIVER_INTEL);
gem_quiescent_gpu(fake);
obj_count = get_object_count();
obj_count = igt_get_stable_obj_count(fake);
fd = drm_open_driver(DRIVER_INTEL);
@@ -373,8 +355,7 @@ static void test_export_close_race(void)
close(fd);
gem_quiescent_gpu(fake);
obj_count = get_object_count() - obj_count;
obj_count = igt_get_stable_obj_count(fake) - obj_count;
igt_info("leaked %i objects\n", obj_count);