[Powertop] [PATCH v2] Add support for Intel GPU statistics

--===============0933471905752621069==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

>From 6fd9783d4def5e4f6fc2647225a4cb34949afef9 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan(a)linux.intel.com>
Date: Sun, 5 Aug 2012 10:04:02 -0700
Subject: [PATCH] Add support for Intel GPU statistics

As of the 3.5 kernel, the Intel GPUs report their C states (power gating) v=
ia sysfs.
This patch will show them as part of the C state tab, arranged like a core =
inside package 0
(which matches physical topology)

Changes since v1: incorporated feedback from Sergey
---
 src/Makefile.am       |    2 +-
 src/cpu/cpu.cpp       |   33 +++++++++++++
 src/cpu/intel_cpus.h  |   23 +++++++++
 src/cpu/intel_gpu.cpp |  122 +++++++++++++++++++++++++++++++++++++++++++++=
++++
 4 files changed, 179 insertions(+), 1 deletions(-)
 create mode 100644 src/cpu/intel_gpu.cpp

diff --git a/src/Makefile.am b/src/Makefile.am
index d0976fd..d233d85 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ powertop_SOURCES =3D parameters/persistent.cpp parameters=
/learn.cpp parameters/par
 		calibrate/calibrate.h measurement/measurement.cpp measurement/power_supp=
ly.cpp \
 		measurement/measurement.h measurement/acpi.cpp measurement/sysfs.h measu=
rement/sysfs.cpp \
 		measurement/acpi.h measurement/extech.cpp measurement/power_supply.h mea=
surement/extech.h \
-		main.cpp css.h powertop.css
+		main.cpp css.h powertop.css cpu/intel_gpu.cpp


 powertop_CXXFLAGS =3D -fno-omit-frame-pointer -fstack-protector -Wall -Wsh=
adow -Wformat $(NCURSES_CFLAGS) $(PCIUTILS_CFLAGS) $(LIBNL_CFLAGS) $(GLIB2_=
CFLAGS)
diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp
index 63e48ee..0c36bae 100644
--- a/src/cpu/cpu.cpp
+++ b/src/cpu/cpu.cpp
@@ -123,6 +123,16 @@ static class abstract_cpu * new_core(int core, int cpu=
, char * vendor, int famil
 	return ret;
 }

