X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=metrics.c;h=3eb6319ecda18865c0cd770311fe6930dd9c4fdc;hb=f8ff428db9bedbbee44177fb8c476e4bf8742958;hp=0c776e7ebec5cdc1fe950588688b985ac36b9895;hpb=2760598732e9c373f3331d7d125b580a224bbbe3;p=fips

diff --git a/metrics.c b/metrics.c
index 0c776e7..3eb6319 100644
--- a/metrics.c
+++ b/metrics.c
@@ -58,23 +58,29 @@ typedef struct op_metrics
 	metrics_op_t op;
 	double time_ns;
 
-	double *counters;
-	unsigned num_counters;
+	double **counters;
 } op_metrics_t;
 
-typedef struct counter_group_info
+typedef struct metrics_group_info
 {
 	GLuint id;
-	GLint num_counters;
-	GLint max_active_counters;
-	GLuint *counters;
-} counter_group_info_t;
+	char *name;
+
+	GLuint num_counters;
+	GLuint max_active_counters;
+
+	GLuint *counter_ids;
+	char **counter_names;
+	GLuint *counter_types;
+
+} metrics_group_info_t;
 
 typedef struct metrics_info
 {
-	int num_groups;
-	int max_counters_per_group;
-	counter_group_info_t *groups;
+	int initialized;
+
+	unsigned num_groups;
+	metrics_group_info_t *groups;
 } metrics_info_t;
 
 typedef struct context
@@ -101,45 +107,121 @@ context_t current_context;
 int frames;
 int verbose;
 
+static void
+metrics_group_info_init (metrics_group_info_t *group, GLuint id)
+{
+	GLsizei length;
+	unsigned i;
+
+	group->id = id;
+
+	/* Get name */
+	glGetPerfMonitorGroupStringAMD (id, 0, &length, NULL);
+
+	group->name = xmalloc (length + 1);
+
+	glGetPerfMonitorGroupStringAMD (id, length + 1, NULL, group->name);
+
+	/* Get number of counters */
+	group->num_counters = 0;
+	group->max_active_counters = 0;
+	glGetPerfMonitorCountersAMD (group->id,
+				     (int *) &group->num_counters,
+				     (int *) &group->max_active_counters,
+				     0, NULL);
+
+	/* Get counter numbers */
+	group->counter_ids = xmalloc (group->num_counters * sizeof (GLuint));
+
+	glGetPerfMonitorCountersAMD (group->id, NULL, NULL,
+				     group->num_counters,
+				     group->counter_ids);
+
+	/* Get counter names */
+	group->counter_names = xmalloc (group->num_counters * sizeof (char *));
+	group->counter_types = xmalloc (group->num_counters * sizeof (GLuint));
+
+	for (i = 0; i < group->num_counters; i++) {
+		glGetPerfMonitorCounterInfoAMD (group->id,
+						group->counter_ids[i],
+						GL_COUNTER_TYPE_AMD,
+						&group->counter_types[i]);
+
+		/* We assume that all peformance counters are made
+		 * available as uint32 values. The code calling
+		 * CONSUME in accumulate_program_metrics will need to
+		 * be extended to accomodate other counter values. */
+		if (group->counter_types[i] != GL_UNSIGNED_INT) {
+			fprintf (stderr, "fips: Internal error: No support for non-uint counter values\n");
+			exit (1);
+		}
+
+		glGetPerfMonitorCounterStringAMD (group->id,
+						  group->counter_ids[i],
+						  0, &length, NULL);
+
+		group->counter_names[i] = xmalloc (length + 1);
+
+		glGetPerfMonitorCounterStringAMD (group->id,
+						  group->counter_ids[i],
+						  length + 1, NULL,
+						  group->counter_names[i]);
+	}
+}
+
+static void
+metrics_group_info_fini (metrics_group_info_t *group)
+{
+	unsigned i;
+
+	for (i = 0; i < group->num_counters; i++)
+		free (group->counter_names[i]);
+
+	free (group->counter_types);
+	free (group->counter_names);
+	free (group->counter_ids);
+
+	free (group->name);
+}
+
+static void
+metrics_info_fini (metrics_info_t *info);
+
 void
 metrics_info_init (void)
 {
-	int i;
+	unsigned i;
 	GLuint *group_ids;
 	metrics_info_t *metrics_info = &current_context.metrics_info;
 
-	glGetPerfMonitorGroupsAMD (&metrics_info->num_groups, 0, NULL);
+	if (metrics_info->initialized)
+		metrics_info_fini (metrics_info);
+
+	glGetPerfMonitorGroupsAMD ((int *) &metrics_info->num_groups, 0, NULL);
 
 	group_ids = xmalloc (metrics_info->num_groups * sizeof (GLuint));
 
 	glGetPerfMonitorGroupsAMD (NULL, metrics_info->num_groups, group_ids);
 
-	metrics_info->max_counters_per_group = 0;
-
-	metrics_info->groups = xmalloc (metrics_info->num_groups * sizeof (counter_group_info_t));
+	metrics_info->groups = xmalloc (metrics_info->num_groups * sizeof (metrics_group_info_t));
 
 	for (i = 0; i < metrics_info->num_groups; i++)
-	{
-		counter_group_info_t *group;
-
-		group = &metrics_info->groups[i];
-
-		group->id = group_ids[i];
+		metrics_group_info_init (&metrics_info->groups[i], group_ids[i]);
 
-		glGetPerfMonitorCountersAMD (group->id, &group->num_counters,
-					     &group->max_active_counters, 0, NULL);
+	free (group_ids);
 
-		group->counters = xmalloc (group->num_counters * sizeof (GLuint));
+	metrics_info->initialized = 1;
+}
 
-		glGetPerfMonitorCountersAMD (group->id, NULL, NULL,
-					     group->num_counters,
-					     group->counters);
+static void
+metrics_info_fini (metrics_info_t *info)
+{
+	unsigned i;
 
-		if (group->num_counters > metrics_info->max_counters_per_group)
-			metrics_info->max_counters_per_group = group->num_counters;
-	}
+	for (i = 0; i < info->num_groups; i++)
+		metrics_group_info_fini (&info->groups[i]);
 
-	free (group_ids);
+	free (info->groups);
 }
 
 static const char *
