lib/igt_eld: improve logging

PATCH In review Simon Ser 3 participants 4 messages Jun 5, 2019 – Jun 6, 2019 Library code

Share & tools

Simon Ser

author

2019-06-05 09:51 UTC #0 lore raw

PATCH 1/1 lib/igt_eld: improve logging

- Print a log line when a monitor isn't present
- Print a log line when a non-IGT ELD is parsed (rejigger the code flow to make skips uniform)
- Print the ELD path on read failure, just in case

Signed-off-by Simon Ser <[email protected]>

---
 lib/igt_eld.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

lib/igt_eld.c +11 -4

index 1bb294e3fb2a..8b602796b23c 100644
@@ -191,12 +191,14 @@ static bool eld_parse_entry(const char *path, struct eld_entry *eld)
 	}
 
 	if (ferror(f) != 0) {
-		igt_debug("Failed to read ELD file: %d\n", ferror(f));
+		igt_debug("Failed to read ELD file %s: %d\n", path, ferror(f));
 		return false;
 	}
 
 	fclose(f);
 
+	if (!monitor_present)
+		igt_debug("Monitor not present in ELD: %s\n", path);
 	return monitor_present;
 }

@@ -233,10 +235,15 @@ bool eld_has_igt(void)
 				continue;
 			}
 
-			if (strcmp(eld.monitor_name, "IGT") == 0) {
-				closedir(dir);
-				return true;
+			if (strcmp(eld.monitor_name, "IGT") != 0) {
+				igt_debug("Skipping non-IGT ELD: %s "
+					  "(monitor name: %s)\n",
+					  path, eld.monitor_name);
+				continue;
 			}
+
+			closedir(dir);
+			return true;
 		}
 		closedir(dir);
 	}

--
2.21.0

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Peres, Martin

Reviewed-by Martin Peres on v1 1/1

2019-06-05 09:54 UTC #1 lore raw

Quoted 4 lines · Simon

- Print a log line when a monitor isn't present
- Print a log line when a non-IGT ELD is parsed (rejigger the code flow to make skips uniform)
- Print the ELD path on read failure, just in case

Thanks for doing this!

Reviewed-by Martin Peres <[email protected]>

Quoted 46 lines

Signed-off-by Simon Ser <[email protected]>

---
 lib/igt_eld.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

lib/igt_eld.c +11 -5

index 1bb294e3fb2a..8b602796b23c 100644
@@ -191,12 +191,14 @@ static bool eld_parse_entry(const char *path, struct eld_entry *eld)
 	}
 
 	if (ferror(f) != 0) {
-		igt_debug("Failed to read ELD file: %d\n", ferror(f));
+		igt_debug("Failed to read ELD file %s: %d\n", path, ferror(f));
 		return false;
 	}
 
 	fclose(f);
 
+	if (!monitor_present)
+		igt_debug("Monitor not present in ELD: %s\n", path);
 	return monitor_present;
 }

@@ -233,10 +235,15 @@ bool eld_has_igt(void)
 				continue;
 			}
 
-			if (strcmp(eld.monitor_name, "IGT") == 0) {
-				closedir(dir);
-				return true;
+			if (strcmp(eld.monitor_name, "IGT") != 0) {
+				igt_debug("Skipping non-IGT ELD: %s "
+					  "(monitor name: %s)\n",
+					  path, eld.monitor_name);
+				continue;
 			}
+
+			closedir(dir);
+			return true;
 		}
 		closedir(dir);
 	}
--

Quoted 3 lines

2.21.0

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Patchwork

2019-06-05 11:21 UTC #2 lore raw

[igt-dev] ✓ Fi.CI.BAT: success for lib/igt_eld: improve logging

In reply to Simon Ser

== Series Details ==

Series: lib/igt_eld: improve logging
URL : https://patchwork.freedesktop.org/series/61644/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6194 -> IGTPW_3114
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://patchwork.freedesktop.org/api/1.0/series/61644/revisions/1/mbox/

Known issues
------------

