Skip to contentSkip to conversation

tests/ xe_exec_compute_mode: Increase fence timeout for simulation env

PATCH In review Bommu Krishnaiah 3 participants 6 messages Jun 16, 2023 – Jun 20, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/ xe_exec_compute_mode: Increase fence timeout for simulation env

Increase fence timeout to 100 seconds for simulation env. Value is determined based on experiments.

---
 tests/xe/xe_exec_compute_mode.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
tests/xe/xe_exec_compute_mode.c +14 -6
index 68519399..aba35c19 100644
@@ -113,6 +113,7 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 	} *data;
 	int i, j, b;
 	int map_fd = -1;
+	int64_t fence_timeout;
 
 	igt_assert(n_engines <= MAX_N_ENGINES);
 
@@ -184,7 +185,12 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 					 to_user_pointer(data), addr,
 					 bo_size, sync, 1);
 #define ONE_SEC	1000
-	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL, ONE_SEC);
+#define HUNDRED_SEC	100000
+
+	fence_timeout = igt_run_in_simulation() ? HUNDRED_SEC : ONE_SEC;
+
+	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,
+		       fence_timeout);
 	data[0].vm_sync = 0;
 
 	for (i = 0; i < n_execs; i++) {
@@ -210,7 +216,7 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 
 		if (flags & REBIND && i + 1 != n_execs) {
 			xe_wait_ufence(fd, &data[i].exec_sync, USER_FENCE_VALUE,
-				       NULL, ONE_SEC);
+				       NULL, fence_timeout);
 			xe_vm_unbind_async(fd, vm, bind_engines[e], 0,
 					   addr, bo_size, NULL, 0);
 
@@ -226,7 +232,7 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 							 addr, bo_size, sync,
 							 1);
 			xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE,
-				       NULL, ONE_SEC);
+				       NULL, fence_timeout);
 			data[0].vm_sync = 0;
 		}
 
@@ -239,7 +245,8 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 				 * an invalidate.
 				 */
 				xe_wait_ufence(fd, &data[i].exec_sync,
-					       USER_FENCE_VALUE, NULL, ONE_SEC);
+					       USER_FENCE_VALUE, NULL,
+					       fence_timeout);
 				igt_assert_eq(data[i].data, 0xc0ffee);
 			} else if (i * 2 != n_execs) {
 				/*
@@ -269,7 +276,7 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 	j = flags & INVALIDATE ? n_execs - 1 : 0;
 	for (i = j; i < n_execs; i++)
 		xe_wait_ufence(fd, &data[i].exec_sync, USER_FENCE_VALUE, NULL,
-			       ONE_SEC);
+			       fence_timeout);
 
 	/* Wait for all execs to complete */
 	if (flags & INVALIDATE)
@@ -278,7 +285,8 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 	sync[0].addr = to_user_pointer(&data[0].vm_sync);
 	xe_vm_unbind_async(fd, vm, bind_engines[0], 0, addr, bo_size,
 			   sync, 1);
-	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL, ONE_SEC);
+	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,
+		       fence_timeout);
 
 	for (i = j; i < n_execs; i++)
 		igt_assert_eq(data[i].data, 0xc0ffee);
Signature · 1 line
2.25.1
#1 lore raw
Quoted 21 lines · Bommu Krishnaiah

Increase fence timeout to 100 seconds for simulation env. Value is determined based on experiments.

---
 tests/xe/xe_exec_compute_mode.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
tests/xe/xe_exec_compute_mode.c +1 -0
index 68519399..aba35c19 100644
@@ -113,6 +113,7 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 	} *data;
 	int i, j, b;
 	int map_fd = -1;
+	int64_t fence_timeout;
 
 	igt_assert(n_engines <= MAX_N_ENGINES);
 

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci, · line 188

Quoted 5 lines
tests/xe/xe_exec_compute_mode.c +1 -1
@@ -184,7 +185,12 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 					 to_user_pointer(data), addr,
 					 bo_size, sync, 1);
 #define ONE_SEC	1000
-	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL, ONE_SEC);
+#define HUNDRED_SEC	100000

Be aware we're going to switch to nanoseconds as a timeout, more info here:

https://patchwork.freedesktop.org/series/118670/

--
Zbigniew

