Skip to contentSkip to conversation

scripts/trace.pl: Fix ring ignore

PATCH In review Tvrtko Ursulin 3 participants 4 messages Dec 19, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scripts/trace.pl: Fix ring ignore

From: Tvrtko Ursulin <[email protected]>

Breakage from previous refactoring.

---
 scripts/trace.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/trace.pl +1 -1
index 588126ad46ab..98e4a9843a43 100755
@@ -383,7 +383,7 @@ while (<>) {
 		$tp{$kv[0]} = $kv[1];
 	}
 
-	return undef if exists $tp{'ring'} and exists $ignore_ring{$tp{'ring'}};
+	next if exists $tp{'ring'} and exists $ignore_ring{$tp{'ring'}};
 
 	if ($tp_name eq 'i915_gem_request_wait_begin') {
 		my %rw;
Signature · 6 lines
2.14.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✓ Fi.CI.BAT: success for scripts/trace.pl: Fix ring ignore

== Series Details ==

== Series Details ==

Series: scripts/trace.pl: Fix ring ignore
URL : https://patchwork.freedesktop.org/series/35565/
State : success

== Summary ==

IGT patchset tested on top of latest successful build cfb711c046c22c3881d2334f0b43ec4eb0b9a5fc scripts/trace.pl: Auto-detect tracepoint field order

with latest DRM-Tip kernel build CI_DRM_3545
3e151c0e41e6 drm-tip: 2017y-12m-18d-22h-45m-04s UTC integration manifest

No testlist changes.

Test gem_mmap_gtt:

        Subgroup basic-small-bo-tiledx:
                fail       -> PASS       (fi-gdg-551) fdo#102575
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                dmesg-warn -> PASS       (fi-kbl-r) fdo#104172 +1
        Subgroup suspend-read-crc-pipe-b:
                incomplete -> PASS       (fi-snb-2520m) fdo#103713
Test kms_psr_sink_crc:
        Subgroup psr_basic:
                dmesg-warn -> PASS       (fi-skl-6700hq) fdo#101144

fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#104172 https://bugs.freedesktop.org/show_bug.cgi?id=104172
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#101144 https://bugs.freedesktop.org/show_bug.cgi?id=101144

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:435s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:445s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:386s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:496s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:277s
fi-bxt-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:496s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:500s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:478s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:474s
fi-elk-e7500     total:224  pass:163  dwarn:15  dfail:0   fail:0   skip:45 
fi-gdg-551       total:288  pass:179  dwarn:1   dfail:0   fail:0   skip:108 time:261s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:543s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:410s
fi-hsw-4770r     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:420s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:395s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:476s
fi-ivb-3770      total:288  pass:255  dwarn:0   dfail:0   fail:0   skip:33  time:425s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:482s
fi-kbl-7560u     total:288  pass:268  dwarn:1   dfail:0   fail:0   skip:19  time:525s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:468s
fi-kbl-r         total:288  pass:260  dwarn:1   dfail:0   fail:0   skip:27  time:529s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:579s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:445s
fi-skl-6600u     total:288  pass:260  dwarn:1   dfail:0   fail:0   skip:27  time:533s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:548s
fi-skl-6700k2    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:510s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:498s
fi-skl-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:443s
fi-snb-2520m     total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:551s
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:425s
Blacklisted hosts:
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:594s
fi-cnl-y         total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:652s
fi-glk-dsi       total:288  pass:257  dwarn:0   dfail:0   fail:1   skip:30  time:476s

== Logs ==

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

Reviewed-by on v1 1/1
#2 lore raw
In reply to Tvrtko Ursulin

Quoting Tvrtko Ursulin (2017-12-19 08:46:52)

Quoted 16 lines

From: Tvrtko Ursulin <[email protected]>

Breakage from previous refactoring.

---
 scripts/trace.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/trace.pl +0 -0
index 588126ad46ab..98e4a9843a43 100755

scripts/trace.pl while (<>) { · line 386

Quoted 5 lines
scripts/trace.pl +1 -1
@@ -383,7 +383,7 @@ while (<>) {
                $tp{$kv[0]} = $kv[1];
        }
 
-       return undef if exists $tp{'ring'} and exists $ignore_ring{$tp{'ring'}};
+       next if exists $tp{'ring'} and exists $ignore_ring{$tp{'ring'}};

Skip if this tracepoint has a ring field (didn't you say you wanted to change those to engines ;) and that name is included in the set of ignores. Move on to the next tracepoint.

Does perl not like an undefined key? next if $ignore_ring{$tp{'ring'}};

-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

✗ Fi.CI.IGT: warning for scripts/trace.pl: Fix ring ignore

In reply to Tvrtko Ursulin
== Series Details ==

== Series Details ==

Series: scripts/trace.pl: Fix ring ignore
URL : https://patchwork.freedesktop.org/series/35565/
State : warning

== Summary ==

Warning: bzip IGTPW_699/shard-kbl7/results14.json.bz2 wasn't in correct JSON format Test kms_frontbuffer_tracking:

        Subgroup fbc-rgb565-draw-mmap-gtt:
                pass       -> SKIP       (shard-hsw) fdo#103167
        Subgroup fbc-1p-primscrn-spr-indfb-fullscreen:
                pass       -> FAIL       (shard-hsw) fdo#101623 +2
Test kms_draw_crc:
        Subgroup draw-method-rgb565-pwrite-untiled:
                pass       -> SKIP       (shard-hsw)
Test kms_cursor_crc:
        Subgroup cursor-256x85-sliding:
                skip       -> PASS       (shard-hsw)
Test kms_cursor_legacy:
        Subgroup basic-busy-flip-before-cursor-atomic:
                skip       -> PASS       (shard-hsw)
Test pm_rpm:
        Subgroup universal-planes:
                skip       -> PASS       (shard-hsw)

fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623

shard-hsw        total:2712 pass:1534 dwarn:1   dfail:0   fail:11  skip:1166 time:9393s
shard-snb        total:2712 pass:1309 dwarn:1   dfail:0   fail:11  skip:1391 time:8023s
Blacklisted hosts:
shard-apl        total:2712 pass:1681 dwarn:1   dfail:1   fail:27  skip:1001 time:13782s
shard-kbl        total:2636 pass:1724 dwarn:25  dfail:4   fail:22  skip:861 time:10929s

== Logs ==

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