Port intel_idle from 2D driver as intel_gpu_top with a better interface.

.gitignore

@@ -37,4 +37,5 @@ tests/gem_basic
 tests/gem_flink
 tests/gem_mmap
 tests/gem_readwrite
+tools/intel_gpu_top
 tools/intel_stepping

lib/Makefile.am

@@ -1,6 +1,8 @@
 libintel_tools_la_SOURCES = \
 	intel_batchbuffer.c \
 	intel_batchbuffer.h \
+	intel_gpu_tools.c \
+	intel_gpu_tools.h \
 	drmtest.c \
 	drmtest.h
 

lib/intel_gpu_tools.c

@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Eric Anholt <eric@anholt.net>
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <err.h>
+#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
+
+struct pci_device *pci_dev;
+uint32_t devid;
+void *mmio;
+
+void
+intel_get_mmio(void)
+{
+	int err;
+	int mmio_bar;
+
+	err = pci_system_init();
+	if (err != 0) {
+		fprintf(stderr, "Couldn't initialize PCI system: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	/* Grab the graphics card */
+	pci_dev = pci_device_find_by_slot(0, 0, 2, 0);
+	if (pci_dev == NULL)
+		errx(1, "Couldn't find graphics card");
+
+	err = pci_device_probe(pci_dev);
+	if (err != 0) {
+		fprintf(stderr, "Couldn't probe graphics card: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	if (pci_dev->vendor_id != 0x8086)
+		errx(1, "Graphics card is non-intel");
+	devid = pci_dev->device_id;
+
+	if (IS_9XX(devid))
+		mmio_bar = 0;
+	else
+		mmio_bar = 1;
+
+	err = pci_device_map_range (pci_dev,
+				    pci_dev->regions[mmio_bar].base_addr,
+				    pci_dev->regions[mmio_bar].size,
+				    PCI_DEV_MAP_FLAG_WRITABLE,
+				    &mmio);
+
+	if (err != 0) {
+		fprintf(stderr, "Couldn't map MMIO region: %s\n",
+			strerror(err));
+		exit(1);
+	}
+}

lib/intel_gpu_tools.h

@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Eric Anholt <eric@anholt.net>
+ *
+ */
+
+#include <sys/types.h>
+#include <pciaccess.h>
+#include "intel_chipset.h"
+#include "i810_reg.h"
+
+extern struct pci_device *pci_dev;
+extern uint32_t devid;
+extern void *mmio;
+
+static inline uint32_t
+INREG(uint32_t reg)
+{
+	return *(volatile uint32_t *)((volatile char *)mmio + reg);
+}
+
+void intel_get_mmio(void);

tools/Makefile.am

@@ -1,5 +1,8 @@
-bin_PROGRAMS = intel_stepping
+bin_PROGRAMS = \
+	intel_gpu_top \
+	intel_stepping
 
+intel_gpu_top_LDADD = ../lib/libintel_tools.la $(PCIACCESS_LIBS)
 intel_stepping_LDADD = $(PCIACCESS_LIBS)
 
 AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(WARN_CFLAGS) \

tools/intel_gpu_top.c

@@ -0,0 +1,165 @@
+/*
+ * Copyright © 2007 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Eric Anholt <eric@anholt.net>
+ *
+ */
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <err.h>
+#include "intel_gpu_tools.h"
+
+#define MAX_NUM_TOP_BITS	100
+
+struct top_bit {
+	/* initial setup */
+	uint32_t *reg;
+	uint32_t bit;
+	char *name;
+	void (*update)(struct top_bit *top_bit);
+
+	/* runtime */
+	int count;
+} top_bits[MAX_NUM_TOP_BITS];
+struct top_bit *top_bits_sorted[MAX_NUM_TOP_BITS];
+
+int num_top_bits;
+
+uint32_t instdone;
+
+static int
+top_bits_sort(const void *a, const void *b)
+{
+	struct top_bit * const *bit_a = a;
+	struct top_bit * const *bit_b = b;
+	int a_count = (*bit_a)->count;
+	int b_count = (*bit_b)->count;
+
+	if (a_count < b_count)
+		return 1;
+	else if (a_count == b_count)
+		return 0;
+	else
+		return -1;
+}
+
+static void
+update_idle_bit(struct top_bit *top_bit)
+{
+	if ((*top_bit->reg & top_bit->bit) == 0)
+		top_bit->count++;
+}
+
+static void
+add_instdone_bit(uint32_t bit, char *name)
+{
+	top_bits[num_top_bits].reg = &instdone;
+	top_bits[num_top_bits].bit = bit;
+	top_bits[num_top_bits].name = name;
+	top_bits[num_top_bits].update = update_idle_bit;
+	top_bits_sorted[num_top_bits] = &top_bits[num_top_bits];
+	num_top_bits++;
+}
+
+int main(int argc, char **argv)
+{
+	intel_get_mmio();
+
+	if (IS_965(devid)) {
+		add_instdone_bit(I965_SF_DONE, "Perspective interpolation");
+		add_instdone_bit(I965_SE_DONE, "Dispatcher");
+		add_instdone_bit(I965_WM_DONE, "Projection and LOD");
+		add_instdone_bit(I965_TEXTURE_FETCH_DONE, "Texture fetch");
+		add_instdone_bit(I965_SAMPLER_CACHE_DONE, "Sampler Cache");
+		add_instdone_bit(I965_FILTER_DONE, "Filtering");
+		add_instdone_bit(I965_PS_DONE, "Pixel shader");
+		add_instdone_bit(I965_CC_DONE, "Color calculator");
+		add_instdone_bit(I965_MAP_FILTER_DONE, "Map filter");
+		add_instdone_bit(I965_MAP_L2_IDLE, "Map L2");
+		add_instdone_bit(I965_CP_DONE, "CP");
+	} else if (IS_9XX(devid)) {
+		add_instdone_bit(IDCT_DONE, "IDCT");
+		add_instdone_bit(IQ_DONE, "IQ");
+		add_instdone_bit(PR_DONE, "PR");
+		add_instdone_bit(VLD_DONE, "VLD");
+		add_instdone_bit(IP_DONE, "Instruction parser");
+		add_instdone_bit(FBC_DONE, "Framebuffer Compression");
+		add_instdone_bit(BINNER_DONE, "Binner");
+		add_instdone_bit(SF_DONE, "Strips and fans");
+		add_instdone_bit(SE_DONE, "Setup engine");
+		add_instdone_bit(WM_DONE, "Windowizer");
+		add_instdone_bit(IZ_DONE, "Intermediate Z");
+		add_instdone_bit(PERSPECTIVE_INTERP_DONE, "Perspective interpolation");
+		add_instdone_bit(DISPATCHER_DONE, "Dispatcher");
+		add_instdone_bit(PROJECTION_DONE, "Projection and LOD");
+		add_instdone_bit(DEPENDENT_ADDRESS_DONE, "Dependent address calculation");
+		add_instdone_bit(TEXTURE_FETCH_DONE, "Texture fetch");
+		add_instdone_bit(TEXTURE_DECOMPRESS_DONE, "Texture decompression");
+		add_instdone_bit(SAMPLER_CACHE_DONE, "Sampler Cache");
+		add_instdone_bit(FILTER_DONE, "Filtering");
+		add_instdone_bit(BYPASS_FIFO_DONE, "Bypass FIFO");
+		add_instdone_bit(PS_DONE, "Pixel shader");
+		add_instdone_bit(CC_DONE, "Color calculator");
+		add_instdone_bit(MAP_FILTER_DONE, "Map filter");
+		add_instdone_bit(MAP_L2_IDLE, "Map L2");
+	}
+
+	for (;;) {
+		int i, j;
+		char clear_screen[] = {0x1b, '[', 'H',
+				       0x1b, '[', 'J',
+				       0x0};
+
+		for (i = 0; i < 100; i++) {
+			if (IS_965(devid))
+				instdone = INREG(INST_DONE_I965);
+			else
+				instdone = INREG(INST_DONE);
+
+			for (j = 0; j < num_top_bits; j++)
+				top_bits[j].update(&top_bits[j]);
+
+			usleep(10000);
+		}
+
+		qsort(top_bits_sorted, num_top_bits, sizeof(struct top_bit *),
+		      top_bits_sort);
+
+		printf(clear_screen);
+		printf("%30s  %s\n\n", "task", "percent busy");
+		for (i = 0; i < num_top_bits; i++) {
+			if (top_bits_sorted[i]->count == 0)
+				break;
+
+			printf("%30s: %d\n",
+			       top_bits_sorted[i]->name,
+			       top_bits_sorted[i]->count);
+
+			top_bits_sorted[i]->count = 0;
+		}
+	}
+
+	return 0;
+}