Quoted 58 lines
tests/xe/xe_exec_compute_mode.c +12 -5
+
+	fence_timeout = igt_run_in_simulation() ? HUNDRED_SEC : ONE_SEC;
+
+	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,
+		       fence_timeout);
 	data[0].vm_sync = 0;
 
 	for (i = 0; i < n_execs; i++) {
@@ -210,7 +216,7 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 
 		if (flags & REBIND && i + 1 != n_execs) {
 			xe_wait_ufence(fd, &data[i].exec_sync, USER_FENCE_VALUE,
-				       NULL, ONE_SEC);
+				       NULL, fence_timeout);
 			xe_vm_unbind_async(fd, vm, bind_engines[e], 0,
 					   addr, bo_size, NULL, 0);
 
@@ -226,7 +232,7 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 							 addr, bo_size, sync,
 							 1);
 			xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE,
-				       NULL, ONE_SEC);
+				       NULL, fence_timeout);
 			data[0].vm_sync = 0;
 		}
 
@@ -239,7 +245,8 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 				 * an invalidate.
 				 */
 				xe_wait_ufence(fd, &data[i].exec_sync,
-					       USER_FENCE_VALUE, NULL, ONE_SEC);
+					       USER_FENCE_VALUE, NULL,
+					       fence_timeout);
 				igt_assert_eq(data[i].data, 0xc0ffee);
 			} else if (i * 2 != n_execs) {
 				/*
@@ -269,7 +276,7 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 	j = flags & INVALIDATE ? n_execs - 1 : 0;
 	for (i = j; i < n_execs; i++)
 		xe_wait_ufence(fd, &data[i].exec_sync, USER_FENCE_VALUE, NULL,
-			       ONE_SEC);
+			       fence_timeout);
 
 	/* Wait for all execs to complete */
 	if (flags & INVALIDATE)
@@ -278,7 +285,8 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 	sync[0].addr = to_user_pointer(&data[0].vm_sync);
 	xe_vm_unbind_async(fd, vm, bind_engines[0], 0, addr, bo_size,
 			   sync, 1);
-	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL, ONE_SEC);
+	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,
+		       fence_timeout);
 
 	for (i = j; i < n_execs; i++)
 		igt_assert_eq(data[i].data, 0xc0ffee);
Signature · 1 line
2.25.1
#2 lore raw
Quoted 39 lines

-----Original Message-----
From: Kempczynski, Zbigniew <[email protected]>
Sent: 19 June 2023 11:23
To: Bommu, Krishnaiah <[email protected]>
Cc: [email protected]
Subject: Re: [igt-dev] [PATCH] tests/ xe_exec_compute_mode: Increase fence timeout for simulation env

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 13 lines · Bommu Krishnaiah

Increase fence timeout to 100 seconds for simulation env. Value is determined based on experiments.

---
 tests/xe/xe_exec_compute_mode.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
(quoted diff) +0 -0

b/tests/xe/xe_exec_compute_mode.c index 68519399..aba35c19 100644

tests/xe/xe_exec_compute_mode.c +0 -0
@@ -113,6 +113,7 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 8 lines
tests/xe/xe_exec_compute_mode.c +1 -0
 	} *data;
 	int i, j, b;
 	int map_fd = -1;
+	int64_t fence_timeout;
 
 	igt_assert(n_engines <= MAX_N_ENGINES);
 
@@ -184,7 +185,12 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci,

Quoted 4 lines
tests/xe/xe_exec_compute_mode.c +0 -1
 					 to_user_pointer(data), addr,
 					 bo_size, sync, 1);
 #define ONE_SEC	1000
-	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,

ONE_SEC);

Quoted 6 lines

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci, · line 188

Quoted 1 line
tests/xe/xe_exec_compute_mode.c +1 -0
+#define HUNDRED_SEC	100000

Be aware we're going to switch to nanoseconds as a timeout, more info here:

https://patchwork.freedesktop.org/series/118670/

@Kempczynski, Zbigniew should I need to wait until https://patchwork.freedesktop.org/series/118670/ is merged, or should I need to merge with fixme

Regards,
Krishna.

Quoted 72 lines

--
Zbigniew

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct · line 190

Quoted 2 lines
tests/xe/xe_exec_compute_mode.c +2 -0
+
+	fence_timeout = igt_run_in_simulation() ? HUNDRED_SEC :

ONE_SEC;

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct · line 219

