Skip to contentSkip to conversation

Revert "syncobj_timeline: don't expect EINVAL for WAIT_UNSUBMITTED, | WAIT_AVAILABLE"

igt-dev Bhanuprakash Modem 4 participants 11 messages Nov 13, 2023

lore
Share & tools
lore
#0 lore raw

This reverts commit f6f5903348eff6510f8877043f9397a2a5cb94b3.

This patch is causing the regression in CI.

[1767/1775] Generating i915_tests.rst with a custom command
FAILED: docs/testplan/i915_tests.rst
./igt_doc.py --config ../tests/intel/i915_test_config.json --rest docs/testplan/i915_tests.rst --check-testlist --igt-build-path ./build
Warning: Documented igt@syncobj_timeline@invalid-multi-wait-all-available-unsubmitted doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-multi-wait-all-available-unsubmitted-signaled doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-multi-wait-all-available-unsubmitted-submitted doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-multi-wait-all-available-unsubmitted-submitted-signaled doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-multi-wait-available-unsubmitted doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-multi-wait-available-unsubmitted-signaled doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-multi-wait-available-unsubmitted-submitted doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-multi-wait-available-unsubmitted-submitted-signaled doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-single-wait-all-available-unsubmitted doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-single-wait-available-unsubmitted doesn't exist on source files
Warning: Missing documentation for igt@syncobj_timeline@etime-multi-wait-all-available-unsubmitted
Warning: Missing documentation for igt@syncobj_timeline@etime-multi-wait-all-available-unsubmitted-signaled
Warning: Missing documentation for igt@syncobj_timeline@etime-multi-wait-all-available-unsubmitted-submitted
Warning: Missing documentation for igt@syncobj_timeline@etime-multi-wait-all-available-unsubmitted-submitted-signaled
Warning: Missing documentation for igt@syncobj_timeline@etime-multi-wait-available-unsubmitted
Warning: Missing documentation for igt@syncobj_timeline@etime-single-wait-all-available-unsubmitted
Warning: Missing documentation for igt@syncobj_timeline@etime-single-wait-available-unsubmitted
Warning: Missing documentation for igt@syncobj_timeline@multi-wait-available-unsubmitted-signaled
Warning: Missing documentation for igt@syncobj_timeline@multi-wait-available-unsubmitted-submitted
Warning: Missing documentation for igt@syncobj_timeline@multi-wait-available-unsubmitted-submitted-signaled
Please refer: docs/test_documentation.md for more details
[1771/1775] Compiling C object runner/runner_test.p/runner_tests.c.o
ninja: build stopped: subcommand failed.

Cc Erik Kurzinger <[email protected]>
Cc Zbigniew Kempczyński <[email protected]>
Cc Simon Ser <[email protected]>
---
 tests/syncobj_timeline.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tests/syncobj_timeline.c +2 -2
index 0422bca51..b4e1d093a 100644
@@ -1782,7 +1782,7 @@ igt_main
 						WAIT_SIGNALED)) != 1)
 			continue;
 
-		if ((flags & WAIT_UNSUBMITTED) && !((flags & WAIT_FOR_SUBMIT) || (flags & WAIT_AVAILABLE)))
+		if ((flags & WAIT_UNSUBMITTED) && !(flags & WAIT_FOR_SUBMIT))
 			err = -EINVAL;
 		else if (!(flags & WAIT_SIGNALED) && !((flags & WAIT_SUBMITTED) && (flags & WAIT_AVAILABLE)))
 			err = -ETIME;
@@ -1851,7 +1851,7 @@ igt_main
 			continue;
 
 		err = 0;
