X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=metrics.c;h=5c5cd1b77585cf881260e75cfab023ed754102c4;hb=cc60267c8ddfcc6681106193294da2d8221160cf;hp=64f1dccd1af331a4d9eeece75362a96ac54a5023;hpb=2926b5a9207c28986f449a322761e4103f4c28e7;p=fips

diff --git a/metrics.c b/metrics.c
index 64f1dcc..5c5cd1b 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;
+	char *name;
+
+	GLuint num_counters;
+	GLuint max_active_counters;
+
 	GLuint *counters;
-} counter_group_info_t;
+	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->counters = xmalloc (group->num_counters * sizeof (GLuint));
+
+	glGetPerfMonitorCountersAMD (group->id, NULL, NULL,
+				     group->num_counters,
+				     group->counters);
+
+	/* 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->counters[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->counters[i],
+						  0, &length, NULL);
+
+		group->counter_names[i] = xmalloc (length + 1);
+
+		glGetPerfMonitorCounterStringAMD (group->id,
+						  group->counters[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->counters);
+
+	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;
+		metrics_group_info_init (&metrics_info->groups[i], i);
 
-		group = &metrics_info->groups[i];
-
-		group->id = 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 *
@@ -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];
@@ -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 *
@@ -328,42 +413,26 @@ accumulate_program_metrics (metrics_op_t op, GLuint *result, GLuint size)
 
 	while (p < ((unsigned char *) result) + size)
 	{
-		GLuint group_id, counter_id, counter_type;
+		GLuint group_id, 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);
+		assert (group_id < ctx->metrics_info.num_groups);
+		group = &ctx->metrics_info.groups[group_id];
 
-		/* 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 < group->num_counters; i++) {
+			if (group->counters[i] == counter_id)
+				break;
 		}
+		counter_index = i;
+		assert (counter_index < group->num_counters);
 
-		CONSUME (value);
-
-		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_id][counter_index] += value;
 	}
 }
 
@@ -392,10 +461,13 @@ time_compare(const void *in_a, const void *in_b, void *arg)
 }
 
 static void
-print_op_metrics (op_metrics_t *metric, double total)
+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;
+	unsigned i, group_id, counter;
+	double value;
 
 	/* Since we sparsely fill the array based on program
 	 * id, many "programs" have no time.
@@ -419,10 +491,15 @@ print_op_metrics (op_metrics_t *metric, double total)
 		metric->time_ns / total * 100);
 
 	printf ("[");
-	for (i = 0; i < metric->num_counters; i++) {
-		if (metric->counters[i] == 0.0)
-			continue;
-		printf ("%d: %.2f ms ", i, metric->counters[i] / 1e6);
+	for (group_id = 0; group_id < info->num_groups; group_id++) {
+		group = &info->groups[group_id];
+		for (counter = 0; counter < group->num_counters; counter++) {
+			value = metric->counters[group_id][counter];
+			if (value == 0.0)
+				continue;
+			printf ("%s: %.2f ", group->counter_names[counter],
+				value / 1e6);
+		}
 	}
 	printf ("]\n");
 }
@@ -447,7 +524,9 @@ print_program_metrics (void)
 		time_compare, ctx->op_metrics);
 
 	for (i = 0; i < ctx->num_op_metrics; i++)
-		print_op_metrics (&ctx->op_metrics[sorted[i]], total);
+		print_op_metrics (ctx, &ctx->op_metrics[sorted[i]], total);
+
+	free (sorted);
 }
 
 /* Called at program exit */
@@ -456,6 +535,8 @@ metrics_exit (void)
 {
 	if (verbose)
 		printf ("fips: terminating\n");
+
+	metrics_info_fini (&current_context.metrics_info);
 }
 
 
@@ -533,6 +614,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;