Quoted 11 lines
tests/xe/xe_exec_compute_mode.c +3 -0
+
+	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,
+		       fence_timeout);
 	data[0].vm_sync = 0;
 
 	for (i = 0; i < n_execs; i++) {
@@ -210,7 +216,7 @@ test_exec(int fd, struct
 drm_xe_engine_class_instance *eci,
 
 		if (flags & REBIND && i + 1 != n_execs) {
 			xe_wait_ufence(fd, &data[i].exec_sync,

USER_FENCE_VALUE,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 6 lines
tests/xe/xe_exec_compute_mode.c +1 -1
-				       NULL, ONE_SEC);
+				       NULL, fence_timeout);
 			xe_vm_unbind_async(fd, vm, bind_engines[e], 0,
 					   addr, bo_size, NULL, 0);
@@ -226,7 +232,7 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci,

Quoted 3 lines
tests/xe/xe_exec_compute_mode.c +0 -0
 							 addr, bo_size, sync,
 							 1);
 			xe_wait_ufence(fd, &data[0].vm_sync,

USER_FENCE_VALUE,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 6 lines
tests/xe/xe_exec_compute_mode.c +1 -1
-				       NULL, ONE_SEC);
+				       NULL, fence_timeout);
 			data[0].vm_sync = 0;
 		}
 
@@ -239,7 +245,8 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci,

Quoted 4 lines
tests/xe/xe_exec_compute_mode.c +0 -1
 				 * an invalidate.
 				 */
 				xe_wait_ufence(fd, &data[i].exec_sync,
-					       USER_FENCE_VALUE, NULL,

ONE_SEC);

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 6 lines
tests/xe/xe_exec_compute_mode.c +2 -0
+					       USER_FENCE_VALUE, NULL,
+					       fence_timeout);
 				igt_assert_eq(data[i].data, 0xc0ffee);
 			} else if (i * 2 != n_execs) {
 				/*
@@ -269,7 +276,7 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci,

Quoted 3 lines
tests/xe/xe_exec_compute_mode.c +0 -0
 	j = flags & INVALIDATE ? n_execs - 1 : 0;
 	for (i = j; i < n_execs; i++)
 		xe_wait_ufence(fd, &data[i].exec_sync,

USER_FENCE_VALUE, NULL,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 6 lines
tests/xe/xe_exec_compute_mode.c +1 -1
-			       ONE_SEC);
+			       fence_timeout);
 
 	/* Wait for all execs to complete */
 	if (flags & INVALIDATE)
@@ -278,7 +285,8 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci,

Quoted 4 lines
tests/xe/xe_exec_compute_mode.c +0 -1
 	sync[0].addr = to_user_pointer(&data[0].vm_sync);
 	xe_vm_unbind_async(fd, vm, bind_engines[0], 0, addr, bo_size,
 			   sync, 1);
-	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,

ONE_SEC);

Quoted 8 lines
tests/xe/xe_exec_compute_mode.c +2 -1
+	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,
+		       fence_timeout);
 
 	for (i = j; i < n_execs; i++)
 		igt_assert_eq(data[i].data, 0xc0ffee);
--

2.25.1

#3 lore raw
Quoted 39 lines · Krishnaiah
Quoted 39 lines

-----Original Message-----
From: Kempczynski, Zbigniew <[email protected]>
Sent: 19 June 2023 11:23
To: Bommu, Krishnaiah <[email protected]>
Cc: [email protected]
Subject: Re: [igt-dev] [PATCH] tests/ xe_exec_compute_mode: Increase fence timeout for simulation env

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 13 lines · Bommu Krishnaiah

Increase fence timeout to 100 seconds for simulation env. Value is determined based on experiments.

---
 tests/xe/xe_exec_compute_mode.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
(quoted diff) +0 -0

b/tests/xe/xe_exec_compute_mode.c index 68519399..aba35c19 100644

tests/xe/xe_exec_compute_mode.c +0 -0
@@ -113,6 +113,7 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 8 lines
tests/xe/xe_exec_compute_mode.c +1 -0
 	} *data;
 	int i, j, b;
 	int map_fd = -1;
+	int64_t fence_timeout;
 
 	igt_assert(n_engines <= MAX_N_ENGINES);
 
@@ -184,7 +185,12 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci,

