Add support for Intel GPU statistics

From 7bc1ffe1c7d6793bafb9a51d52f797bf51911097 Mon Sep 17 00:00:00 2001

src/cpu/cpu.cpp +18 -0

+	unsigned int core_number = 0;
+	class abstract_cpu *package;
+
+
+	package = system_level.children[0];
+	
+	core_number = package->children.size();
+
+	if (package->children.size() <= core_number)
+		package->children.resize(core_number + 1, NULL);
+
+	if (!package->children[core_number]) {
+		package->children[core_number] = new_i965_gpu();
+		package->childcount++;
+	}
+}
+
+
 void enumerate_cpus(void)
 {
 	ifstream file;

src/cpu/cpu.cpp +0 -0

 	perf_events = new perf_power_bundle();
 
 	if (!perf_events->add_event("power:cpu_idle")){

src/cpu/intel_cpus.h +23 -0

index b69c5c6..1949af1 100644
@@ -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 *separator);
+	virtual int	has_pstate_level(int level) { return 0; };
+	virtual int	has_pstates(void) { return 0; };
+
+};

src/cpu/intel_gpu.cpp new file +73 -0

new file mode 100644
index 0000000..77a7051
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2012, Intel Corporation
+ *
+ * This file is part of PowerTOP
+ *
+ * This program file is free software; you can redistribute it and/or modify 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 WITHOUT
+ * 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 = read_sysfs("/sys/class/drm/card0/power/rc6_residency_ms", NULL);
+	rc6p_before = read_sysfs("/sys/class/drm/card0/power/rc6p_residency_ms", NULL);
+	rc6pp_before = read_sysfs("/sys/class/drm/card0/power/rc6pp_residency_ms", 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] = 0;
+	double ratio, d = -1.0, time_delta;
+
+	if (line_nr == LEVEL_HEADER) {
+		sprintf(buffer,_("  GPU "));
+		return buffer;
+	}
+
+	buffer[0] = 0;
+	
+	time_delta  = 1000000 * (after.tv_sec - before.tv_sec) + after.tv_usec - before.tv_usec;
+	ratio = 100000.0/time_delta;
+	
+	if (line_nr == 0)

src/cpu/intel_gpu.cpp new file +33 -0

+	/* cope with rounding errors due to the measurement interval */
+	if (d < 0.0)
+		d = 0.0;
+	if (d > 100.0)
+		d = 100.0;
+	
+	sprintf(buffer,"%5.1f%%", d);
+
+	return buffer;
+}
+
+
+void i965_core::measurement_end(void)
+{
+	gettimeofday(&after, NULL);
+
+	rc6_after = read_sysfs("/sys/class/drm/card0/power/rc6_residency_ms", NULL);
+	rc6p_after = read_sysfs("/sys/class/drm/card0/power/rc6p_residency_ms", NULL);
+	rc6pp_after = read_sysfs("/sys/class/drm/card0/power/rc6pp_residency_ms", NULL);
+}
+
+char * i965_core::fill_pstate_line(int line_nr, char *buffer)
+{
+	buffer[0] = 0;
+	return buffer;
+}
+
+char * i965_core::fill_pstate_name(int line_nr, char *buffer)
+{
+	buffer[0] = 0;
+	return buffer;
+}
+

Signature · 6 lines

1.7.7.6

_______________________________________________
PowerTop mailing list
PowerTop(a)lists.01.org
https://lists.01.org/mailman/listinfo/powertop

src/cpu/cpu.cpp void enumerate_cpus(void) · line 328

Quoted 8 lines

src/cpu/cpu.cpp +7 -0

+	file.open("/sys/class/drm/card0/power/rc6_residency_ms",  ios::in);
+
+	if (file) {
+		handle_i965_gpu();
+		file.close();
+	}
+

side note: just wonder how much C++ stream with its heavy buffering, etc. is slower than stat(). I'll review and if it makes sense will probably prepare simple stat() wrapper to lib.cpp

src/cpu/intel_gpu.cpp line 83

Quoted 12 lines

src/cpu/intel_gpu.cpp new file +12 -0

+	
+	if (line_nr == 0)
+		d = 100.0 - ratio * (rc6_after + rc6p_after + rc6pp_after - rc6_before - rc6p_before - rc6pp_before);
+	if (line_nr == 1)
+		d = ratio * (rc6_after - rc6_before);
+	if (line_nr == 2)
+		d = ratio * (rc6p_after - rc6p_before);
+	if (line_nr == 3)
+		d = ratio * (rc6pp_after - rc6pp_before);
+	if (line_nr >= 4 || line_nr < 0)
+		return buffer;
+

small side note /* someone will do it anyway :-) */:
how about

	if (line_nr == 0)
		d = 100.0 - ratio * (rc6_after + rc6p_after + rc6pp_after - rc6_before - rc6p_before - rc6pp_before);
	else if (line_nr == 1)
		d = ratio * (rc6_after - rc6_before);
	else if (line_nr == 2)
		d = ratio * (rc6p_after - rc6p_before);
	else if (line_nr == 3)
		d = ratio * (rc6pp_after - rc6pp_before);
	else if (line_nr >= 4 || line_nr < 0)
		return buffer;

Quoted 12 lines

src/cpu/cpu.cpp void enumerate_cpus(void) · line 328

Quoted 8 lines

src/cpu/cpu.cpp +7 -0

+	file.open("/sys/class/drm/card0/power/rc6_residency_ms",  ios::in);
+
+	if (file) {
+		handle_i965_gpu();
+		file.close();
+	}
+

side note: just wonder how much C++ stream with its heavy buffering, etc. is slower than stat(). I'll review and if it makes sense will probably prepare simple stat() wrapper to lib.cpp

better to use access() than stat.

both have the fun of getting a bunch of low level system headers into C++ I'm sure that'll work most of the time, but for something as non-time critical as this I wonder how badly that is inviting trouble.

Quoted 16 lines

src/cpu/intel_gpu.cpp line 83

Quoted 12 lines

src/cpu/intel_gpu.cpp new file +12 -0

+	
+	if (line_nr == 0)
+		d = 100.0 - ratio * (rc6_after + rc6p_after + rc6pp_after - rc6_before - rc6p_before - rc6pp_before);
+	if (line_nr == 1)
+		d = ratio * (rc6_after - rc6_before);
+	if (line_nr == 2)
+		d = ratio * (rc6p_after - rc6p_before);
+	if (line_nr == 3)
+		d = ratio * (rc6pp_after - rc6pp_before);
+	if (line_nr >= 4 || line_nr < 0)
+		return buffer;
+

small side note /* someone will do it anyway :-) */:
how about

Quoted 10 lines

	if (line_nr == 0)
		d = 100.0 - ratio * (rc6_after + rc6p_after + rc6pp_after - rc6_before - rc6p_before - rc6pp_before);
	else if (line_nr == 1)
		d = ratio * (rc6_after - rc6_before);
	else if (line_nr == 2)
		d = ratio * (rc6p_after - rc6p_before);
	else if (line_nr == 3)
		d = ratio * (rc6pp_after - rc6pp_before);
	else if (line_nr >= 4 || line_nr < 0)
		return buffer;

well last time I looked at the disassembly for such a case, this generated worse code. I'll admit that that was about 2 gcc versions ago though.