diff options
| -rw-r--r-- | tests/Makefile.sources | 4 | ||||
| -rw-r--r-- | tests/drm_vma_limiter.c | 108 | ||||
| -rw-r--r-- | tests/drm_vma_limiter_cached.c | 129 | ||||
| -rw-r--r-- | tests/drm_vma_limiter_cpu.c | 96 | ||||
| -rw-r--r-- | tests/drm_vma_limiter_gtt.c | 97 | ||||
| -rw-r--r-- | tests/meson.build | 4 |
6 files changed, 0 insertions, 438 deletions
diff --git a/tests/Makefile.sources b/tests/Makefile.sources index ad62611f..54b4a3c2 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -33,10 +33,6 @@ TESTS_progs = \ drm_import_export \ drm_mm \ drm_read \ - drm_vma_limiter \ - drm_vma_limiter_cached \ - drm_vma_limiter_cpu \ - drm_vma_limiter_gtt \ drv_getparams_basic \ drv_hangman \ drv_missed_irq \ diff --git a/tests/drm_vma_limiter.c b/tests/drm_vma_limiter.c deleted file mode 100644 index fc853f31..00000000 --- a/tests/drm_vma_limiter.c +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright © 2011 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - * - * Authors: - * Daniel Vetter <daniel.vetter@ffwll.ch> - */ - -#include "igt.h" -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <fcntl.h> -#include <inttypes.h> -#include <errno.h> -#include <sys/stat.h> -#include <sys/time.h> -#include "drm.h" -#include "intel_bufmgr.h" - -static drm_intel_bufmgr *bufmgr; -struct intel_batchbuffer *batch; - -/* Testcase: check whether the libdrm vma limiter works - * - * We've had reports of the X server exhausting the default rlimit of 64k vma's - * in the kernel. libdrm has grown facilities to limit the vma caching since, - * this checks whether they actually work. - */ - -IGT_TEST_DESCRIPTION("Check whether the libdrm vma limiter works."); - -/* we do both cpu and gtt maps, so only need half of 64k to exhaust */ -#define BO_ARRAY_SIZE 35000 -drm_intel_bo *bos[BO_ARRAY_SIZE]; - -igt_simple_main -{ - int fd; - int i; - char *ptr; - - igt_skip_on_simulation(); - - fd = drm_open_driver(DRIVER_INTEL); - - bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); - drm_intel_bufmgr_gem_enable_reuse(bufmgr); - batch = intel_batchbuffer_alloc(bufmgr, intel_get_drm_devid(fd)); - - drm_intel_bufmgr_gem_set_vma_cache_size(bufmgr, 500); - - for (i = 0; i < BO_ARRAY_SIZE; i++) { - bos[i] = drm_intel_bo_alloc(bufmgr, "mmap bo", 4096, 4096); - igt_assert(bos[i]); - - drm_intel_bo_map(bos[i], 1); - ptr = bos[i]->virtual; - igt_assert(ptr); - *ptr = 'c'; - drm_intel_bo_unmap(bos[i]); - - drm_intel_gem_bo_map_gtt(bos[i]); - ptr = bos[i]->virtual; - igt_assert(ptr); - *ptr = 'c'; - drm_intel_gem_bo_unmap_gtt(bos[i]); - } - - /* and recheck whether a second map of the same still works */ - for (i = 0; i < BO_ARRAY_SIZE; i++) { - bos[i] = drm_intel_bo_alloc(bufmgr, "mmap bo", 4096, 4096); - igt_assert(bos[i]); - - drm_intel_bo_map(bos[i], 1); - ptr = bos[i]->virtual; - igt_assert(*ptr = 'c'); - drm_intel_bo_unmap(bos[i]); - - drm_intel_gem_bo_map_gtt(bos[i]); - ptr = bos[i]->virtual; - igt_assert(*ptr = 'c'); - drm_intel_gem_bo_unmap_gtt(bos[i]); - } - - intel_batchbuffer_free(batch); - drm_intel_bufmgr_destroy(bufmgr); - - close(fd); -} diff --git a/tests/drm_vma_limiter_cached.c b/tests/drm_vma_limiter_cached.c deleted file mode 100644 index 28841d62..00000000 --- a/tests/drm_vma_limiter_cached.c +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright © 2011 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - * - * Authors: - * Daniel Vetter <daniel.vetter@ffwll.ch> - */ - -#include "igt.h" -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <fcntl.h> -#include <inttypes.h> -#include <errno.h> -#include <sys/stat.h> -#include <sys/time.h> -#include "drm.h" -#include "intel_bufmgr.h" - -static drm_intel_bufmgr *bufmgr; -struct intel_batchbuffer *batch; - -/* Testcase: check whether the libdrm vma limiter works - * - * We've had reports of the X server exhausting the default rlimit of 64k vma's - * in the kernel. libdrm has grown facilities to limit the vma caching since, - * this checks whether they actually work. - * - * This one checks whether mmaps of unused cached bos are also properly reaped. - */ - -/* we do both cpu and gtt maps, so only need half of 64k to exhaust */ - -igt_simple_main -{ - int fd; - int i; - char *ptr; - drm_intel_bo *load_bo; - - igt_skip_on_simulation(); - - fd = drm_open_driver(DRIVER_INTEL); - igt_require_gem(fd); - - bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); - drm_intel_bufmgr_gem_enable_reuse(bufmgr); - batch = intel_batchbuffer_alloc(bufmgr, intel_get_drm_devid(fd)); - - load_bo = drm_intel_bo_alloc(bufmgr, "target bo", 1024*4096, 4096); - igt_assert(load_bo); - - drm_intel_bufmgr_gem_set_vma_cache_size(bufmgr, 500); - - /* IMPORTANT: we need to enable buffer reuse, otherwise we won't test - * the libdrm bo cache! */ - drm_intel_bufmgr_gem_enable_reuse(bufmgr); - - /* put some load onto the gpu to keep the light buffers active for long - * enough */ - for (i = 0; i < 10000; i++) { - BLIT_COPY_BATCH_START(0); - OUT_BATCH((3 << 24) | /* 32 bits */ - (0xcc << 16) | /* copy ROP */ - 4096); - OUT_BATCH(0); /* dst x1,y1 */ - OUT_BATCH((1024 << 16) | 512); - OUT_RELOC(load_bo, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0); - OUT_BATCH((0 << 16) | 512); /* src x1, y1 */ - OUT_BATCH(4096); - OUT_RELOC(load_bo, I915_GEM_DOMAIN_RENDER, 0, 0); - ADVANCE_BATCH(); - } - -#define GROUP_SZ 100 - for (i = 0; i < 68000; ) { - int j; - drm_intel_bo *bo[GROUP_SZ]; - - for (j = 0; j < GROUP_SZ; j++, i++) { - bo[j] = drm_intel_bo_alloc(bufmgr, "mmap bo", 4096, 4096); - igt_assert(bo[j]); - - drm_intel_gem_bo_map_gtt(bo[j]); - ptr = bo[j]->virtual; - igt_assert(ptr); - *ptr = 'c'; - drm_intel_gem_bo_unmap_gtt(bo[j]); - - /* put it onto the active list ... */ - COLOR_BLIT_COPY_BATCH_START(0); - OUT_BATCH((3 << 24) | /* 32 bits */ - 128); - OUT_BATCH(0); /* dst x1,y1 */ - OUT_BATCH((1 << 16) | 1); - OUT_RELOC(bo[j], I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0); - OUT_BATCH(0xffffffff); /* color */ - ADVANCE_BATCH(); - } - intel_batchbuffer_flush(batch); - - for (j = 0; j < GROUP_SZ; j++) - drm_intel_bo_unreference(bo[j]); - } - - intel_batchbuffer_free(batch); - drm_intel_bufmgr_destroy(bufmgr); - - close(fd); -} diff --git a/tests/drm_vma_limiter_cpu.c b/tests/drm_vma_limiter_cpu.c deleted file mode 100644 index 5ea7491d..00000000 --- a/tests/drm_vma_limiter_cpu.c +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright © 2011 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - * - * Authors: - * Daniel Vetter <daniel.vetter@ffwll.ch> - */ - -#include "igt.h" -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <fcntl.h> -#include <inttypes.h> -#include <errno.h> -#include <sys/stat.h> -#include <sys/time.h> -#include "drm.h" -#include "intel_bufmgr.h" - -static drm_intel_bufmgr *bufmgr; -struct intel_batchbuffer *batch; - -/* Testcase: check whether the libdrm vma limiter works - * - * We've had reports of the X server exhausting the default rlimit of 64k vma's - * in the kernel. libdrm has grown facilities to limit the vma caching since, - * this checks whether they actually work. - * - * This one checks cpu mmaps only. - */ - -#define BO_ARRAY_SIZE 68000 -drm_intel_bo *bos[BO_ARRAY_SIZE]; - -igt_simple_main -{ - int fd; - int i; - char *ptr; - - igt_skip_on_simulation(); - - fd = drm_open_driver(DRIVER_INTEL); - - bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); - drm_intel_bufmgr_gem_enable_reuse(bufmgr); - batch = intel_batchbuffer_alloc(bufmgr, intel_get_drm_devid(fd)); - - drm_intel_bufmgr_gem_set_vma_cache_size(bufmgr, 500); - - for (i = 0; i < BO_ARRAY_SIZE; i++) { - bos[i] = drm_intel_bo_alloc(bufmgr, "mmap bo", 4096, 4096); - igt_assert(bos[i]); - - drm_intel_bo_map(bos[i], 1); - ptr = bos[i]->virtual; - igt_assert(ptr); - *ptr = 'c'; - drm_intel_bo_unmap(bos[i]); - } - - /* and recheck whether a second map of the same still works */ - for (i = 0; i < BO_ARRAY_SIZE; i++) { - bos[i] = drm_intel_bo_alloc(bufmgr, "mmap bo", 4096, 4096); - igt_assert(bos[i]); - - drm_intel_bo_map(bos[i], 1); - ptr = bos[i]->virtual; - igt_assert(*ptr = 'c'); - drm_intel_bo_unmap(bos[i]); - } - - intel_batchbuffer_free(batch); - drm_intel_bufmgr_destroy(bufmgr); - - close(fd); -} diff --git a/tests/drm_vma_limiter_gtt.c b/tests/drm_vma_limiter_gtt.c deleted file mode 100644 index 52028230..00000000 --- a/tests/drm_vma_limiter_gtt.c +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright © 2011 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - * - * Authors: - * Daniel Vetter <daniel.vetter@ffwll.ch> - */ - -#include "igt.h" -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <fcntl.h> -#include <inttypes.h> -#include <errno.h> -#include <sys/stat.h> -#include <sys/time.h> -#include "drm.h" -#include "intel_bufmgr.h" - -static drm_intel_bufmgr *bufmgr; -struct intel_batchbuffer *batch; - -/* Testcase: check whether the libdrm vma limiter works - * - * We've had reports of the X server exhausting the default rlimit of 64k vma's - * in the kernel. libdrm has grown facilities to limit the vma caching since, - * this checks whether they actually work. - * - * This one checks cpu mmaps only. - */ - -/* we do both cpu and gtt maps, so only need half of 64k to exhaust */ -#define BO_ARRAY_SIZE 68000 -drm_intel_bo *bos[BO_ARRAY_SIZE]; - -igt_simple_main -{ - int fd; - int i; - char *ptr; - - igt_skip_on_simulation(); - - fd = drm_open_driver(DRIVER_INTEL); - - bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); - drm_intel_bufmgr_gem_enable_reuse(bufmgr); - batch = intel_batchbuffer_alloc(bufmgr, intel_get_drm_devid(fd)); - - drm_intel_bufmgr_gem_set_vma_cache_size(bufmgr, 500); - - for (i = 0; i < BO_ARRAY_SIZE; i++) { - bos[i] = drm_intel_bo_alloc(bufmgr, "mmap bo", 4096, 4096); - igt_assert(bos[i]); - - drm_intel_gem_bo_map_gtt(bos[i]); - ptr = bos[i]->virtual; - igt_assert(ptr); - *ptr = 'c'; - drm_intel_gem_bo_unmap_gtt(bos[i]); - } - - /* and recheck whether a second map of the same still works */ - for (i = 0; i < BO_ARRAY_SIZE; i++) { - bos[i] = drm_intel_bo_alloc(bufmgr, "mmap bo", 4096, 4096); - igt_assert(bos[i]); - - drm_intel_gem_bo_map_gtt(bos[i]); - ptr = bos[i]->virtual; - igt_assert(*ptr = 'c'); - drm_intel_gem_bo_unmap_gtt(bos[i]); - } - - intel_batchbuffer_free(batch); - drm_intel_bufmgr_destroy(bufmgr); - - close(fd); -} diff --git a/tests/meson.build b/tests/meson.build index 9ec39e08..029b8043 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -10,10 +10,6 @@ test_progs = [ 'drm_import_export', 'drm_mm', 'drm_read', - 'drm_vma_limiter', - 'drm_vma_limiter_cached', - 'drm_vma_limiter_cpu', - 'drm_vma_limiter_gtt', 'drv_getparams_basic', 'drv_hangman', 'drv_missed_irq', |