Reinstrumented matrix_count.c