[Mesa-dev] [PATCH v2 11/16] intel: tools: update intel_aub.h

[Rafael Antognolli]

On Tue, Jun 19, 2018 at 02:45:26PM +0100, Lionel Landwerlin wrote:
> Scott added new stuff in IGT.
> 
> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
> ---
>  src/intel/tools/intel_aub.h | 26 ++++++++++++++++++++++++++
>  1 file changed, 26 insertions(+)
> 
> diff --git a/src/intel/tools/intel_aub.h b/src/intel/tools/intel_aub.h
> index 5f0aba8e68e..9ca548edaf3 100644
> --- a/src/intel/tools/intel_aub.h
> +++ b/src/intel/tools/intel_aub.h
> @@ -49,6 +49,12 @@
>  #define CMD_AUB			(7 << 29)
>  
>  #define CMD_AUB_HEADER		(CMD_AUB | (1 << 23) | (0x05 << 16))
> +
> +#define CMD_MEM_TRACE_REGISTER_POLL	(CMD_AUB | (0x2e << 23) | (0x02 << 16))
> +#define CMD_MEM_TRACE_REGISTER_WRITE	(CMD_AUB | (0x2e << 23) | (0x03 << 16))
> +#define CMD_MEM_TRACE_MEMORY_WRITE	(CMD_AUB | (0x2e << 23) | (0x06 << 16))
> +#define CMD_MEM_TRACE_VERSION		(CMD_AUB | (0x2e << 23) | (0x0e << 16))
> +
>  /* DW1 */
>  # define AUB_HEADER_MAJOR_SHIFT		24
>  # define AUB_HEADER_MINOR_SHIFT		16
> @@ -92,8 +98,28 @@
>  #define AUB_TRACE_MEMTYPE_PCI		(3 << 16)
>  #define AUB_TRACE_MEMTYPE_GTT_ENTRY     (4 << 16)
>  
> +#define AUB_MEM_TRACE_VERSION_FILE_VERSION	1
> +
>  /* DW2 */
>  
> +#define AUB_MEM_TRACE_VERSION_DEVICE_MASK	0x0000ff00
> +#define AUB_MEM_TRACE_VERSION_DEVICE_CNL	(15 << 8)
> +
> +#define AUB_MEM_TRACE_VERSION_METHOD_MASK	0x000c0000
> +#define AUB_MEM_TRACE_VERSION_METHOD_PHY	(1 << 18)
> +
> +#define AUB_MEM_TRACE_REGISTER_SIZE_MASK	0x000f0000
> +#define AUB_MEM_TRACE_REGISTER_SIZE_DWORD	(2 << 16)
> +
> +#define AUB_MEM_TRACE_REGISTER_SPACE_MASK	0xf0000000
> +#define AUB_MEM_TRACE_REGISTER_SPACE_MMIO	(0 << 28)
> +
> +/* DW3 */
> +
> +#define AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_MASK		0xf0000000
> +#define AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_LOCAL	(1 << 28)
> +#define AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT_ENTRY	(4 << 28)
> +

Cool, we can use these last ones in aubinator's
handle_memtrace_mem_write(). That could be done later though.

Reviewed-by: Rafael Antognolli <rafael.antognolli at intel.com>

>  /**
>   * aub_state_struct_type enum values are encoded with the top 16 bits
>   * representing the type to be delivered to the .aub file, and the bottom 16
> -- 
> 2.17.1
>