[PATCH i-g-t v3 10/10] tests/intel/xe_drm_fdinfo: Rename and reorder tests
Nirmoy Das
nirmoy.das at linux.intel.com
Wed Aug 28 15:08:56 UTC 2024
On 8/27/2024 6:54 PM, Lucas De Marchi wrote:
> There are 2 main categories of tests in xe_drm_fdinfo:
> mem and utilization. Group and name tests accordingly.
>
> For utilization, create subgroups: "single", "others" and "all",
> with variants on each of them.
>
> No change in behavior on each tests, it's just rename and reorder.
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
> tests/intel/xe_drm_fdinfo.c | 148 ++++++++++++++++++------------------
> 1 file changed, 74 insertions(+), 74 deletions(-)
>
> diff --git a/tests/intel/xe_drm_fdinfo.c b/tests/intel/xe_drm_fdinfo.c
> index d45e45c6b..d1ed0fcaa 100644
> --- a/tests/intel/xe_drm_fdinfo.c
> +++ b/tests/intel/xe_drm_fdinfo.c
> @@ -22,41 +22,41 @@
> * Feature: SMI, core
> * Test category: SysMan
> *
> - * SUBTEST: basic-memory
> + * SUBTEST: basic-mem
> * Description: Check if basic fdinfo content is present for memory
> *
> - * SUBTEST: basic-engine-utilization
> + * SUBTEST: basic-utilization
> * Description: Check if basic fdinfo content is present for engine utilization
> *
> - * SUBTEST: drm-idle
> - * Description: Check that engines show no load when idle
> + * SUBTEST: mem-total-resident
> + * Description: Create and compare total and resident memory consumption by client
> *
> - * SUBTEST: drm-busy-idle
> - * Description: Check that engines show load when idle after busy
> + * SUBTEST: mem-shared
> + * Description: Create and compare shared memory consumption by client
> *
> - * SUBTEST: drm-busy-idle-isolation
> - * Description: Check that engine load does not spill over to other drm clients
> + * SUBTEST: mem-active
> + * Description: Create and compare active memory consumption by client
> *
> - * SUBTEST: drm-busy-idle-check-all
> - * Description: Check that only the target engine shows load when idle after busy
> + * SUBTEST: utilization-single-idle
> + * Description: Check that each engine shows no load
> *
> - * SUBTEST: drm-most-busy-idle-check-all
> - * Description: Check that only the target engine shows idle and all others are busy
> + * SUBTEST: utilization-single-full-load
> + * Description: Check that each engine shows full load
> *
> - * SUBTEST: drm-all-busy-idle-check-all
> - * Description: Check that all engines show busy when all are loaded
> + * SUBTEST: utilization-single-full-load-isolation
> + * Description: Check that each engine load does not spill over to other drm clients
> *
> - * SUBTEST: drm-busy-exec-queue-destroy-idle
> + * SUBTEST: utilization-single-full-load-destroy-queue
> * Description: Destroy exec queue before idle and ensure load is accurate
> *
> - * SUBTEST: drm-total-resident
> - * Description: Create and compare total and resident memory consumption by client
> + * SUBTEST: utilization-others-idle
> + * Description: Check that only the target engine shows load
> *
> - * SUBTEST: drm-shared
> - * Description: Create and compare shared memory consumption by client
> + * SUBTEST: utilization-others-full-load
> + * Description: Check that only the target engine shows idle and all others are busy
> *
> - * SUBTEST: drm-active
> - * Description: Create and compare active memory consumption by client
> + * SUBTEST: utilization-all-full-load
> + * Description: Check that all engines show busy when all are loaded
> */
>
> IGT_TEST_DESCRIPTION("Read and verify drm client memory consumption and engine utilization using fdinfo");
> @@ -104,7 +104,7 @@ static void read_engine_cycles(int xe, struct pceu_cycles *pceu)
> }
>
> /* Subtests */
> -static void test_active(int fd, struct drm_xe_engine *engine)
> +static void mem_active(int fd, struct drm_xe_engine *engine)
> {
> struct drm_xe_mem_region *memregion;
> uint64_t memreg = all_memory_regions(fd), region;
> @@ -230,7 +230,7 @@ static void test_active(int fd, struct drm_xe_engine *engine)
> xe_vm_destroy(fd, vm);
> }
>
> -static void test_shared(int xe)
> +static void mem_shared(int xe)
> {
> struct drm_xe_mem_region *memregion;
> uint64_t memreg = all_memory_regions(xe), region;
> @@ -275,7 +275,7 @@ static void test_shared(int xe)
> }
> }
>
> -static void test_total_resident(int xe)
> +static void mem_total_resident(int xe)
> {
> struct drm_xe_mem_region *memregion;
> uint64_t memreg = all_memory_regions(xe), region;
> @@ -508,7 +508,7 @@ check_results(struct pceu_cycles *s1, struct pceu_cycles *s2,
> }
>
> static void
> -single(int fd, struct drm_xe_engine_class_instance *hwe, unsigned int flags)
> +utilization_single(int fd, struct drm_xe_engine_class_instance *hwe, unsigned int flags)
> {
> struct pceu_cycles pceu1[2][DRM_XE_ENGINE_CLASS_COMPUTE + 1];
> struct pceu_cycles pceu2[2][DRM_XE_ENGINE_CLASS_COMPUTE + 1];
> @@ -557,64 +557,64 @@ single(int fd, struct drm_xe_engine_class_instance *hwe, unsigned int flags)
> }
>
> static void
> -busy_check_all(int fd, struct drm_xe_engine_class_instance *hwe)
> +utilization_single_destroy_queue(int fd, struct drm_xe_engine_class_instance *hwe)
> {
> struct pceu_cycles pceu1[DRM_XE_ENGINE_CLASS_COMPUTE + 1];
> struct pceu_cycles pceu2[DRM_XE_ENGINE_CLASS_COMPUTE + 1];
> struct spin_ctx *ctx = NULL;
> uint32_t vm;
> - int class;
>
> vm = xe_vm_create(fd, 0, 0);
> -
> ctx = spin_ctx_init(fd, hwe, vm);
> spin_sync_start(fd, ctx);
>
> read_engine_cycles(fd, pceu1);
> usleep(batch_duration_usec);
> - spin_sync_end(fd, ctx);
> - read_engine_cycles(fd, pceu2);
> -
> - xe_for_each_engine_class(class) {
> - enum expected_load expected_load = hwe->engine_class != class ?
> - EXPECTED_LOAD_IDLE : EXPECTED_LOAD_FULL;
> -
> - check_results(pceu1, pceu2, class, expected_load);
> - }
>
> + /* destroy queue before sampling again */
Wouldn't this change the behavior ?
Regards,
Nirmoy
> spin_sync_end(fd, ctx);
> spin_ctx_destroy(fd, ctx);
> +
> + read_engine_cycles(fd, pceu2);
> +
> xe_vm_destroy(fd, vm);
> +
> + check_results(pceu1, pceu2, hwe->engine_class, EXPECTED_LOAD_FULL);
> }
>
> static void
> -single_destroy_queue(int fd, struct drm_xe_engine_class_instance *hwe)
> +utilization_others_idle(int fd, struct drm_xe_engine_class_instance *hwe)
> {
> struct pceu_cycles pceu1[DRM_XE_ENGINE_CLASS_COMPUTE + 1];
> struct pceu_cycles pceu2[DRM_XE_ENGINE_CLASS_COMPUTE + 1];
> struct spin_ctx *ctx = NULL;
> uint32_t vm;
> + int class;
>
> vm = xe_vm_create(fd, 0, 0);
> +
> ctx = spin_ctx_init(fd, hwe, vm);
> spin_sync_start(fd, ctx);
>
> read_engine_cycles(fd, pceu1);
> usleep(batch_duration_usec);
> -
> - /* destroy queue before sampling again */
> spin_sync_end(fd, ctx);
> - spin_ctx_destroy(fd, ctx);
> -
> read_engine_cycles(fd, pceu2);
>
> - xe_vm_destroy(fd, vm);
> + xe_for_each_engine_class(class) {
> + enum expected_load expected_load = hwe->engine_class != class ?
> + EXPECTED_LOAD_IDLE : EXPECTED_LOAD_FULL;
>
> - check_results(pceu1, pceu2, hwe->engine_class, EXPECTED_LOAD_FULL);
> + check_results(pceu1, pceu2, class, expected_load);
> + }
> +
> + spin_sync_end(fd, ctx);
> + spin_ctx_destroy(fd, ctx);
> + xe_vm_destroy(fd, vm);
> }
>
> static void
> -most_busy_check_all(int fd, struct drm_xe_engine_class_instance *hwe)
> +utilization_others_full_load(int fd, struct drm_xe_engine_class_instance *hwe)
> {
> struct pceu_cycles pceu1[DRM_XE_ENGINE_CLASS_COMPUTE + 1];
> struct pceu_cycles pceu2[DRM_XE_ENGINE_CLASS_COMPUTE + 1];
> @@ -658,7 +658,7 @@ most_busy_check_all(int fd, struct drm_xe_engine_class_instance *hwe)
> }
>
> static void
> -all_busy_check_all(int fd)
> +utilization_all_full_load(int fd)
> {
> struct pceu_cycles pceu1[DRM_XE_ENGINE_CLASS_COMPUTE + 1];
> struct pceu_cycles pceu2[DRM_XE_ENGINE_CLASS_COMPUTE + 1];
> @@ -710,51 +710,51 @@ igt_main
> }
>
> igt_describe("Check if basic fdinfo content is present for memory");
> - igt_subtest("basic-memory")
> + igt_subtest("basic-mem")
> basic_memory(xe);
>
> igt_describe("Check if basic fdinfo content is present for engine utilization");
> - igt_subtest("basic-engine-utilization")
> + igt_subtest("basic-utilization")
> basic_engine_utilization(xe);
>
> - igt_subtest("drm-idle")
> - xe_for_each_engine(xe, hwe)
> - single(xe, hwe, 0);
> + igt_describe("Create and compare total and resident memory consumption by client");
> + igt_subtest("mem-total-resident")
> + mem_total_resident(xe);
>
> - igt_subtest("drm-busy-idle")
> - xe_for_each_engine(xe, hwe)
> - single(xe, hwe, TEST_BUSY | TEST_TRAILING_IDLE);
> + igt_describe("Create and compare shared memory consumption by client");
> + igt_subtest("mem-shared")
> + mem_shared(xe);
>
> - igt_subtest("drm-busy-idle-isolation")
> - xe_for_each_engine(xe, hwe)
> - single(xe, hwe, TEST_BUSY | TEST_TRAILING_IDLE | TEST_ISOLATION);
> + igt_describe("Create and compare active memory consumption by client");
> + igt_subtest("mem-active")
> + mem_active(xe, xe_engine(xe, 0));
>
> - igt_subtest("drm-busy-idle-check-all")
> + igt_subtest("utilization-single-idle")
> xe_for_each_engine(xe, hwe)
> - busy_check_all(xe, hwe);
> + utilization_single(xe, hwe, 0);
>
> - igt_subtest("drm-most-busy-idle-check-all")
> + igt_subtest("utilization-single-full-load")
> xe_for_each_engine(xe, hwe)
> - most_busy_check_all(xe, hwe);
> + utilization_single(xe, hwe, TEST_BUSY | TEST_TRAILING_IDLE);
>
> - igt_subtest("drm-all-busy-idle-check-all")
> - all_busy_check_all(xe);
> + igt_subtest("utilization-single-full-load-isolation")
> + xe_for_each_engine(xe, hwe)
> + utilization_single(xe, hwe, TEST_BUSY | TEST_TRAILING_IDLE | TEST_ISOLATION);
>
> - igt_subtest("drm-busy-exec-queue-destroy-idle")
> + igt_subtest("utilization-single-full-load-destroy-queue")
> xe_for_each_engine(xe, hwe)
> - single_destroy_queue(xe, hwe);
> + utilization_single_destroy_queue(xe, hwe);
>
> - igt_describe("Create and compare total and resident memory consumption by client");
> - igt_subtest("drm-total-resident")
> - test_total_resident(xe);
> + igt_subtest("utilization-others-idle")
> + xe_for_each_engine(xe, hwe)
> + utilization_others_idle(xe, hwe);
>
> - igt_describe("Create and compare shared memory consumption by client");
> - igt_subtest("drm-shared")
> - test_shared(xe);
> + igt_subtest("utilization-others-full-load")
> + xe_for_each_engine(xe, hwe)
> + utilization_others_full_load(xe, hwe);
>
> - igt_describe("Create and compare active memory consumption by client");
> - igt_subtest("drm-active")
> - test_active(xe, xe_engine(xe, 0));
> + igt_subtest("utilization-all-full-load")
> + utilization_all_full_load(xe);
>
> igt_fixture {
> drm_close_driver(xe);
More information about the igt-dev
mailing list