tests/gem_cpu_reloc: Fix gem_cpu_reloc OOM failure
PATCH 1/1 tests/gem_cpu_reloc: Fix gem_cpu_reloc OOM failure
On android with small memory footprints gem_cpu_reloc can fail due to OOM.
Refactor gem_cpu_reloc into 2 tests, a basic test which performs 10 relocations and a full test which skips if there is insufficient memory.
Changed the memory required test to better estimate the actual RAM used.
--- tests/gem_cpu_reloc.c | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-)
tests/gem_cpu_reloc.c +36 -12
@@ -159,16 +159,14 @@ uint32_t gen8_batch[] = {uint32_t *batch = gen6_batch;uint32_t batch_size =sizeof (gen6_batch); -igt_simple_main +void run_test (int fd,int count) {const uint32_t hang[] = {-1 ,-1 ,-1 ,-1 };const uint32_t end[] = {MI_BATCH_BUFFER_END ,0 }; -uint64_t aper_size;uint32_t noop;uint32_t *handles; -int fd, i, count; +int i; - fd =drm_open_any (); noop =intel_get_drm_devid (fd); use_blt =0 ;
@@ -180,13 +178,6 @@ igt_simple_main batch_size +=2 *4 ; } - aper_size =gem_mappable_aperture_size (); - count = aper_size /4096 *2 ; -if (igt_run_in_simulation ()) - count =10 ; - -intel_require_memory (1 +count,4096 ,CHECK_RAM ); - handles =malloc (count *sizeof (uint32_t ));igt_assert (handles);
@@ -246,6 +237,39 @@ igt_simple_mainigt_progress ("gem_cpu_reloc: " ,2 *count+i,3 *count); } -igt_info ("Test suceeded, cleanup up - this might take a while.\n" ); +igt_info ("Subtest suceeded, cleanup up - this might take a while.\n" ); +for (i =0 ; i < count; i++) { +gem_close (fd, handles[i]); + } +gem_close (fd, noop); +free (handles); +} + +igt_main +{ +uint64_t aper_size; +int fd, count; + + igt_fixture { + fd =drm_open_any (); + } + + igt_subtest("basic") { +run_test (fd,10 ); + } + +igt_skip_on_simulation (); + + igt_subtest("full") { + aper_size =gem_mappable_aperture_size (); + count = aper_size /4096 *2 ; + +/* count + 2 (noop & bad) buffers. A gem object appears to +require about 2kb + buffer + kernel overhead */ +intel_require_memory (2 +count,2048 +4096 ,CHECK_RAM ); + +run_test (fd, count); + } +close (fd); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 101 lines
-----Original Message-----
From: Morton, Derek J
Sent: Tuesday, May 12, 2015 1:10 PM
To: [email protected]
Cc: Wood, Thomas; Gore, Tim; Morton, Derek J
Subject: [PATCH i-g-t] tests/gem_cpu_reloc: Fixgem_cpu_relocOOM failureOn android with small memory footprints
gem_cpu_reloccan fail due to OOM.Refactor
gem_cpu_relocinto 2 tests, a basic test which performs 10 relocations and a full test which skips if there is insufficient memory.Changed the memory required test to better estimate the actual RAM used.
Signed-off-by Derek Morton <[email protected]>--- tests/gem_cpu_reloc.c | 48 ++++++++++++++++++++++++++++++++++++- ----------- 1 file changed, 36 insertions(+), 12 deletions(-)tests/gem_cpu_reloc.c index renamed from tests/gem_cpu_reloc.c +0
-0058089c..2f5fc60 100644
tests/gem_cpu_reloc.c +36
-13@@ -159,16 +159,14 @@ uint32_t gen8_batch[] = { uint32_t *batch = gen6_batch;uint32_t batch_size =sizeof (gen6_batch); -igt_simple_main +void run_test (int fd,int count) {const uint32_t hang[] = {-1 ,-1 ,-1 ,-1 };const uint32_t end[] = {MI_BATCH_BUFFER_END ,0 }; -uint64_t aper_size;uint32_t noop;uint32_t *handles; -int fd, i, count; +int i; - fd =drm_open_any (); noop =intel_get_drm_devid (fd); use_blt =0 ;@@ -180,13 +178,6 @@ igt_simple_main batch_size +=2 *4 ; } - aper_size =gem_mappable_aperture_size (); - count = aper_size /4096 *2 ; -if (igt_run_in_simulation ()) - count =10 ; - -intel_require_memory (1 +count,4096 ,CHECK_RAM ); - handles =malloc (count *sizeof (uint32_t ));igt_assert (handles);@@ -246,6 +237,39 @@ igt_simple_mainigt_progress ("gem_cpu_reloc: " ,2 *count+i,3 *count); } -igt_info ("Test suceeded, cleanup up - this might take a while.\n" ); +igt_info ("Subtest suceeded, cleanup up - this might take a while.\n" ); +for (i =0 ; i < count; i++) { +gem_close (fd, handles[i]); + } +gem_close (fd, noop); +free (handles); +} + +igt_main +{ +uint64_t aper_size; +int fd, count; + + igt_fixture { + fd =drm_open_any (); + } + + igt_subtest("basic") { +run_test (fd,10 ); + } + +igt_skip_on_simulation (); + + igt_subtest("full") { + aper_size =gem_mappable_aperture_size (); + count = aper_size /4096 *2 ; + +/* count + 2 (noop & bad) buffers. A gem object appears to +require about 2kb + buffer + kernel overhead */ +intel_require_memory (2 +count,2048 +4096 ,CHECK_RAM ); + +run_test (fd, count); + } +close (fd); } --
Quoted 1 line
1.9.1
Works for me. This follows the pattern we have been using for other tests that cannot run on low memory systems.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 20 lines · Derek Morton
On android with small memory footprints
gem_cpu_reloccan fail due to OOM.Refactor
gem_cpu_relocinto 2 tests, a basic test which performs 10 relocations and a full test which skips if there is insufficient memory.Changed the memory required test to better estimate the actual RAM used.
Signed-off-by Derek Morton <[email protected]>--- tests/gem_cpu_reloc.c | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-)tests/gem_cpu_reloc.c +0
-0
tests/gem_cpu_reloc.c uint32_t gen8_batch[] = { · line 162
Quoted 5 lines
tests/gem_cpu_reloc.c +1
-1@@ -159,16 +159,14 @@ uint32_t gen8_batch[] = {uint32_t *batch = gen6_batch;uint32_t batch_size =sizeof (gen6_batch); -igt_simple_main +void run_test (int fd,int count)
This function should be marked static.
Quoted 57 lines
tests/gem_cpu_reloc.c +26
-11{const uint32_t hang[] = {-1 ,-1 ,-1 ,-1 };const uint32_t end[] = {MI_BATCH_BUFFER_END ,0 }; -uint64_t aper_size;uint32_t noop;uint32_t *handles; -int fd, i, count; +int i; - fd =drm_open_any (); noop =intel_get_drm_devid (fd); use_blt =0 ;@@ -180,13 +178,6 @@ igt_simple_main batch_size +=2 *4 ; } - aper_size =gem_mappable_aperture_size (); - count = aper_size /4096 *2 ; -if (igt_run_in_simulation ()) - count =10 ; - -intel_require_memory (1 +count,4096 ,CHECK_RAM ); - handles =malloc (count *sizeof (uint32_t ));igt_assert (handles);@@ -246,6 +237,39 @@ igt_simple_mainigt_progress ("gem_cpu_reloc: " ,2 *count+i,3 *count); } -igt_info ("Test suceeded, cleanup up - this might take a while.\n" ); +igt_info ("Subtest suceeded, cleanup up - this might take a while.\n" ); +for (i =0 ; i < count; i++) { +gem_close (fd, handles[i]); + } +gem_close (fd, noop); +free (handles); +} + +igt_main +{ +uint64_t aper_size; +int fd, count; + + igt_fixture { + fd =drm_open_any (); + } + + igt_subtest("basic") { +run_test (fd,10 ); + } + +igt_skip_on_simulation (); + + igt_subtest("full") { + aper_size =gem_mappable_aperture_size ();
tests/gem_cpu_reloc.c igt_simple_main · line 274
Quoted 10 lines
tests/gem_cpu_reloc.c +9
-0+ count = aper_size /4096 *2 ; + +/* count + 2 (noop & bad) buffers. A gem object appears to +require about 2kb + buffer + kernel overhead */ +intel_require_memory (2 +count,2048 +4096 ,CHECK_RAM ); + +run_test (fd, count); + } +close (fd);
This should be inside an igt_fixture block, otherwise fd will be uninitialised when listing subtests.
Quoted 4 lines
tests/gem_cpu_reloc.c +0
-1} --1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx