]> git.cworth.org Git - fips/blobdiff - metrics.c
metrics: Move the create/fini/destroy functions to the top of file.
[fips] / metrics.c
index 6e81fae4714753608b454f6968d6ef56c147cecb..0a69e58bd88867b10f081661c34c17f23639d8ad 100644 (file)
--- a/metrics.c
+++ b/metrics.c
 #include "fips-dispatch-gl.h"
 
 #include "metrics.h"
+#include "context.h"
+#include "metrics-info.h"
 #include "xmalloc.h"
 
+int frames;
+int verbose;
+
+#define MAX_MONITORS_IN_FLIGHT 1000
+
 /* Timer query */
 typedef struct timer_query
 {
@@ -49,7 +56,6 @@ typedef struct monitor
        struct monitor *next;
 } monitor_t;
 
-
 typedef struct op_metrics
 {
        /* This happens to also be the index into the
@@ -61,48 +67,8 @@ typedef struct op_metrics
        double **counters;
 } op_metrics_t;
 
-typedef struct metrics_group_info
+struct metrics
 {
-       GLuint id;
-       char *name;
-
-       GLuint num_counters;
-       GLuint max_active_counters;
-
-       GLuint *counter_ids;
-       char **counter_names;
-       GLuint *counter_types;
-
-} metrics_group_info_t;
-
-typedef struct shader_stage_info
-{
-       char *name;
-
-       GLuint active_group_index;
-       GLuint active_counter_index;
-
-       GLuint stall_group_index;
-       GLuint stall_counter_index;
-
-} shader_stage_info_t;
-
-typedef struct metrics_info
-{
-       int initialized;
-
-       unsigned num_groups;
-       metrics_group_info_t *groups;
-
-       unsigned num_shader_stages;
-       shader_stage_info_t *stages;
-
-} metrics_info_t;
-
-typedef struct context
-{
-       metrics_info_t metrics_info;
-
        metrics_op_t op;
 
        /* GL_TIME_ELAPSED query for which glEndQuery has not yet
@@ -127,219 +93,49 @@ typedef struct context
 
        unsigned num_op_metrics;
        op_metrics_t *op_metrics;
-} context_t;
-
-/* FIXME: Need a map from integers to context objects and track the
- * current context with glXMakeContextCurrent, eglMakeCurrent, etc. */
-
-context_t current_context;
-
-int frames;
-int verbose;
-
-#define MAX_MONITORS_IN_FLIGHT 1000
-
-void
-metrics_collect_available (void);
-
-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]);
-
-               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);
-}
-
-/* A helper function, part of metrics_info_init below. */
+};
 
-typedef enum {
-       SHADER_ACTIVE,
-       SHADER_STALL
-} shader_phase_t;
-
-static void
-_add_shader_stage (metrics_info_t *info, const char *name,
-                  GLuint group_index, GLuint counter_index,
-                  shader_phase_t phase)
+metrics_t *
+metrics_create (void)
 {
-       shader_stage_info_t *stage;
-       char *stage_name, *space;
-       unsigned i;
+       metrics_t *metrics;
 
-       stage_name = xstrdup (name);
+       metrics = xmalloc (sizeof (metrics_t));
 
-       /* Terminate the stage name at the first space.
-        *
-        * This is valid for counter names such as:
-        *
-        *      "Vertex Shader Active Time"
-        * or
-        *      "Vertex Shader Stall Time - Core Stall"
-        */
-       space = strchr (stage_name, ' ');
-       if (space)
-               *space = '\0';
+       metrics->op = 0;
 
-       /* Look for an existing stage of the given name. */
-       stage = NULL;
+       metrics->timer_begun_id = 0;
 
-       for (i = 0; i < info->num_shader_stages; i++) {
-               if (strcmp (info->stages[i].name, stage_name) == 0) {
-                       stage = &info->stages[i];
-                       break;
-               }
-       }
+       metrics->timer_head = NULL;
+       metrics->timer_tail = NULL;
 
-       if (stage == NULL) {
-               info->num_shader_stages++;
-               info->stages = xrealloc (info->stages,
-                                        info->num_shader_stages *
-                                        sizeof (shader_stage_info_t));
-               stage = &info->stages[info->num_shader_stages - 1];
-               stage->name = xstrdup (stage_name);
-               stage->active_group_index = 0;
-               stage->active_counter_index = 0;
-               stage->stall_group_index = 0;
-               stage->stall_counter_index = 0;
-       }
+       metrics->monitor_begun_id = 0;
 
-       if (phase == SHADER_ACTIVE) {
-               stage->active_group_index = group_index;
-               stage->active_counter_index = counter_index;
-       } else {
-               stage->stall_group_index = group_index;
-               stage->stall_counter_index = counter_index;
-       }
+       metrics->monitor_head = NULL;
+       metrics->monitor_tail = NULL;
 
-       free (stage_name);
-}
+       metrics->monitors_in_flight = 0;
 
