Skip to contentSkip to conversation

intel/pmu: Catch-up with i915 RC6 aggregation changes

PATCH In review Tvrtko Ursulin 3 participants 5 messages Nov 24, 2017 Library code

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 intel/pmu: Catch-up with i915 RC6 aggregation changes

From: Tvrtko Ursulin <[email protected]>

Since i915 PMU is removing separate RC6 counters and now aggregates all under a single one, catch up the test and intel-gpu-overlay with those changes.

---
 lib/igt_perf.h   |  4 +---
 overlay/rc6.c    | 45 +++++++--------------------------------------
 tests/perf_pmu.c | 53 -----------------------------------------------------
 3 files changed, 8 insertions(+), 94 deletions(-)
lib/igt_perf.h +1 -3
index 5428feb0c746..7b66fc582b88 100644
@@ -64,10 +64,8 @@ enum drm_i915_pmu_engine_sample {
 #define I915_PMU_REQUESTED_FREQUENCY	__I915_PMU_OTHER(1)
 #define I915_PMU_INTERRUPTS		__I915_PMU_OTHER(2)
 #define I915_PMU_RC6_RESIDENCY		__I915_PMU_OTHER(3)
-#define I915_PMU_RC6p_RESIDENCY		__I915_PMU_OTHER(4)
-#define I915_PMU_RC6pp_RESIDENCY	__I915_PMU_OTHER(5)
 
-#define I915_PMU_LAST I915_PMU_RC6pp_RESIDENCY
+#define I915_PMU_LAST I915_PMU_RC6_RESIDENCY
 
 static inline int
 perf_event_open(struct perf_event_attr *attr,
overlay/rc6.c +7 -38

70 lines not on this page · raw message

tests/perf_pmu.c +0 -53

65 lines not on this page · raw message

Signature · 6 lines
2.14.1

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

Quoting Tvrtko Ursulin (2017-11-24 17:16:18)

Quoted 5 lines

From: Tvrtko Ursulin <[email protected]>

Since i915 PMU is removing separate RC6 counters and now aggregates all under a single one, catch up the test and intel-gpu-overlay with those changes.

First run failed
(perf_pmu:1928) CRITICAL: 'idle - prev' != 'slept' (1884715520.000000 not within 5.000000% tolerance of 2000133450.000000)

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

#2 lore raw

✓ Fi.CI.BAT: success for intel/pmu: Catch-up with i915 RC6 aggregation changes

In reply to Tvrtko Ursulin
== Series Details ==

== Series Details ==

Series: intel/pmu: Catch-up with i915 RC6 aggregation changes
URL : https://patchwork.freedesktop.org/series/34371/
State : success

== Summary ==

IGT patchset tested on top of latest successful build c6577473df7117b7a6e030605df1e28cd0e55708 lib/igt_core: Move write_stderr out of LIBUNWIND ifdef

with latest DRM-Tip kernel build CI_DRM_3385
c2ee9de5c13c drm-tip: 2017y-11m-24d-17h-10m-43s UTC integration manifest

Testlist changes:
-igt@perf_pmu@other-init-5
-igt@perf_pmu@other-init-6
-igt@perf_pmu@other-read-5
-igt@perf_pmu@other-read-6
-igt@perf_pmu@rc6p

Test gem_exec_reloc:

        Subgroup basic-cpu-active:
                pass       -> FAIL       (fi-gdg-551) fdo#102582 +5
Test kms_cursor_legacy:
        Subgroup basic-busy-flip-before-cursor-legacy:
                pass       -> FAIL       (fi-gdg-551) fdo#102618

fdo#102582 https://bugs.freedesktop.org/show_bug.cgi?id=102582
fdo#102618 https://bugs.freedesktop.org/show_bug.cgi?id=102618

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:444s
fi-blb-e6850     total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:388s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:539s
fi-bwr-2160      total:289  pass:183  dwarn:0   dfail:0   fail:0   skip:106 time:278s
fi-bxt-dsi       total:289  pass:259  dwarn:0   dfail:0   fail:0   skip:30  time:511s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:503s
fi-byt-j1900     total:289  pass:254  dwarn:0   dfail:0   fail:0   skip:35  time:493s
fi-byt-n2820     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:490s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:427s
fi-gdg-551       total:289  pass:170  dwarn:1   dfail:0   fail:9   skip:109 time:277s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:538s
fi-hsw-4770      total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:427s
fi-hsw-4770r     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:434s
fi-ilk-650       total:289  pass:228  dwarn:0   dfail:0   fail:0   skip:61  time:431s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:494s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:463s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:486s
fi-kbl-7560u     total:289  pass:270  dwarn:0   dfail:0   fail:0   skip:19  time:532s
fi-kbl-7567u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:480s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:530s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:455s
fi-skl-6600u     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:539s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:568s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:508s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:499s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:458s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:556s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:0   skip:40  time:418s
Blacklisted hosts:
fi-cfl-s2        total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:595s
fi-cnl-y         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:558s
fi-glk-dsi       total:91   pass:46   dwarn:0   dfail:1   fail:2   skip:41 

== Logs ==

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

#3 lore raw

✗ Fi.CI.IGT: warning for intel/pmu: Catch-up with i915 RC6 aggregation changes

In reply to Tvrtko Ursulin
== Series Details ==

== Series Details ==

Series: intel/pmu: Catch-up with i915 RC6 aggregation changes
URL : https://patchwork.freedesktop.org/series/34371/
State : warning

== Summary ==

Test kms_frontbuffer_tracking:

        Subgroup fbc-1p-pri-indfb-multidraw:
                fail       -> SKIP       (shard-snb) fdo#103167
        Subgroup fbc-1p-offscren-pri-shrfb-draw-blt:
                pass       -> FAIL       (shard-snb) fdo#101623 +1
Test kms_draw_crc:
        Subgroup draw-method-xrgb2101010-pwrite-xtiled:
                pass       -> SKIP       (shard-snb)
Test drv_module_reload:
        Subgroup basic-reload:
                pass       -> DMESG-WARN (shard-hsw) fdo#102707
Test gem_softpin:
        Subgroup noreloc-s3:
                pass       -> DMESG-WARN (shard-snb) fdo#102365
Test kms_plane:
        Subgroup plane-panning-bottom-right-suspend-pipe-c-planes:
                skip       -> PASS       (shard-hsw) fdo#103375

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

shard-hsw        total:2662 pass:1532 dwarn:2   dfail:0   fail:10  skip:1118 time:9469s
shard-snb        total:2662 pass:1303 dwarn:2   dfail:0   fail:13  skip:1344 time:8081s

== Logs ==

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

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

Quoting Tvrtko Ursulin (2017-11-24 17:16:18)

Quoted 7 lines

From: Tvrtko Ursulin <[email protected]>

Since i915 PMU is removing separate RC6 counters and now aggregates all under a single one, catch up the test and intel-gpu-overlay with those changes.

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