* [igt-dev] [PATCH i-g-t] lib/i915/perf: return NULL when platform is not supported
@ 2020-02-25 11:22 Lionel Landwerlin
2020-02-25 11:26 ` Lionel Landwerlin
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Lionel Landwerlin @ 2020-02-25 11:22 UTC (permalink / raw)
To: igt-dev
Instead of asserting.
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
lib/i915/perf.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/lib/i915/perf.c b/lib/i915/perf.c
index 5b5b7f90..a5dd3eab 100644
--- a/lib/i915/perf.c
+++ b/lib/i915/perf.c
@@ -116,6 +116,13 @@ eu_available(const struct drm_i915_query_topology_info *topo,
eu / 8] >> (eu % 8)) & 1;
}
+static struct intel_perf *
+unsupported_i915_perf_platform(struct intel_perf *perf)
+{
+ intel_perf_free(perf);
+ return NULL;
+}
+
struct intel_perf *
intel_perf_for_devinfo(uint32_t device_id,
uint32_t revision,
@@ -193,7 +200,7 @@ intel_perf_for_devinfo(uint32_t device_id,
intel_perf_load_metrics_sklgt4(perf);
break;
default:
- assert(0); /* unreachable */
+ return unsupported_i915_perf_platform(perf);
}
} else if (devinfo->is_broxton) {
perf->devinfo.eu_threads_count = 6;
@@ -207,7 +214,7 @@ intel_perf_for_devinfo(uint32_t device_id,
intel_perf_load_metrics_kblgt3(perf);
break;
default:
- assert(0); /* unreachable */
+ return unsupported_i915_perf_platform(perf);
}
} else if (devinfo->is_geminilake) {
perf->devinfo.eu_threads_count = 6;
@@ -221,7 +228,7 @@ intel_perf_for_devinfo(uint32_t device_id,
intel_perf_load_metrics_cflgt3(perf);
break;
default:
- assert(0); /* unreachable */
+ return unsupported_i915_perf_platform(perf);
}
} else if (devinfo->is_cannonlake) {
intel_perf_load_metrics_cnl(perf);
@@ -232,7 +239,7 @@ intel_perf_for_devinfo(uint32_t device_id,
} else if (devinfo->is_tigerlake) {
intel_perf_load_metrics_tgl(perf);
} else {
- assert(0); /* unreachable */
+ return unsupported_i915_perf_platform(perf);
}
return perf;
--
2.25.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] lib/i915/perf: return NULL when platform is not supported
2020-02-25 11:22 [igt-dev] [PATCH i-g-t] lib/i915/perf: return NULL when platform is not supported Lionel Landwerlin
@ 2020-02-25 11:26 ` Lionel Landwerlin
2020-02-25 11:32 ` Petri Latvala
2020-02-25 12:26 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2020-02-26 15:12 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2 siblings, 1 reply; 5+ messages in thread
From: Lionel Landwerlin @ 2020-02-25 11:26 UTC (permalink / raw)
To: igt-dev@lists.freedesktop.org
On 25/02/2020 13:22, Lionel Landwerlin wrote:
> Instead of asserting.
>
> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This deserves a
Fixes: 5f7e4ae6a91e ("tests/perf: reuse the new i915-perf library")
> ---
> lib/i915/perf.c | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/lib/i915/perf.c b/lib/i915/perf.c
> index 5b5b7f90..a5dd3eab 100644
> --- a/lib/i915/perf.c
> +++ b/lib/i915/perf.c
> @@ -116,6 +116,13 @@ eu_available(const struct
> drm_i915_query_topology_info *topo,
> eu / 8] >> (eu % 8)) & 1;
> }
> +static struct intel_perf *
> +unsupported_i915_perf_platform(struct intel_perf *perf)
> +{
> + intel_perf_free(perf);
> + return NULL;
> +}
> +
> struct intel_perf *
> intel_perf_for_devinfo(uint32_t device_id,
> uint32_t revision,
> @@ -193,7 +200,7 @@ intel_perf_for_devinfo(uint32_t device_id,
> intel_perf_load_metrics_sklgt4(perf);
> break;
> default:
> - assert(0); /* unreachable */
> + return unsupported_i915_perf_platform(perf);
> }
> } else if (devinfo->is_broxton) {
> perf->devinfo.eu_threads_count = 6;
> @@ -207,7 +214,7 @@ intel_perf_for_devinfo(uint32_t device_id,
> intel_perf_load_metrics_kblgt3(perf);
> break;
> default:
> - assert(0); /* unreachable */
> + return unsupported_i915_perf_platform(perf);
> }
> } else if (devinfo->is_geminilake) {
> perf->devinfo.eu_threads_count = 6;
> @@ -221,7 +228,7 @@ intel_perf_for_devinfo(uint32_t device_id,
> intel_perf_load_metrics_cflgt3(perf);
> break;
> default:
> - assert(0); /* unreachable */
> + return unsupported_i915_perf_platform(perf);
> }
> } else if (devinfo->is_cannonlake) {
> intel_perf_load_metrics_cnl(perf);
> @@ -232,7 +239,7 @@ intel_perf_for_devinfo(uint32_t device_id,
> } else if (devinfo->is_tigerlake) {
> intel_perf_load_metrics_tgl(perf);
> } else {
> - assert(0); /* unreachable */
> + return unsupported_i915_perf_platform(perf);
> }
> return perf;
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] lib/i915/perf: return NULL when platform is not supported
2020-02-25 11:26 ` Lionel Landwerlin
@ 2020-02-25 11:32 ` Petri Latvala
0 siblings, 0 replies; 5+ messages in thread
From: Petri Latvala @ 2020-02-25 11:32 UTC (permalink / raw)
To: Lionel Landwerlin; +Cc: igt-dev@lists.freedesktop.org
On Tue, Feb 25, 2020 at 01:26:16PM +0200, Lionel Landwerlin wrote:
> On 25/02/2020 13:22, Lionel Landwerlin wrote:
> > Instead of asserting.
> >
> > Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
>
>
> This deserves a
>
> Fixes: 5f7e4ae6a91e ("tests/perf: reuse the new i915-perf library")
And a
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
>
>
> > ---
> > lib/i915/perf.c | 15 +++++++++++----
> > 1 file changed, 11 insertions(+), 4 deletions(-)
> >
> > diff --git a/lib/i915/perf.c b/lib/i915/perf.c
> > index 5b5b7f90..a5dd3eab 100644
> > --- a/lib/i915/perf.c
> > +++ b/lib/i915/perf.c
> > @@ -116,6 +116,13 @@ eu_available(const struct
> > drm_i915_query_topology_info *topo,
> > eu / 8] >> (eu % 8)) & 1;
> > }
> > +static struct intel_perf *
> > +unsupported_i915_perf_platform(struct intel_perf *perf)
> > +{
> > + intel_perf_free(perf);
> > + return NULL;
> > +}
> > +
> > struct intel_perf *
> > intel_perf_for_devinfo(uint32_t device_id,
> > uint32_t revision,
> > @@ -193,7 +200,7 @@ intel_perf_for_devinfo(uint32_t device_id,
> > intel_perf_load_metrics_sklgt4(perf);
> > break;
> > default:
> > - assert(0); /* unreachable */
> > + return unsupported_i915_perf_platform(perf);
> > }
> > } else if (devinfo->is_broxton) {
> > perf->devinfo.eu_threads_count = 6;
> > @@ -207,7 +214,7 @@ intel_perf_for_devinfo(uint32_t device_id,
> > intel_perf_load_metrics_kblgt3(perf);
> > break;
> > default:
> > - assert(0); /* unreachable */
> > + return unsupported_i915_perf_platform(perf);
> > }
> > } else if (devinfo->is_geminilake) {
> > perf->devinfo.eu_threads_count = 6;
> > @@ -221,7 +228,7 @@ intel_perf_for_devinfo(uint32_t device_id,
> > intel_perf_load_metrics_cflgt3(perf);
> > break;
> > default:
> > - assert(0); /* unreachable */
> > + return unsupported_i915_perf_platform(perf);
> > }
> > } else if (devinfo->is_cannonlake) {
> > intel_perf_load_metrics_cnl(perf);
> > @@ -232,7 +239,7 @@ intel_perf_for_devinfo(uint32_t device_id,
> > } else if (devinfo->is_tigerlake) {
> > intel_perf_load_metrics_tgl(perf);
> > } else {
> > - assert(0); /* unreachable */
> > + return unsupported_i915_perf_platform(perf);
> > }
> > return perf;
>
>
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for lib/i915/perf: return NULL when platform is not supported
2020-02-25 11:22 [igt-dev] [PATCH i-g-t] lib/i915/perf: return NULL when platform is not supported Lionel Landwerlin
2020-02-25 11:26 ` Lionel Landwerlin
@ 2020-02-25 12:26 ` Patchwork
2020-02-26 15:12 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-02-25 12:26 UTC (permalink / raw)
To: Lionel Landwerlin; +Cc: igt-dev
== Series Details ==
Series: lib/i915/perf: return NULL when platform is not supported
URL : https://patchwork.freedesktop.org/series/73896/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8004 -> IGTPW_4221
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4221/index.html
Known issues
------------
Here are the changes found in IGTPW_4221 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@vgem_basic@unload:
- fi-tgl-y: [PASS][1] -> [DMESG-WARN][2] ([CI#94] / [i915#402])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8004/fi-tgl-y/igt@vgem_basic@unload.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4221/fi-tgl-y/igt@vgem_basic@unload.html
#### Possible fixes ####
* igt@i915_selftest@live_execlists:
- fi-icl-y: [INCOMPLETE][3] ([i915#140]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8004/fi-icl-y/igt@i915_selftest@live_execlists.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4221/fi-icl-y/igt@i915_selftest@live_execlists.html
* igt@kms_chamelium@dp-edid-read:
- fi-cml-u2: [FAIL][5] ([i915#217] / [i915#976]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8004/fi-cml-u2/igt@kms_chamelium@dp-edid-read.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4221/fi-cml-u2/igt@kms_chamelium@dp-edid-read.html
* igt@prime_self_import@basic-with_fd_dup:
- fi-tgl-y: [DMESG-WARN][7] ([CI#94] / [i915#402]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8004/fi-tgl-y/igt@prime_self_import@basic-with_fd_dup.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4221/fi-tgl-y/igt@prime_self_import@basic-with_fd_dup.html
[CI#94]: https://gitlab.freedesktop.org/gfx-ci/i915-infra/issues/94
[i915#140]: https://gitlab.freedesktop.org/drm/intel/issues/140
[i915#217]: https://gitlab.freedesktop.org/drm/intel/issues/217
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#976]: https://gitlab.freedesktop.org/drm/intel/issues/976
Participating hosts (43 -> 45)
------------------------------
Additional (7): fi-ehl-1 fi-ilk-650 fi-snb-2520m fi-gdg-551 fi-elk-e7500 fi-blb-e6850 fi-skl-6600u
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5464 -> IGTPW_4221
CI-20190529: 20190529
CI_DRM_8004: 1a2e0cce5af4a9ad9694995610ed64578ccc430f @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4221: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4221/index.html
IGT_5464: 8cf2f8684992052ab89de1cf328c418224c0c2a7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4221/index.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
* [igt-dev] ✗ Fi.CI.IGT: failure for lib/i915/perf: return NULL when platform is not supported
2020-02-25 11:22 [igt-dev] [PATCH i-g-t] lib/i915/perf: return NULL when platform is not supported Lionel Landwerlin
2020-02-25 11:26 ` Lionel Landwerlin
2020-02-25 12:26 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
@ 2020-02-26 15:12 ` Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-02-26 15:12 UTC (permalink / raw)
To: Lionel Landwerlin; +Cc: igt-dev
== Series Details ==
Series: lib/i915/perf: return NULL when platform is not supported
URL : https://patchwork.freedesktop.org/series/73896/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8004_full -> IGTPW_4221_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with IGTPW_4221_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_4221_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4221/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_4221_full:
### IGT changes ###
#### Possible regressions ####
* igt@i915_pm_rpm@fences:
- shard-tglb: [PASS][1] -> [SKIP][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8004/shard-tglb2/igt@i915_pm_rpm@fences.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4221/shard-tglb6/igt@i915_pm_rpm@fences.html
Known issues
------------
Here are the changes found in IGTPW_4221_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_color@pipe-a-gamma:
- shard-tglb: [PASS][3] -> [FAIL][4] ([i915#1149])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8004/shard-tglb1/igt@kms_color@pipe-a-gamma.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4221/shard-tglb2/igt@kms_color@pipe-a-gamma.html
#### Possible fixes ####
* igt@gem_exec_async@concurrent-writes-blt:
- shard-tglb: [FAIL][5] -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8004/shard-tglb6/igt@gem_exec_async@concurrent-writes-blt.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4221/shard-tglb8/igt@gem_exec_async@concurrent-writes-blt.html
* igt@i915_pm_rpm@pm-tiling:
- shard-tglb: [SKIP][7] -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8004/shard-tglb7/igt@i915_pm_rpm@pm-tiling.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4221/shard-tglb5/igt@i915_pm_rpm@pm-tiling.html
#### Warnings ####
* igt@i915_pm_dc@dc6-psr:
- shard-tglb: [FAIL][9] ([i915#454]) -> [SKIP][10] ([i915#468])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8004/shard-tglb3/igt@i915_pm_dc@dc6-psr.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4221/shard-tglb2/igt@i915_pm_dc@dc6-psr.html
* igt@i915_selftest@live_gt_lrc:
- shard-tglb: [INCOMPLETE][11] ([i915#1233]) -> [DMESG-FAIL][12] ([i915#1233])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8004/shard-tglb1/igt@i915_selftest@live_gt_lrc.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4221/shard-tglb8/igt@i915_selftest@live_gt_lrc.html
[i915#1149]: https://gitlab.freedesktop.org/drm/intel/issues/1149
[i915#1233]: https://gitlab.freedesktop.org/drm/intel/issues/1233
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#468]: https://gitlab.freedesktop.org/drm/intel/issues/468
Participating hosts (8 -> 8)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5464 -> IGTPW_4221
CI-20190529: 20190529
CI_DRM_8004: 1a2e0cce5af4a9ad9694995610ed64578ccc430f @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4221: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4221/index.html
IGT_5464: 8cf2f8684992052ab89de1cf328c418224c0c2a7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4221/index.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-02-26 15:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-25 11:22 [igt-dev] [PATCH i-g-t] lib/i915/perf: return NULL when platform is not supported Lionel Landwerlin
2020-02-25 11:26 ` Lionel Landwerlin
2020-02-25 11:32 ` Petri Latvala
2020-02-25 12:26 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2020-02-26 15:12 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox