Hi John,

On 2022-06-02 at 17:54:04 -0700, john.c.harri...@intel.com wrote:
> From: Rodrigo Vivi <rodrigo.v...@intel.com>
> 
> Newer platforms have an embedded table giving details about that
> platform's hardware configuration. This table can be retrieved from
> the KMD via the existing query API. So add a test for it as both an
> example of how to fetch the table and to validate the contents as much
> as is possible.
> 
> Signed-off-by: Rodrigo Vivi <rodrigo.v...@intel.com>
> Signed-off-by: John Harrison <john.c.harri...@intel.com>
> Cc: Slawomir Milczarek <slawomir.milcza...@intel.com>
> Reviewed-by: Matthew Brost <matthew.br...@intel.com>
> ---
>  lib/intel_hwconfig_types.h | 118 ++++++++++++++++++++++++
>  tests/i915/i915_query.c    | 179 +++++++++++++++++++++++++++++++++++++
>  2 files changed, 297 insertions(+)
>  create mode 100644 lib/intel_hwconfig_types.h
> 
> diff --git a/lib/intel_hwconfig_types.h b/lib/intel_hwconfig_types.h
> new file mode 100644
> index 000000000000..d5db217afba2
> --- /dev/null
> +++ b/lib/intel_hwconfig_types.h
> @@ -0,0 +1,118 @@
> +// SPDX-License-Identifier: MIT
> +/*
> + * Copyright © 2022 Intel Corporation
> + */
> +
> +#ifndef _INTEL_HWCONFIG_TYPES_H_
> +#define _INTEL_HWCONFIG_TYPES_H_
> +
> +#include "intel_chipset.h"
> +
> +/**
> + * enum intel_hwconfig - Global definition of hwconfig table attributes
> + *
> + * Intel devices provide a KLV (Key/Length/Value) table containing
> + * the static hardware configuration for that platform.
> + * This enum defines the current attribute keys for this KLV.
> + */
> +enum intel_hwconfig {
> +     INTEL_HWCONFIG_MAX_SLICES_SUPPORTED = 1,
> +     INTEL_HWCONFIG_MAX_DUAL_SUBSLICES_SUPPORTED,            /* 2 */
> +     INTEL_HWCONFIG_MAX_NUM_EU_PER_DSS,                      /* 3 */
> +     INTEL_HWCONFIG_NUM_PIXEL_PIPES,                         /* 4 */
> +     INTEL_HWCONFIG_DEPRECATED_MAX_NUM_GEOMETRY_PIPES,       /* 5 */
> +     INTEL_HWCONFIG_DEPRECATED_L3_CACHE_SIZE_IN_KB,          /* 6 */
> +     INTEL_HWCONFIG_DEPRECATED_L3_BANK_COUNT,                /* 7 */
> +     INTEL_HWCONFIG_L3_CACHE_WAYS_SIZE_IN_BYTES,             /* 8 */
> +     INTEL_HWCONFIG_L3_CACHE_WAYS_PER_SECTOR,                /* 9 */
> +     INTEL_HWCONFIG_MAX_MEMORY_CHANNELS,                     /* 10 */
> +     INTEL_HWCONFIG_MEMORY_TYPE,                             /* 11 */
> +     INTEL_HWCONFIG_CACHE_TYPES,                             /* 12 */
> +     INTEL_HWCONFIG_LOCAL_MEMORY_PAGE_SIZES_SUPPORTED,       /* 13 */
> +     INTEL_HWCONFIG_DEPRECATED_SLM_SIZE_IN_KB,               /* 14 */
> +     INTEL_HWCONFIG_NUM_THREADS_PER_EU,                      /* 15 */
> +     INTEL_HWCONFIG_TOTAL_VS_THREADS,                        /* 16 */
> +     INTEL_HWCONFIG_TOTAL_GS_THREADS,                        /* 17 */
> +     INTEL_HWCONFIG_TOTAL_HS_THREADS,                        /* 18 */
> +     INTEL_HWCONFIG_TOTAL_DS_THREADS,                        /* 19 */
> +     INTEL_HWCONFIG_TOTAL_VS_THREADS_POCS,                   /* 20 */
> +     INTEL_HWCONFIG_TOTAL_PS_THREADS,                        /* 21 */
> +     INTEL_HWCONFIG_DEPRECATED_MAX_FILL_RATE,                /* 22 */
> +     INTEL_HWCONFIG_MAX_RCS,                                 /* 23 */
> +     INTEL_HWCONFIG_MAX_CCS,                                 /* 24 */
> +     INTEL_HWCONFIG_MAX_VCS,                                 /* 25 */
> +     INTEL_HWCONFIG_MAX_VECS,                                /* 26 */
> +     INTEL_HWCONFIG_MAX_COPY_CS,                             /* 27 */
> +     INTEL_HWCONFIG_DEPRECATED_URB_SIZE_IN_KB,               /* 28 */
> +     INTEL_HWCONFIG_MIN_VS_URB_ENTRIES,                      /* 29 */
> +     INTEL_HWCONFIG_MAX_VS_URB_ENTRIES,                      /* 30 */
> +     INTEL_HWCONFIG_MIN_PCS_URB_ENTRIES,                     /* 31 */
> +     INTEL_HWCONFIG_MAX_PCS_URB_ENTRIES,                     /* 32 */
> +     INTEL_HWCONFIG_MIN_HS_URB_ENTRIES,                      /* 33 */
> +     INTEL_HWCONFIG_MAX_HS_URB_ENTRIES,                      /* 34 */
> +     INTEL_HWCONFIG_MIN_GS_URB_ENTRIES,                      /* 35 */
> +     INTEL_HWCONFIG_MAX_GS_URB_ENTRIES,                      /* 36 */
> +     INTEL_HWCONFIG_MIN_DS_URB_ENTRIES,                      /* 37 */
> +     INTEL_HWCONFIG_MAX_DS_URB_ENTRIES,                      /* 38 */
> +     INTEL_HWCONFIG_PUSH_CONSTANT_URB_RESERVED_SIZE,         /* 39 */
> +     INTEL_HWCONFIG_POCS_PUSH_CONSTANT_URB_RESERVED_SIZE,    /* 40 */
> +     INTEL_HWCONFIG_URB_REGION_ALIGNMENT_SIZE_IN_BYTES,      /* 41 */
> +     INTEL_HWCONFIG_URB_ALLOCATION_SIZE_UNITS_IN_BYTES,      /* 42 */
> +     INTEL_HWCONFIG_MAX_URB_SIZE_CCS_IN_BYTES,               /* 43 */
> +     INTEL_HWCONFIG_VS_MIN_DEREF_BLOCK_SIZE_HANDLE_COUNT,    /* 44 */
> +     INTEL_HWCONFIG_DS_MIN_DEREF_BLOCK_SIZE_HANDLE_COUNT,    /* 45 */
> +     INTEL_HWCONFIG_NUM_RT_STACKS_PER_DSS,                   /* 46 */
> +     INTEL_HWCONFIG_MAX_URB_STARTING_ADDRESS,                /* 47 */
> +     INTEL_HWCONFIG_MIN_CS_URB_ENTRIES,                      /* 48 */
> +     INTEL_HWCONFIG_MAX_CS_URB_ENTRIES,                      /* 49 */
> +     INTEL_HWCONFIG_L3_ALLOC_PER_BANK_URB,                   /* 50 */
> +     INTEL_HWCONFIG_L3_ALLOC_PER_BANK_REST,                  /* 51 */
> +     INTEL_HWCONFIG_L3_ALLOC_PER_BANK_DC,                    /* 52 */
> +     INTEL_HWCONFIG_L3_ALLOC_PER_BANK_RO,                    /* 53 */
> +     INTEL_HWCONFIG_L3_ALLOC_PER_BANK_Z,                     /* 54 */
> +     INTEL_HWCONFIG_L3_ALLOC_PER_BANK_COLOR,                 /* 55 */
> +     INTEL_HWCONFIG_L3_ALLOC_PER_BANK_UNIFIED_TILE_CACHE,    /* 56 */
> +     INTEL_HWCONFIG_L3_ALLOC_PER_BANK_COMMAND_BUFFER,        /* 57 */
> +     INTEL_HWCONFIG_L3_ALLOC_PER_BANK_RW,                    /* 58 */
> +     INTEL_HWCONFIG_MAX_NUM_L3_CONFIGS,                      /* 59 */
> +     INTEL_HWCONFIG_BINDLESS_SURFACE_OFFSET_BIT_COUNT,       /* 60 */
> +     INTEL_HWCONFIG_RESERVED_CCS_WAYS,                       /* 61 */
> +     INTEL_HWCONFIG_CSR_SIZE_IN_MB,                          /* 62 */
> +     INTEL_HWCONFIG_GEOMETRY_PIPES_PER_SLICE,                /* 63 */
> +     INTEL_HWCONFIG_L3_BANK_SIZE_IN_KB,                      /* 64 */
> +     INTEL_HWCONFIG_SLM_SIZE_PER_DSS,                        /* 65 */
> +     INTEL_HWCONFIG_MAX_PIXEL_FILL_RATE_PER_SLICE,           /* 66 */
> +     INTEL_HWCONFIG_MAX_PIXEL_FILL_RATE_PER_DSS,             /* 67 */
> +     INTEL_HWCONFIG_URB_SIZE_PER_SLICE_IN_KB,                /* 68 */
> +     INTEL_HWCONFIG_URB_SIZE_PER_L3_BANK_COUNT_IN_KB,        /* 69 */
> +     INTEL_HWCONFIG_MAX_SUBSLICE,                            /* 70 */
> +     INTEL_HWCONFIG_MAX_EU_PER_SUBSLICE,                     /* 71 */
> +     INTEL_HWCONFIG_RAMBO_L3_BANK_SIZE_IN_KB,                /* 72 */
> +     INTEL_HWCONFIG_SLM_SIZE_PER_SS_IN_KB,                   /* 73 */
> +     INTEL_HWCONFIG_NUM_HBM_STACKS_PER_TILE,                 /* 74 */
> +     INTEL_HWCONFIG_NUM_CHANNELS_PER_HBM_STACK,              /* 75 */
> +     INTEL_HWCONFIG_HBM_CHANNEL_WIDTH_IN_BYTES,              /* 76 */
> +     INTEL_HWCONFIG_MIN_TASK_URB_ENTRIES,                    /* 77 */
> +     INTEL_HWCONFIG_MAX_TASK_URB_ENTRIES,                    /* 78 */
> +     INTEL_HWCONFIG_MIN_MESH_URB_ENTRIES,                    /* 79 */
> +     INTEL_HWCONFIG_MAX_MESH_URB_ENTRIES,                    /* 80 */
> +     __INTEL_HWCONFIG_KEY_LIMIT
> +};
> +
> +enum {
> +     INTEL_HWCONFIG_MEMORY_TYPE_LPDDR4 = 0,
> +     INTEL_HWCONFIG_MEMORY_TYPE_LPDDR5,
> +     INTEL_HWCONFIG_MEMORY_TYPE_HBM2,
> +     INTEL_HWCONFIG_MEMORY_TYPE_HBM2e,
> +     INTEL_HWCONFIG_MEMORY_TYPE_GDDR6,
> +     __INTEL_HWCONFIG_MEMORY_TYPE_LIMIT
> +};
> +
> +enum {
> +     INTEL_HWCONFIG_CACHE_TYPE_L3 = 0,
> +     INTEL_HWCONFIG_CACHE_TYPE_LLC,
> +     INTEL_HWCONFIG_CACHE_TYPE_EDRAM,
> +     __INTEL_HWCONFIG_CACHE_TYPE_LIMIT
> +};
> +
> +#endif /* _INTEL_HWCONFIG_TYPES_H_ */
> diff --git a/tests/i915/i915_query.c b/tests/i915/i915_query.c
> index 246a979af72a..c47a74117d8d 100644
> --- a/tests/i915/i915_query.c
> +++ b/tests/i915/i915_query.c
> @@ -22,6 +22,7 @@
>   */
>  
>  #include "igt.h"
> +#include "intel_hwconfig_types.h"
>  
>  #include <limits.h>
>  
> @@ -912,6 +913,181 @@ static void test_query_geometry_subslices(int fd)
>       }
>  }
>  
> +static const char * const hwconfig_keys[] = {
> +     [INTEL_HWCONFIG_MAX_SLICES_SUPPORTED] = "Maximum number of Slices",
> +     [INTEL_HWCONFIG_MAX_DUAL_SUBSLICES_SUPPORTED] = "Maximum number of DSS",
> +     [INTEL_HWCONFIG_MAX_NUM_EU_PER_DSS] = "Maximum number of EUs per DSS",
> +     [INTEL_HWCONFIG_NUM_PIXEL_PIPES] = "Pixel Pipes",
> +     [INTEL_HWCONFIG_DEPRECATED_MAX_NUM_GEOMETRY_PIPES] = "[DEPRECATED] 
> Geometry Pipes",
> +     [INTEL_HWCONFIG_DEPRECATED_L3_CACHE_SIZE_IN_KB] = "[DEPRECATED] L3 Size 
> (in KB)",
> +     [INTEL_HWCONFIG_DEPRECATED_L3_BANK_COUNT] = "[DEPRECATED] L3 Bank 
> Count",
> +     [INTEL_HWCONFIG_L3_CACHE_WAYS_SIZE_IN_BYTES] = "L3 Cache Ways Size (in 
> bytes)",
> +     [INTEL_HWCONFIG_L3_CACHE_WAYS_PER_SECTOR] = "L3 Cache Ways Per Sector",
> +     [INTEL_HWCONFIG_MAX_MEMORY_CHANNELS] = "Memory Channels",
> +     [INTEL_HWCONFIG_MEMORY_TYPE] = "Memory type",
> +     [INTEL_HWCONFIG_CACHE_TYPES] = "Cache types",
> +     [INTEL_HWCONFIG_LOCAL_MEMORY_PAGE_SIZES_SUPPORTED] = "Local memory page 
> size",
> +     [INTEL_HWCONFIG_DEPRECATED_SLM_SIZE_IN_KB] = "[DEPRECATED] SLM Size (in 
> KB)",
> +     [INTEL_HWCONFIG_NUM_THREADS_PER_EU] = "Num thread per EU",
> +     [INTEL_HWCONFIG_TOTAL_VS_THREADS] = "Maximum Vertex Shader threads",
> +     [INTEL_HWCONFIG_TOTAL_GS_THREADS] = "Maximum Geometry Shader threads",
> +     [INTEL_HWCONFIG_TOTAL_HS_THREADS] = "Maximum Hull Shader threads",
> +     [INTEL_HWCONFIG_TOTAL_DS_THREADS] = "Maximum Domain Shader threads",
> +     [INTEL_HWCONFIG_TOTAL_VS_THREADS_POCS] = "Maximum Vertex Shader Threads 
> for POCS",
> +     [INTEL_HWCONFIG_TOTAL_PS_THREADS] = "Maximum Pixel Shader Threads",
> +     [INTEL_HWCONFIG_DEPRECATED_MAX_FILL_RATE] = "[DEPRECATED] Maximum pixel 
> rate for Fill",
> +     [INTEL_HWCONFIG_MAX_RCS] = "MaxRCS",
> +     [INTEL_HWCONFIG_MAX_CCS] = "MaxCCS",
> +     [INTEL_HWCONFIG_MAX_VCS] = "MaxVCS",
> +     [INTEL_HWCONFIG_MAX_VECS] = "MaxVECS",
> +     [INTEL_HWCONFIG_MAX_COPY_CS] = "MaxCopyCS",
> +     [INTEL_HWCONFIG_DEPRECATED_URB_SIZE_IN_KB] = "[DEPRECATED] URB Size (in 
> KB)",
> +     [INTEL_HWCONFIG_MIN_VS_URB_ENTRIES] = "The minimum number of VS URB 
> entries.",
> +     [INTEL_HWCONFIG_MAX_VS_URB_ENTRIES] = "The maximum number of VS URB 
> entries.",
> +     [INTEL_HWCONFIG_MIN_PCS_URB_ENTRIES] = "The minimum number of PCS URB 
> entries",
> +     [INTEL_HWCONFIG_MAX_PCS_URB_ENTRIES] = "The maximum number of PCS URB 
> entries",
> +     [INTEL_HWCONFIG_MIN_HS_URB_ENTRIES] = "The minimum number of HS URB 
> entries",
> +     [INTEL_HWCONFIG_MAX_HS_URB_ENTRIES] = "The maximum number of HS URB 
> entries",
> +     [INTEL_HWCONFIG_MIN_GS_URB_ENTRIES] = "The minimum number of GS URB 
> entries",
> +     [INTEL_HWCONFIG_MAX_GS_URB_ENTRIES] = "The maximum number of GS URB 
> entries",
> +     [INTEL_HWCONFIG_MIN_DS_URB_ENTRIES] = "The minimum number of DS URB 
> Entries",
> +     [INTEL_HWCONFIG_MAX_DS_URB_ENTRIES] = "The maximum number of DS URB 
> Entries",
> +     [INTEL_HWCONFIG_PUSH_CONSTANT_URB_RESERVED_SIZE] = "Push Constant URB 
> Reserved Size (in bytes)",
> +     [INTEL_HWCONFIG_POCS_PUSH_CONSTANT_URB_RESERVED_SIZE] = "POCS Push 
> Constant URB Reserved Size (in bytes)",
> +     [INTEL_HWCONFIG_URB_REGION_ALIGNMENT_SIZE_IN_BYTES] = "URB Region 
> Alignment Size (in bytes)",
> +     [INTEL_HWCONFIG_URB_ALLOCATION_SIZE_UNITS_IN_BYTES] = "URB Allocation 
> Size Units (in bytes)",
> +     [INTEL_HWCONFIG_MAX_URB_SIZE_CCS_IN_BYTES] = "Max URB Size CCS (in 
> bytes)",
> +     [INTEL_HWCONFIG_VS_MIN_DEREF_BLOCK_SIZE_HANDLE_COUNT] = "VS Min Deref 
> BlockSize Handle Count",
> +     [INTEL_HWCONFIG_DS_MIN_DEREF_BLOCK_SIZE_HANDLE_COUNT] = "DS Min Deref 
> Block Size Handle Count",
> +     [INTEL_HWCONFIG_NUM_RT_STACKS_PER_DSS] = "Num RT Stacks Per DSS",
> +     [INTEL_HWCONFIG_MAX_URB_STARTING_ADDRESS] = "Max URB Starting Address",
> +     [INTEL_HWCONFIG_MIN_CS_URB_ENTRIES] = "Min CS URB Entries",
> +     [INTEL_HWCONFIG_MAX_CS_URB_ENTRIES] = "Max CS URB Entries",
> +     [INTEL_HWCONFIG_L3_ALLOC_PER_BANK_URB] = "L3 Alloc Per Bank - URB",
> +     [INTEL_HWCONFIG_L3_ALLOC_PER_BANK_REST] = "L3 Alloc Per Bank - Rest",
> +     [INTEL_HWCONFIG_L3_ALLOC_PER_BANK_DC] = "L3 Alloc Per Bank - DC",
> +     [INTEL_HWCONFIG_L3_ALLOC_PER_BANK_RO] = "L3 Alloc Per Bank - RO",
> +     [INTEL_HWCONFIG_L3_ALLOC_PER_BANK_Z] = "L3 Alloc Per Bank - Z",
> +     [INTEL_HWCONFIG_L3_ALLOC_PER_BANK_COLOR] = "L3 Alloc Per Bank - Color",
> +     [INTEL_HWCONFIG_L3_ALLOC_PER_BANK_UNIFIED_TILE_CACHE] = "L3 Alloc Per 
> Bank - Unified Tile Cache",
> +     [INTEL_HWCONFIG_L3_ALLOC_PER_BANK_COMMAND_BUFFER] = "L3 Alloc Per Bank 
> - Command Buffer",
> +     [INTEL_HWCONFIG_L3_ALLOC_PER_BANK_RW] = "L3 Alloc Per Bank - RW",
> +     [INTEL_HWCONFIG_MAX_NUM_L3_CONFIGS] = "Num L3 Configs",
> +     [INTEL_HWCONFIG_BINDLESS_SURFACE_OFFSET_BIT_COUNT] = "Bindless Surface 
> Offset Bit Count",
> +     [INTEL_HWCONFIG_RESERVED_CCS_WAYS] = "Reserved CCS ways",
> +     [INTEL_HWCONFIG_CSR_SIZE_IN_MB] = "CSR Size (in MB)",
> +     [INTEL_HWCONFIG_GEOMETRY_PIPES_PER_SLICE] = "Geometry pipes per slice",
> +     [INTEL_HWCONFIG_L3_BANK_SIZE_IN_KB] = "L3 bank size (in KB)",
> +     [INTEL_HWCONFIG_SLM_SIZE_PER_DSS] = "SLM size per DSS",
> +     [INTEL_HWCONFIG_MAX_PIXEL_FILL_RATE_PER_SLICE] = "Max pixel fill rate 
> per slice",
> +     [INTEL_HWCONFIG_MAX_PIXEL_FILL_RATE_PER_DSS] = "Max pixel fill rate per 
> DSS",
> +     [INTEL_HWCONFIG_URB_SIZE_PER_SLICE_IN_KB] = "URB size per slice (in 
> KB)",
> +     [INTEL_HWCONFIG_URB_SIZE_PER_L3_BANK_COUNT_IN_KB] = "URB size per L3 
> bank count (in KB)",
> +     [INTEL_HWCONFIG_MAX_SUBSLICE] = "Max subslices",
> +     [INTEL_HWCONFIG_MAX_EU_PER_SUBSLICE] = "Max EUs per subslice",
> +     [INTEL_HWCONFIG_RAMBO_L3_BANK_SIZE_IN_KB] = "RAMBO L3 bank size (in 
> KB)",
> +     [INTEL_HWCONFIG_SLM_SIZE_PER_SS_IN_KB] = "SLM size per SS (in KB)",
> +     [INTEL_HWCONFIG_NUM_HBM_STACKS_PER_TILE] = "Num HBM Stacks Per Tile",
> +     [INTEL_HWCONFIG_NUM_CHANNELS_PER_HBM_STACK] = "Num Channels Per HBM 
> Stack",
> +     [INTEL_HWCONFIG_HBM_CHANNEL_WIDTH_IN_BYTES] = "HBM Channel Width (in 
> bytes)",
> +     [INTEL_HWCONFIG_MIN_TASK_URB_ENTRIES] = "Min Task URB Entries",
> +     [INTEL_HWCONFIG_MAX_TASK_URB_ENTRIES] = "Max Task URB Entries",
> +     [INTEL_HWCONFIG_MIN_MESH_URB_ENTRIES] = "Min Mesh URB Entries",
> +     [INTEL_HWCONFIG_MAX_MESH_URB_ENTRIES] = "Max Mesh URB Entries",
> +};
> +
> +static const char * const hwconfig_memtypes[] = {
> +     [INTEL_HWCONFIG_MEMORY_TYPE_LPDDR4] = "LPDDR4",
> +     [INTEL_HWCONFIG_MEMORY_TYPE_LPDDR5] = "LPDDR5",
> +     [INTEL_HWCONFIG_MEMORY_TYPE_HBM2] = "HBM2",
> +     [INTEL_HWCONFIG_MEMORY_TYPE_HBM2e] = "HBM2e",
> +     [INTEL_HWCONFIG_MEMORY_TYPE_GDDR6] = "GDDR6",
> +};
> +
> +static const char * const hwconfig_cachetypes[] = {
> +     [INTEL_HWCONFIG_CACHE_TYPE_L3] = "L3",
> +     [INTEL_HWCONFIG_CACHE_TYPE_LLC] = "LLC",
> +     [INTEL_HWCONFIG_CACHE_TYPE_EDRAM] = "EDRAM",
> +};
> +
> +static void query_parse_and_validate_hwconfig_table(int i915)
> +{
> +     struct drm_i915_query_item item = {
> +             .query_id = DRM_I915_QUERY_HWCONFIG_BLOB,
> +     };
> +     uint32_t *data, value;
> +     int i = 0;
> +     int len, j, max_words, table_size;
> +
> +     igt_assert(ARRAY_SIZE(hwconfig_keys) == __INTEL_HWCONFIG_KEY_LIMIT);
> +     igt_assert(ARRAY_SIZE(hwconfig_memtypes) == 
> __INTEL_HWCONFIG_MEMORY_TYPE_LIMIT);
> +     igt_assert(ARRAY_SIZE(hwconfig_cachetypes) == 
> __INTEL_HWCONFIG_CACHE_TYPE_LIMIT);
> +
> +     i915_query_items(i915, &item, 1);
> +     table_size = item.length;
> +     igt_require(table_size > 0);
> +
> +     data = malloc(table_size);
> +     igt_assert(data);
> +     memset(data, 0, table_size);
> +     item.data_ptr = to_user_pointer(data);
> +
> +     i915_query_items(i915, &item, 1);
> +     igt_assert(item.length == table_size);
> +     igt_info("Table size = %d bytes\n", table_size);
> +     igt_assert(table_size > 0);
> +
> +     /* HWConfig table is a list of KLV sets */
> +     max_words = table_size / sizeof(uint32_t);
> +     igt_assert(max_words * sizeof(uint32_t) == table_size);
> +     while (i < max_words) {
> +             /* Attribute ID zero is invalid */
> +             igt_assert(data[i] > 0);
> +             igt_assert(data[i] < __INTEL_HWCONFIG_KEY_LIMIT);
> +
> +             len = data[i + 1];
> +             igt_assert(len > 0);
> +             igt_assert((i + 2 + len) <= max_words);
> +
> +             igt_info("[%2d] %s: ", data[i], hwconfig_keys[data[i]]);
> +
> +             value = data[i + 2];
> +             switch (data[i]) {
> +             case INTEL_HWCONFIG_MEMORY_TYPE:
> +                     igt_assert(len == 1);
> +                     igt_assert(value < __INTEL_HWCONFIG_MEMORY_TYPE_LIMIT);
> +                     igt_info("%s\n", hwconfig_memtypes[value]);
> +                     break;
> +
> +             case INTEL_HWCONFIG_CACHE_TYPES:
> +                     igt_assert(len == 1);
> +
> +                     if (!value)
> +                             igt_info("-\n");
> +
> +                     j = 0;
> +                     while (value) {
> +                             if (value & BIT(j)) {
> +                                     value &= ~BIT(j);
> +                                     igt_assert(j < 
> __INTEL_HWCONFIG_CACHE_TYPE_LIMIT);
> +                                     igt_info("%s%s", 
> hwconfig_cachetypes[j], value ? ", " : "\n");
> +                             }
> +                     }
> +                     break;
> +
> +             default:
> +                     for (j = i + 2; j < i + 1 + len; j++)
> +                             igt_info("%d, ", data[j]);
> +                     igt_info("%d\n", data[j]);
> +             }
> +
> +             /* Advance to next key */
> +             i += 2 + len;
> +     }
> +
> +     free(data);
> +}
> +
>  igt_main
>  {
>       int fd = -1;
> @@ -986,6 +1162,9 @@ igt_main
>                       engines(fd);
>       }
>  

Please add description before every new test you are adding
with igt_describe().

BR,
Kamil

> +     igt_subtest("hwconfig_table")
> +             query_parse_and_validate_hwconfig_table(fd);
> +
>       igt_fixture {
>               close(fd);
>       }
> -- 
> 2.36.0
> 

Reply via email to