Quoted 4 lines
tests/xe/xe_exec_compute_mode.c +0 -1
 					 to_user_pointer(data), addr,
 					 bo_size, sync, 1);
 #define ONE_SEC	1000
-	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,

ONE_SEC);

Quoted 7 lines
Quoted 6 lines

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci, · line 188

Quoted 1 line
tests/xe/xe_exec_compute_mode.c +1 -0
+#define HUNDRED_SEC	100000

Be aware we're going to switch to nanoseconds as a timeout, more info here:

https://patchwork.freedesktop.org/series/118670/

@Kempczynski, Zbigniew should I need to wait until https://patchwork.freedesktop.org/series/118670/ is merged, or should I need to merge with fixme

Don't use fixme tag. At the moment you can merge your change, but we will need fix all user fence wait usages in all igts when this uapi change will land.

--
Zbigniew

--

Quoted 76 lines

Regards,
Krishna.

Quoted 72 lines

--
Zbigniew

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct · line 190

Quoted 2 lines
tests/xe/xe_exec_compute_mode.c +2 -0
+
+	fence_timeout = igt_run_in_simulation() ? HUNDRED_SEC :

ONE_SEC;

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct · line 219

Quoted 11 lines
tests/xe/xe_exec_compute_mode.c +3 -0
+
+	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,
+		       fence_timeout);
 	data[0].vm_sync = 0;
 
 	for (i = 0; i < n_execs; i++) {
@@ -210,7 +216,7 @@ test_exec(int fd, struct
 drm_xe_engine_class_instance *eci,
 
 		if (flags & REBIND && i + 1 != n_execs) {
 			xe_wait_ufence(fd, &data[i].exec_sync,

USER_FENCE_VALUE,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 6 lines
tests/xe/xe_exec_compute_mode.c +1 -1
-				       NULL, ONE_SEC);
+				       NULL, fence_timeout);
 			xe_vm_unbind_async(fd, vm, bind_engines[e], 0,
 					   addr, bo_size, NULL, 0);
@@ -226,7 +232,7 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci,

Quoted 3 lines
tests/xe/xe_exec_compute_mode.c +0 -0
 							 addr, bo_size, sync,
 							 1);
 			xe_wait_ufence(fd, &data[0].vm_sync,

USER_FENCE_VALUE,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 6 lines
tests/xe/xe_exec_compute_mode.c +1 -1
-				       NULL, ONE_SEC);
+				       NULL, fence_timeout);
 			data[0].vm_sync = 0;
 		}
 
@@ -239,7 +245,8 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci,

Quoted 4 lines
tests/xe/xe_exec_compute_mode.c +0 -1
 				 * an invalidate.
 				 */
 				xe_wait_ufence(fd, &data[i].exec_sync,
-					       USER_FENCE_VALUE, NULL,

ONE_SEC);

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 6 lines
tests/xe/xe_exec_compute_mode.c +2 -0
+					       USER_FENCE_VALUE, NULL,
+					       fence_timeout);
 				igt_assert_eq(data[i].data, 0xc0ffee);
 			} else if (i * 2 != n_execs) {
 				/*
@@ -269,7 +276,7 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci,

Quoted 3 lines
tests/xe/xe_exec_compute_mode.c +0 -0
 	j = flags & INVALIDATE ? n_execs - 1 : 0;
 	for (i = j; i < n_execs; i++)
 		xe_wait_ufence(fd, &data[i].exec_sync,

USER_FENCE_VALUE, NULL,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 6 lines
tests/xe/xe_exec_compute_mode.c +1 -1
-			       ONE_SEC);
+			       fence_timeout);
 
 	/* Wait for all execs to complete */
 	if (flags & INVALIDATE)
@@ -278,7 +285,8 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci,

Quoted 4 lines
tests/xe/xe_exec_compute_mode.c +0 -1
 	sync[0].addr = to_user_pointer(&data[0].vm_sync);
 	xe_vm_unbind_async(fd, vm, bind_engines[0], 0, addr, bo_size,
 			   sync, 1);
-	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,

ONE_SEC);

Quoted 8 lines
tests/xe/xe_exec_compute_mode.c +2 -1
+	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,
+		       fence_timeout);
 
 	for (i = j; i < n_execs; i++)
 		igt_assert_eq(data[i].data, 0xc0ffee);
--

2.25.1

#4 lore raw
In reply to Bommu Krishnaiah

