intel/aub: Sync the AUB defines with mesa's
PATCH 1/3 intel/aub: Sync the AUB defines with mesa's
Signed-off-by Damien Lespiau <[email protected]>
--- intel/intel_aub.h | 76 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 53 insertions(+), 23 deletions(-)
intel/intel_aub.h +53 -23
@@ -93,29 +93,59 @@#define AUB_TRACE_MEMTYPE_GTT_ENTRY (4 << 16)/* DW2 */ -// operation = TRACE_DATA_WRITE, Type = TRACE_DATA_WRITE_GENERAL_STATE -#define AUB_TRACE_GENERAL_STATE_MASK 0x000000ff - -#define AUB_TRACE_VS_STATE 0x00000001 -#define AUB_TRACE_GS_STATE 0x00000002 -#define AUB_TRACE_CL_STATE 0x00000003 -#define AUB_TRACE_SF_STATE 0x00000004 -#define AUB_TRACE_WM_STATE 0x00000005 -#define AUB_TRACE_CC_STATE 0x00000006 -#define AUB_TRACE_CL_VP 0x00000007 -#define AUB_TRACE_SF_VP 0x00000008 -#define AUB_TRACE_CC_VP 0x00000009 -#define AUB_TRACE_SAMPLER_STATE 0x0000000a -#define AUB_TRACE_KERNEL 0x0000000b -#define AUB_TRACE_SCRATCH 0x0000000c -#define AUB_TRACE_SDC 0x0000000d -#define AUB_TRACE_BLEND_STATE 0x00000016 -#define AUB_TRACE_DEPTH_STENCIL_STATE 0x00000017 - -// operation = TRACE_DATA_WRITE, Type = TRACE_DATA_WRITE_SURFACE_STATE -#define AUB_TRACE_SURFACE_STATE_MASK 0x00000ff00 -#define AUB_TRACE_BINDING_TABLE 0x000000100 -#define AUB_TRACE_SURFACE_STATE 0x000000200 + +/** +* 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 +* bits representing the subtype. This macro performs the encoding. +*/ +#define ENCODE_SS_TYPE (type, subtype) (((type) << 16) | (subtype)) + +enum aub_state_struct_type { +AUB_TRACE_VS_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,1 ), +AUB_TRACE_GS_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,2 ), +AUB_TRACE_CLIP_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,3 ), +AUB_TRACE_SF_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,4 ), +AUB_TRACE_WM_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,5 ), +AUB_TRACE_CC_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,6 ), +AUB_TRACE_CLIP_VP_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,7 ), +AUB_TRACE_SF_VP_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,8 ), +AUB_TRACE_CC_VP_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,0x9 ), +AUB_TRACE_SAMPLER_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,0xa ), +AUB_TRACE_KERNEL_INSTRUCTIONS =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,0xb ), +AUB_TRACE_SCRATCH_SPACE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,0xc ), +AUB_TRACE_SAMPLER_DEFAULT_COLOR =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,0xd ), + +AUB_TRACE_SCISSOR_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,0x15 ), +AUB_TRACE_BLEND_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,0x16 ), +AUB_TRACE_DEPTH_STENCIL_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,0x17 ), + +AUB_TRACE_VERTEX_BUFFER =ENCODE_SS_TYPE (AUB_TRACE_TYPE_VERTEX_BUFFER ,0 ), +AUB_TRACE_BINDING_TABLE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_SURFACE ,0x100 ), +AUB_TRACE_SURFACE_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_SURFACE ,0x200 ), +AUB_TRACE_VS_CONSTANTS =ENCODE_SS_TYPE (AUB_TRACE_TYPE_CONSTANT_BUFFER ,0 ), +AUB_TRACE_WM_CONSTANTS =ENCODE_SS_TYPE (AUB_TRACE_TYPE_CONSTANT_BUFFER ,1 ), +}; + +#undef ENCODE_SS_TYPE + +/** +* Decode a aub_state_struct_type value to determine the type that should be +* stored in the .aub file. +*/ +static inline uint32_t AUB_TRACE_TYPE (enum aub_state_struct_type ss_type) +{ +return (ss_type &0xFFFF0000 ) >>16 ; +} + +/** +* Decode a state_struct_type value to determine the subtype that should be +* stored in the .aub file. +*/ +static inline uint32_t AUB_TRACE_SUBTYPE (enum aub_state_struct_type ss_type) +{ +return ss_type &0xFFFF ; +}/* DW3: address */ /* DW4: len */
Signature · 1 line
1.7.7.5
PATCH 2/3 intel/aub: Implement a way to specify the output .aub filename
Signed-off-by Damien Lespiau <[email protected]>
--- intel/intel_bufmgr.h | 3 +++ intel/intel_bufmgr_gem.c | 26 +++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletions(-)
intel/intel_bufmgr.h +3 -0
@@ -171,6 +171,9 @@ int drm_intel_gem_bo_get_reloc_count(drm_intel_bo *bo);void drm_intel_gem_bo_clear_relocs (drm_intel_bo *bo,int start);void drm_intel_gem_bo_start_gtt_access (drm_intel_bo *bo,int write_enable); +void +drm_intel_bufmgr_gem_set_aub_filename (drm_intel_bufmgr *bufmgr, +const char *filename);void drm_intel_bufmgr_gem_set_aub_dump (drm_intel_bufmgr *bufmgr,int enable); void drm_intel_gem_bo_aub_dump_bmp(drm_intel_bo *bo, int x1, int y1, int width, int height,
intel/intel_bufmgr_gem.c +25 -1
@@ -127,6 +127,7 @@ typedef struct _drm_intel_bufmgr_gem { unsigned int no_exec : 1;bool fenced_relocs; +char *aub_filename;FILE *aub_file;uint32_t aub_offset; } drm_intel_bufmgr_gem;
@@ -1573,6 +1574,7 @@ drm_intel_bufmgr_gem_destroy(drm_intel_bufmgr *bufmgr)free (bufmgr_gem->exec2_objects);free (bufmgr_gem->exec_objects);free (bufmgr_gem->exec_bos); +free (bufmgr_gem->aub_filename);pthread_mutex_destroy (&bufmgr_gem->lock);
@@ -2860,6 +2862,23 @@ drm_intel_bufmgr_gem_get_devid(drm_intel_bufmgr *bufmgr) }/** +* Sets the AUB filename. +* +* This function has to be called before drm_intel_bufmgr_gem_set_aub_dump() +* for it to have any effect. +*/ +void +drm_intel_bufmgr_gem_set_aub_filename (drm_intel_bufmgr *bufmgr, +const char *filename) +{ +drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *)bufmgr; + +free (bufmgr_gem->aub_filename); +if (filename) + bufmgr_gem->aub_filename =strdup (filename); +} + +/** * Sets up AUB dumping. * * This is a trace file format that can be used with the simulator.
@@ -2874,6 +2893,7 @@ drm_intel_bufmgr_gem_set_aub_dump(drm_intel_bufmgr *bufmgr, int enable)int entry =0x200003 ;int i;int gtt_size =0x10000 ; +const char *filename;if (!enable) {if (bufmgr_gem->aub_file) {
@@ -2885,7 +2905,11 @@ drm_intel_bufmgr_gem_set_aub_dump(drm_intel_bufmgr *bufmgr, int enable)if (geteuid () !=getuid ())return ; - bufmgr_gem->aub_file =fopen ("intel.aub" ,"w+" ); +if (bufmgr_gem->aub_filename) + filename = bufmgr_gem->aub_filename; +else + filename ="intel.aub" ; + bufmgr_gem->aub_file =fopen (filename,"w+" );if (!bufmgr_gem->aub_file)return ;
Signature · 1 line
1.7.7.5
PATCH 3/3 intel/aub: Return early if we disable aub dumps
In reply to Damien LespiauNo need to prepare the .aub header and dump in that case, it'll be done with the next call with true.
Signed-off-by Damien Lespiau <[email protected]>
--- intel/intel_bufmgr_gem.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
intel/intel_bufmgr_gem.c +1 -0
@@ -2900,6 +2900,7 @@ drm_intel_bufmgr_gem_set_aub_dump(drm_intel_bufmgr *bufmgr, int enable)fclose (bufmgr_gem->aub_file); bufmgr_gem->aub_file =NULL ; } +return ; }if (geteuid () !=getuid ())
Signature · 1 line
1.7.7.5
Just remembered that Ken reviewed those 3 patches on IRC. So pushed them.
Signature · 1 line
Damien
Quoted 95 lines · Damien Lespiau
Signed-off-by Damien Lespiau <[email protected]>--- intel/intel_aub.h | 76 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 53 insertions(+), 23 deletions(-)intel/intel_aub.h +53
-23@@ -93,29 +93,59 @@#define AUB_TRACE_MEMTYPE_GTT_ENTRY (4 << 16)/* DW2 */ -// operation = TRACE_DATA_WRITE, Type = TRACE_DATA_WRITE_GENERAL_STATE -#define AUB_TRACE_GENERAL_STATE_MASK 0x000000ff - -#define AUB_TRACE_VS_STATE 0x00000001 -#define AUB_TRACE_GS_STATE 0x00000002 -#define AUB_TRACE_CL_STATE 0x00000003 -#define AUB_TRACE_SF_STATE 0x00000004 -#define AUB_TRACE_WM_STATE 0x00000005 -#define AUB_TRACE_CC_STATE 0x00000006 -#define AUB_TRACE_CL_VP 0x00000007 -#define AUB_TRACE_SF_VP 0x00000008 -#define AUB_TRACE_CC_VP 0x00000009 -#define AUB_TRACE_SAMPLER_STATE 0x0000000a -#define AUB_TRACE_KERNEL 0x0000000b -#define AUB_TRACE_SCRATCH 0x0000000c -#define AUB_TRACE_SDC 0x0000000d -#define AUB_TRACE_BLEND_STATE 0x00000016 -#define AUB_TRACE_DEPTH_STENCIL_STATE 0x00000017 - -// operation = TRACE_DATA_WRITE, Type = TRACE_DATA_WRITE_SURFACE_STATE -#define AUB_TRACE_SURFACE_STATE_MASK 0x00000ff00 -#define AUB_TRACE_BINDING_TABLE 0x000000100 -#define AUB_TRACE_SURFACE_STATE 0x000000200 + +/** +* 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 +* bits representing the subtype. This macro performs the encoding. +*/ +#define ENCODE_SS_TYPE (type, subtype) (((type) << 16) | (subtype)) + +enum aub_state_struct_type { +AUB_TRACE_VS_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,1 ), +AUB_TRACE_GS_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,2 ), +AUB_TRACE_CLIP_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,3 ), +AUB_TRACE_SF_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,4 ), +AUB_TRACE_WM_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,5 ), +AUB_TRACE_CC_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,6 ), +AUB_TRACE_CLIP_VP_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,7 ), +AUB_TRACE_SF_VP_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,8 ), +AUB_TRACE_CC_VP_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,0x9 ), +AUB_TRACE_SAMPLER_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,0xa ), +AUB_TRACE_KERNEL_INSTRUCTIONS =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,0xb ), +AUB_TRACE_SCRATCH_SPACE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,0xc ), +AUB_TRACE_SAMPLER_DEFAULT_COLOR =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,0xd ), + +AUB_TRACE_SCISSOR_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,0x15 ), +AUB_TRACE_BLEND_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,0x16 ), +AUB_TRACE_DEPTH_STENCIL_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_GENERAL ,0x17 ), + +AUB_TRACE_VERTEX_BUFFER =ENCODE_SS_TYPE (AUB_TRACE_TYPE_VERTEX_BUFFER ,0 ), +AUB_TRACE_BINDING_TABLE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_SURFACE ,0x100 ), +AUB_TRACE_SURFACE_STATE =ENCODE_SS_TYPE (AUB_TRACE_TYPE_SURFACE ,0x200 ), +AUB_TRACE_VS_CONSTANTS =ENCODE_SS_TYPE (AUB_TRACE_TYPE_CONSTANT_BUFFER ,0 ), +AUB_TRACE_WM_CONSTANTS =ENCODE_SS_TYPE (AUB_TRACE_TYPE_CONSTANT_BUFFER ,1 ), +}; + +#undef ENCODE_SS_TYPE + +/** +* Decode a aub_state_struct_type value to determine the type that should be +* stored in the .aub file. +*/ +static inline uint32_t AUB_TRACE_TYPE (enum aub_state_struct_type ss_type) +{ +return (ss_type &0xFFFF0000 ) >>16 ; +} + +/** +* Decode a state_struct_type value to determine the subtype that should be +* stored in the .aub file. +*/ +static inline uint32_t AUB_TRACE_SUBTYPE (enum aub_state_struct_type ss_type) +{ +return ss_type &0xFFFF ; +}/* DW3: address */ /* DW4: len */ Signature · 1 line
1.7.7.5