On Fri, Sep 14, 2018 at 02:35:38PM +0100, Chris Wilson wrote:
> Check we have sufficient memory to run the tests before getting trapped
> in the swap of despair.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107935
> Signed-off-by: Chris Wilson <[email protected]>

Looks consistent with the igt_info().

Reviewed-by: Ville Syrjälä <[email protected]>

> ---
>  tests/gen3_mixed_blits.c         | 1 +
>  tests/gen3_render_linear_blits.c | 1 +
>  tests/gen3_render_mixed_blits.c  | 1 +
>  tests/gen3_render_tiledx_blits.c | 1 +
>  tests/gen3_render_tiledy_blits.c | 1 +
>  5 files changed, 5 insertions(+)
> 
> diff --git a/tests/gen3_mixed_blits.c b/tests/gen3_mixed_blits.c
> index fa64598a6..948f4e6a7 100644
> --- a/tests/gen3_mixed_blits.c
> +++ b/tests/gen3_mixed_blits.c
> @@ -458,6 +458,7 @@ int main(int argc, char **argv)
>       if (count == 0)
>               count = 3 * gem_aperture_size(fd) / (1024*1024) / 2;
>       igt_info("Using %d 1MiB buffers\n", count);
> +     intel_require_memory(count, 1024*1024, CHECK_RAM);
>  
>       handle = malloc(sizeof(uint32_t)*count*3);
>       tiling = handle + count;
> diff --git a/tests/gen3_render_linear_blits.c 
> b/tests/gen3_render_linear_blits.c
> index a03d7fc06..9d1499a59 100644
> --- a/tests/gen3_render_linear_blits.c
> +++ b/tests/gen3_render_linear_blits.c
> @@ -333,6 +333,7 @@ int main(int argc, char **argv)
>       if (count == 0)
>               count = 3 * gem_aperture_size(fd) / (1024*1024) / 2;
>       igt_info("Using %d 1MiB buffers\n", count);
> +     intel_require_memory(count, 1024*1024, CHECK_RAM);
>  
>       handle = malloc(sizeof(uint32_t)*count*2);
>       start_val = handle + count;
> diff --git a/tests/gen3_render_mixed_blits.c b/tests/gen3_render_mixed_blits.c
> index 2f127d993..afb53a598 100644
> --- a/tests/gen3_render_mixed_blits.c
> +++ b/tests/gen3_render_mixed_blits.c
> @@ -352,6 +352,7 @@ int main(int argc, char **argv)
>       if (count == 0)
>               count = 3 * gem_aperture_size(fd) / (1024*1024) / 2;
>       igt_info("Using %d 1MiB buffers\n", count);
> +     intel_require_memory(count, 1024*1024, CHECK_RAM);
>  
>       handle = malloc(sizeof(uint32_t)*count*3);
>       tiling = handle + count;
> diff --git a/tests/gen3_render_tiledx_blits.c 
> b/tests/gen3_render_tiledx_blits.c
> index 06cdda382..e6246f2b0 100644
> --- a/tests/gen3_render_tiledx_blits.c
> +++ b/tests/gen3_render_tiledx_blits.c
> @@ -339,6 +339,7 @@ int main(int argc, char **argv)
>       if (count == 0)
>               count = 3 * gem_aperture_size(fd) / (1024*1024) / 2;
>       igt_info("Using %d 1MiB buffers\n", count);
> +     intel_require_memory(count, 1024*1024, CHECK_RAM);
>  
>       handle = malloc(sizeof(uint32_t)*count*2);
>       start_val = handle + count;
> diff --git a/tests/gen3_render_tiledy_blits.c 
> b/tests/gen3_render_tiledy_blits.c
> index 9e4f4b77b..17502ccb7 100644
> --- a/tests/gen3_render_tiledy_blits.c
> +++ b/tests/gen3_render_tiledy_blits.c
> @@ -339,6 +339,7 @@ int main(int argc, char **argv)
>       if (count == 0)
>               count = 3 * gem_aperture_size(fd) / (1024*1024) / 2;
>       igt_info("Using %d 1MiB buffers\n", count);
> +     intel_require_memory(count, 1024*1024, CHECK_RAM);
>  
>       handle = malloc(sizeof(uint32_t)*count*2);
>       start_val = handle + count;
> -- 
> 2.19.0
> 
> _______________________________________________
> igt-dev mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/igt-dev

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to