[Intel-gfx] [PATCH i-g-t v4 6/9] intel-gpu-overlay: Use RAPL PMU for power reading
Tvrtko Ursulin
tursulin at ursulin.net
Tue Nov 21 19:35:32 UTC 2017
From: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
Wire up to the RAPL PMU for GPU energy readings.
The only complication is that we have to add code to parse:
# cat /sys/devices/power/events/energy-gpu.scale
2.3283064365386962890625e-10
v2: Link with -lm.
v3: strtod can handle scientific notation, even though my initial
reading of the man page did not spot that. (Chris Wilson)
v4: Meson fix.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk> (v3)
---
lib/igt_perf.c | 16 +++++--
lib/igt_perf.h | 1 +
overlay/Makefile.am | 2 +-
overlay/meson.build | 2 +-
overlay/power.c | 127 ++++++++++++++++++++++++++++++++++++----------------
overlay/power.h | 2 +
6 files changed, 105 insertions(+), 45 deletions(-)
diff --git a/lib/igt_perf.c b/lib/igt_perf.c
index 208474302fcc..0221461e918f 100644
--- a/lib/igt_perf.c
+++ b/lib/igt_perf.c
@@ -27,11 +27,12 @@ uint64_t i915_type_id(void)
return strtoull(buf, NULL, 0);
}
-static int _perf_open(uint64_t config, int group, uint64_t format)
+static int
+_perf_open(uint64_t type, uint64_t config, int group, uint64_t format)
{
struct perf_event_attr attr = { };
- attr.type = i915_type_id();
+ attr.type = type;
if (attr.type == 0)
return -ENOENT;
@@ -46,11 +47,18 @@ static int _perf_open(uint64_t config, int group, uint64_t format)
int perf_i915_open(uint64_t config)
{
- return _perf_open(config, -1, PERF_FORMAT_TOTAL_TIME_ENABLED);
+ return _perf_open(i915_type_id(), config, -1,
+ PERF_FORMAT_TOTAL_TIME_ENABLED);
}
int perf_i915_open_group(uint64_t config, int group)
{
- return _perf_open(config, group,
+ return _perf_open(i915_type_id(), config, group,
PERF_FORMAT_TOTAL_TIME_ENABLED | PERF_FORMAT_GROUP);
}
+
+int igt_perf_open(uint64_t type, uint64_t config)
+{
+ return _perf_open(type, config, -1,
+ PERF_FORMAT_TOTAL_TIME_ENABLED);
+}
diff --git a/lib/igt_perf.h b/lib/igt_perf.h
index db07b00a7b6b..938d548891c5 100644
--- a/lib/igt_perf.h
+++ b/lib/igt_perf.h
@@ -99,5 +99,6 @@ perf_event_open(struct perf_event_attr *attr,
uint64_t i915_type_id(void);
int perf_i915_open(uint64_t config);
int perf_i915_open_group(uint64_t config, int group);
+int igt_perf_open(uint64_t type, uint64_t config);
#endif /* I915_PERF_H */
diff --git a/overlay/Makefile.am b/overlay/Makefile.am
index cefde2d040f8..f49f54ac3590 100644
--- a/overlay/Makefile.am
+++ b/overlay/Makefile.am
@@ -63,7 +63,7 @@ intel_gpu_overlay_SOURCES += \
intel_gpu_overlay_SOURCES += $(both_x11_sources)
-intel_gpu_overlay_LDADD = $(LDADD) -lrt
+intel_gpu_overlay_LDADD = $(LDADD) -lrt -lm
EXTRA_DIST= \
README \
diff --git a/overlay/meson.build b/overlay/meson.build
index ffc011cce998..6b479eb89890 100644
--- a/overlay/meson.build
+++ b/overlay/meson.build
@@ -21,7 +21,7 @@ dri2proto = dependency('dri2proto', version : '>= 2.6', required : false)
cairo_xlib = dependency('cairo-xlib', required : false)
xrandr = dependency('xrandr', version : '>=1.3', required : false)
-gpu_overlay_deps = [ realtime, cairo, pciaccess, libdrm, libdrm_intel ]
+gpu_overlay_deps = [ realtime, math, cairo, pciaccess, libdrm, libdrm_intel ]
both_x11_src = ''
diff --git a/overlay/power.c b/overlay/power.c
index 805f4ca7805c..9ac90fde8786 100644
--- a/overlay/power.c
+++ b/overlay/power.c
@@ -30,60 +30,107 @@
#include <fcntl.h>
#include <time.h>
#include <errno.h>
+#include <ctype.h>
+#include <math.h>
#include "igt_perf.h"
#include "power.h"
#include "debugfs.h"
-/* XXX Is this exposed through RAPL? */
-
-int power_init(struct power *power)
+static int
+filename_to_buf(const char *filename, char *buf, unsigned int bufsize)
{
- char buf[4096];
- int fd, len;
-
- memset(power, 0, sizeof(*power));
-
- power->fd = -1;
+ int fd;
+ ssize_t ret;
- sprintf(buf, "%s/i915_energy_uJ", debugfs_dri_path);
- fd = open(buf, 0);
+ fd = open(filename, O_RDONLY);
if (fd < 0)
- return power->error = errno;
+ return -1;
- len = read(fd, buf, sizeof(buf));
+ ret = read(fd, buf, bufsize - 1);
close(fd);
+ if (ret < 1)
+ return -1;
- if (len < 0)
- return power->error = errno;
-
- buf[len] = '\0';
- if (strtoull(buf, 0, 0) == 0)
- return power->error = EINVAL;
+ buf[ret] = '\0';
return 0;
}
-static uint64_t file_to_u64(const char *name)
+static uint64_t filename_to_u64(const char *filename, int base)
{
- char buf[4096];
- int fd, len;
+ char buf[64], *b;
- sprintf(buf, "%s/%s", debugfs_dri_path, name);
- fd = open(buf, 0);
- if (fd < 0)
+ if (filename_to_buf(filename, buf, sizeof(buf)))
return 0;
- len = read(fd, buf, sizeof(buf)-1);
- close(fd);
+ /*
+ * Handle both single integer and key=value formats by skipping
+ * leading non-digits.
+ */
+ b = buf;
+ while (*b && !isdigit(*b))
+ b++;
+
+ return strtoull(b, NULL, base);
+}
+
+static uint64_t debugfs_file_to_u64(const char *name)
+{
+ char buf[1024];
+
+ snprintf(buf, sizeof(buf), "%s/%s", debugfs_dri_path, name);
+
+ return filename_to_u64(buf, 0);
+}
+
+static uint64_t rapl_type_id(void)
+{
+ return filename_to_u64("/sys/devices/power/type", 10);
+}
+
+static uint64_t rapl_gpu_power(void)
+{
+ return filename_to_u64("/sys/devices/power/events/energy-gpu", 0);
+}
- if (len < 0)
+static double filename_to_double(const char *filename)
+{
+ char buf[64];
+
+ if (filename_to_buf(filename, buf, sizeof(buf)))
return 0;
- buf[len] = '\0';
+ return strtod(buf, NULL);
+}
+
+static double rapl_gpu_power_scale(void)
+{
+ return filename_to_double("/sys/devices/power/events/energy-gpu.scale");
+}
+
+int power_init(struct power *power)
+{
+ uint64_t val;
+
+ memset(power, 0, sizeof(*power));
+
+ power->fd = igt_perf_open(rapl_type_id(), rapl_gpu_power());
+ if (power->fd >= 0) {
+ power->rapl_scale = rapl_gpu_power_scale();
+
+ if (power->rapl_scale != NAN) {
+ power->rapl_scale *= 1e3; /* from nano to micro */
+ return 0;
+ }
+ }
+
+ val = debugfs_file_to_u64("i915_energy_uJ");
+ if (val == 0)
+ return power->error = EINVAL;
- return strtoull(buf, 0, 0);
+ return 0;
}
static uint64_t clock_ms_to_u64(void)
@@ -93,30 +140,30 @@ static uint64_t clock_ms_to_u64(void)
if (clock_gettime(CLOCK_MONOTONIC, &tv) < 0)
return 0;
- return (uint64_t)tv.tv_sec * 1000 + tv.tv_nsec / 1000000;
+ return (uint64_t)tv.tv_sec * 1e3 + tv.tv_nsec / 1e6;
}
int power_update(struct power *power)
{
- struct power_stat *s = &power->stat[power->count++&1];
- struct power_stat *d = &power->stat[power->count&1];
+ struct power_stat *s = &power->stat[power->count++ & 1];
+ struct power_stat *d = &power->stat[power->count & 1];
uint64_t d_time;
if (power->error)
return power->error;
- if (power->fd != -1) {
+ if (power->fd >= 0) {
uint64_t data[2];
int len;
len = read(power->fd, data, sizeof(data));
- if (len < 0)
+ if (len != sizeof(data))
return power->error = errno;
- s->energy = data[0];
- s->timestamp = data[1] / (1000*1000);
+ s->energy = llround((double)data[0] * power->rapl_scale);
+ s->timestamp = data[1] / 1e6;
} else {
- s->energy = file_to_u64("i915_energy_uJ");
+ s->energy = debugfs_file_to_u64("i915_energy_uJ") / 1e3;
s->timestamp = clock_ms_to_u64();
}
@@ -124,7 +171,9 @@ int power_update(struct power *power)
return EAGAIN;
d_time = s->timestamp - d->timestamp;
- power->power_mW = (s->energy - d->energy) / d_time;
+ power->power_mW = round((double)(s->energy - d->energy) *
+ (1e3f / d_time));
power->new_sample = 1;
+
return 0;
}
diff --git a/overlay/power.h b/overlay/power.h
index bf8346ce46b4..28abfc32234b 100644
--- a/overlay/power.h
+++ b/overlay/power.h
@@ -39,6 +39,8 @@ struct power {
int new_sample;
uint64_t power_mW;
+
+ double rapl_scale;
};
int power_init(struct power *power);
--
2.14.1
More information about the Intel-gfx
mailing list