X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=metrics.c;h=ad7ea3a330cc27b6354e13a8070209b0b406bd13;hb=refs%2Fheads%2Fframe-timings;hp=2fe2dc7c9ba875b08eb239c432799f21997f190f;hpb=d9086ea8efecea9efbcd46a68eb96a68ce88543b;p=fips diff --git a/metrics.c b/metrics.c index 2fe2dc7..ad7ea3a 100644 --- a/metrics.c +++ b/metrics.c @@ -26,7 +26,10 @@ #include #include #include +#include #include +#include +#include #include "fips-dispatch-gl.h" @@ -71,6 +74,9 @@ typedef struct op_metrics struct metrics { + /* Flag to indicate first frame is being processed. */ + bool first_frame; + /* Description of all available peformance counters, counter * groups, their names and IDs, etc. */ metrics_info_t *info; @@ -105,8 +111,33 @@ struct metrics GLint64 swap_begin_timestamp; unsigned swap_end_timestamp_id; GLint64 previous_swap_end_timestamp; + + struct timespec previous_cpu_time_ts; + struct timespec cpu_time_ts; }; +/* Return (a - b) while accounting for the fact that between a and b, + * the counter may have wrapped around (with a maximum number of bits + * in the counter of GL_QUERY_COUNTER_BITS). */ +static uint64_t +subtract_timestamp (uint64_t a, uint64_t b) +{ + GLint timestamp_bits; + + glGetQueryiv (GL_TIMESTAMP, GL_QUERY_COUNTER_BITS, ×tamp_bits); + + /* Note: "<<" isn't defined for the number of bits in the + * type, and the compiler will punish you. + */ + if (timestamp_bits == 64) + return a - b; + + if (b > a) + return (1ull << timestamp_bits) + a - b; + else + return a - b; +} + metrics_t * metrics_create (metrics_info_t *info) { @@ -116,6 +147,8 @@ metrics_create (metrics_info_t *info) metrics->info = info; + metrics->first_frame = true; + metrics->op = 0; metrics->timer_begun_id = 0; @@ -138,6 +171,9 @@ metrics_create (metrics_info_t *info) /* Get the first frame timestamp started immediately. */ glQueryCounter (metrics->swap_end_timestamp_id, GL_TIMESTAMP); + /* As well as the initial CPU time. */ + clock_gettime (CLOCK_PROCESS_CPUTIME_ID, &metrics->cpu_time_ts); + return metrics; } @@ -149,7 +185,6 @@ metrics_fini (metrics_t *metrics) /* 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; } @@ -168,7 +203,6 @@ metrics_fini (metrics_t *metrics) if (metrics->info->have_perfmon) { if (metrics->monitor_begun_id) { - glEndPerfMonitorAMD (metrics->monitor_begun_id); glDeletePerfMonitorsAMD (1, &metrics->monitor_begun_id); metrics->monitor_begun_id = 0; } @@ -403,6 +437,7 @@ accumulate_program_metrics (metrics_t *metrics, metrics_op_t op, { \ fprintf (stderr, "Unexpected end-of-buffer while " \ "parsing results\n"); \ + value = 0.0; \ break; \ } \ (var) = *((typeof(var) *) p); \ @@ -523,6 +558,7 @@ print_per_stage_metrics (metrics_t *metrics, const char *op_string; unsigned group_index, counter; double value; + int program_name_length = 0; /* Don't print anything for stages with no alloted time. */ if (per_stage->time_ns == 0.0) @@ -530,13 +566,29 @@ print_per_stage_metrics (metrics_t *metrics, op_string = metrics_op_string (op_metrics->op); - printf ("%21s", op_string); - if (op_metrics->op >= METRICS_OP_SHADER) { - printf (" %3d", op_metrics->op - METRICS_OP_SHADER); - } else { - printf (" "); + int program = op_metrics->op - METRICS_OP_SHADER; + glGetObjectLabel (GL_PROGRAM, program, 0, + &program_name_length, NULL); + if (program_name_length) { + char *program_name; + + program_name = malloc(program_name_length + 1); + if (program_name == 0) { + fprintf (stderr, "Out of memory.\n"); + exit (1); + } + glGetObjectLabel (GL_PROGRAM, program, + program_name_length + 1, + NULL, program_name); + printf ("%21s ", program_name); + } else { + printf ("%21s %3d", op_string, program); + } + } + else { + printf ("%21s ", op_string); } if (per_stage->stage) @@ -787,10 +839,15 @@ metrics_collect_available (metrics_t *metrics) } } +/* Subtract timespec values: Return (a - b) in seconds as a double. */ +#define SUBTRACT_TIMESPEC(a, b) (double) (a.tv_sec - b.tv_sec + \ + (a.tv_nsec - b.tv_nsec) / 1e9) + void metrics_end_frame_pre_swap (metrics_t *metrics) { GLuint64 swap_end_timestamp, frame_time_ns, latency_ns; + double cpu_time; /* Don't leave any counters running over the end_frame work we * do here. The counters will be started again at the end of @@ -815,25 +872,36 @@ metrics_end_frame_pre_swap (metrics_t *metrics) glGetQueryObjectui64v (metrics->swap_end_timestamp_id, GL_QUERY_RESULT, &swap_end_timestamp); + + if (metrics->first_frame) { + /* Print header */ + printf ("# frame: Frame_Number Frame_Time_milliseconds Frame_latency_milliseconds CPU_load GPU_load\n"); - if (frames > 0) { - /* Subtract previous frame's timestamp to get frame time. */ - frame_time_ns = swap_end_timestamp - metrics->previous_swap_end_timestamp; + metrics->first_frame = false; + } else { + /* Subtract previous frame's times to get frame times. */ + frame_time_ns = subtract_timestamp (swap_end_timestamp, + metrics->previous_swap_end_timestamp); - latency_ns = swap_end_timestamp - metrics->swap_begin_timestamp; + latency_ns = subtract_timestamp (swap_end_timestamp, + metrics->swap_begin_timestamp); + + cpu_time = SUBTRACT_TIMESPEC (metrics->cpu_time_ts, + metrics->previous_cpu_time_ts); /* We've waited one frame to ensure we have a timestamp * result. So the time we've actually measured here is * for the previous frame. */ - printf ("frame-time: %d %" PRId64 "\n", - frames - 1, frame_time_ns); - - printf ("frame-latency: %d %" PRId64 "\n", - frames - 1, latency_ns); - + printf ("frame: %d %g %g %g %g\n", + frames - 1, + (double) frame_time_ns / 1e6, + (double) latency_ns / 1e6, + cpu_time / (frame_time_ns / 1e9), + 0.0); } metrics->previous_swap_end_timestamp = swap_end_timestamp; + metrics->previous_cpu_time_ts = metrics->cpu_time_ts; /* Before the actual swap call, we get the current timestamp * value. This is a synchronous get so we can use this as the @@ -847,6 +915,7 @@ metrics_end_frame_post_swap (metrics_t *metrics) { static int initialized = 0; static struct timeval tv_start, tv_now; + int err; /* Now that the swap command has been queued, we issue an * asynchronous query of the timestamp value. Comparing this @@ -856,6 +925,14 @@ metrics_end_frame_post_swap (metrics_t *metrics) glQueryCounter (metrics->swap_end_timestamp_id, GL_TIMESTAMP); + /* Query the total amount of CPU time spent by this process. */ + err = clock_gettime (CLOCK_PROCESS_CPUTIME_ID, &metrics->cpu_time_ts); + if (err == -1 ) { + fprintf (stderr, "Failed to query CPU time with clock_gettime: %s\n", + strerror (errno)); + exit (1); + } + if (! initialized) { gettimeofday (&tv_start, NULL); if (getenv ("FIPS_VERBOSE")) @@ -867,7 +944,7 @@ metrics_end_frame_post_swap (metrics_t *metrics) frames++; - if (frames % 15 == 0) { + if (frames) { double fps; gettimeofday (&tv_now, NULL);