Here are the changes found in IGTPW_3114 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u2: [PASS][1] -> [FAIL][2] ([fdo#103167])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/fi-icl-u2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/fi-icl-u2/igt@[email protected]

#### Possible fixes ####

* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][3] ([fdo#109485]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/fi-kbl-7500u/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/fi-kbl-7500u/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#108602]: https://bugs.freedesktop.org/show_bug.cgi?id=108602
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485

Participating hosts (49 -> 46)
------------------------------

Additional (5): fi-kbl-7567u fi-skl-gvtdvm fi-byt-j1900 fi-icl-u3 fi-skl-6600u
Missing (8): fi-ilk-m540 fi-hsw-4200u fi-skl-guc fi-byt-squawks fi-bsw-cyan fi-kbl-7560u fi-byt-clapper fi-bdw-samus

Build changes
-------------

* IGT: IGT_5038 -> IGTPW_3114

CI_DRM_6194: 10a75edfc43885387e1e9e2bc50f9678e9bf59d6 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_3114: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/
IGT_5038: a34cbc9834aed017d1a452ba42d3e53f9258f8d2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Patchwork

2019-06-06 15:12 UTC #3 lore raw

[igt-dev] ✓ Fi.CI.IGT: success for lib/igt_eld: improve logging

In reply to Simon Ser

== Series Details ==

Series: lib/igt_eld: improve logging
URL : https://patchwork.freedesktop.org/series/61644/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6194_full -> IGTPW_3114_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://patchwork.freedesktop.org/api/1.0/series/61644/revisions/1/mbox/

Known issues
------------

Here are the changes found in IGTPW_3114_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_tiled_swapping@non-threaded:
- shard-iclb: [PASS][1] -> [FAIL][2] ([fdo#108686])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-iclb7/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-iclb1/igt@[email protected]
- shard-glk: [PASS][3] -> [DMESG-WARN][4] ([fdo#108686])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-glk4/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-glk5/igt@[email protected]
- shard-hsw: [PASS][5] -> [INCOMPLETE][6] ([fdo#103540])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-hsw1/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-hsw8/igt@[email protected]

* igt@kms_cursor_edge_walk@pipe-c-128x128-right-edge:
- shard-iclb: [PASS][7] -> [INCOMPLETE][8] ([fdo#107713])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-iclb5/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-iclb1/igt@[email protected]

* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
- shard-glk: [PASS][9] -> [FAIL][10] ([fdo#104873])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-glk2/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-glk2/igt@[email protected]

* igt@kms_flip@2x-flip-vs-rmfb:
- shard-hsw: [PASS][11] -> [SKIP][12] ([fdo#109271]) +3 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-hsw6/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-hsw1/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt:
- shard-iclb: [PASS][13] -> [FAIL][14] ([fdo#103167]) +5 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-iclb2/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-iclb5/igt@[email protected]

* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-apl: [PASS][15] -> [DMESG-WARN][16] ([fdo#108566]) +3 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-apl1/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-apl2/igt@[email protected]

* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [PASS][17] -> [SKIP][18] ([fdo#109441]) +2 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-iclb3/igt@kms_psr@psr2_cursor_mmap_cpu.html

* igt@kms_setmode@basic:
- shard-hsw: [PASS][19] -> [FAIL][20] ([fdo#99912])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-hsw1/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-hsw6/igt@[email protected]

#### Possible fixes ####

* igt@gem_ctx_isolation@bcs0-s3:
- shard-apl: [DMESG-WARN][21] ([fdo#108566]) -> [PASS][22] +5 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-apl2/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-apl4/igt@[email protected]

* {igt@gem_ctx_param@vm}:
- shard-hsw: [DMESG-WARN][23] ([fdo#110836]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-hsw5/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-hsw8/igt@[email protected]

* igt@kms_cursor_crc@pipe-c-cursor-dpms:
- shard-apl: [FAIL][25] ([fdo#103232]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-apl4/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-apl6/igt@[email protected]
- shard-kbl: [FAIL][27] ([fdo#103232]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-kbl7/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-kbl1/igt@[email protected]

* igt@kms_flip@2x-plain-flip-interruptible:
- shard-hsw: [SKIP][29] ([fdo#109271]) -> [PASS][30] +18 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-hsw1/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-hsw4/igt@[email protected]

* igt@kms_flip@flip-vs-suspend:
- shard-kbl: [INCOMPLETE][31] ([fdo#103665]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-kbl3/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-kbl6/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite:
- shard-iclb: [FAIL][33] ([fdo#103167]) -> [PASS][34] +7 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-iclb6/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-iclb2/igt@[email protected]

* igt@kms_plane_lowres@pipe-a-tiling-y:
- shard-iclb: [FAIL][35] ([fdo#103166]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-iclb4/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-iclb2/igt@[email protected]

* igt@kms_plane_scaling@pipe-a-scaler-with-rotation:
- shard-iclb: [INCOMPLETE][37] ([fdo#107713] / [fdo#110041]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-iclb7/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-iclb4/igt@[email protected]

* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][39] ([fdo#109441]) -> [PASS][40] +3 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-iclb3/igt@kms_psr@psr2_sprite_plane_move.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html

* igt@perf_pmu@rc6-runtime-pm-long:
- shard-hsw: [FAIL][41] ([fdo#105010]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-hsw8/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-hsw7/igt@[email protected]

* igt@tools_test@tools_test:
- shard-kbl: [SKIP][43] ([fdo#109271]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-kbl3/igt@tools_test@tools_test.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-kbl7/igt@tools_test@tools_test.html

#### Warnings ####

* igt@gem_mmap_gtt@forked-big-copy-xy:
- shard-iclb: [TIMEOUT][45] ([fdo#109673]) -> [INCOMPLETE][46] ([fdo#107713] / [fdo#109100])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6194/shard-iclb6/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3114/shard-iclb8/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

Participating hosts (10 -> 6)
------------------------------

Missing (4): pig-skl-6260u shard-skl pig-hsw-4770r pig-glk-j5005

Build changes
-------------

* IGT: IGT_5038 -> IGTPW_3114
* Piglit: piglit_4509 -> None

== Logs ==