[PATCH v4 3/3] tests/xe_waitfence: Removed duplicate code in waitfence
Rodrigo Vivi
rodrigo.vivi at intel.com
Mon Jan 22 20:54:56 UTC 2024
On Mon, Jan 22, 2024 at 08:15:43AM +0530, Bommu Krishnaiah wrote:
> Removed duplicate code in xe_waitfence at waitfence
>
> Signed-off-by: Bommu Krishnaiah <krishnaiah.bommu at intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> ---
> lib/xe/xe_ioctl.c | 35 -----------------------------------
> lib/xe/xe_ioctl.h | 2 --
> tests/intel/xe_waitfence.c | 4 ++--
> 3 files changed, 2 insertions(+), 39 deletions(-)
>
> diff --git a/lib/xe/xe_ioctl.c b/lib/xe/xe_ioctl.c
> index 39605a019..49c5d359e 100644
> --- a/lib/xe/xe_ioctl.c
> +++ b/lib/xe/xe_ioctl.c
> @@ -523,41 +523,6 @@ int64_t xe_wait_ufence(int fd, uint64_t *addr, uint64_t value,
> return timeout;
> }
>
> -/**
> - * xe_wait_ufence_abstime:
> - * @fd: xe device fd
> - * @addr: address of value to compare
> - * @value: expected value (equal) in @address
> - * @exec_queue: exec_queue id
> - * @timeout: absolute time when wait expire
> - * @flag: wait flag
> - *
> - * Function compares @value with memory pointed by @addr until they are equal.
> - * Asserts that ioctl returned without error.
> - *
> - * Returns elapsed time in nanoseconds if user fence was signalled.
> - */
> -int64_t xe_wait_ufence_abstime(int fd, uint64_t *addr, uint64_t value,
> - uint32_t exec_queue, int64_t timeout,
> - uint16_t flag)
> -{
> - struct drm_xe_wait_user_fence wait = {
> - .addr = to_user_pointer(addr),
> - .op = DRM_XE_UFENCE_WAIT_OP_EQ,
> - .flags = flag,
> - .value = value,
> - .mask = DRM_XE_UFENCE_WAIT_MASK_U64,
> - .timeout = timeout,
> - .exec_queue_id = exec_queue,
> - };
> - struct timespec ts;
> -
> - igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_WAIT_USER_FENCE, &wait), 0);
> - igt_assert_eq(clock_gettime(CLOCK_MONOTONIC, &ts), 0);
> -
> - return ts.tv_sec * 1e9 + ts.tv_nsec;
> -}
> -
> void xe_force_gt_reset(int fd, int gt)
> {
> char reset_string[128];
> diff --git a/lib/xe/xe_ioctl.h b/lib/xe/xe_ioctl.h
> index 8a92073b0..03932561d 100644
> --- a/lib/xe/xe_ioctl.h
> +++ b/lib/xe/xe_ioctl.h
> @@ -90,8 +90,6 @@ int __xe_wait_ufence(int fd, uint64_t *addr, uint64_t value,
> uint32_t exec_queue, int64_t *timeout);
> int64_t xe_wait_ufence(int fd, uint64_t *addr, uint64_t value,
> uint32_t exec_queue, int64_t timeout);
> -int64_t xe_wait_ufence_abstime(int fd, uint64_t *addr, uint64_t value, uint32_t
> - exec_queue, int64_t timeout, uint16_t flag);
> void xe_force_gt_reset(int fd, int gt);
>
> #endif /* XE_IOCTL_H */
> diff --git a/tests/intel/xe_waitfence.c b/tests/intel/xe_waitfence.c
> index e6354b3ff..6ed9d56f8 100644
> --- a/tests/intel/xe_waitfence.c
> +++ b/tests/intel/xe_waitfence.c
> @@ -36,7 +36,7 @@ static void do_bind(int fd, uint32_t vm, uint32_t bo, uint64_t offset,
> xe_vm_bind_async(fd, vm, 0, bo, offset, addr, size, sync, 1);
> }
>
> -static int64_t wait_with_eci_abstime(int fd, uint64_t *addr, uint64_t value,
> +static int64_t xe_wait_ufence_abstime(int fd, uint64_t *addr, uint64_t value,
> uint32_t exec_queue, int64_t timeout,
> uint16_t flag)
No need for the 'xe_' prefix addition in a local static function.
with that changed,
Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> {
> @@ -117,7 +117,7 @@ waitfence(int fd, enum waittype wt)
> clock_gettime(CLOCK_MONOTONIC, &ts);
> current = ts.tv_sec * 1e9 + ts.tv_nsec;
> timeout = current + MS_TO_NS(10);
> - signalled = wait_with_eci_abstime(fd, &wait_fence, 7,
> + signalled = xe_wait_ufence_abstime(fd, &wait_fence, 7,
> exec_queue, timeout,
> DRM_XE_UFENCE_WAIT_FLAG_ABSTIME);
> igt_debug("wait type: ENGINE ABSTIME - timeout: %" PRId64
> --
> 2.25.1
>
More information about the igt-dev
mailing list