@@ -179,7 +261,7 @@ metrics_op_string (metrics_op_t op)
 	case METRICS_OP_TEX_IMAGE:
 		return "glTexImage*(+)";
 	default:
-		fprintf (stderr, "Internal error: "
+		fprintf (stderr, "fips: Internal error: "
 			 "Unknown metrics op value: %d\n", op);
 		exit (1);
 	}
@@ -193,7 +275,7 @@ metrics_counter_start (void)
 	context_t *ctx = &current_context;
 	timer_query_t *timer;
 	monitor_t *monitor;
-	int i;
+	unsigned i;
 
 	/* Create new timer query, add to list */
 	timer = xmalloc (sizeof (timer_query_t));
@@ -230,7 +312,7 @@ metrics_counter_start (void)
 
 	for (i = 0; i < ctx->metrics_info.num_groups; i++)
 	{
-		counter_group_info_t *group;
+		metrics_group_info_t *group;
 		int num_counters;
 
 		group = &ctx->metrics_info.groups[i];
@@ -248,7 +330,7 @@ metrics_counter_start (void)
 		glSelectPerfMonitorCountersAMD(monitor->id,
 					       GL_TRUE, group->id,
 					       num_counters,
-					       group->counters);
+					       group->counter_ids);
 	}
 
 	/* Start the queries */
@@ -280,16 +362,19 @@ static void
 op_metrics_init (context_t *ctx, op_metrics_t *metrics, metrics_op_t op)
 {
 	metrics_info_t *info = &ctx->metrics_info;
-	unsigned i;
+	unsigned i, j;
 
 	metrics->op = op;
 	metrics->time_ns = 0.0;
 
-	metrics->num_counters = info->num_groups * info->max_counters_per_group;
-	metrics->counters = xmalloc (sizeof(double) * metrics->num_counters);
+	metrics->counters = xmalloc (sizeof(double *) * info->num_groups);
 
-	for (i = 0; i < metrics->num_counters; i++)
-		metrics->counters[i] = 0.0;
+	for (i = 0; i < info->num_groups; i++) {
+		metrics->counters[i] = xmalloc (sizeof (double) *
+						info->groups[i].num_counters);
+		for (j = 0; j < info->groups[i].num_counters; j++)
+			metrics->counters[i][j] = 0.0;
+	}
 }
 
 static op_metrics_t *
@@ -324,46 +409,37 @@ accumulate_program_metrics (metrics_op_t op, GLuint *result, GLuint size)
 	p += sizeof(var);
 
 	context_t *ctx = &current_context;
+	metrics_info_t *info = &ctx->metrics_info;
 	unsigned char *p = (unsigned char *) result;
 
 	while (p < ((unsigned char *) result) + size)
 	{
-		GLuint group_id, counter_id, counter_type;
+		GLuint group_id, group_index;
+		GLuint counter_id, counter_index;
+		metrics_group_info_t *group;
 		uint32_t value;
 		unsigned i;
 
 		CONSUME (group_id);
 		CONSUME (counter_id);
+		CONSUME (value);
 
-		glGetPerfMonitorCounterInfoAMD (group_id, counter_id,
-						GL_COUNTER_TYPE_AMD,
-						&counter_type);
-
-		/* We assume that all peformance counters are made
-		 * available as uint32 values. This code can easily be
-		 * extended as needed. */
-		if (counter_type != GL_UNSIGNED_INT) {
-			fprintf (stderr, "Warning: Non-uint counter value. Ignoring remainder of results\n");
-			break;
+		for (i = 0; i < info->num_groups; i++) {
+			if (info->groups[i].id == i)
+				break;
 		}
+		group_index = i;
+		assert (group_index < info->num_groups);
+		group = &info->groups[group_index];
 
-		CONSUME (value);
+		for (i = 0; i < group->num_counters; i++) {
+			if (group->counter_ids[i] == counter_id)
+				break;
+		}
+		counter_index = i;
+		assert (counter_index < group->num_counters);
 
-		i = (group_id * ctx->metrics_info.max_counters_per_group +
-		     counter_id);
-
-		assert (i < ctx->op_metrics[op].num_counters);
-
-		/* FIXME: While I'm still occasionally getting bogus
-		 * numbers from the performance counters, I'm simply
-		 * going to discard anything larger than half the
-		 * range, (something that looks like a negative signed
-		 * quantity).
-		 */
-		if (((int32_t) value) < 0)
-			fprintf (stderr, ".");
-		else
-			ctx->op_metrics[op].counters[i] += value;
+		ctx->op_metrics[op].counters[group_index][counter_index] += value;
 	}
 }
 