-		if ((flags & WAIT_UNSUBMITTED) && !((flags & WAIT_FOR_SUBMIT) || (flags & WAIT_AVAILABLE))) {
+		if ((flags & WAIT_UNSUBMITTED) && !(flags & WAIT_FOR_SUBMIT)) {
 			err = -EINVAL;
 		} else if (flags & WAIT_ALL) {
 			if (flags & (WAIT_UNSUBMITTED | WAIT_SUBMITTED))
Signature · 1 line
2.40.0
#1 lore raw

NACK. Please fix your docs/testplan/i915_tests.rst instead.

#2 lore raw
Quoted 1 line · Simon Ser

NACK. Please fix your docs/testplan/i915_tests.rst instead.

Let's do fixes outside of master branch where it doesn't bother others.

/Juha-Pekka

#3 lore raw
Quoted 5 lines · Juha-Pekka Heikkila
Quoted 1 line · Simon Ser

NACK. Please fix your docs/testplan/i915_tests.rst instead.

Let's do fixes outside of master branch where it doesn't bother others.

Sorry, but no. This commit fixes a bug already. The CI regression is completely unrelated, and Intel-specific, I really don't understand why it happens in the first place.

Is it by design that actual bug fixes break Intel CI?

#4 lore raw
Quoted 6 lines · Simon Ser
Quoted 4 lines · Juha-Pekka Heikkila
Quoted 1 line · Simon Ser

NACK. Please fix your docs/testplan/i915_tests.rst instead.

Quoted 7 lines
Quoted 1 line

Let's do fixes outside of master branch where it doesn't bother others.

Sorry, but no. This commit fixes a bug already. The CI regression is completely unrelated, and Intel-specific, I really don't understand why it happens in the first place.

Is it by design that actual bug fixes break Intel CI?

As is this is blocking others totally unrelated to this. This patch never passed ci in the first place hence never should've been merged. Let's fix it somewhere else than on everyone's build machines independently.

/Juha-Pekka

#5 lore raw
Quoted 14 lines · Juha-Pekka Heikkila
Quoted 12 lines · Simon Ser
Quoted 5 lines · On Monday, November 13th, 2023 at 10:59, Juha-Pekka Heikkila…
Quoted 1 line · Simon Ser

NACK. Please fix your docs/testplan/i915_tests.rst instead.

Let's do fixes outside of master branch where it doesn't bother others.

Sorry, but no. This commit fixes a bug already. The CI regression is completely unrelated, and Intel-specific, I really don't understand why it happens in the first place.

Quoted 5 lines
Quoted 1 line

Is it by design that actual bug fixes break Intel CI?

As is this is blocking others totally unrelated to this. This patch never passed ci in the first place hence never should've been merged. Let's fix it somewhere else than on everyone's build machines independently.

If we want a quick fix, we can disable the broken Intel CI, instead of reverting a completely correct bugfix.

#6 lore raw
Quoted 16 lines · Simon Ser
Quoted 14 lines · Juha-Pekka Heikkila
Quoted 12 lines · Simon Ser
Quoted 5 lines · On Monday, November 13th, 2023 at 10:59, Juha-Pekka Heikkila…
Quoted 1 line · Simon Ser

NACK. Please fix your docs/testplan/i915_tests.rst instead.

Let's do fixes outside of master branch where it doesn't bother others.

Sorry, but no. This commit fixes a bug already. The CI regression is completely unrelated, and Intel-specific, I really don't understand why it happens in the first place.

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

Is it by design that actual bug fixes break Intel CI?

As is this is blocking others totally unrelated to this. This patch never passed ci in the first place hence never should've been merged. Let's fix it somewhere else than on everyone's build machines independently.

If we want a quick fix, we can disable the broken Intel CI, instead of reverting a completely correct bugfix.

Simon, disabling CI doesn't universally fix the build for everyone. If you don't use testplan it's your story but it's not the story for all other igt users. Passing ci testing is the requirement for merging, that's why ci is running on patch sets. This reverted patch didn't even build in ci and after you merged it others started to see what ci already had reported about this patch.

/Juha-Pekka

#7 lore raw

Apologies. Jani highlights that the bugfix does update the testlist (dynamically generated), and I completely missed that. The CI failure makes a lot more sense now.

#8 lore raw
In reply to Simon Ser
Quoted 1 line · Simon Ser

NACK. Please fix your docs/testplan/i915_tests.rst instead.

As "CI" won't pick the latest head, my patch can't go through the CI. And we can't guarantee that my fix may not end up in some other problem.

#9 lore raw
In reply to Bhanuprakash Modem
Quoted 61 lines · Bhanuprakash Modem

This reverts commit f6f5903348eff6510f8877043f9397a2a5cb94b3.

This patch is causing the regression in CI.

[1767/1775] Generating i915_tests.rst with a custom command
FAILED: docs/testplan/i915_tests.rst
./igt_doc.py --config ../tests/intel/i915_test_config.json --rest docs/testplan/i915_tests.rst --check-testlist --igt-build-path ./build
Warning: Documented igt@syncobj_timeline@invalid-multi-wait-all-available-unsubmitted doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-multi-wait-all-available-unsubmitted-signaled doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-multi-wait-all-available-unsubmitted-submitted doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-multi-wait-all-available-unsubmitted-submitted-signaled doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-multi-wait-available-unsubmitted doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-multi-wait-available-unsubmitted-signaled doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-multi-wait-available-unsubmitted-submitted doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-multi-wait-available-unsubmitted-submitted-signaled doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-single-wait-all-available-unsubmitted doesn't exist on source files
Warning: Documented igt@syncobj_timeline@invalid-single-wait-available-unsubmitted doesn't exist on source files
Warning: Missing documentation for igt@syncobj_timeline@etime-multi-wait-all-available-unsubmitted
Warning: Missing documentation for igt@syncobj_timeline@etime-multi-wait-all-available-unsubmitted-signaled
Warning: Missing documentation for igt@syncobj_timeline@etime-multi-wait-all-available-unsubmitted-submitted
Warning: Missing documentation for igt@syncobj_timeline@etime-multi-wait-all-available-unsubmitted-submitted-signaled
Warning: Missing documentation for igt@syncobj_timeline@etime-multi-wait-available-unsubmitted
Warning: Missing documentation for igt@syncobj_timeline@etime-single-wait-all-available-unsubmitted
Warning: Missing documentation for igt@syncobj_timeline@etime-single-wait-available-unsubmitted
Warning: Missing documentation for igt@syncobj_timeline@multi-wait-available-unsubmitted-signaled
Warning: Missing documentation for igt@syncobj_timeline@multi-wait-available-unsubmitted-submitted
Warning: Missing documentation for igt@syncobj_timeline@multi-wait-available-unsubmitted-submitted-signaled
Please refer: docs/test_documentation.md for more details
[1771/1775] Compiling C object runner/runner_test.p/runner_tests.c.o
ninja: build stopped: subcommand failed.

Cc Erik Kurzinger <[email protected]>
Cc Zbigniew Kempczyński <[email protected]>
Cc Simon Ser <[email protected]>
---
  tests/syncobj_timeline.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
tests/syncobj_timeline.c +2 -2
index 0422bca51..b4e1d093a 100644
@@ -1782,7 +1782,7 @@ igt_main
  						WAIT_SIGNALED)) != 1)
  			continue;
 
-		if ((flags & WAIT_UNSUBMITTED) && !((flags & WAIT_FOR_SUBMIT) || (flags & WAIT_AVAILABLE)))
+		if ((flags & WAIT_UNSUBMITTED) && !(flags & WAIT_FOR_SUBMIT))
  			err = -EINVAL;
  		else if (!(flags & WAIT_SIGNALED) && !((flags & WAIT_SUBMITTED) && (flags & WAIT_AVAILABLE)))
  			err = -ETIME;
@@ -1851,7 +1851,7 @@ igt_main
  			continue;
 
  		err = 0;
-		if ((flags & WAIT_UNSUBMITTED) && !((flags & WAIT_FOR_SUBMIT) || (flags & WAIT_AVAILABLE))) {
+		if ((flags & WAIT_UNSUBMITTED) && !(flags & WAIT_FOR_SUBMIT)) {
  			err = -EINVAL;
  		} else if (flags & WAIT_ALL) {
  			if (flags & (WAIT_UNSUBMITTED | WAIT_SUBMITTED))
#10 lore raw

[igt-dev] ✗ Fi.CI.BAT: failure for Revert "syncobj_timeline: don't expect EINVAL for WAIT_UNSUBMITTED, | WAIT_AVAILABLE"

In reply to Bhanuprakash Modem
== Series Details ==

== Series Details ==

Series: Revert "syncobj_timeline: don't expect EINVAL for WAIT_UNSUBMITTED, | WAIT_AVAILABLE"
URL : https://patchwork.freedesktop.org/series/126326/
State : failure

== Summary ==

Series 126326 revision 1 was fully merged or fully failed: no git log