From: Matthew Auld <matthew.auld@intel.com> To: igt-dev@lists.freedesktop.org Cc: thomas.hellstrom@linux.intel.com, Janusz Krzysztofik <janusz.krzysztofik@intel.com>, intel-gfx@lists.freedesktop.org, Dominik Grzegorzek <dominik.grzegorzek@intel.com> Subject: [Intel-gfx] [PATCH i-g-t 11/12] lib/i915/intel_memory_region: Add new macros and support for igt_collection Date: Tue, 11 May 2021 17:51:16 +0100 [thread overview] Message-ID: <20210511165117.428062-12-matthew.auld@intel.com> (raw) In-Reply-To: <20210511165117.428062-1-matthew.auld@intel.com> From: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> As with new memory region era we will have to cover different sets of memory regions inside the tests this patch adds support for generating subtest names according to passed memory region collection. Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> Cc: Vinay Belgaumkar <vinay.belgaumkar@intel.com> Cc: Janusz Krzysztofik <janusz.krzysztofik@intel.com> Cc: Ashutosh Dixit <ashutosh.dixit@intel.com> Cc: Dominik Grzegorzek <dominik.grzegorzek@intel.com> --- lib/i915/intel_memory_region.c | 26 ++++++++++++++++++-------- lib/i915/intel_memory_region.h | 15 ++++++++++++++- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/lib/i915/intel_memory_region.c b/lib/i915/intel_memory_region.c index 91d3ef18..983ac4df 100644 --- a/lib/i915/intel_memory_region.c +++ b/lib/i915/intel_memory_region.c @@ -80,9 +80,12 @@ const char *get_memory_region_name(uint32_t region) { uint16_t class = MEMORY_TYPE_FROM_REGION(region); - if (class == I915_MEMORY_CLASS_SYSTEM) + switch (class) { + case I915_MEMORY_CLASS_SYSTEM: return "smem"; - + case I915_MEMORY_CLASS_DEVICE: + return "lmem"; + } igt_assert_f(false, "Unknown memory region"); } @@ -169,11 +172,13 @@ int __gem_create_in_memory_region_list(int fd, uint32_t *handle, uint64_t size, struct drm_i915_gem_memory_class_instance *mem_regions, int num_regions) { - /* a temporary solution, to be removed when these arguments will be used */ - (void) mem_regions; - (void) num_regions; + struct drm_i915_gem_create_ext_memory_regions ext_regions = { + .base = { .name = I915_GEM_CREATE_EXT_MEMORY_REGIONS }, + .num_regions = num_regions, + .regions = to_user_pointer(mem_regions), + }; - return __gem_create(fd, &size, handle); + return __gem_create_ext(fd, &size, handle, &ext_regions.base); } /* gem_create_in_memory_region_list: @@ -264,8 +269,13 @@ char *memregion_dynamic_subtest_name(struct igt_collection *set) int r; region = data->value; - - r = snprintf(p, len, "%s-", get_memory_region_name(region)); + if (IS_DEVICE_MEMORY_REGION(region)) + r = snprintf(p, len, "%s%d-", + get_memory_region_name(region), + MEMORY_INSTANCE_FROM_REGION(region)); + else + r = snprintf(p, len, "%s-", + get_memory_region_name(region)); igt_assert(r > 0); p += r; diff --git a/lib/i915/intel_memory_region.h b/lib/i915/intel_memory_region.h index 3e53d8de..e9d1d66d 100644 --- a/lib/i915/intel_memory_region.h +++ b/lib/i915/intel_memory_region.h @@ -26,6 +26,9 @@ #define INTEL_MEMORY_REGION_H #define I915_SYSTEM_MEMORY I915_MEMORY_CLASS_SYSTEM +#define I915_DEVICE_MEMORY I915_MEMORY_CLASS_DEVICE +#define I915_STOLEN_SYSTEM_MEMORY I915_MEMORY_CLASS_STOLEN_SYSTEM +#define I915_STOLEN_DEVICE_MEMORY I915_MEMORY_CLASS_STOLEN_DEVICE #define INTEL_MEMORY_REGION_ID(type, instance) ((type) << 16u | (instance)) #define MEMORY_TYPE_FROM_REGION(r) ((r) >> 16u) @@ -34,10 +37,19 @@ #define IS_MEMORY_REGION_TYPE(region, type) \ (MEMORY_TYPE_FROM_REGION(region) == type) +#define IS_DEVICE_MEMORY_REGION(region) \ + IS_MEMORY_REGION_TYPE(region, I915_MEMORY_CLASS_DEVICE) #define IS_SYSTEM_MEMORY_REGION(region) \ IS_MEMORY_REGION_TYPE(region, I915_MEMORY_CLASS_SYSTEM) +#define IS_STOLEN_MEMORY_REGION(region) \ + (IS_MEMORY_REGION_TYPE(region, I915_MEMORY_CLASS_STOLEN_SYSTEM) || \ + IS_MEMORY_REGION_TYPE(region, I915_MEMORY_CLASS_STOLEN_DEVICE)) + #define REGION_SMEM INTEL_MEMORY_REGION_ID(I915_MEMORY_CLASS_SYSTEM, 0) +#define REGION_LMEM(n) INTEL_MEMORY_REGION_ID(I915_MEMORY_CLASS_DEVICE, (n)) +#define REGION_STLN_SMEM(n) INTEL_MEMORY_REGION_ID(I915_MEMORY_CLASS_STOLEN_SYSTEM, (n)) +#define REGION_STLN_LMEM(n) INTEL_MEMORY_REGION_ID(I915_MEMORY_CLASS_STOLEN_DEVICE, (n)) bool gem_has_query_support(int fd); @@ -89,7 +101,8 @@ __get_memory_region_set(struct drm_i915_query_memory_regions *regions, /* * Helper macro to create igt_collection which contains all memory regions - * which matches mem_region_types array. + * which matches mem_region_types array. Useful to filter out stolen memory + * from accessible memory regions. */ #define get_memory_region_set(regions, mem_region_types...) ({ \ unsigned int arr__[] = { mem_region_types }; \ -- 2.26.3 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Matthew Auld <matthew.auld@intel.com> To: igt-dev@lists.freedesktop.org Cc: thomas.hellstrom@linux.intel.com, Janusz Krzysztofik <janusz.krzysztofik@intel.com>, petri.latvala@intel.com, intel-gfx@lists.freedesktop.org, daniel@ffwll.ch Subject: [igt-dev] [PATCH i-g-t 11/12] lib/i915/intel_memory_region: Add new macros and support for igt_collection Date: Tue, 11 May 2021 17:51:16 +0100 [thread overview] Message-ID: <20210511165117.428062-12-matthew.auld@intel.com> (raw) In-Reply-To: <20210511165117.428062-1-matthew.auld@intel.com> From: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> As with new memory region era we will have to cover different sets of memory regions inside the tests this patch adds support for generating subtest names according to passed memory region collection. Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> Cc: Vinay Belgaumkar <vinay.belgaumkar@intel.com> Cc: Janusz Krzysztofik <janusz.krzysztofik@intel.com> Cc: Ashutosh Dixit <ashutosh.dixit@intel.com> Cc: Dominik Grzegorzek <dominik.grzegorzek@intel.com> --- lib/i915/intel_memory_region.c | 26 ++++++++++++++++++-------- lib/i915/intel_memory_region.h | 15 ++++++++++++++- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/lib/i915/intel_memory_region.c b/lib/i915/intel_memory_region.c index 91d3ef18..983ac4df 100644 --- a/lib/i915/intel_memory_region.c +++ b/lib/i915/intel_memory_region.c @@ -80,9 +80,12 @@ const char *get_memory_region_name(uint32_t region) { uint16_t class = MEMORY_TYPE_FROM_REGION(region); - if (class == I915_MEMORY_CLASS_SYSTEM) + switch (class) { + case I915_MEMORY_CLASS_SYSTEM: return "smem"; - + case I915_MEMORY_CLASS_DEVICE: + return "lmem"; + } igt_assert_f(false, "Unknown memory region"); } @@ -169,11 +172,13 @@ int __gem_create_in_memory_region_list(int fd, uint32_t *handle, uint64_t size, struct drm_i915_gem_memory_class_instance *mem_regions, int num_regions) { - /* a temporary solution, to be removed when these arguments will be used */ - (void) mem_regions; - (void) num_regions; + struct drm_i915_gem_create_ext_memory_regions ext_regions = { + .base = { .name = I915_GEM_CREATE_EXT_MEMORY_REGIONS }, + .num_regions = num_regions, + .regions = to_user_pointer(mem_regions), + }; - return __gem_create(fd, &size, handle); + return __gem_create_ext(fd, &size, handle, &ext_regions.base); } /* gem_create_in_memory_region_list: @@ -264,8 +269,13 @@ char *memregion_dynamic_subtest_name(struct igt_collection *set) int r; region = data->value; - - r = snprintf(p, len, "%s-", get_memory_region_name(region)); + if (IS_DEVICE_MEMORY_REGION(region)) + r = snprintf(p, len, "%s%d-", + get_memory_region_name(region), + MEMORY_INSTANCE_FROM_REGION(region)); + else + r = snprintf(p, len, "%s-", + get_memory_region_name(region)); igt_assert(r > 0); p += r; diff --git a/lib/i915/intel_memory_region.h b/lib/i915/intel_memory_region.h index 3e53d8de..e9d1d66d 100644 --- a/lib/i915/intel_memory_region.h +++ b/lib/i915/intel_memory_region.h @@ -26,6 +26,9 @@ #define INTEL_MEMORY_REGION_H #define I915_SYSTEM_MEMORY I915_MEMORY_CLASS_SYSTEM +#define I915_DEVICE_MEMORY I915_MEMORY_CLASS_DEVICE +#define I915_STOLEN_SYSTEM_MEMORY I915_MEMORY_CLASS_STOLEN_SYSTEM +#define I915_STOLEN_DEVICE_MEMORY I915_MEMORY_CLASS_STOLEN_DEVICE #define INTEL_MEMORY_REGION_ID(type, instance) ((type) << 16u | (instance)) #define MEMORY_TYPE_FROM_REGION(r) ((r) >> 16u) @@ -34,10 +37,19 @@ #define IS_MEMORY_REGION_TYPE(region, type) \ (MEMORY_TYPE_FROM_REGION(region) == type) +#define IS_DEVICE_MEMORY_REGION(region) \ + IS_MEMORY_REGION_TYPE(region, I915_MEMORY_CLASS_DEVICE) #define IS_SYSTEM_MEMORY_REGION(region) \ IS_MEMORY_REGION_TYPE(region, I915_MEMORY_CLASS_SYSTEM) +#define IS_STOLEN_MEMORY_REGION(region) \ + (IS_MEMORY_REGION_TYPE(region, I915_MEMORY_CLASS_STOLEN_SYSTEM) || \ + IS_MEMORY_REGION_TYPE(region, I915_MEMORY_CLASS_STOLEN_DEVICE)) + #define REGION_SMEM INTEL_MEMORY_REGION_ID(I915_MEMORY_CLASS_SYSTEM, 0) +#define REGION_LMEM(n) INTEL_MEMORY_REGION_ID(I915_MEMORY_CLASS_DEVICE, (n)) +#define REGION_STLN_SMEM(n) INTEL_MEMORY_REGION_ID(I915_MEMORY_CLASS_STOLEN_SYSTEM, (n)) +#define REGION_STLN_LMEM(n) INTEL_MEMORY_REGION_ID(I915_MEMORY_CLASS_STOLEN_DEVICE, (n)) bool gem_has_query_support(int fd); @@ -89,7 +101,8 @@ __get_memory_region_set(struct drm_i915_query_memory_regions *regions, /* * Helper macro to create igt_collection which contains all memory regions - * which matches mem_region_types array. + * which matches mem_region_types array. Useful to filter out stolen memory + * from accessible memory regions. */ #define get_memory_region_set(regions, mem_region_types...) ({ \ unsigned int arr__[] = { mem_region_types }; \ -- 2.26.3 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2021-05-11 16:51 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-11 16:51 [Intel-gfx] [PATCH i-g-t 00/12] DG1/LMEM uAPI basics Matthew Auld 2021-05-11 16:51 ` [igt-dev] " Matthew Auld 2021-05-11 16:51 ` [Intel-gfx] [PATCH i-g-t 01/12] lib/i915/gem_create: Add gem_create_ext Matthew Auld 2021-05-11 16:51 ` [igt-dev] " Matthew Auld 2021-05-11 16:51 ` [Intel-gfx] [PATCH i-g-t 02/12] lib/i915/intel_memory_region: Add memory regions stubs Matthew Auld 2021-05-11 16:51 ` [Intel-gfx] [PATCH i-g-t 03/12] tests/gem_gpgpu_fill: Convert from simple to standard igt_main Matthew Auld 2021-05-11 16:51 ` [igt-dev] " Matthew Auld 2021-05-11 16:51 ` [Intel-gfx] [PATCH i-g-t 04/12] tests/i915/gem_exec_basic: Use memory region interface Matthew Auld 2021-05-11 16:51 ` [Intel-gfx] [PATCH i-g-t 05/12] tests/i915/gem_gpgpu_fill: " Matthew Auld 2021-05-11 16:51 ` [igt-dev] " Matthew Auld 2021-05-11 16:51 ` [Intel-gfx] [PATCH i-g-t 06/12] tests/i915/gem_media_fill: " Matthew Auld 2021-05-11 16:51 ` [igt-dev] " Matthew Auld 2021-05-11 16:51 ` [Intel-gfx] [PATCH i-g-t 07/12] i915_drm.h sync Matthew Auld 2021-05-11 16:51 ` [igt-dev] " Matthew Auld 2021-05-19 8:19 ` [Intel-gfx] " Petri Latvala 2021-05-19 8:19 ` [igt-dev] " Petri Latvala 2021-05-19 8:25 ` [Intel-gfx] " Jani Nikula 2021-05-19 8:25 ` [igt-dev] " Jani Nikula 2021-05-11 16:51 ` [Intel-gfx] [PATCH i-g-t 08/12] Synchronize memory region uapi and tests with i915_drm.h Matthew Auld 2021-05-11 16:51 ` [igt-dev] " Matthew Auld 2021-05-11 16:51 ` [Intel-gfx] [PATCH i-g-t 09/12] lib/i915/intel_memory_region/dg1: Add new lib to query memory region Matthew Auld 2021-05-11 16:51 ` [igt-dev] " Matthew Auld 2021-05-11 16:51 ` [Intel-gfx] [PATCH i-g-t 10/12] tests/i915/gem_create: exercise placements extension Matthew Auld 2021-05-11 16:51 ` [igt-dev] " Matthew Auld 2021-05-11 16:51 ` Matthew Auld [this message] 2021-05-11 16:51 ` [igt-dev] [PATCH i-g-t 11/12] lib/i915/intel_memory_region: Add new macros and support for igt_collection Matthew Auld 2021-05-11 16:51 ` [Intel-gfx] [PATCH i-g-t 12/12] tests/i915/gem_exec_basic/dg1: Iterate over all memory regions Matthew Auld 2021-05-11 16:51 ` [igt-dev] " Matthew Auld 2021-05-11 17:52 ` [igt-dev] ✗ Fi.CI.BAT: failure for DG1/LMEM uAPI basics Patchwork 2021-05-19 8:13 ` [Intel-gfx] [igt-dev] [PATCH i-g-t 00/12] " Matthew Auld 2021-05-19 8:50 ` Petri Latvala 2021-05-19 10:45 ` Matthew Auld 2021-05-19 10:45 ` Matthew Auld 2021-05-19 11:02 ` [Intel-gfx] " Petri Latvala 2021-05-19 11:02 ` Petri Latvala 2021-05-19 11:36 ` [Intel-gfx] " Matthew Auld 2021-05-19 11:36 ` Matthew Auld 2021-05-19 12:07 ` [Intel-gfx] " Petri Latvala 2021-05-19 12:07 ` Petri Latvala
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210511165117.428062-12-matthew.auld@intel.com \ --to=matthew.auld@intel.com \ --cc=dominik.grzegorzek@intel.com \ --cc=igt-dev@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=janusz.krzysztofik@intel.com \ --cc=thomas.hellstrom@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.