* [Intel-gfx] [PATCH i-g-t] tools/intel_gpu_top: Include total package power
@ 2020-05-20 10:38 ` Chris Wilson
0 siblings, 0 replies; 9+ messages in thread
From: Chris Wilson @ 2020-05-20 10:38 UTC (permalink / raw)
To: igt-dev; +Cc: intel-gfx, Chris Wilson
With integrated graphics the TDP is shared between the gpu and the cpu,
knowing the total energy consumed by the package is relevant to
understanding throttling.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
tools/intel_gpu_top.c | 195 ++++++++++++++++++++++++++++--------------
1 file changed, 133 insertions(+), 62 deletions(-)
diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
index 8197482dd..e64cec338 100644
--- a/tools/intel_gpu_top.c
+++ b/tools/intel_gpu_top.c
@@ -69,6 +69,12 @@ struct engine {
struct pmu_counter sema;
};
+struct rapl {
+ uint64_t power, type;
+ double scale;
+ int fd;
+};
+
struct engines {
unsigned int num_engines;
unsigned int num_counters;
@@ -76,9 +82,7 @@ struct engines {
int fd;
struct pmu_pair ts;
- int rapl_fd;
- double rapl_scale;
- const char *rapl_unit;
+ struct rapl r_gpu, r_pkg;
int imc_fd;
double imc_reads_scale;
@@ -90,13 +94,124 @@ struct engines {
struct pmu_counter freq_act;
struct pmu_counter irq;
struct pmu_counter rc6;
- struct pmu_counter rapl;
+ struct pmu_counter s_gpu, s_pkg;
struct pmu_counter imc_reads;
struct pmu_counter imc_writes;
struct engine engine;
};
+__attribute__((format(scanf,3,4)))
+static int igt_sysfs_scanf(int dir, const char *attr, const char *fmt, ...)
+{
+ FILE *file;
+ int fd;
+ int ret = -1;
+
+ fd = openat(dir, attr, O_RDONLY);
+ if (fd < 0)
+ return -1;
+
+ file = fdopen(fd, "r");
+ if (file) {
+ va_list ap;
+
+ va_start(ap, fmt);
+ ret = vfscanf(file, fmt, ap);
+ va_end(ap);
+
+ fclose(file);
+ } else {
+ close(fd);
+ }
+
+ return ret;
+}
+
+static int rapl_parse(struct rapl *r, const char *str)
+{
+ locale_t locale, oldlocale;
+ bool result = true;
+ char buf[128];
+ int dir;
+
+ memset(r, 0, sizeof(*r));
+
+ dir = open("/sys/devices/power", O_RDONLY);
+ if (dir < 0)
+ return -errno;
+
+ /* Replace user environment with plain C to match kernel format */
+ locale = newlocale(LC_ALL, "C", 0);
+ oldlocale = uselocale(locale);
+
+ result &= igt_sysfs_scanf(dir, "type", "%"PRIu64, &r->type) == 1;
+
+ snprintf(buf, sizeof(buf), "events/energy-%s", str);
+ result &= igt_sysfs_scanf(dir, buf, "event=%"PRIx64, &r->power) == 1;
+
+ snprintf(buf, sizeof(buf), "events/energy-%s.scale", str);
+ result &= igt_sysfs_scanf(dir, buf, "%lf", &r->scale) == 1;
+
+ uselocale(oldlocale);
+ freelocale(locale);
+
+ close(dir);
+
+ if (!result)
+ return -EINVAL;
+
+ if (isnan(r->scale) || !r->scale)
+ return -ERANGE;
+
+ return 0;
+}
+
+static int rapl_open(struct rapl *r, const char *domain)
+{
+ r->fd = rapl_parse(r, domain);
+ if (r->fd < 0)
+ goto err;
+
+ r->fd = igt_perf_open(r->type, r->power);
+ if (r->fd < 0) {
+ r->fd = -errno;
+ goto err;
+ }
+
+ return 0;
+
+err:
+ errno = 0;
+ return r->fd;
+}
+
+static int gpu_power_open(struct rapl *r)
+{
+ return rapl_open(r, "gpu");
+}
+
+static int pkg_power_open(struct rapl *r)
+{
+ return rapl_open(r, "pkg");
+}
+
+static inline bool rapl_valid(struct rapl *r)
+{
+ return r->fd >= 0;
+}
+
+static inline int ram_power_open(struct rapl *r)
+{
+ return rapl_open(r, "ram");
+}
+
+static inline void rapl_close(struct rapl *r)
+{
+ close(r->fd);
+ r->fd = -1;
+}
+
static uint64_t
get_pmu_config(int dirfd, const char *name, const char *counter)
{
@@ -338,38 +453,6 @@ static double filename_to_double(const char *filename)
return v;
}
-#define RAPL_ROOT "/sys/devices/power/"
-#define RAPL_EVENT "/sys/devices/power/events/"
-
-static uint64_t rapl_type_id(void)
-{
- return filename_to_u64(RAPL_ROOT "type", 10);
-}
-
-static uint64_t rapl_gpu_power(void)
-{
- return filename_to_u64(RAPL_EVENT "energy-gpu", 0);
-}
-
-static double rapl_gpu_power_scale(void)
-{
- return filename_to_double(RAPL_EVENT "energy-gpu.scale");
-}
-
-static const char *rapl_gpu_power_unit(void)
-{
- char buf[32];
-
- if (filename_to_buf(RAPL_EVENT "energy-gpu.unit",
- buf, sizeof(buf)) == 0)
- if (!strcmp(buf, "Joules"))
- return strdup("Watts");
- else
- return strdup(buf);
- else
- return NULL;
-}
-
#define IMC_ROOT "/sys/devices/uncore_imc/"
#define IMC_EVENT "/sys/devices/uncore_imc/events/"
@@ -496,24 +579,8 @@ static int pmu_init(struct engines *engines)
}
}
- engines->rapl_fd = -1;
- if (rapl_type_id()) {
- engines->rapl_scale = rapl_gpu_power_scale();
- engines->rapl_unit = rapl_gpu_power_unit();
- if (!engines->rapl_unit)
- return -1;
-
- engines->rapl.config = rapl_gpu_power();
- if (!engines->rapl.config)
- return -1;
-
- engines->rapl_fd = igt_perf_open(rapl_type_id(),
- engines->rapl.config);
- if (engines->rapl_fd < 0)
- return -1;
-
- engines->rapl.present = true;
- }
+ engines->s_gpu.present = gpu_power_open(&engines->r_gpu) >= 0;
+ engines->s_pkg.present = pkg_power_open(&engines->r_pkg) >= 0;
engines->imc_fd = -1;
if (imc_type_id()) {
@@ -633,9 +700,13 @@ static void pmu_sample(struct engines *engines)
engines->ts.prev = engines->ts.cur;
- if (engines->rapl_fd >= 0)
- __update_sample(&engines->rapl,
- pmu_read_single(engines->rapl_fd));
+ if (engines->s_gpu.present)
+ __update_sample(&engines->s_gpu,
+ pmu_read_single(engines->r_gpu.fd));
+
+ if (engines->s_pkg.present)
+ __update_sample(&engines->s_pkg,
+ pmu_read_single(engines->r_pkg.fd));
if (engines->imc_fd >= 0) {
pmu_read_multi(engines->imc_fd, 2, val);
@@ -1052,8 +1123,8 @@ print_header(struct engines *engines, double t,
.items = rc6_items,
};
struct cnt_item power_items[] = {
- { &engines->rapl, 4, 2, 1.0, t, engines->rapl_scale, "value",
- "W" },
+ { &engines->s_gpu, 4, 2, 1.0, t, engines->r_gpu.scale, "gpu", "W" },
+ { &engines->s_pkg, 4, 2, 1.0, t, engines->r_pkg.scale, "pkg", "W" },
{ NULL, 0, 0, 0.0, 0.0, 0.0, "unit", "W" },
{ },
};
@@ -1083,10 +1154,10 @@ print_header(struct engines *engines, double t,
printf("\033[H\033[J");
if (lines++ < con_h)
- printf("intel-gpu-top - %s/%s MHz; %s%% RC6; %s %s; %s irqs/s\n",
+ printf("intel-gpu-top - %s/%s MHz; %s%% RC6; %s/%s W; %s irqs/s\n",
freq_items[1].buf, freq_items[0].buf,
- rc6_items[0].buf, power_items[0].buf,
- engines->rapl_unit,
+ rc6_items[0].buf,
+ power_items[0].buf, power_items[1].buf,
irq_items[0].buf);
if (lines++ < con_h)
--
2.27.0.rc0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [igt-dev] [PATCH i-g-t] tools/intel_gpu_top: Include total package power
@ 2020-05-20 10:38 ` Chris Wilson
0 siblings, 0 replies; 9+ messages in thread
From: Chris Wilson @ 2020-05-20 10:38 UTC (permalink / raw)
To: igt-dev; +Cc: intel-gfx, Tvrtko Ursulin, Chris Wilson
With integrated graphics the TDP is shared between the gpu and the cpu,
knowing the total energy consumed by the package is relevant to
understanding throttling.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
tools/intel_gpu_top.c | 195 ++++++++++++++++++++++++++++--------------
1 file changed, 133 insertions(+), 62 deletions(-)
diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
index 8197482dd..e64cec338 100644
--- a/tools/intel_gpu_top.c
+++ b/tools/intel_gpu_top.c
@@ -69,6 +69,12 @@ struct engine {
struct pmu_counter sema;
};
+struct rapl {
+ uint64_t power, type;
+ double scale;
+ int fd;
+};
+
struct engines {
unsigned int num_engines;
unsigned int num_counters;
@@ -76,9 +82,7 @@ struct engines {
int fd;
struct pmu_pair ts;
- int rapl_fd;
- double rapl_scale;
- const char *rapl_unit;
+ struct rapl r_gpu, r_pkg;
int imc_fd;
double imc_reads_scale;
@@ -90,13 +94,124 @@ struct engines {
struct pmu_counter freq_act;
struct pmu_counter irq;
struct pmu_counter rc6;
- struct pmu_counter rapl;
+ struct pmu_counter s_gpu, s_pkg;
struct pmu_counter imc_reads;
struct pmu_counter imc_writes;
struct engine engine;
};
+__attribute__((format(scanf,3,4)))
+static int igt_sysfs_scanf(int dir, const char *attr, const char *fmt, ...)
+{
+ FILE *file;
+ int fd;
+ int ret = -1;
+
+ fd = openat(dir, attr, O_RDONLY);
+ if (fd < 0)
+ return -1;
+
+ file = fdopen(fd, "r");
+ if (file) {
+ va_list ap;
+
+ va_start(ap, fmt);
+ ret = vfscanf(file, fmt, ap);
+ va_end(ap);
+
+ fclose(file);
+ } else {
+ close(fd);
+ }
+
+ return ret;
+}
+
+static int rapl_parse(struct rapl *r, const char *str)
+{
+ locale_t locale, oldlocale;
+ bool result = true;
+ char buf[128];
+ int dir;
+
+ memset(r, 0, sizeof(*r));
+
+ dir = open("/sys/devices/power", O_RDONLY);
+ if (dir < 0)
+ return -errno;
+
+ /* Replace user environment with plain C to match kernel format */
+ locale = newlocale(LC_ALL, "C", 0);
+ oldlocale = uselocale(locale);
+
+ result &= igt_sysfs_scanf(dir, "type", "%"PRIu64, &r->type) == 1;
+
+ snprintf(buf, sizeof(buf), "events/energy-%s", str);
+ result &= igt_sysfs_scanf(dir, buf, "event=%"PRIx64, &r->power) == 1;
+
+ snprintf(buf, sizeof(buf), "events/energy-%s.scale", str);
+ result &= igt_sysfs_scanf(dir, buf, "%lf", &r->scale) == 1;
+
+ uselocale(oldlocale);
+ freelocale(locale);
+
+ close(dir);
+
+ if (!result)
+ return -EINVAL;
+
+ if (isnan(r->scale) || !r->scale)
+ return -ERANGE;
+
+ return 0;
+}
+
+static int rapl_open(struct rapl *r, const char *domain)
+{
+ r->fd = rapl_parse(r, domain);
+ if (r->fd < 0)
+ goto err;
+
+ r->fd = igt_perf_open(r->type, r->power);
+ if (r->fd < 0) {
+ r->fd = -errno;
+ goto err;
+ }
+
+ return 0;
+
+err:
+ errno = 0;
+ return r->fd;
+}
+
+static int gpu_power_open(struct rapl *r)
+{
+ return rapl_open(r, "gpu");
+}
+
+static int pkg_power_open(struct rapl *r)
+{
+ return rapl_open(r, "pkg");
+}
+
+static inline bool rapl_valid(struct rapl *r)
+{
+ return r->fd >= 0;
+}
+
+static inline int ram_power_open(struct rapl *r)
+{
+ return rapl_open(r, "ram");
+}
+
+static inline void rapl_close(struct rapl *r)
+{
+ close(r->fd);
+ r->fd = -1;
+}
+
static uint64_t
get_pmu_config(int dirfd, const char *name, const char *counter)
{
@@ -338,38 +453,6 @@ static double filename_to_double(const char *filename)
return v;
}
-#define RAPL_ROOT "/sys/devices/power/"
-#define RAPL_EVENT "/sys/devices/power/events/"
-
-static uint64_t rapl_type_id(void)
-{
- return filename_to_u64(RAPL_ROOT "type", 10);
-}
-
-static uint64_t rapl_gpu_power(void)
-{
- return filename_to_u64(RAPL_EVENT "energy-gpu", 0);
-}
-
-static double rapl_gpu_power_scale(void)
-{
- return filename_to_double(RAPL_EVENT "energy-gpu.scale");
-}
-
-static const char *rapl_gpu_power_unit(void)
-{
- char buf[32];
-
- if (filename_to_buf(RAPL_EVENT "energy-gpu.unit",
- buf, sizeof(buf)) == 0)
- if (!strcmp(buf, "Joules"))
- return strdup("Watts");
- else
- return strdup(buf);
- else
- return NULL;
-}
-
#define IMC_ROOT "/sys/devices/uncore_imc/"
#define IMC_EVENT "/sys/devices/uncore_imc/events/"
@@ -496,24 +579,8 @@ static int pmu_init(struct engines *engines)
}
}
- engines->rapl_fd = -1;
- if (rapl_type_id()) {
- engines->rapl_scale = rapl_gpu_power_scale();
- engines->rapl_unit = rapl_gpu_power_unit();
- if (!engines->rapl_unit)
- return -1;
-
- engines->rapl.config = rapl_gpu_power();
- if (!engines->rapl.config)
- return -1;
-
- engines->rapl_fd = igt_perf_open(rapl_type_id(),
- engines->rapl.config);
- if (engines->rapl_fd < 0)
- return -1;
-
- engines->rapl.present = true;
- }
+ engines->s_gpu.present = gpu_power_open(&engines->r_gpu) >= 0;
+ engines->s_pkg.present = pkg_power_open(&engines->r_pkg) >= 0;
engines->imc_fd = -1;
if (imc_type_id()) {
@@ -633,9 +700,13 @@ static void pmu_sample(struct engines *engines)
engines->ts.prev = engines->ts.cur;
- if (engines->rapl_fd >= 0)
- __update_sample(&engines->rapl,
- pmu_read_single(engines->rapl_fd));
+ if (engines->s_gpu.present)
+ __update_sample(&engines->s_gpu,
+ pmu_read_single(engines->r_gpu.fd));
+
+ if (engines->s_pkg.present)
+ __update_sample(&engines->s_pkg,
+ pmu_read_single(engines->r_pkg.fd));
if (engines->imc_fd >= 0) {
pmu_read_multi(engines->imc_fd, 2, val);
@@ -1052,8 +1123,8 @@ print_header(struct engines *engines, double t,
.items = rc6_items,
};
struct cnt_item power_items[] = {
- { &engines->rapl, 4, 2, 1.0, t, engines->rapl_scale, "value",
- "W" },
+ { &engines->s_gpu, 4, 2, 1.0, t, engines->r_gpu.scale, "gpu", "W" },
+ { &engines->s_pkg, 4, 2, 1.0, t, engines->r_pkg.scale, "pkg", "W" },
{ NULL, 0, 0, 0.0, 0.0, 0.0, "unit", "W" },
{ },
};
@@ -1083,10 +1154,10 @@ print_header(struct engines *engines, double t,
printf("\033[H\033[J");
if (lines++ < con_h)
- printf("intel-gpu-top - %s/%s MHz; %s%% RC6; %s %s; %s irqs/s\n",
+ printf("intel-gpu-top - %s/%s MHz; %s%% RC6; %s/%s W; %s irqs/s\n",
freq_items[1].buf, freq_items[0].buf,
- rc6_items[0].buf, power_items[0].buf,
- engines->rapl_unit,
+ rc6_items[0].buf,
+ power_items[0].buf, power_items[1].buf,
irq_items[0].buf);
if (lines++ < con_h)
--
2.27.0.rc0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for tools/intel_gpu_top: Include total package power
2020-05-20 10:38 ` [igt-dev] " Chris Wilson
(?)
@ 2020-05-20 11:09 ` Patchwork
-1 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2020-05-20 11:09 UTC (permalink / raw)
To: Chris Wilson; +Cc: igt-dev
== Series Details ==
Series: tools/intel_gpu_top: Include total package power
URL : https://patchwork.freedesktop.org/series/77463/
State : success
== Summary ==
CI Bug Log - changes from IGT_5664 -> IGTPW_4599
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/index.html
Changes
-------
No changes found
Participating hosts (49 -> 42)
------------------------------
Missing (7): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-hsw-4770 fi-kbl-7560u fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5664 -> IGTPW_4599
CI-20190529: 20190529
CI_DRM_8509: ea6a2729d3d286137415319de4161042b0337e87 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4599: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/index.html
IGT_5664: 404e2fa06b9c5986dec3fa210234fe8b034b157e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/index.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Intel-gfx] [igt-dev] [PATCH i-g-t] tools/intel_gpu_top: Include total package power
2020-05-20 10:38 ` [igt-dev] " Chris Wilson
@ 2020-05-20 11:54 ` Tvrtko Ursulin
-1 siblings, 0 replies; 9+ messages in thread
From: Tvrtko Ursulin @ 2020-05-20 11:54 UTC (permalink / raw)
To: Chris Wilson, igt-dev; +Cc: intel-gfx
On 20/05/2020 11:38, Chris Wilson wrote:
> With integrated graphics the TDP is shared between the gpu and the cpu,
> knowing the total energy consumed by the package is relevant to
> understanding throttling.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> tools/intel_gpu_top.c | 195 ++++++++++++++++++++++++++++--------------
> 1 file changed, 133 insertions(+), 62 deletions(-)
>
> diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
> index 8197482dd..e64cec338 100644
> --- a/tools/intel_gpu_top.c
> +++ b/tools/intel_gpu_top.c
> @@ -69,6 +69,12 @@ struct engine {
> struct pmu_counter sema;
> };
>
> +struct rapl {
> + uint64_t power, type;
> + double scale;
> + int fd;
> +};
> +
> struct engines {
> unsigned int num_engines;
> unsigned int num_counters;
> @@ -76,9 +82,7 @@ struct engines {
> int fd;
> struct pmu_pair ts;
>
> - int rapl_fd;
> - double rapl_scale;
> - const char *rapl_unit;
> + struct rapl r_gpu, r_pkg;
>
> int imc_fd;
> double imc_reads_scale;
> @@ -90,13 +94,124 @@ struct engines {
> struct pmu_counter freq_act;
> struct pmu_counter irq;
> struct pmu_counter rc6;
> - struct pmu_counter rapl;
> + struct pmu_counter s_gpu, s_pkg;
> struct pmu_counter imc_reads;
> struct pmu_counter imc_writes;
>
> struct engine engine;
> };
>
> +__attribute__((format(scanf,3,4)))
> +static int igt_sysfs_scanf(int dir, const char *attr, const char *fmt, ...)
> +{
> + FILE *file;
> + int fd;
> + int ret = -1;
> +
> + fd = openat(dir, attr, O_RDONLY);
> + if (fd < 0)
> + return -1;
> +
> + file = fdopen(fd, "r");
> + if (file) {
> + va_list ap;
> +
> + va_start(ap, fmt);
> + ret = vfscanf(file, fmt, ap);
> + va_end(ap);
> +
> + fclose(file);
> + } else {
> + close(fd);
> + }
> +
> + return ret;
> +}
It's a bit naughty to add this helper only to be used from RAPL. We
should either consolidate to use this one or have this patch use
existing filenamd_to_* helpers.
> +
> +static int rapl_parse(struct rapl *r, const char *str)
> +{
> + locale_t locale, oldlocale;
> + bool result = true;
> + char buf[128];
> + int dir;
> +
> + memset(r, 0, sizeof(*r));
> +
> + dir = open("/sys/devices/power", O_RDONLY);
> + if (dir < 0)
> + return -errno;
> +
> + /* Replace user environment with plain C to match kernel format */
> + locale = newlocale(LC_ALL, "C", 0);
> + oldlocale = uselocale(locale);
> +
> + result &= igt_sysfs_scanf(dir, "type", "%"PRIu64, &r->type) == 1;
> +
> + snprintf(buf, sizeof(buf), "events/energy-%s", str);
> + result &= igt_sysfs_scanf(dir, buf, "event=%"PRIx64, &r->power) == 1;
> +
> + snprintf(buf, sizeof(buf), "events/energy-%s.scale", str);
> + result &= igt_sysfs_scanf(dir, buf, "%lf", &r->scale) == 1;
> +
> + uselocale(oldlocale);
> + freelocale(locale);
> +
> + close(dir);
> +
> + if (!result)
> + return -EINVAL;
> +
> + if (isnan(r->scale) || !r->scale)
> + return -ERANGE;
> +
> + return 0;
> +}
> +
> +static int rapl_open(struct rapl *r, const char *domain)
> +{
> + r->fd = rapl_parse(r, domain);
> + if (r->fd < 0)
> + goto err;
> +
> + r->fd = igt_perf_open(r->type, r->power);
> + if (r->fd < 0) {
> + r->fd = -errno;
> + goto err;
> + }
> +
> + return 0;
> +
> +err:
> + errno = 0;
> + return r->fd;
> +}
> +
> +static int gpu_power_open(struct rapl *r)
> +{
> + return rapl_open(r, "gpu");
> +}
> +
> +static int pkg_power_open(struct rapl *r)
> +{
> + return rapl_open(r, "pkg");
> +}
> +
> +static inline bool rapl_valid(struct rapl *r)
> +{
> + return r->fd >= 0;
> +}
> +
> +static inline int ram_power_open(struct rapl *r)
> +{
> + return rapl_open(r, "ram");
> +}
> +
> +static inline void rapl_close(struct rapl *r)
> +{
> + close(r->fd);
> + r->fd = -1;
> +}
> +
> static uint64_t
> get_pmu_config(int dirfd, const char *name, const char *counter)
> {
> @@ -338,38 +453,6 @@ static double filename_to_double(const char *filename)
> return v;
> }
>
> -#define RAPL_ROOT "/sys/devices/power/"
> -#define RAPL_EVENT "/sys/devices/power/events/"
> -
> -static uint64_t rapl_type_id(void)
> -{
> - return filename_to_u64(RAPL_ROOT "type", 10);
> -}
> -
> -static uint64_t rapl_gpu_power(void)
> -{
> - return filename_to_u64(RAPL_EVENT "energy-gpu", 0);
> -}
> -
> -static double rapl_gpu_power_scale(void)
> -{
> - return filename_to_double(RAPL_EVENT "energy-gpu.scale");
> -}
> -
> -static const char *rapl_gpu_power_unit(void)
> -{
> - char buf[32];
> -
> - if (filename_to_buf(RAPL_EVENT "energy-gpu.unit",
> - buf, sizeof(buf)) == 0)
> - if (!strcmp(buf, "Joules"))
> - return strdup("Watts");
> - else
> - return strdup(buf);
> - else
> - return NULL;
> -}
> -
> #define IMC_ROOT "/sys/devices/uncore_imc/"
> #define IMC_EVENT "/sys/devices/uncore_imc/events/"
>
> @@ -496,24 +579,8 @@ static int pmu_init(struct engines *engines)
> }
> }
>
> - engines->rapl_fd = -1;
> - if (rapl_type_id()) {
> - engines->rapl_scale = rapl_gpu_power_scale();
> - engines->rapl_unit = rapl_gpu_power_unit();
> - if (!engines->rapl_unit)
> - return -1;
> -
> - engines->rapl.config = rapl_gpu_power();
> - if (!engines->rapl.config)
> - return -1;
> -
> - engines->rapl_fd = igt_perf_open(rapl_type_id(),
> - engines->rapl.config);
> - if (engines->rapl_fd < 0)
> - return -1;
> -
> - engines->rapl.present = true;
> - }
> + engines->s_gpu.present = gpu_power_open(&engines->r_gpu) >= 0;
> + engines->s_pkg.present = pkg_power_open(&engines->r_pkg) >= 0;
>
> engines->imc_fd = -1;
> if (imc_type_id()) {
> @@ -633,9 +700,13 @@ static void pmu_sample(struct engines *engines)
>
> engines->ts.prev = engines->ts.cur;
>
> - if (engines->rapl_fd >= 0)
> - __update_sample(&engines->rapl,
> - pmu_read_single(engines->rapl_fd));
> + if (engines->s_gpu.present)
> + __update_sample(&engines->s_gpu,
> + pmu_read_single(engines->r_gpu.fd));
> +
> + if (engines->s_pkg.present)
> + __update_sample(&engines->s_pkg,
> + pmu_read_single(engines->r_pkg.fd));
>
> if (engines->imc_fd >= 0) {
> pmu_read_multi(engines->imc_fd, 2, val);
> @@ -1052,8 +1123,8 @@ print_header(struct engines *engines, double t,
> .items = rc6_items,
> };
> struct cnt_item power_items[] = {
> - { &engines->rapl, 4, 2, 1.0, t, engines->rapl_scale, "value",
> - "W" },
> + { &engines->s_gpu, 4, 2, 1.0, t, engines->r_gpu.scale, "gpu", "W" },
> + { &engines->s_pkg, 4, 2, 1.0, t, engines->r_pkg.scale, "pkg", "W" },
> { NULL, 0, 0, 0.0, 0.0, 0.0, "unit", "W" },
> { },
> };
> @@ -1083,10 +1154,10 @@ print_header(struct engines *engines, double t,
> printf("\033[H\033[J");
>
> if (lines++ < con_h)
> - printf("intel-gpu-top - %s/%s MHz; %s%% RC6; %s %s; %s irqs/s\n",
> + printf("intel-gpu-top - %s/%s MHz; %s%% RC6; %s/%s W; %s irqs/s\n",
Detecting the unit was also a good thing to have so why drop it?
Regards,
Tvrtko
> freq_items[1].buf, freq_items[0].buf,
> - rc6_items[0].buf, power_items[0].buf,
> - engines->rapl_unit,
> + rc6_items[0].buf,
> + power_items[0].buf, power_items[1].buf,
> irq_items[0].buf);
>
> if (lines++ < con_h)
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] tools/intel_gpu_top: Include total package power
@ 2020-05-20 11:54 ` Tvrtko Ursulin
0 siblings, 0 replies; 9+ messages in thread
From: Tvrtko Ursulin @ 2020-05-20 11:54 UTC (permalink / raw)
To: Chris Wilson, igt-dev; +Cc: intel-gfx, Tvrtko Ursulin
On 20/05/2020 11:38, Chris Wilson wrote:
> With integrated graphics the TDP is shared between the gpu and the cpu,
> knowing the total energy consumed by the package is relevant to
> understanding throttling.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> tools/intel_gpu_top.c | 195 ++++++++++++++++++++++++++++--------------
> 1 file changed, 133 insertions(+), 62 deletions(-)
>
> diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
> index 8197482dd..e64cec338 100644
> --- a/tools/intel_gpu_top.c
> +++ b/tools/intel_gpu_top.c
> @@ -69,6 +69,12 @@ struct engine {
> struct pmu_counter sema;
> };
>
> +struct rapl {
> + uint64_t power, type;
> + double scale;
> + int fd;
> +};
> +
> struct engines {
> unsigned int num_engines;
> unsigned int num_counters;
> @@ -76,9 +82,7 @@ struct engines {
> int fd;
> struct pmu_pair ts;
>
> - int rapl_fd;
> - double rapl_scale;
> - const char *rapl_unit;
> + struct rapl r_gpu, r_pkg;
>
> int imc_fd;
> double imc_reads_scale;
> @@ -90,13 +94,124 @@ struct engines {
> struct pmu_counter freq_act;
> struct pmu_counter irq;
> struct pmu_counter rc6;
> - struct pmu_counter rapl;
> + struct pmu_counter s_gpu, s_pkg;
> struct pmu_counter imc_reads;
> struct pmu_counter imc_writes;
>
> struct engine engine;
> };
>
> +__attribute__((format(scanf,3,4)))
> +static int igt_sysfs_scanf(int dir, const char *attr, const char *fmt, ...)
> +{
> + FILE *file;
> + int fd;
> + int ret = -1;
> +
> + fd = openat(dir, attr, O_RDONLY);
> + if (fd < 0)
> + return -1;
> +
> + file = fdopen(fd, "r");
> + if (file) {
> + va_list ap;
> +
> + va_start(ap, fmt);
> + ret = vfscanf(file, fmt, ap);
> + va_end(ap);
> +
> + fclose(file);
> + } else {
> + close(fd);
> + }
> +
> + return ret;
> +}
It's a bit naughty to add this helper only to be used from RAPL. We
should either consolidate to use this one or have this patch use
existing filenamd_to_* helpers.
> +
> +static int rapl_parse(struct rapl *r, const char *str)
> +{
> + locale_t locale, oldlocale;
> + bool result = true;
> + char buf[128];
> + int dir;
> +
> + memset(r, 0, sizeof(*r));
> +
> + dir = open("/sys/devices/power", O_RDONLY);
> + if (dir < 0)
> + return -errno;
> +
> + /* Replace user environment with plain C to match kernel format */
> + locale = newlocale(LC_ALL, "C", 0);
> + oldlocale = uselocale(locale);
> +
> + result &= igt_sysfs_scanf(dir, "type", "%"PRIu64, &r->type) == 1;
> +
> + snprintf(buf, sizeof(buf), "events/energy-%s", str);
> + result &= igt_sysfs_scanf(dir, buf, "event=%"PRIx64, &r->power) == 1;
> +
> + snprintf(buf, sizeof(buf), "events/energy-%s.scale", str);
> + result &= igt_sysfs_scanf(dir, buf, "%lf", &r->scale) == 1;
> +
> + uselocale(oldlocale);
> + freelocale(locale);
> +
> + close(dir);
> +
> + if (!result)
> + return -EINVAL;
> +
> + if (isnan(r->scale) || !r->scale)
> + return -ERANGE;
> +
> + return 0;
> +}
> +
> +static int rapl_open(struct rapl *r, const char *domain)
> +{
> + r->fd = rapl_parse(r, domain);
> + if (r->fd < 0)
> + goto err;
> +
> + r->fd = igt_perf_open(r->type, r->power);
> + if (r->fd < 0) {
> + r->fd = -errno;
> + goto err;
> + }
> +
> + return 0;
> +
> +err:
> + errno = 0;
> + return r->fd;
> +}
> +
> +static int gpu_power_open(struct rapl *r)
> +{
> + return rapl_open(r, "gpu");
> +}
> +
> +static int pkg_power_open(struct rapl *r)
> +{
> + return rapl_open(r, "pkg");
> +}
> +
> +static inline bool rapl_valid(struct rapl *r)
> +{
> + return r->fd >= 0;
> +}
> +
> +static inline int ram_power_open(struct rapl *r)
> +{
> + return rapl_open(r, "ram");
> +}
> +
> +static inline void rapl_close(struct rapl *r)
> +{
> + close(r->fd);
> + r->fd = -1;
> +}
> +
> static uint64_t
> get_pmu_config(int dirfd, const char *name, const char *counter)
> {
> @@ -338,38 +453,6 @@ static double filename_to_double(const char *filename)
> return v;
> }
>
> -#define RAPL_ROOT "/sys/devices/power/"
> -#define RAPL_EVENT "/sys/devices/power/events/"
> -
> -static uint64_t rapl_type_id(void)
> -{
> - return filename_to_u64(RAPL_ROOT "type", 10);
> -}
> -
> -static uint64_t rapl_gpu_power(void)
> -{
> - return filename_to_u64(RAPL_EVENT "energy-gpu", 0);
> -}
> -
> -static double rapl_gpu_power_scale(void)
> -{
> - return filename_to_double(RAPL_EVENT "energy-gpu.scale");
> -}
> -
> -static const char *rapl_gpu_power_unit(void)
> -{
> - char buf[32];
> -
> - if (filename_to_buf(RAPL_EVENT "energy-gpu.unit",
> - buf, sizeof(buf)) == 0)
> - if (!strcmp(buf, "Joules"))
> - return strdup("Watts");
> - else
> - return strdup(buf);
> - else
> - return NULL;
> -}
> -
> #define IMC_ROOT "/sys/devices/uncore_imc/"
> #define IMC_EVENT "/sys/devices/uncore_imc/events/"
>
> @@ -496,24 +579,8 @@ static int pmu_init(struct engines *engines)
> }
> }
>
> - engines->rapl_fd = -1;
> - if (rapl_type_id()) {
> - engines->rapl_scale = rapl_gpu_power_scale();
> - engines->rapl_unit = rapl_gpu_power_unit();
> - if (!engines->rapl_unit)
> - return -1;
> -
> - engines->rapl.config = rapl_gpu_power();
> - if (!engines->rapl.config)
> - return -1;
> -
> - engines->rapl_fd = igt_perf_open(rapl_type_id(),
> - engines->rapl.config);
> - if (engines->rapl_fd < 0)
> - return -1;
> -
> - engines->rapl.present = true;
> - }
> + engines->s_gpu.present = gpu_power_open(&engines->r_gpu) >= 0;
> + engines->s_pkg.present = pkg_power_open(&engines->r_pkg) >= 0;
>
> engines->imc_fd = -1;
> if (imc_type_id()) {
> @@ -633,9 +700,13 @@ static void pmu_sample(struct engines *engines)
>
> engines->ts.prev = engines->ts.cur;
>
> - if (engines->rapl_fd >= 0)
> - __update_sample(&engines->rapl,
> - pmu_read_single(engines->rapl_fd));
> + if (engines->s_gpu.present)
> + __update_sample(&engines->s_gpu,
> + pmu_read_single(engines->r_gpu.fd));
> +
> + if (engines->s_pkg.present)
> + __update_sample(&engines->s_pkg,
> + pmu_read_single(engines->r_pkg.fd));
>
> if (engines->imc_fd >= 0) {
> pmu_read_multi(engines->imc_fd, 2, val);
> @@ -1052,8 +1123,8 @@ print_header(struct engines *engines, double t,
> .items = rc6_items,
> };
> struct cnt_item power_items[] = {
> - { &engines->rapl, 4, 2, 1.0, t, engines->rapl_scale, "value",
> - "W" },
> + { &engines->s_gpu, 4, 2, 1.0, t, engines->r_gpu.scale, "gpu", "W" },
> + { &engines->s_pkg, 4, 2, 1.0, t, engines->r_pkg.scale, "pkg", "W" },
> { NULL, 0, 0, 0.0, 0.0, 0.0, "unit", "W" },
> { },
> };
> @@ -1083,10 +1154,10 @@ print_header(struct engines *engines, double t,
> printf("\033[H\033[J");
>
> if (lines++ < con_h)
> - printf("intel-gpu-top - %s/%s MHz; %s%% RC6; %s %s; %s irqs/s\n",
> + printf("intel-gpu-top - %s/%s MHz; %s%% RC6; %s/%s W; %s irqs/s\n",
Detecting the unit was also a good thing to have so why drop it?
Regards,
Tvrtko
> freq_items[1].buf, freq_items[0].buf,
> - rc6_items[0].buf, power_items[0].buf,
> - engines->rapl_unit,
> + rc6_items[0].buf,
> + power_items[0].buf, power_items[1].buf,
> irq_items[0].buf);
>
> if (lines++ < con_h)
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Intel-gfx] [igt-dev] [PATCH i-g-t] tools/intel_gpu_top: Include total package power
2020-05-20 11:54 ` Tvrtko Ursulin
(?)
@ 2020-05-20 12:01 ` Chris Wilson
2020-05-20 12:07 ` [igt-dev] [Intel-gfx] " Chris Wilson
-1 siblings, 1 reply; 9+ messages in thread
From: Chris Wilson @ 2020-05-20 12:01 UTC (permalink / raw)
To: Tvrtko Ursulin, igt-dev; +Cc: intel-gfx
Quoting Tvrtko Ursulin (2020-05-20 12:54:19)
>
> On 20/05/2020 11:38, Chris Wilson wrote:
> > @@ -1083,10 +1154,10 @@ print_header(struct engines *engines, double t,
> > printf("\033[H\033[J");
> >
> > if (lines++ < con_h)
> > - printf("intel-gpu-top - %s/%s MHz; %s%% RC6; %s %s; %s irqs/s\n",
> > + printf("intel-gpu-top - %s/%s MHz; %s%% RC6; %s/%s W; %s irqs/s\n",
>
> Detecting the unit was also a good thing to have so why drop it?
Because I'm lazy and reused some packaged code rather than try and
repackage the code here. Even too lazy to add libigt_rapl.la.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Intel-gfx] [igt-dev] [PATCH i-g-t] tools/intel_gpu_top: Include total package power
2020-05-20 12:01 ` [Intel-gfx] " Chris Wilson
@ 2020-05-20 12:07 ` Chris Wilson
0 siblings, 0 replies; 9+ messages in thread
From: Chris Wilson @ 2020-05-20 12:07 UTC (permalink / raw)
To: Tvrtko Ursulin, igt-dev; +Cc: intel-gfx
Quoting Chris Wilson (2020-05-20 13:01:35)
> Quoting Tvrtko Ursulin (2020-05-20 12:54:19)
> >
> > On 20/05/2020 11:38, Chris Wilson wrote:
> > > @@ -1083,10 +1154,10 @@ print_header(struct engines *engines, double t,
> > > printf("\033[H\033[J");
> > >
> > > if (lines++ < con_h)
> > > - printf("intel-gpu-top - %s/%s MHz; %s%% RC6; %s %s; %s irqs/s\n",
> > > + printf("intel-gpu-top - %s/%s MHz; %s%% RC6; %s/%s W; %s irqs/s\n",
> >
> > Detecting the unit was also a good thing to have so why drop it?
>
> Because I'm lazy and reused some packaged code rather than try and
> repackage the code here. Even too lazy to add libigt_rapl.la.
Also, we would only ever report W or mW as the SI unit, the choose is
ours and whatever we choose requires adjusting of the reported rapl
scalefactor. Since we measure in seconds, the rapl scalefactor itself
would have to convert from horsepower into J for the results to make
sense, and defined that way.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [igt-dev] [Intel-gfx] [PATCH i-g-t] tools/intel_gpu_top: Include total package power
@ 2020-05-20 12:07 ` Chris Wilson
0 siblings, 0 replies; 9+ messages in thread
From: Chris Wilson @ 2020-05-20 12:07 UTC (permalink / raw)
To: Tvrtko Ursulin, igt-dev; +Cc: intel-gfx
Quoting Chris Wilson (2020-05-20 13:01:35)
> Quoting Tvrtko Ursulin (2020-05-20 12:54:19)
> >
> > On 20/05/2020 11:38, Chris Wilson wrote:
> > > @@ -1083,10 +1154,10 @@ print_header(struct engines *engines, double t,
> > > printf("\033[H\033[J");
> > >
> > > if (lines++ < con_h)
> > > - printf("intel-gpu-top - %s/%s MHz; %s%% RC6; %s %s; %s irqs/s\n",
> > > + printf("intel-gpu-top - %s/%s MHz; %s%% RC6; %s/%s W; %s irqs/s\n",
> >
> > Detecting the unit was also a good thing to have so why drop it?
>
> Because I'm lazy and reused some packaged code rather than try and
> repackage the code here. Even too lazy to add libigt_rapl.la.
Also, we would only ever report W or mW as the SI unit, the choose is
ours and whatever we choose requires adjusting of the reported rapl
scalefactor. Since we measure in seconds, the rapl scalefactor itself
would have to convert from horsepower into J for the results to make
sense, and defined that way.
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 9+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for tools/intel_gpu_top: Include total package power
2020-05-20 10:38 ` [igt-dev] " Chris Wilson
` (2 preceding siblings ...)
(?)
@ 2020-05-21 0:37 ` Patchwork
-1 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2020-05-21 0:37 UTC (permalink / raw)
To: Chris Wilson; +Cc: igt-dev
== Series Details ==
Series: tools/intel_gpu_top: Include total package power
URL : https://patchwork.freedesktop.org/series/77463/
State : success
== Summary ==
CI Bug Log - changes from IGT_5664_full -> IGTPW_4599_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/index.html
Known issues
------------
Here are the changes found in IGTPW_4599_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_tiled_swapping@non-threaded:
- shard-kbl: [PASS][1] -> [DMESG-WARN][2] ([i915#183])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-kbl6/igt@gem_tiled_swapping@non-threaded.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-kbl4/igt@gem_tiled_swapping@non-threaded.html
* igt@i915_pm_rps@reset:
- shard-tglb: [PASS][3] -> [FAIL][4] ([i915#39])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-tglb2/igt@i915_pm_rps@reset.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-tglb1/igt@i915_pm_rps@reset.html
* igt@kms_cursor_crc@pipe-a-cursor-256x256-random:
- shard-kbl: [PASS][5] -> [FAIL][6] ([i915#54])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-kbl7/igt@kms_cursor_crc@pipe-a-cursor-256x256-random.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-kbl3/igt@kms_cursor_crc@pipe-a-cursor-256x256-random.html
- shard-glk: [PASS][7] -> [FAIL][8] ([i915#54])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-glk5/igt@kms_cursor_crc@pipe-a-cursor-256x256-random.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-glk9/igt@kms_cursor_crc@pipe-a-cursor-256x256-random.html
- shard-apl: [PASS][9] -> [FAIL][10] ([i915#54])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-apl3/igt@kms_cursor_crc@pipe-a-cursor-256x256-random.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-apl7/igt@kms_cursor_crc@pipe-a-cursor-256x256-random.html
* igt@kms_cursor_crc@pipe-a-cursor-256x85-random:
- shard-kbl: [PASS][11] -> [FAIL][12] ([i915#54] / [i915#93] / [i915#95])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-kbl3/igt@kms_cursor_crc@pipe-a-cursor-256x85-random.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-kbl4/igt@kms_cursor_crc@pipe-a-cursor-256x85-random.html
* igt@kms_cursor_edge_walk@pipe-a-64x64-left-edge:
- shard-apl: [PASS][13] -> [FAIL][14] ([i915#70] / [i915#95])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-apl4/igt@kms_cursor_edge_walk@pipe-a-64x64-left-edge.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-apl7/igt@kms_cursor_edge_walk@pipe-a-64x64-left-edge.html
* igt@kms_draw_crc@draw-method-xrgb8888-blt-untiled:
- shard-snb: [PASS][15] -> [SKIP][16] ([fdo#109271]) +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-snb4/igt@kms_draw_crc@draw-method-xrgb8888-blt-untiled.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-snb1/igt@kms_draw_crc@draw-method-xrgb8888-blt-untiled.html
* igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-blt:
- shard-tglb: [PASS][17] -> [SKIP][18] ([i915#668]) +6 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-tglb3/igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-blt.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-tglb6/igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-blt.html
* igt@kms_hdr@bpc-switch-suspend:
- shard-apl: [PASS][19] -> [DMESG-WARN][20] ([i915#180]) +4 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-apl8/igt@kms_hdr@bpc-switch-suspend.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-apl4/igt@kms_hdr@bpc-switch-suspend.html
* igt@kms_psr@no_drrs:
- shard-iclb: [PASS][21] -> [FAIL][22] ([i915#173])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-iclb2/igt@kms_psr@no_drrs.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-iclb1/igt@kms_psr@no_drrs.html
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [PASS][23] -> [SKIP][24] ([fdo#109441])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-iclb6/igt@kms_psr@psr2_primary_mmap_cpu.html
* igt@kms_setmode@basic:
- shard-apl: [PASS][25] -> [FAIL][26] ([i915#31])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-apl8/igt@kms_setmode@basic.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-apl6/igt@kms_setmode@basic.html
* igt@kms_universal_plane@universal-plane-pipe-c-functional:
- shard-kbl: [PASS][27] -> [FAIL][28] ([i915#331])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-kbl1/igt@kms_universal_plane@universal-plane-pipe-c-functional.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-kbl3/igt@kms_universal_plane@universal-plane-pipe-c-functional.html
- shard-apl: [PASS][29] -> [FAIL][30] ([i915#331])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-apl8/igt@kms_universal_plane@universal-plane-pipe-c-functional.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-apl8/igt@kms_universal_plane@universal-plane-pipe-c-functional.html
* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-kbl: [PASS][31] -> [DMESG-WARN][32] ([i915#180]) +2 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-kbl4/igt@kms_vblank@pipe-a-ts-continuation-suspend.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-kbl1/igt@kms_vblank@pipe-a-ts-continuation-suspend.html
* igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend:
- shard-tglb: [PASS][33] -> [INCOMPLETE][34] ([i915#1602] / [i915#456])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-tglb3/igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-tglb2/igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend.html
#### Possible fixes ####
* igt@gem_workarounds@suspend-resume-fd:
- shard-kbl: [INCOMPLETE][35] ([i915#155]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-kbl6/igt@gem_workarounds@suspend-resume-fd.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-kbl7/igt@gem_workarounds@suspend-resume-fd.html
* igt@i915_pm_dc@dc5-psr:
- shard-iclb: [FAIL][37] ([i915#1899]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-iclb3/igt@i915_pm_dc@dc5-psr.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-iclb4/igt@i915_pm_dc@dc5-psr.html
- shard-tglb: [FAIL][39] ([i915#1899]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-tglb7/igt@i915_pm_dc@dc5-psr.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-tglb1/igt@i915_pm_dc@dc5-psr.html
* igt@kms_big_fb@linear-32bpp-rotate-180:
- shard-apl: [FAIL][41] ([i915#1119] / [i915#95]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-apl7/igt@kms_big_fb@linear-32bpp-rotate-180.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-apl8/igt@kms_big_fb@linear-32bpp-rotate-180.html
- shard-kbl: [FAIL][43] ([i915#1119] / [i915#93] / [i915#95]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-kbl6/igt@kms_big_fb@linear-32bpp-rotate-180.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-kbl3/igt@kms_big_fb@linear-32bpp-rotate-180.html
* igt@kms_cursor_crc@pipe-a-cursor-128x128-offscreen:
- shard-kbl: [FAIL][45] ([i915#54] / [i915#93] / [i915#95]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-kbl1/igt@kms_cursor_crc@pipe-a-cursor-128x128-offscreen.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-kbl4/igt@kms_cursor_crc@pipe-a-cursor-128x128-offscreen.html
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-tglb: [FAIL][47] ([i915#1121]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-tglb2/igt@kms_fbcon_fbt@fbc-suspend.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-tglb6/igt@kms_fbcon_fbt@fbc-suspend.html
* {igt@kms_flip@flip-vs-absolute-wf_vblank@a-edp1}:
- shard-tglb: [FAIL][49] ([i915#1883]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-tglb1/igt@kms_flip@flip-vs-absolute-wf_vblank@a-edp1.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-tglb6/igt@kms_flip@flip-vs-absolute-wf_vblank@a-edp1.html
* {igt@kms_flip@flip-vs-suspend@a-dp1}:
- shard-apl: [DMESG-WARN][51] ([i915#180]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-apl3/igt@kms_flip@flip-vs-suspend@a-dp1.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-apl3/igt@kms_flip@flip-vs-suspend@a-dp1.html
- shard-kbl: [DMESG-WARN][53] ([i915#180]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-kbl1/igt@kms_flip@flip-vs-suspend@a-dp1.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-kbl3/igt@kms_flip@flip-vs-suspend@a-dp1.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-kbl: [DMESG-WARN][55] ([i915#180] / [i915#93] / [i915#95]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-kbl1/igt@kms_frontbuffer_tracking@fbc-suspend.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-kbl6/igt@kms_frontbuffer_tracking@fbc-suspend.html
* igt@kms_psr2_su@frontbuffer:
- shard-tglb: [SKIP][57] -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-tglb2/igt@kms_psr2_su@frontbuffer.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-tglb6/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@psr2_sprite_blt:
- shard-iclb: [SKIP][59] ([fdo#109441]) -> [PASS][60] +1 similar issue
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-iclb3/igt@kms_psr@psr2_sprite_blt.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-iclb2/igt@kms_psr@psr2_sprite_blt.html
* {igt@perf@blocking-parameterized}:
- shard-iclb: [FAIL][61] ([i915#1542]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-iclb3/igt@perf@blocking-parameterized.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-iclb8/igt@perf@blocking-parameterized.html
#### Warnings ####
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][63] -> [SKIP][64] ([i915#588])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-iclb8/igt@i915_pm_dc@dc3co-vpb-simulation.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-iclb2/igt@i915_pm_dc@dc3co-vpb-simulation.html
* igt@kms_content_protection@atomic-dpms:
- shard-apl: [TIMEOUT][65] ([i915#1319]) -> [FAIL][66] ([fdo#110321] / [fdo#110336]) +1 similar issue
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-apl7/igt@kms_content_protection@atomic-dpms.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-apl6/igt@kms_content_protection@atomic-dpms.html
- shard-kbl: [FAIL][67] ([fdo#110321] / [fdo#110336] / [i915#93] / [i915#95]) -> [TIMEOUT][68] ([i915#1319])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-kbl2/igt@kms_content_protection@atomic-dpms.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-kbl2/igt@kms_content_protection@atomic-dpms.html
* igt@kms_content_protection@legacy:
- shard-apl: [FAIL][69] ([fdo#110321] / [fdo#110336]) -> [TIMEOUT][70] ([i915#1319])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-apl1/igt@kms_content_protection@legacy.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-apl3/igt@kms_content_protection@legacy.html
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-apl: [FAIL][71] ([i915#1525]) -> [DMESG-FAIL][72] ([i915#180] / [i915#95])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-apl6/igt@kms_fbcon_fbt@fbc-suspend.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-apl6/igt@kms_fbcon_fbt@fbc-suspend.html
- shard-kbl: [FAIL][73] ([i915#64]) -> [FAIL][74] ([i915#1121] / [i915#93] / [i915#95])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-kbl3/igt@kms_fbcon_fbt@fbc-suspend.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-kbl2/igt@kms_fbcon_fbt@fbc-suspend.html
* igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
- shard-apl: [FAIL][75] ([fdo#108145] / [i915#265]) -> [FAIL][76] ([fdo#108145] / [i915#265] / [i915#95])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-apl2/igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-apl1/igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb.html
- shard-kbl: [FAIL][77] ([fdo#108145] / [i915#265]) -> [FAIL][78] ([fdo#108145] / [i915#265] / [i915#93] / [i915#95])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5664/shard-kbl6/igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/shard-kbl4/igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110321]: https://bugs.freedesktop.org/show_bug.cgi?id=110321
[fdo#110336]: https://bugs.freedesktop.org/show_bug.cgi?id=110336
[i915#1119]: https://gitlab.freedesktop.org/drm/intel/issues/1119
[i915#1121]: https://gitlab.freedesktop.org/drm/intel/issues/1121
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1525]: https://gitlab.freedesktop.org/drm/intel/issues/1525
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#1602]: https://gitlab.freedesktop.org/drm/intel/issues/1602
[i915#173]: https://gitlab.freedesktop.org/drm/intel/issues/173
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#183]: https://gitlab.freedesktop.org/drm/intel/issues/183
[i915#1883]: https://gitlab.freedesktop.org/drm/intel/issues/1883
[i915#1899]: https://gitlab.freedesktop.org/drm/intel/issues/1899
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#331]: https://gitlab.freedesktop.org/drm/intel/issues/331
[i915#39]: https://gitlab.freedesktop.org/drm/intel/issues/39
[i915#456]: https://gitlab.freedesktop.org/drm/intel/issues/456
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
[i915#64]: https://gitlab.freedesktop.org/drm/intel/issues/64
[i915#668]: https://gitlab.freedesktop.org/drm/intel/issues/668
[i915#70]: https://gitlab.freedesktop.org/drm/intel/issues/70
[i915#93]: https://gitlab.freedesktop.org/drm/intel/issues/93
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (8 -> 8)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5664 -> IGTPW_4599
CI-20190529: 20190529
CI_DRM_8509: ea6a2729d3d286137415319de4161042b0337e87 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4599: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/index.html
IGT_5664: 404e2fa06b9c5986dec3fa210234fe8b034b157e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4599/index.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-05-21 0:37 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-20 10:38 [Intel-gfx] [PATCH i-g-t] tools/intel_gpu_top: Include total package power Chris Wilson
2020-05-20 10:38 ` [igt-dev] " Chris Wilson
2020-05-20 11:09 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2020-05-20 11:54 ` [Intel-gfx] [igt-dev] [PATCH i-g-t] " Tvrtko Ursulin
2020-05-20 11:54 ` Tvrtko Ursulin
2020-05-20 12:01 ` [Intel-gfx] " Chris Wilson
2020-05-20 12:07 ` Chris Wilson
2020-05-20 12:07 ` [igt-dev] [Intel-gfx] " Chris Wilson
2020-05-21 0:37 ` [igt-dev] ✓ Fi.CI.IGT: success for " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.