Hi Krishnaiah,

small nit: remove space between "tests/" and name of the test:

[PATCH] tests/ xe_exec_compute_mode: Increase fence timeout for simulation env ------------- ^

should be:
[PATCH] tests/xe_exec_compute_mode: Increase fence timeout for simulation env

Regards,
Kamil

Quoted 84 lines · Bommu Krishnaiah

Increase fence timeout to 100 seconds for simulation env. Value is determined based on experiments.

---
 tests/xe/xe_exec_compute_mode.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
tests/xe/xe_exec_compute_mode.c +14 -6
index 68519399..aba35c19 100644
@@ -113,6 +113,7 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 	} *data;
 	int i, j, b;
 	int map_fd = -1;
+	int64_t fence_timeout;
 
 	igt_assert(n_engines <= MAX_N_ENGINES);
 
@@ -184,7 +185,12 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 					 to_user_pointer(data), addr,
 					 bo_size, sync, 1);
 #define ONE_SEC	1000
-	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL, ONE_SEC);
+#define HUNDRED_SEC	100000
+
+	fence_timeout = igt_run_in_simulation() ? HUNDRED_SEC : ONE_SEC;
+
+	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,
+		       fence_timeout);
 	data[0].vm_sync = 0;
 
 	for (i = 0; i < n_execs; i++) {
@@ -210,7 +216,7 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 
 		if (flags & REBIND && i + 1 != n_execs) {
 			xe_wait_ufence(fd, &data[i].exec_sync, USER_FENCE_VALUE,
-				       NULL, ONE_SEC);
+				       NULL, fence_timeout);
 			xe_vm_unbind_async(fd, vm, bind_engines[e], 0,
 					   addr, bo_size, NULL, 0);
 
@@ -226,7 +232,7 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 							 addr, bo_size, sync,
 							 1);
 			xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE,
-				       NULL, ONE_SEC);
+				       NULL, fence_timeout);
 			data[0].vm_sync = 0;
 		}
 
@@ -239,7 +245,8 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 				 * an invalidate.
 				 */
 				xe_wait_ufence(fd, &data[i].exec_sync,
-					       USER_FENCE_VALUE, NULL, ONE_SEC);
+					       USER_FENCE_VALUE, NULL,
+					       fence_timeout);
 				igt_assert_eq(data[i].data, 0xc0ffee);
 			} else if (i * 2 != n_execs) {
 				/*
@@ -269,7 +276,7 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 	j = flags & INVALIDATE ? n_execs - 1 : 0;
 	for (i = j; i < n_execs; i++)
 		xe_wait_ufence(fd, &data[i].exec_sync, USER_FENCE_VALUE, NULL,
-			       ONE_SEC);
+			       fence_timeout);
 
 	/* Wait for all execs to complete */
 	if (flags & INVALIDATE)
@@ -278,7 +285,8 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
 	sync[0].addr = to_user_pointer(&data[0].vm_sync);
 	xe_vm_unbind_async(fd, vm, bind_engines[0], 0, addr, bo_size,
 			   sync, 1);
-	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL, ONE_SEC);
+	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,
+		       fence_timeout);
 
 	for (i = j; i < n_execs; i++)
 		igt_assert_eq(data[i].data, 0xc0ffee);
Signature · 1 line
2.25.1
#5 lore raw
Quoted 10 lines

-----Original Message-----
From: Kamil Konieczny <[email protected]>
Sent: 19 June 2023 19:43
To: [email protected]
Cc: Bommu, Krishnaiah <[email protected]>
Subject: Re: [igt-dev] [PATCH] tests/ xe_exec_compute_mode: Increase fence timeout for simulation env

Quoted 7 lines

Hi Krishnaiah,

small nit: remove space between "tests/" and name of the test:

[PATCH] tests/ xe_exec_compute_mode: Increase fence timeout for simulation env
------------- ^

I will remove space, by mistake I added space
Regards,
Krishna.

Quoted 107 lines

should be:
[PATCH] tests/xe_exec_compute_mode: Increase fence timeout for simulation env

Regards,
Kamil

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 13 lines · Bommu Krishnaiah

Increase fence timeout to 100 seconds for simulation env. Value is determined based on experiments.

---
 tests/xe/xe_exec_compute_mode.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
(quoted diff) +0 -0