-void
-metrics_info_init (void)
-{
-       unsigned i, j;
-       GLuint *group_ids;
-       metrics_info_t *info = &current_context.metrics_info;
-
-       glGetPerfMonitorGroupsAMD ((int *) &info->num_groups, 0, NULL);
-
-       group_ids = xmalloc (info->num_groups * sizeof (GLuint));
-
-       glGetPerfMonitorGroupsAMD (NULL, info->num_groups, group_ids);
-
-       info->groups = xmalloc (info->num_groups * sizeof (metrics_group_info_t));
-
-       for (i = 0; i < info->num_groups; i++)
-               metrics_group_info_init (&info->groups[i], group_ids[i]);
-
-       free (group_ids);
-
-       /* Identify each shader stage (by looking at
-        * performance-counter names for specific patterns) and
-        * initialize structures referring to the corresponding
-        * counter numbers for each stage. */
-       info->num_shader_stages = 0;
-       info->stages = NULL;
-
-       for (i = 0; i < info->num_groups; i++) {
-               metrics_group_info_t *group = &info->groups[i];
-               for (j = 0; j < group->num_counters; j++) {
-                       char *name = group->counter_names[j];
-                       if (strstr (name, "Shader Active Time")) {
-                               _add_shader_stage (info, name, i, j,
-                                                  SHADER_ACTIVE);
-                       }
-                       if (strstr (name, "Shader Stall Time")) {
-                               _add_shader_stage (info, name, i, j,
-                                                  SHADER_STALL);
-                       }
-               }
-       }
+       metrics->num_op_metrics = 0;
+       metrics->op_metrics = NULL;
 
-       info->initialized = 1;
+       return metrics;
 }
 
 void