+static class abstract_cpu * new_i965_gpu(void)
+{
+	class abstract_cpu *ret =3D NULL;
+
+	ret =3D new class i965_core;
+	ret->childcount =3D 0;
+
+	return ret;
+}
+
 static class abstract_cpu * new_cpu(int number, char * vendor, int family,=
 int model)
 {
 	class abstract_cpu * ret =3D NULL;
@@ -218,6 +228,26 @@ static void handle_one_cpu(unsigned int number, char *=
vendor, int family, int mo
 	all_cpus[number] =3D cpu;
 }

+static void handle_i965_gpu(void)
+{
+	unsigned int core_number =3D 0;
+	class abstract_cpu *package;
+
+
+	package =3D system_level.children[0];
+	=

+	core_number =3D package->children.size();
+
+	if (package->children.size() <=3D core_number)
+		package->children.resize(core_number + 1, NULL);
+
+	if (!package->children[core_number]) {
+		package->children[core_number] =3D new_i965_gpu();
+		package->childcount++;
+	}
+}
+
+
 void enumerate_cpus(void)
 {
 	ifstream file;
@@ -288,6 +318,9 @@ void enumerate_cpus(void)

 	file.close();

+	if (access("/sys/class/drm/card0/power/rc6_residency_ms", R_OK) =3D=3D 0)
+		handle_i965_gpu();
+
 	perf_events =3D new perf_power_bundle();

 	if (!perf_events->add_event("power:cpu_idle")){
diff --git a/src/cpu/intel_cpus.h b/src/cpu/intel_cpus.h
index b69c5c6..1949af1 100644
--- a/src/cpu/intel_cpus.h
+++ b/src/cpu/intel_cpus.h
@@ -137,3 +137,26 @@ public:


 extern int has_c2c7_res;
+
+class i965_core: public cpu_core
+{
+private:
+	uint64_t	rc6_before, rc6_after;
+	uint64_t	rc6p_before, rc6p_after;
+	uint64_t	rc6pp_before, rc6pp_after;
+	=

+	struct timeval	before;
+	struct timeval	after;
+
+public:
+	virtual void	measurement_start(void);
+	virtual void	measurement_end(void);
+	virtual int     can_collapse(void) { return 0;};
+
+	virtual char *  fill_pstate_line(int line_nr, char *buffer);
+	virtual char *  fill_pstate_name(int line_nr, char *buffer);
+	virtual char *  fill_cstate_line(int line_nr, char *buffer, const char *s=
eparator);
+	virtual int	has_pstate_level(int level) { return 0; };
+	virtual int	has_pstates(void) { return 0; };
+
+};
diff --git a/src/cpu/intel_gpu.cpp b/src/cpu/intel_gpu.cpp
new file mode 100644
index 0000000..6b6df6c
--- /dev/null
+++ b/src/cpu/intel_gpu.cpp
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2012, Intel Corporation
+ *
+ * This file is part of PowerTOP
+ *
+ * This program file is free software; you can redistribute it and/or modi=
fy it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WIT=
HOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program in a file named COPYING; if not, write to the
+ * Free Software Foundation, Inc,
+ * 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ * or just google for it.
+ *
+ * Authors:
+ *	Arjan van de Ven <arjan(a)linux.intel.com>
+ */
+#include "cpu.h"
+#include <iostream>
+#include <fstream>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/time.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include "../lib.h"
+#include "../parameters/parameters.h"
+#include "../display.h"
+
+void i965_core::measurement_start(void)
+{
+	ifstream file;
+
+	gettimeofday(&before, NULL);
+	rc6_before =3D read_sysfs("/sys/class/drm/card0/power/rc6_residency_ms", =
NULL);
+	rc6p_before =3D read_sysfs("/sys/class/drm/card0/power/rc6p_residency_ms"=
, NULL);
+	rc6pp_before =3D read_sysfs("/sys/class/drm/card0/power/rc6pp_residency_m=
s", NULL);
+
+	update_cstate("gpu c0", "Active", 0, 0, 1, 0);
+	update_cstate("gpu rc6", "RC6", 0, rc6_before, 1, 1);
+	update_cstate("gpu rc6p", "RC6p", 0, rc6p_before, 1, 2);
+	update_cstate("gpu rc6pp", "RC6pp", 0, rc6pp_before, 1, 3);
+}
+
+char * i965_core::fill_cstate_line(int line_nr, char *buffer, const char *=
separator)
+{
+	buffer[0] =3D 0;
+	double ratio, d =3D -1.0, time_delta;
+
+	if (line_nr =3D=3D LEVEL_HEADER) {
+		sprintf(buffer,_("  GPU "));
+		return buffer;
+	}
+
+	buffer[0] =3D 0;
+	=

+	time_delta  =3D 1000000 * (after.tv_sec - before.tv_sec) + after.tv_usec =
- before.tv_usec;
+	ratio =3D 100000.0/time_delta;
+
+	switch (line_nr) {	=

+	case 0:
+		d =3D 100.0 - ratio * (rc6_after + rc6p_after + rc6pp_after - rc6_before=
 - rc6p_before - rc6pp_before);
+		break;
+	case 1:
+		d =3D ratio * (rc6_after - rc6_before);
+		break;
+	case 2:
+		d =3D ratio * (rc6p_after - rc6p_before);
+		break;
+	case 3:
+		d =3D ratio * (rc6pp_after - rc6pp_before);
+		break;
+	default:
+		return buffer;
+	}
+		=

+	/* cope with rounding errors due to the measurement interval */
+	if (d < 0.0)
+		d =3D 0.0;
+	if (d > 100.0)
+		d =3D 100.0;
+	=

+	sprintf(buffer,"%5.1f%%", d);
+
+	return buffer;
+}
+
+
+void i965_core::measurement_end(void)
+{
+	gettimeofday(&after, NULL);
+
+	rc6_after =3D read_sysfs("/sys/class/drm/card0/power/rc6_residency_ms", N=
ULL);
+	rc6p_after =3D read_sysfs("/sys/class/drm/card0/power/rc6p_residency_ms",=
 NULL);
+	rc6pp_after =3D read_sysfs("/sys/class/drm/card0/power/rc6pp_residency_ms=
", NULL);
+}
+
+char * i965_core::fill_pstate_line(int line_nr, char *buffer)
+{
+	buffer[0] =3D 0;
+	return buffer;
+}
+
+char * i965_core::fill_pstate_name(int line_nr, char *buffer)
+{
+	buffer[0] =3D 0;
+	return buffer;
+}
+
-- =

1.7.7.6


--===============0933471905752621069==--