@@ -391,13 +467,57 @@ time_compare(const void *in_a, const void *in_b, void *arg)
 	return 0;
 }
 
+static void
+print_op_metrics (context_t *ctx, op_metrics_t *metric, double total)
+{
+	metrics_info_t *info = &ctx->metrics_info;
+	metrics_group_info_t *group;
+	const char *op_string;
+	unsigned i, group_index, counter;
+	double value;
+
+	/* Since we sparsely fill the array based on program
+	 * id, many "programs" have no time.
+	 */
+	if (metric->time_ns == 0.0)
+		return;
+
+	op_string = metrics_op_string (metric->op);
+
+	printf ("%s", op_string);
+	if (metric->op >= METRICS_OP_SHADER) {
+		printf (" %d:", metric->op - METRICS_OP_SHADER);
+	} else {
+		printf (":");
+		for (i = strlen (op_string); i < 20; i++)
+			printf (" ");
+	}
+
+	printf ("\t%7.2f ms (% 2.1f%%)",
+		metric->time_ns / 1e6,
+		metric->time_ns / total * 100);
+
+	printf ("[");
+	for (group_index = 0; group_index < info->num_groups; group_index++) {
+		group = &info->groups[group_index];
+		for (counter = 0; counter < group->num_counters; counter++) {
+			value = metric->counters[group_index][counter];
+			if (value == 0.0)
+				continue;
+			printf ("%s: %.2f ", group->counter_names[counter],
+				value / 1e6);
+		}
+	}
+	printf ("]\n");
+}
+
 static void
 print_program_metrics (void)
 {
 	context_t *ctx = &current_context;
 	int *sorted; /* Sorted indices into the ctx->op_metrics */
 	double total = 0;
-	unsigned i, j;
+	unsigned i;
 
 	/* Make a sorted list of the operations by time used, and figure
 	 * out the total so we can print percentages.
@@ -410,37 +530,10 @@ print_program_metrics (void)
 	qsort_r(sorted, ctx->num_op_metrics, sizeof(*sorted),
 		time_compare, ctx->op_metrics);
 
-	for (i = 0; i < ctx->num_op_metrics; i++) {
-		const char *op_string;
-		op_metrics_t *metric =&ctx->op_metrics[sorted[i]];
-
-		/* Since we sparsely fill the array based on program
-		 * id, many "programs" have no time.
-		 */
-		if (metric->time_ns == 0.0)
-			continue;
-
-		op_string = metrics_op_string (metric->op);
-
-		printf ("%s", op_string);
-		if (metric->op >= METRICS_OP_SHADER) {
-			printf (" %d:", metric->op - METRICS_OP_SHADER);
-		} else {
-			printf (":");
-			for (j = strlen (op_string); j < 20; j++)
-				printf (" ");
-		}
-		printf ("\t%7.2f ms (% 2.1f%%)",
-			metric->time_ns / 1e6,
-			metric->time_ns / total * 100);
-		printf ("[");
-		for (j = 0; j < metric->num_counters; j++) {
-			if (metric->counters[j] == 0.0)
-				continue;
-			printf ("%d: %.2f ms ", j, metric->counters[j] / 1e6);
-		}
-		printf ("]\n");
-	}
+	for (i = 0; i < ctx->num_op_metrics; i++)
+		print_op_metrics (ctx, &ctx->op_metrics[sorted[i]], total);
+
+	free (sorted);
 }
 
 /* Called at program exit */
@@ -449,6 +542,8 @@ metrics_exit (void)
 {
 	if (verbose)
 		printf ("fips: terminating\n");
+
+	metrics_info_fini (&current_context.metrics_info);
 }
 
 
@@ -526,6 +621,8 @@ metrics_end_frame (void)
 
 		accumulate_program_metrics (monitor->op, result, result_size);
 
+		free (result);
+
 		current_context.monitor_head = monitor->next;
 		if (current_context.monitor_head == NULL)
 			current_context.monitor_tail = NULL;