-metrics_info_fini (void)
+metrics_fini (metrics_t *metrics)
 {
-       context_t *ctx = &current_context;
-       metrics_info_t *info = &ctx->metrics_info;
-       unsigned i;
        timer_query_t *timer, *timer_next;
        monitor_t *monitor, *monitor_next;
 
-       if (! info->initialized)
-               return;
-
-       metrics_collect_available ();
-
-       if (ctx->timer_begun_id) {
+       /* Discard and cleanup any outstanding queries. */
+       if (metrics->timer_begun_id) {
                glEndQuery (GL_TIME_ELAPSED);
-               glDeleteQueries (1, &ctx->timer_begun_id);
-               ctx->timer_begun_id = 0;
+               glDeleteQueries (1, &metrics->timer_begun_id);
+               metrics->timer_begun_id = 0;
        }
 
-       for (timer = ctx->timer_head;
+       for (timer = metrics->timer_head;
             timer;
             timer = timer_next)
        {
@@ -347,16 +143,16 @@ metrics_info_fini (void)
                timer_next = timer->next;
                free (timer);
        }
-       ctx->timer_head = NULL;
-       ctx->timer_tail = NULL;
+       metrics->timer_head = NULL;
+       metrics->timer_tail = NULL;
 
-       if (ctx->monitor_begun_id) {
-               glEndPerfMonitorAMD (ctx->monitor_begun_id);
-               glDeletePerfMonitorsAMD (1, &ctx->monitor_begun_id);
-               ctx->monitor_begun_id = 0;
+       if (metrics->monitor_begun_id) {
+               glEndPerfMonitorAMD (metrics->monitor_begun_id);
+               glDeletePerfMonitorsAMD (1, &metrics->monitor_begun_id);
+               metrics->monitor_begun_id = 0;
        }
 
-       for (monitor = ctx->monitor_head;
+       for (monitor = metrics->monitor_head;
             monitor;
             monitor = monitor_next)
        {
@@ -364,24 +160,18 @@ metrics_info_fini (void)
                monitor_next = monitor->next;
                free (monitor);
        }
-       ctx->monitor_head = NULL;
-       ctx->monitor_tail = NULL;
+       metrics->monitor_head = NULL;
+       metrics->monitor_tail = NULL;
 
-       current_context.monitors_in_flight = 0;
-
-       for (i = 0; i < info->num_groups; i++)
-               metrics_group_info_fini (&info->groups[i]);
-
-       free (info->groups);
-       info->groups = NULL;
-
-       for (i = 0; i < info->num_shader_stages; i++)
-               free (info->stages[i].name);
+       metrics->monitors_in_flight = 0;
+}
 
-       free (info->stages);
-       info->stages = NULL;
+void
+metrics_destroy (metrics_t *metrics)
+{
+       metrics_fini (metrics);
 
-       info->initialized = 0;
+       free (metrics);
 }
 
 static const char *
@@ -432,13 +222,14 @@ metrics_op_string (metrics_op_t op)
 void
 metrics_counter_start (void)
 {
-       context_t *ctx = &current_context;
+       context_t *ctx = context_get_current ();
+       metrics_t *metrics = ctx->metrics;
        unsigned i;
 
        /* Initialize the timer_query and monitor objects */
-       glGenQueries (1, &ctx->timer_begun_id);
+       glGenQueries (1, &metrics->timer_begun_id);
 
-       glGenPerfMonitorsAMD (1, &ctx->monitor_begun_id);
+       glGenPerfMonitorsAMD (1, &metrics->monitor_begun_id);
 
        for (i = 0; i < ctx->metrics_info.num_groups; i++)
        {
@@ -457,81 +248,88 @@ metrics_counter_start (void)
 
                }
 
-               glSelectPerfMonitorCountersAMD(ctx->monitor_begun_id,
+               glSelectPerfMonitorCountersAMD(metrics->monitor_begun_id,
                                               GL_TRUE, group->id,
                                               num_counters,
                                               group->counter_ids);
        }
 
        /* Start the queries */
-       glBeginQuery (GL_TIME_ELAPSED, ctx->timer_begun_id);
+       glBeginQuery (GL_TIME_ELAPSED, metrics->timer_begun_id);
 
-       glBeginPerfMonitorAMD (ctx->monitor_begun_id);
+       glBeginPerfMonitorAMD (metrics->monitor_begun_id);
 }
 
 void
 metrics_counter_stop (void)
 {
-       context_t *ctx = &current_context;
+       context_t *ctx = context_get_current ();
+       metrics_t *metrics = ctx->metrics;
        timer_query_t *timer;
        monitor_t *monitor;
 
        /* Stop the current timer and monitor. */
        glEndQuery (GL_TIME_ELAPSED);
-       glEndPerfMonitorAMD (ctx->monitor_begun_id);
+       glEndPerfMonitorAMD (metrics->monitor_begun_id);
 
        /* Add these IDs to our lists of outstanding queries and
         * monitors so the results can be collected later. */
        timer = xmalloc (sizeof (timer_query_t));
 
-       timer->op = ctx->op;
-       timer->id = ctx->timer_begun_id;
+       timer->op = metrics->op;
+       timer->id = metrics->timer_begun_id;
        timer->next = NULL;
 
-       if (ctx->timer_tail) {
-               ctx->timer_tail->next = timer;
-               ctx->timer_tail = timer;
+       if (metrics->timer_tail) {
+               metrics->timer_tail->next = timer;
+               metrics->timer_tail = timer;
        } else {
-               ctx->timer_tail = timer;
-               ctx->timer_head = timer;
+               metrics->timer_tail = timer;
+               metrics->timer_head = timer;
        }
 
        /* Create a new performance-monitor query */
        monitor = xmalloc (sizeof (monitor_t));
 
-       monitor->op = ctx->op;
-       monitor->id = ctx->monitor_begun_id;
+       monitor->op = metrics->op;
+       monitor->id = metrics->monitor_begun_id;
        monitor->next = NULL;
 
-       if (ctx->monitor_tail) {
-               ctx->monitor_tail->next = monitor;
-               ctx->monitor_tail = monitor;
+       if (metrics->monitor_tail) {
+               metrics->monitor_tail->next = monitor;
+               metrics->monitor_tail = monitor;
        } else {
-               ctx->monitor_tail = monitor;
-               ctx->monitor_head = monitor;
+               metrics->monitor_tail = monitor;
+               metrics->monitor_head = monitor;
        }
 
-       ctx->monitors_in_flight++;
+       metrics->monitors_in_flight++;
 
        /* Avoid being a resource hog and collect outstanding results
         * once we have sent off a large number of
         * queries. (Presumably, many of the outstanding queries are
         * available by now.)
         */
-       if (ctx->monitors_in_flight > MAX_MONITORS_IN_FLIGHT)
+       if (metrics->monitors_in_flight > MAX_MONITORS_IN_FLIGHT)
                metrics_collect_available ();
 }
 
 void
 metrics_set_current_op (metrics_op_t op)
 {
-       current_context.op = op;
+       context_t *ctx = context_get_current ();
+       metrics_t *metrics = ctx->metrics;
+
+       metrics->op = op;
 }
 
 metrics_op_t
 metrics_get_current_op (void)
 {
-       return current_context.op;
+       context_t *ctx = context_get_current ();
+       metrics_t *metrics = ctx->metrics;
+
+       return metrics->op;
 }
 
 static void
@@ -556,19 +354,20 @@ op_metrics_init (context_t *ctx, op_metrics_t *metrics, metrics_op_t op)
 static op_metrics_t *
 ctx_get_op_metrics (context_t *ctx, metrics_op_t op)
 {
+       metrics_t *metrics = ctx->metrics;
        unsigned i;
 
-       if (op >= ctx->num_op_metrics)
+       if (op >= metrics->num_op_metrics)
        {
-               ctx->op_metrics = realloc (ctx->op_metrics,
-                                          (op + 1) * sizeof (op_metrics_t));
-               for (i = ctx->num_op_metrics; i < op + 1; i++)
-                       op_metrics_init (ctx, &ctx->op_metrics[i], i);
+               metrics->op_metrics = realloc (metrics->op_metrics,
+                                              (op + 1) * sizeof (op_metrics_t));
+               for (i = metrics->num_op_metrics; i < op + 1; i++)
+                       op_metrics_init (ctx, &metrics->op_metrics[i], i);
 
-               ctx->num_op_metrics = op + 1;
+               metrics->num_op_metrics = op + 1;
        }
 
-       return &ctx->op_metrics[op];
+       return &metrics->op_metrics[op];
 }
 
 static void
@@ -584,7 +383,7 @@ accumulate_program_metrics (metrics_op_t op, GLuint *result, GLuint size)
        (var) = *((typeof(var) *) p);                                   \
        p += sizeof(var);
 
-       context_t *ctx = &current_context;
+       context_t *ctx = context_get_current ();
        metrics_info_t *info = &ctx->metrics_info;
        op_metrics_t *metrics = ctx_get_op_metrics (ctx, op);
        unsigned char *p = (unsigned char *) result;
@@ -647,9 +446,10 @@ accumulate_program_metrics (metrics_op_t op, GLuint *result, GLuint size)
 static void
 accumulate_program_time (metrics_op_t op, unsigned time_ns)
 {
+       context_t *ctx = context_get_current ();
        op_metrics_t *metrics;
 
-       metrics = ctx_get_op_metrics (&current_context, op);
+       metrics = ctx_get_op_metrics (ctx, op);
 
        metrics->time_ns += time_ns;
 }
@@ -774,7 +574,8 @@ time_compare(const void *in_a, const void *in_b, void *arg unused)
 static void
 print_program_metrics (void)
 {
-       context_t *ctx = &current_context;
+       context_t *ctx = context_get_current ();
+       metrics_t *metrics = ctx->metrics;
        metrics_info_t *info = &ctx->metrics_info;
        unsigned num_shader_stages = info->num_shader_stages;
        per_stage_metrics_t *sorted, *per_stage;
@@ -786,15 +587,15 @@ print_program_metrics (void)
        /* Make a sorted list of the per-stage operations by time
         * used, and figure out the total so we can print percentages.
         */
-       num_sorted = ctx->num_op_metrics * num_shader_stages;
+       num_sorted = metrics->num_op_metrics * num_shader_stages;
 
        sorted = xmalloc (sizeof (*sorted) * num_sorted);
 
        total_time = 0.0;
 
-       for (i = 0; i < ctx->num_op_metrics; i++) {
+       for (i = 0; i < metrics->num_op_metrics; i++) {
 
-               op = &ctx->op_metrics[i];
+               op = &metrics->op_metrics[i];
 
                /* Accumulate total time across all ops. */
                total_time += op->time_ns;
@@ -859,7 +660,7 @@ print_program_metrics (void)
        }
 
        qsort_r (sorted, num_sorted, sizeof (*sorted),
-                time_compare, ctx->op_metrics);
+                time_compare, metrics->op_metrics);
 
        for (i = 0; i < num_sorted; i++)
                print_per_stage_metrics (ctx, &sorted[i], total_time);
@@ -876,9 +677,10 @@ print_program_metrics (void)
 static void
 metrics_exit (void)
 {
-       context_t *ctx = &current_context;
+       context_t *ctx = context_get_current ();
+       metrics_t *metrics = ctx->metrics;
        metrics_info_t *info = &ctx->metrics_info;
-       unsigned i;
+       unsigned i, j;
        timer_query_t *timer, *timer_next;
        monitor_t *monitor, *monitor_next;
 
@@ -888,7 +690,7 @@ metrics_exit (void)
        if (! info->initialized)
                return;
 
-       for (timer = ctx->timer_head;
+       for (timer = metrics->timer_head;
             timer;
             timer = timer_next)
        {
@@ -896,7 +698,7 @@ metrics_exit (void)
                free (timer);
        }
 
-       for (monitor = ctx->monitor_head;
+       for (monitor = metrics->monitor_head;
             monitor;
             monitor = monitor_next)
        {
@@ -904,8 +706,18 @@ metrics_exit (void)
                free (monitor);
        }
 
-       for (i = 0; i < info->num_groups; i++)
-               metrics_group_info_fini (&info->groups[i]);
+       for (i = 0; i < info->num_groups; i++) {
+               metrics_group_info_t *group = &info->groups[i];
+
+               for (j = 0; j < group->num_counters; i++)
+                       free (group->counter_names[j]);
+
+               free (group->counter_types);
+               free (group->counter_names);
+               free (group->counter_ids);
+
+               free (group->name);
+       }
 
        free (info->groups);
 
@@ -918,10 +730,11 @@ metrics_exit (void)
 void
 metrics_collect_available (void)
 {
-       context_t *ctx = &current_context;
+       context_t *ctx = context_get_current ();
+       metrics_t *metrics = ctx->metrics;
 
        /* Consume all timer queries that are ready. */
-       timer_query_t *timer = ctx->timer_head;
+       timer_query_t *timer = metrics->timer_head;
 
        while (timer) {
                GLuint available, elapsed;
@@ -936,18 +749,18 @@ metrics_collect_available (void)
 
                accumulate_program_time (timer->op, elapsed);
 
-               ctx->timer_head = timer->next;
-               if (ctx->timer_head == NULL)
-                       ctx->timer_tail = NULL;
+               metrics->timer_head = timer->next;
+               if (metrics->timer_head == NULL)
+                       metrics->timer_tail = NULL;
 
                glDeleteQueries (1, &timer->id);
 
                free (timer);
-               timer = ctx->timer_head;
+               timer = metrics->timer_head;
        }
 
        /* And similarly for all performance monitors that are ready. */
-       monitor_t *monitor = ctx->monitor_head;
+       monitor_t *monitor = metrics->monitor_head;
 
        while (monitor) {
                GLuint available, result_size, *result;
@@ -976,17 +789,17 @@ metrics_collect_available (void)
 
                free (result);
 
-               ctx->monitor_head = monitor->next;
-               if (ctx->monitor_head == NULL)
-                       ctx->monitor_tail = NULL;
+               metrics->monitor_head = monitor->next;
+               if (metrics->monitor_head == NULL)
+                       metrics->monitor_tail = NULL;
 
                glDeletePerfMonitorsAMD (1, &monitor->id);
 
                free (monitor);
 
-               ctx->monitors_in_flight--;
+               metrics->monitors_in_flight--;
 
-               monitor = ctx->monitor_head;
+               monitor = metrics->monitor_head;
        }
 }