b/tests/xe/xe_exec_compute_mode.c index 68519399..aba35c19 100644

tests/xe/xe_exec_compute_mode.c +0 -0
@@ -113,6 +113,7 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 8 lines
tests/xe/xe_exec_compute_mode.c +1 -0
 	} *data;
 	int i, j, b;
 	int map_fd = -1;
+	int64_t fence_timeout;
 
 	igt_assert(n_engines <= MAX_N_ENGINES);
 
@@ -184,7 +185,12 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci,

Quoted 4 lines
tests/xe/xe_exec_compute_mode.c +0 -1
 					 to_user_pointer(data), addr,
 					 bo_size, sync, 1);
 #define ONE_SEC	1000
-	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,

ONE_SEC);

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci,

Quoted 3 lines
tests/xe/xe_exec_compute_mode.c +3 -0
+#define HUNDRED_SEC	100000
+
+	fence_timeout = igt_run_in_simulation() ? HUNDRED_SEC :

ONE_SEC;

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct · line 219

Quoted 11 lines
tests/xe/xe_exec_compute_mode.c +3 -0
+
+	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,
+		       fence_timeout);
 	data[0].vm_sync = 0;
 
 	for (i = 0; i < n_execs; i++) {
@@ -210,7 +216,7 @@ test_exec(int fd, struct
 drm_xe_engine_class_instance *eci,
 
 		if (flags & REBIND && i + 1 != n_execs) {
 			xe_wait_ufence(fd, &data[i].exec_sync,

USER_FENCE_VALUE,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 6 lines
tests/xe/xe_exec_compute_mode.c +1 -1
-				       NULL, ONE_SEC);
+				       NULL, fence_timeout);
 			xe_vm_unbind_async(fd, vm, bind_engines[e], 0,
 					   addr, bo_size, NULL, 0);
@@ -226,7 +232,7 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci,

Quoted 3 lines
tests/xe/xe_exec_compute_mode.c +0 -0
 							 addr, bo_size, sync,
 							 1);
 			xe_wait_ufence(fd, &data[0].vm_sync,

USER_FENCE_VALUE,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 6 lines
tests/xe/xe_exec_compute_mode.c +1 -1
-				       NULL, ONE_SEC);
+				       NULL, fence_timeout);
 			data[0].vm_sync = 0;
 		}
 
@@ -239,7 +245,8 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci,

Quoted 4 lines
tests/xe/xe_exec_compute_mode.c +0 -1
 				 * an invalidate.
 				 */
 				xe_wait_ufence(fd, &data[i].exec_sync,
-					       USER_FENCE_VALUE, NULL,

ONE_SEC);

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 6 lines
tests/xe/xe_exec_compute_mode.c +2 -0
+					       USER_FENCE_VALUE, NULL,
+					       fence_timeout);
 				igt_assert_eq(data[i].data, 0xc0ffee);
 			} else if (i * 2 != n_execs) {
 				/*
@@ -269,7 +276,7 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci,

Quoted 3 lines
tests/xe/xe_exec_compute_mode.c +0 -0
 	j = flags & INVALIDATE ? n_execs - 1 : 0;
 	for (i = j; i < n_execs; i++)
 		xe_wait_ufence(fd, &data[i].exec_sync,

USER_FENCE_VALUE, NULL,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct

Quoted 6 lines
tests/xe/xe_exec_compute_mode.c +1 -1
-			       ONE_SEC);
+			       fence_timeout);
 
 	/* Wait for all execs to complete */
 	if (flags & INVALIDATE)
@@ -278,7 +285,8 @@ test_exec(int fd, struct

drm_xe_engine_class_instance *eci,

tests/xe/xe_exec_compute_mode.c test_exec(int fd, struct drm_xe_engine_class_instance *eci,

Quoted 4 lines
tests/xe/xe_exec_compute_mode.c +0 -1
 	sync[0].addr = to_user_pointer(&data[0].vm_sync);
 	xe_vm_unbind_async(fd, vm, bind_engines[0], 0, addr, bo_size,
 			   sync, 1);
-	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,

ONE_SEC);

Quoted 8 lines
tests/xe/xe_exec_compute_mode.c +2 -1
+	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, NULL,
+		       fence_timeout);
 
 	for (i = j; i < n_execs; i++)
 		igt_assert_eq(data[i].data, 0xc0ffee);
--

2.25.1