tests/xe/xe_query: Add a test for querying cs cycles
PATCH 1/1 tests/xe/xe_query: Add a test for querying cs cycles
The DRM_XE_QUERY_CS_CYCLES query provides a way for the user to obtain CPU and GPU timestamps as close to each other as possible.
Add a test to query cs cycles and GPU/CPU time correlation as well as validate the parameters.
--- include/drm-uapi/xe_drm.h | 93 ++++++++++++++---- tests/xe/xe_query.c | 200 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 275 insertions(+), 18 deletions(-)
include/drm-uapi/xe_drm.h +75 -18
@@ -128,6 +128,24 @@ struct xe_user_extension {#define DRM_IOCTL_XE_WAIT_USER_FENCE DRM_IOWR(DRM_COMMAND_BASE + DRM_XE_WAIT_USER_FENCE, struct drm_xe_wait_user_fence)#define DRM_IOCTL_XE_VM_MADVISE DRM_IOW(DRM_COMMAND_BASE + DRM_XE_VM_MADVISE, struct drm_xe_vm_madvise) +/** struct drm_xe_engine_class_instance - instance of an engine class */ +struct drm_xe_engine_class_instance { +#define DRM_XE_ENGINE_CLASS_RENDER 0 +#define DRM_XE_ENGINE_CLASS_COPY 1 +#define DRM_XE_ENGINE_CLASS_VIDEO_DECODE 2 +#define DRM_XE_ENGINE_CLASS_VIDEO_ENHANCE 3 +#define DRM_XE_ENGINE_CLASS_COMPUTE 4 +/* +* Kernel only class (not actual hardware engine class). Used for +* creating ordered queues of VM bind operations. +*/ +#define DRM_XE_ENGINE_CLASS_VM_BIND 5 +__u16 engine_class; + +__u16 engine_instance; +__u16 gt_id; +}; +/** * enum drm_xe_memory_class - Supported memory classes. */
@@ -223,6 +241,62 @@ struct drm_xe_query_mem_region {__u64 reserved[6 ]; }; +/** +* struct drm_xe_query_cs_cycles - correlate CPU and GPU timestamps +* +* If a query is made with a struct drm_xe_device_query where .query +* is equal to DRM_XE_QUERY_CS_CYCLES, then the reply uses +* struct drm_xe_query_cs_cycles in .data. +* +* struct drm_xe_query_cs_cycles is allocated by the user and .data points to +* this allocated structure. The user must pass .eci and .clockid as inputs to +* this query. +* +* The query returns the command streamer cycles and the frequency that can +* be used to calculate the command streamer timestamp. In addition the +* query returns a set of cpu timestamps that indicate when the command +* streamer cycle count was captured. +*/ +struct drm_xe_query_cs_cycles { +/** Engine for which command streamer cycles is queried. */ +struct drm_xe_engine_class_instance eci; + +/** MBZ (pad eci to 64 bit) */ +__u16 rsvd; + +/** +* Command streamer cycles as read from the command streamer +* register at 0x358 offset. +*/ +__u64 cs_cycles; + +/** Frequency of the cs cycles in Hz. */ +__u64 cs_frequency; + +/** +* CPU timestamp in ns. The timestamp is captured before reading the +* cs_cycles register using the reference clockid set by the user. +*/ +__u64 cpu_timestamp; + +/** +* Time delta in ns captured around reading the lower dword of the +* cs_cycles register. +*/ +__u64 cpu_delta; + +/** +* Reference clock id for CPU timestamp. For definition, see +* clock_gettime(2) and perf_event_open(2). Supported clock ids are +* CLOCK_MONOTONIC, CLOCK_MONOTONIC_RAW, CLOCK_REALTIME, CLOCK_BOOTTIME, +* CLOCK_TAI. +*/ +__s32 clockid; + +/** Width of the cs cycle counter in bits. */ +__u32 width; +}; +/** * struct drm_xe_query_mem_usage - describe memory regions and usage *
@@ -395,6 +469,7 @@ struct drm_xe_device_query {#define DRM_XE_DEVICE_QUERY_GTS 3#define DRM_XE_DEVICE_QUERY_HWCONFIG 4#define DRM_XE_DEVICE_QUERY_GT_TOPOLOGY 5 +#define DRM_XE_QUERY_CS_CYCLES 6/** @query: The type of data to query */ __u32 query;
@@ -737,24 +812,6 @@ struct drm_xe_exec_queue_set_property {__u64 reserved[2 ]; }; -/** struct drm_xe_engine_class_instance - instance of an engine class */ -struct drm_xe_engine_class_instance { -#define DRM_XE_ENGINE_CLASS_RENDER 0 -#define DRM_XE_ENGINE_CLASS_COPY 1 -#define DRM_XE_ENGINE_CLASS_VIDEO_DECODE 2 -#define DRM_XE_ENGINE_CLASS_VIDEO_ENHANCE 3 -#define DRM_XE_ENGINE_CLASS_COMPUTE 4 -/* -* Kernel only class (not actual hardware engine class). Used for -* creating ordered queues of VM bind operations. -*/ -#define DRM_XE_ENGINE_CLASS_VM_BIND 5 -__u16 engine_class; - -__u16 engine_instance; -__u16 gt_id; -}; -struct drm_xe_exec_queue_create {#define XE_EXEC_QUEUE_EXTENSION_SET_PROPERTY 0/** @extensions: Pointer to the first extension struct, if any */
tests/xe/xe_query.c +200 -0
212 lines not on this page · raw message
Signature · 1 line
2.34.1
Patchwork
CI[Intel-xe] ✗ CI.Patch_applied: failure for tests/xe/xe_query: Add a test for querying cs cycles
== Series Details ==
== Series Details ==
Series: tests/xe/xe_query: Add a test for querying cs cycles
URL : https://patchwork.freedesktop.org/series/122053/
State : failure
== Summary ==
=== Applying kernel patches on branch 'drm-xe-next' with base: === Base commit: 8a6b4e2f0 drm/xe: Fix error path in xe_guc_pc_start() === git am output follows ===
error: include/drm-uapi/xe_drm.h: does not exist in index
error: tests/xe/xe_query.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: tests/xe/xe_query: Add a test for querying cs cycles Patch failed at 0001 tests/xe/xe_query: Add a test for querying cs cycles When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".