Skip to contentSkip to conversation

drm/i915/selftests: Fix GT PM sort comparators

PATCH Applied Emre Cecanpunar 4 participants 6 messages Jul 14 – Jul 15

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/selftests: Fix GT PM sort comparators

Compare the sampled clock values instead of their addresses. Comparing addresses leaves the samples unsorted, preventing the code from discarding the minimum and maximum samples.

Fixes 1a5392479207 ("drm/i915/selftests: Measure CS_TIMESTAMP")
---
 drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/gt/selftest_gt_pm.c +4 -4
index 33351deeea4f..07eaf71955c4 100644
@@ -16,9 +16,9 @@ static int cmp_u64(const void *A, const void *B)
 {
 	const u64 *a = A, *b = B;
 
-	if (a < b)
+	if (*a < *b)
 		return -1;
-	else if (a > b)
+	else if (*a > *b)
 		return 1;
 	else
 		return 0;
@@ -28,9 +28,9 @@ static int cmp_u32(const void *A, const void *B)
 {
 	const u32 *a = A, *b = B;
 
-	if (a < b)
+	if (*a < *b)
 		return -1;
-	else if (a > b)
+	else if (*a > *b)
 		return 1;
 	else
 		return 0;
Signature · 1 line
2.55.0
#1 lore raw

✗ LGCI.VerificationFailed: failure for drm/i915/selftests: Fix GT PM sort comparators

== Series Details ==

== Series Details ==

Series: drm/i915/selftests: Fix GT PM sort comparators
URL : https://patchwork.freedesktop.org/series/170443/
State : failure

== Summary ==

Series author address '[email protected]' is not on the allowlist, which prevents CI from being automatically triggered. If you want CI to run for this series, ask Patchwork project owners to click 'retest' on the series in Patchwork. Exception occurred during validation, bailing out!
Build URL: http://gfx-ci.igk.intel.com:8080/job/CI_PW_kernel/181374/ (on built-in)

#2 lore raw

✓ i915.CI.BAT: success for drm/i915/selftests: Fix GT PM sort comparators (rev2)

In reply to Emre Cecanpunar
== Series Details ==

== Series Details ==

Series: drm/i915/selftests: Fix GT PM sort comparators (rev2)
URL : https://patchwork.freedesktop.org/series/170443/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_18827 -> Patchwork_170443v2
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_170443v2/index.html

Participating hosts (41 -> 39)
------------------------------

Missing (2): bat-dg2-13 fi-snb-2520m

Changes
-------

No changes found

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

* Linux: CI_DRM_18827 -> Patchwork_170443v2

CI-20190529: 20190529
CI_DRM_18827: 6dd678fdc2f39062bed466d7e3c851736e376531 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_9006: 6380a8af26359dd222e22679442272ded836c463 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_170443v2: 6dd678fdc2f39062bed466d7e3c851736e376531 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_170443v2/index.html

#3 lore raw

✓ i915.CI.Full: success for drm/i915/selftests: Fix GT PM sort comparators (rev2)

In reply to Emre Cecanpunar
== Series Details ==

== Series Details ==

Series: drm/i915/selftests: Fix GT PM sort comparators (rev2)
URL : https://patchwork.freedesktop.org/series/170443/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_18827_full -> Patchwork_170443v2_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

No changes in participating hosts

Changes
-------

No changes found

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

* Linux: CI_DRM_18827 -> Patchwork_170443v2

CI-20190529: 20190529
CI_DRM_18827: 6dd678fdc2f39062bed466d7e3c851736e376531 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_9006: 6380a8af26359dd222e22679442272ded836c463 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_170443v2: 6dd678fdc2f39062bed466d7e3c851736e376531 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_170443v2/index.html

maintainer Applied
#4 lore raw
In reply to Emre Cecanpunar
Quoted 28 lines · Emre Cecanpunar

Compare the sampled clock values instead of their addresses. Comparing addresses leaves the samples unsorted, preventing the code from discarding the minimum and maximum samples.

Fixes 1a5392479207 ("drm/i915/selftests: Measure CS_TIMESTAMP")
---
  drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/gt/selftest_gt_pm.c +2 -2
index 33351deeea4f..07eaf71955c4 100644
@@ -16,9 +16,9 @@ static int cmp_u64(const void *A, const void *B)
  {
  	const u64 *a = A, *b = B;
 
-	if (a < b)
+	if (*a < *b)
  		return -1;
-	else if (a > b)
+	else if (*a > *b)
  		return 1;
  	else
  		return 0;
@@ -28,9 +28,9 @@ static int cmp_u32(const void *A, const void *B)
  {

drivers/gpu/drm/i915/gt/selftest_gt_pm.c static int cmp_u32(const void *A, const void *B) · line 36

Quoted 10 lines
drivers/gpu/drm/i915/gt/selftest_gt_pm.c +2 -2
  	const u32 *a = A, *b = B;
 
-	if (a < b)
+	if (*a < *b)
  		return -1;
-	else if (a > b)
+	else if (*a > *b)
  		return 1;
  	else
  		return 0;

Pushed to drm-intel-gt-next, thank you!

Regards,

Tvrtko

#5 lore raw

Hi Tvrtko,

I was about to r-b this patch.

Quoted 6 lines · Tvrtko Ursulin
Quoted 5 lines · Emre Cecanpunar

Compare the sampled clock values instead of their addresses. Comparing addresses leaves the samples unsorted, preventing the code from discarding the minimum and maximum samples.

Fixes 1a5392479207 ("drm/i915/selftests: Measure CS_TIMESTAMP")

Normally we don't keep the Fixes tag for selftest patches as it doesn't have an impact in the real world and it doesn't bring any benefit to backport.

Andi

Quoted 1 line
Quoted 1 line