]> git.cworth.org Git - fips/blobdiff - metrics.c
Add a pointer to metrics_info_t from metrics_t
[fips] / metrics.c
index 3f7f484131ef5d60e45a61545281ba1944772150..47df1e0cf4a7071f5186b24c04cf95898da92311 100644 (file)
--- a/metrics.c
+++ b/metrics.c
@@ -38,6 +38,149 @@ int verbose;
 
 #define MAX_MONITORS_IN_FLIGHT 1000
 
+/* Timer query */
+typedef struct timer_query
+{
+       unsigned id;
+
+       metrics_op_t op;
+       struct timer_query *next;
+} timer_query_t;
+
+/* Performance-monitor query */
+typedef struct monitor
+{
+       unsigned id;
+
+       metrics_op_t op;
+       struct monitor *next;
+} monitor_t;
+
+typedef struct op_metrics
+{
+       /* This happens to also be the index into the
+        * ctx->op_metrics array currently
+        */
+       metrics_op_t op;
+       double time_ns;
+
+       double **counters;
+} op_metrics_t;
+
+struct metrics
+{
+       /* Description of all available peformance counters, counter
+        * groups, their names and IDs, etc. */
+       metrics_info_t *info;
+
+       /* The current operation being measured. */
+       metrics_op_t op;
+
+       /* GL_TIME_ELAPSED query for which glEndQuery has not yet
+        * been called. */
+       unsigned timer_begun_id;
+
+       /* GL_TIME_ELAPSED queries for which glEndQuery has been
+        * called, (but results have not yet been queried). */
+       timer_query_t *timer_head;
+       timer_query_t *timer_tail;
+
+       /* Performance monitor for which glEndPerfMonitorAMD has not
+        * yet been called. */
+       unsigned monitor_begun_id;
+
+       /* Performance monitors for which glEndPerfMonitorAMD has
+        * been called, (but results have not yet been queried). */
+       monitor_t *monitor_head;
+       monitor_t *monitor_tail;
+
+       int monitors_in_flight;
+
+       unsigned num_op_metrics;
+       op_metrics_t *op_metrics;
+};
+
+metrics_t *
+metrics_create (metrics_info_t *info)
+{
+       metrics_t *metrics;
+
+       metrics = xmalloc (sizeof (metrics_t));
+
+       metrics->info = info;
+
+       metrics->op = 0;
+
+       metrics->timer_begun_id = 0;
+
+       metrics->timer_head = NULL;
+       metrics->timer_tail = NULL;
+
+       metrics->monitor_begun_id = 0;
+
+       metrics->monitor_head = NULL;
+       metrics->monitor_tail = NULL;
+
+       metrics->monitors_in_flight = 0;
+
+       metrics->num_op_metrics = 0;
+       metrics->op_metrics = NULL;
+
+       return metrics;
+}
+
+void
+metrics_fini (metrics_t *metrics)
+{
+       timer_query_t *timer, *timer_next;
+       monitor_t *monitor, *monitor_next;
+
+       /* Discard and cleanup any outstanding queries. */
+       if (metrics->timer_begun_id) {
+               glEndQuery (GL_TIME_ELAPSED);
+               glDeleteQueries (1, &metrics->timer_begun_id);
+               metrics->timer_begun_id = 0;
+       }
+
+       for (timer = metrics->timer_head;
+            timer;
+            timer = timer_next)
+       {
+               glDeleteQueries (1, &timer->id);
+               timer_next = timer->next;
+               free (timer);
+       }
+       metrics->timer_head = NULL;
+       metrics->timer_tail = NULL;
+
+       if (metrics->monitor_begun_id) {
+               glEndPerfMonitorAMD (metrics->monitor_begun_id);
+               glDeletePerfMonitorsAMD (1, &metrics->monitor_begun_id);
+               metrics->monitor_begun_id = 0;
+       }
+
+       for (monitor = metrics->monitor_head;
+            monitor;
+            monitor = monitor_next)
+       {
+               glDeletePerfMonitorsAMD (1, &monitor->id);
+               monitor_next = monitor->next;
+               free (monitor);
+       }
+       metrics->monitor_head = NULL;
+       metrics->monitor_tail = NULL;
+
+       metrics->monitors_in_flight = 0;
+}
+
+void
+metrics_destroy (metrics_t *metrics)
+{
+       metrics_fini (metrics);
+
+       free (metrics);
+}
+
 static const char *
 metrics_op_string (metrics_op_t op)
 {
@@ -87,7 +230,7 @@ void
 metrics_counter_start (void)
 {
        context_t *ctx = context_get_current ();
-       metrics_t *metrics = &ctx->metrics;
+       metrics_t *metrics = ctx->metrics;
        unsigned i;
 
        /* Initialize the timer_query and monitor objects */
@@ -95,12 +238,12 @@ metrics_counter_start (void)
 
        glGenPerfMonitorsAMD (1, &metrics->monitor_begun_id);
 
-       for (i = 0; i < ctx->metrics_info.num_groups; i++)
+       for (i = 0; i < metrics->info->num_groups; i++)
        {
                metrics_group_info_t *group;
                int num_counters;
 
-               group = &ctx->metrics_info.groups[i];
+               group = &metrics->info->groups[i];
 
                num_counters = group->num_counters;
                if (group->max_active_counters < group->num_counters)
@@ -128,7 +271,7 @@ void
 metrics_counter_stop (void)
 {
        context_t *ctx = context_get_current ();
-       metrics_t *metrics = &ctx->metrics;
+       metrics_t *metrics = ctx->metrics;
        timer_query_t *timer;
        monitor_t *monitor;
 
@@ -182,7 +325,7 @@ void
 metrics_set_current_op (metrics_op_t op)
 {
        context_t *ctx = context_get_current ();
-       metrics_t *metrics = &ctx->metrics;
+       metrics_t *metrics = ctx->metrics;
 
        metrics->op = op;
 }
@@ -191,7 +334,7 @@ metrics_op_t
 metrics_get_current_op (void)
 {
        context_t *ctx = context_get_current ();
-       metrics_t *metrics = &ctx->metrics;
+       metrics_t *metrics = ctx->metrics;
 
        return metrics->op;
 }
@@ -199,7 +342,7 @@ metrics_get_current_op (void)
 static void
 op_metrics_init (context_t *ctx, op_metrics_t *metrics, metrics_op_t op)
 {
-       metrics_info_t *info = &ctx->metrics_info;
+       metrics_info_t *info = ctx->metrics->info;
        unsigned i, j;
 
        metrics->op = op;
@@ -218,7 +361,7 @@ 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;
+       metrics_t *metrics = ctx->metrics;
        unsigned i;
 
        if (op >= metrics->num_op_metrics)
@@ -248,7 +391,7 @@ accumulate_program_metrics (metrics_op_t op, GLuint *result, GLuint size)
        p += sizeof(var);
 
        context_t *ctx = context_get_current ();
-       metrics_info_t *info = &ctx->metrics_info;
+       metrics_info_t *info = ctx->metrics->info;
        op_metrics_t *metrics = ctx_get_op_metrics (ctx, op);
        unsigned char *p = (unsigned char *) result;
 
@@ -358,7 +501,7 @@ print_per_stage_metrics (context_t *ctx,
                         per_stage_metrics_t *per_stage,
                         double total)
 {
-       metrics_info_t *info = &ctx->metrics_info;
+       metrics_info_t *info = ctx->metrics->info;
        op_metrics_t *metric = per_stage->metrics;
        metrics_group_info_t *group;
        const char *op_string;
@@ -439,8 +582,8 @@ static void
 print_program_metrics (void)
 {
        context_t *ctx = context_get_current ();
-       metrics_t *metrics = &ctx->metrics;
-       metrics_info_t *info = &ctx->metrics_info;
+       metrics_t *metrics = ctx->metrics;
+       metrics_info_t *info = metrics->info;
        unsigned num_shader_stages = info->num_shader_stages;
        per_stage_metrics_t *sorted, *per_stage;
        double total_time, op_cycles;
@@ -542,8 +685,8 @@ static void
 metrics_exit (void)
 {
        context_t *ctx = context_get_current ();
-       metrics_t *metrics = &ctx->metrics;
-       metrics_info_t *info = &ctx->metrics_info;
+       metrics_t *metrics = ctx->metrics;
+       metrics_info_t *info = metrics->info;
        unsigned i, j;
        timer_query_t *timer, *timer_next;
        monitor_t *monitor, *monitor_next;
@@ -595,7 +738,7 @@ void
 metrics_collect_available (void)
 {
        context_t *ctx = context_get_current ();
-       metrics_t *metrics = &ctx->metrics;
+       metrics_t *metrics = ctx->metrics;
 
        /* Consume all timer queries that are ready. */
        timer_query_t *timer = metrics->timer_head;
@@ -699,74 +842,3 @@ metrics_end_frame (void)
                print_program_metrics ();
        }
 }
-
-void
-metrics_init (metrics_t *metrics)
-{
-       metrics->op = 0;
-
-       metrics->timer_begun_id = 0;
-
-       metrics->timer_head = NULL;
-       metrics->timer_tail = NULL;
-
-       metrics->monitor_begun_id = 0;
-
-       metrics->monitor_head = NULL;
-       metrics->monitor_tail = NULL;
-
-       metrics->monitors_in_flight = 0;
-
-       metrics->num_op_metrics = 0;
-       metrics->op_metrics = NULL;
-}
-
-void
-metrics_fini (metrics_t *metrics)
-{
-       timer_query_t *timer, *timer_next;
-       monitor_t *monitor, *monitor_next;
-
-       /* Since these metrics are going away, let's first collect
-        * whatever results might already be available. */
-       metrics_collect_available ();
-
-       /* If, after collection, any queries are still outstanding,
-        * just give up and clean them up. */
-       if (metrics->timer_begun_id) {
-               glEndQuery (GL_TIME_ELAPSED);
-               glDeleteQueries (1, &metrics->timer_begun_id);
-               metrics->timer_begun_id = 0;
-       }
-
-       for (timer = metrics->timer_head;
-            timer;
-            timer = timer_next)
-       {
-               glDeleteQueries (1, &timer->id);
-               timer_next = timer->next;
-               free (timer);
-       }
-       metrics->timer_head = NULL;
-       metrics->timer_tail = NULL;
-
-       if (metrics->monitor_begun_id) {
-               glEndPerfMonitorAMD (metrics->monitor_begun_id);
-               glDeletePerfMonitorsAMD (1, &metrics->monitor_begun_id);
-               metrics->monitor_begun_id = 0;
-       }
-
-       for (monitor = metrics->monitor_head;
-            monitor;
-            monitor = monitor_next)
-       {
-               glDeletePerfMonitorsAMD (1, &monitor->id);
-               monitor_next = monitor->next;
-               free (monitor);
-       }
-       metrics->monitor_head = NULL;
-       metrics->monitor_tail = NULL;
-
-       metrics->monitors_in_flight = 0;
-
-}