radeonsi: move gfx fence wait out of si_check_vm_faults
[mesa.git] / src / gallium / drivers / radeonsi / si_debug.c
index cce665e85fae554b7bc9e249abb2fdc0bc13b1cc..8e16e2906a499d3635cfa7725ace65d32b6edbaa 100644 (file)
 #include "si_shader.h"
 #include "sid.h"
 #include "sid_tables.h"
+#include "radeon/radeon_elf_util.h"
 #include "ddebug/dd_util.h"
+#include "util/u_memory.h"
 
+DEBUG_GET_ONCE_OPTION(replace_shaders, "RADEON_REPLACE_SHADERS", NULL)
 
-static void si_dump_shader(struct si_shader_ctx_state *state, const char *name,
-                          FILE *f)
+static void si_dump_shader(struct si_screen *sscreen,
+                          struct si_shader_ctx_state *state, FILE *f)
 {
        if (!state->cso || !state->current)
                return;
 
-       fprintf(f, "%s shader disassembly:\n", name);
        si_dump_shader_key(state->cso->type, &state->current->key, f);
-       fprintf(f, "%s\n\n", state->current->binary.disasm_string);
+       si_shader_dump(sscreen, state->current, NULL,
+                      state->cso->info.processor, f);
+}
+
+/**
+ * Shader compiles can be overridden with arbitrary ELF objects by setting
+ * the environment variable RADEON_REPLACE_SHADERS=num1:filename1[;num2:filename2]
+ */
+bool si_replace_shader(unsigned num, struct radeon_shader_binary *binary)
+{
+       const char *p = debug_get_option_replace_shaders();
+       const char *semicolon;
+       char *copy = NULL;
+       FILE *f;
+       long filesize, nread;
+       char *buf = NULL;
+       bool replaced = false;
+
+       if (!p)
+               return false;
+
+       while (*p) {
+               unsigned long i;
+               char *endp;
+               i = strtoul(p, &endp, 0);
+
+               p = endp;
+               if (*p != ':') {
+                       fprintf(stderr, "RADEON_REPLACE_SHADERS formatted badly.\n");
+                       exit(1);
+               }
+               ++p;
+
+               if (i == num)
+                       break;
+
+               p = strchr(p, ';');
+               if (!p)
+                       return false;
+               ++p;
+       }
+       if (!*p)
+               return false;
+
+       semicolon = strchr(p, ';');
+       if (semicolon) {
+               p = copy = strndup(p, semicolon - p);
+               if (!copy) {
+                       fprintf(stderr, "out of memory\n");
+                       return false;
+               }
+       }
+
+       fprintf(stderr, "radeonsi: replace shader %u by %s\n", num, p);
+
+       f = fopen(p, "r");
+       if (!f) {
+               perror("radeonsi: failed to open file");
+               goto out_free;
+       }
+
+       if (fseek(f, 0, SEEK_END) != 0)
+               goto file_error;
+
+       filesize = ftell(f);
+       if (filesize < 0)
+               goto file_error;
+
+       if (fseek(f, 0, SEEK_SET) != 0)
+               goto file_error;
+
+       buf = MALLOC(filesize);
+       if (!buf) {
+               fprintf(stderr, "out of memory\n");
+               goto out_close;
+       }
+
+       nread = fread(buf, 1, filesize, f);
+       if (nread != filesize)
+               goto file_error;
+
+       radeon_elf_read(buf, filesize, binary);
+       replaced = true;
+
+out_close:
+       fclose(f);
+out_free:
+       FREE(buf);
+       free(copy);
+       return replaced;
+
+file_error:
+       perror("radeonsi: reading shader");
+       goto out_close;
 }
 
 /* Parsed IBs are difficult to read without colors. Use "less -R file" to
@@ -61,13 +156,16 @@ static void print_spaces(FILE *f, unsigned num)
 static void print_value(FILE *file, uint32_t value, int bits)
 {
        /* Guess if it's int or float */
-       if (value <= (1 << 15))
-               fprintf(file, "%u\n", value);
-       else {
+       if (value <= (1 << 15)) {
+               if (value <= 9)
+                       fprintf(file, "%u\n", value);
+               else
+                       fprintf(file, "%u (0x%0*x)\n", value, bits / 4, value);
+       } else {
                float f = uif(value);
 
                if (fabs(f) < 100000 && f*10 == floor(f*10))
-                       fprintf(file, "%.1ff\n", f);
+                       fprintf(file, "%.1ff (0x%0*x)\n", f, bits / 4, value);
                else
                        /* Don't print more leading zeros than there are bits. */
                        fprintf(file, "0x%0*x\n", bits / 4, value);
@@ -87,15 +185,16 @@ static void si_dump_reg(FILE *file, unsigned offset, uint32_t value,
 {
        int r, f;
 
-       for (r = 0; r < ARRAY_SIZE(reg_table); r++) {
-               const struct si_reg *reg = &reg_table[r];
+       for (r = 0; r < ARRAY_SIZE(sid_reg_table); r++) {
+               const struct si_reg *reg = &sid_reg_table[r];
+               const char *reg_name = sid_strings + reg->name_offset;
 
                if (reg->offset == offset) {
                        bool first_field = true;
 
                        print_spaces(file, INDENT_PKT);
                        fprintf(file, COLOR_YELLOW "%s" COLOR_RESET " <- ",
-                               reg->name);
+                               reg_name);
 
                        if (!reg->num_fields) {
                                print_value(file, value, 32);
@@ -103,7 +202,8 @@ static void si_dump_reg(FILE *file, unsigned offset, uint32_t value,
                        }
 
                        for (f = 0; f < reg->num_fields; f++) {
-                               const struct si_field *field = &reg->fields[f];
+                               const struct si_field *field = sid_fields_table + reg->fields_offset + f;
+                               const int *values_offsets = sid_strings_offsets + field->values_offset;
                                uint32_t val = (value & field->mask) >>
                                               (ffs(field->mask) - 1);
 
@@ -113,13 +213,13 @@ static void si_dump_reg(FILE *file, unsigned offset, uint32_t value,
                                /* Indent the field. */
                                if (!first_field)
                                        print_spaces(file,
-                                                    INDENT_PKT + strlen(reg->name) + 4);
+                                                    INDENT_PKT + strlen(reg_name) + 4);
 
                                /* Print the field. */
-                               fprintf(file, "%s = ", field->name);
+                               fprintf(file, "%s = ", sid_strings + field->name_offset);
 
-                               if (val < field->num_values && field->values[val])
-                                       fprintf(file, "%s\n", field->values[val]);
+                               if (val < field->num_values && values_offsets[val] >= 0)
+                                       fprintf(file, "%s\n", sid_strings + values_offsets[val]);
                                else
                                        print_value(file, val,
                                                    util_bitcount(field->mask));
@@ -156,17 +256,19 @@ static uint32_t *si_parse_packet3(FILE *f, uint32_t *ib, int *num_dw,
                if (packet3_table[i].op == op)
                        break;
 
-       if (i < ARRAY_SIZE(packet3_table))
+       if (i < ARRAY_SIZE(packet3_table)) {
+               const char *name = sid_strings + packet3_table[i].name_offset;
+
                if (op == PKT3_SET_CONTEXT_REG ||
                    op == PKT3_SET_CONFIG_REG ||
                    op == PKT3_SET_UCONFIG_REG ||
                    op == PKT3_SET_SH_REG)
                        fprintf(f, COLOR_CYAN "%s%s" COLOR_CYAN ":\n",
-                               packet3_table[i].name, predicate);
+                               name, predicate);
                else
                        fprintf(f, COLOR_GREEN "%s%s" COLOR_RESET ":\n",
-                               packet3_table[i].name, predicate);
-       else
+                               name, predicate);
+       else
                fprintf(f, COLOR_RED "PKT3_UNKNOWN 0x%x%s" COLOR_RESET ":\n",
                        op, predicate);
 
@@ -254,6 +356,13 @@ static uint32_t *si_parse_packet3(FILE *f, uint32_t *ib, int *num_dw,
                si_dump_reg(f, R_504_DST_ADDR_HI, ib[5], ~0);
                si_dump_reg(f, R_414_COMMAND, ib[6], ~0);
                break;
+       case PKT3_INDIRECT_BUFFER_SI:
+       case PKT3_INDIRECT_BUFFER_CONST:
+       case PKT3_INDIRECT_BUFFER_CIK:
+               si_dump_reg(f, R_3F0_IB_BASE_LO, ib[1], ~0);
+               si_dump_reg(f, R_3F1_IB_BASE_HI, ib[2], ~0);
+               si_dump_reg(f, R_3F2_CONTROL, ib[3], ~0);
+               break;
        case PKT3_NOP:
                if (ib[0] == 0xffff1000) {
                        count = -1; /* One dword NOP. */
@@ -399,7 +508,7 @@ static void si_dump_last_ib(struct si_context *sctx, FILE *f)
 {
        int last_trace_id = -1;
 
-       if (!sctx->last_ib)
+       if (!sctx->last_gfx.ib)
                return;
 
        if (sctx->last_trace_buf) {
@@ -407,7 +516,7 @@ static void si_dump_last_ib(struct si_context *sctx, FILE *f)
                 * waited for the context, so this buffer should be idle.
                 * If the GPU is hung, there is no point in waiting for it.
                 */
-               uint32_t *map = sctx->b.ws->buffer_map(sctx->last_trace_buf->cs_buf,
+               uint32_t *map = sctx->b.ws->buffer_map(sctx->last_trace_buf->buf,
                                                       NULL,
                                                       PIPE_TRANSFER_UNSYNCHRONIZED |
                                                       PIPE_TRANSFER_READ);
@@ -424,11 +533,8 @@ static void si_dump_last_ib(struct si_context *sctx, FILE *f)
                            sctx->init_config_gs_rings->ndw,
                            -1, "IB2: Init GS rings");
 
-       si_parse_ib(f, sctx->last_ib, sctx->last_ib_dw_size,
+       si_parse_ib(f, sctx->last_gfx.ib, sctx->last_gfx.num_dw,
                    last_trace_id, "IB");
-       free(sctx->last_ib); /* dump only once */
-       sctx->last_ib = NULL;
-       r600_resource_reference(&sctx->last_trace_buf, NULL);
 }
 
 static const char *priority_to_string(enum radeon_bo_priority priority)
@@ -483,32 +589,33 @@ static int bo_list_compare_va(const struct radeon_bo_list_item *a,
               a->vm_address > b->vm_address ? 1 : 0;
 }
 
-static void si_dump_last_bo_list(struct si_context *sctx, FILE *f)
+static void si_dump_bo_list(struct si_context *sctx,
+                           const struct radeon_saved_cs *saved, FILE *f)
 {
        unsigned i,j;
 
-       if (!sctx->last_bo_list)
+       if (!saved->bo_list)
                return;
 
        /* Sort the list according to VM adddresses first. */
-       qsort(sctx->last_bo_list, sctx->last_bo_count,
-             sizeof(sctx->last_bo_list[0]), (void*)bo_list_compare_va);
+       qsort(saved->bo_list, saved->bo_count,
+             sizeof(saved->bo_list[0]), (void*)bo_list_compare_va);
 
        fprintf(f, "Buffer list (in units of pages = 4kB):\n"
                COLOR_YELLOW "        Size    VM start page         "
                "VM end page           Usage" COLOR_RESET "\n");
 
-       for (i = 0; i < sctx->last_bo_count; i++) {
+       for (i = 0; i < saved->bo_count; i++) {
                /* Note: Buffer sizes are expected to be aligned to 4k by the winsys. */
-               const unsigned page_size = 4096;
-               uint64_t va = sctx->last_bo_list[i].vm_address;
-               uint64_t size = sctx->last_bo_list[i].buf->size;
+               const unsigned page_size = sctx->b.screen->info.gart_page_size;
+               uint64_t va = saved->bo_list[i].vm_address;
+               uint64_t size = saved->bo_list[i].buf->size;
                bool hit = false;
 
                /* If there's unused virtual memory between 2 buffers, print it. */
                if (i) {
-                       uint64_t previous_va_end = sctx->last_bo_list[i-1].vm_address +
-                                                  sctx->last_bo_list[i-1].buf->size;
+                       uint64_t previous_va_end = saved->bo_list[i-1].vm_address +
+                                                  saved->bo_list[i-1].buf->size;
 
                        if (va > previous_va_end) {
                                fprintf(f, "  %10"PRIu64"    -- hole --\n",
@@ -522,7 +629,7 @@ static void si_dump_last_bo_list(struct si_context *sctx, FILE *f)
 
                /* Print the usage. */
                for (j = 0; j < 64; j++) {
-                       if (!(sctx->last_bo_list[i].priority_usage & (1llu << j)))
+                       if (!(saved->bo_list[i].priority_usage & (1llu << j)))
                                continue;
 
                        fprintf(f, "%s%s", !hit ? "" : ", ", priority_to_string(j));
@@ -532,11 +639,6 @@ static void si_dump_last_bo_list(struct si_context *sctx, FILE *f)
        }
        fprintf(f, "\nNote: The holes represent memory not used by the IB.\n"
                   "      Other buffers can still be allocated there.\n\n");
-
-       for (i = 0; i < sctx->last_bo_count; i++)
-               pb_reference(&sctx->last_bo_list[i].buf, NULL);
-       free(sctx->last_bo_list);
-       sctx->last_bo_list = NULL;
 }
 
 static void si_dump_framebuffer(struct si_context *sctx, FILE *f)
@@ -572,16 +674,20 @@ static void si_dump_debug_state(struct pipe_context *ctx, FILE *f,
                si_dump_debug_registers(sctx, f);
 
        si_dump_framebuffer(sctx, f);
-       si_dump_shader(&sctx->vs_shader, "Vertex", f);
-       si_dump_shader(&sctx->tcs_shader, "Tessellation control", f);
-       si_dump_shader(&sctx->tes_shader, "Tessellation evaluation", f);
-       si_dump_shader(&sctx->gs_shader, "Geometry", f);
-       si_dump_shader(&sctx->ps_shader, "Fragment", f);
+       si_dump_shader(sctx->screen, &sctx->vs_shader, f);
+       si_dump_shader(sctx->screen, &sctx->tcs_shader, f);
+       si_dump_shader(sctx->screen, &sctx->tes_shader, f);
+       si_dump_shader(sctx->screen, &sctx->gs_shader, f);
+       si_dump_shader(sctx->screen, &sctx->ps_shader, f);
 
-       si_dump_last_bo_list(sctx, f);
+       si_dump_bo_list(sctx, &sctx->last_gfx, f);
        si_dump_last_ib(sctx, f);
 
        fprintf(f, "Done.\n");
+
+       /* dump only once */
+       radeon_clear_saved_cs(&sctx->last_gfx);
+       r600_resource_reference(&sctx->last_trace_buf, NULL);
 }
 
 static bool si_vm_fault_occured(struct si_context *sctx, uint32_t *out_addr)
@@ -599,6 +705,9 @@ static bool si_vm_fault_occured(struct si_context *sctx, uint32_t *out_addr)
        while (fgets(line, sizeof(line), p)) {
                char *msg, len;
 
+               if (!line[0] || line[0] == '\n')
+                       continue;
+
                /* Get the timestamp. */
                if (sscanf(line, "[%u.%u]", &sec, &usec) != 2) {
                        assert(0);
@@ -665,15 +774,10 @@ void si_check_vm_faults(struct si_context *sctx)
        FILE *f;
        uint32_t addr;
 
-       /* Use conservative timeout 800ms, after which we won't wait any
-        * longer and assume the GPU is hung.
-        */
-       sctx->b.ws->fence_wait(sctx->b.ws, sctx->last_gfx_fence, 800*1000*1000);
-
        if (!si_vm_fault_occured(sctx, &addr))
                return;
 
-       f = dd_get_debug_file();
+       f = dd_get_debug_file(false);
        if (!f)
                return;
 
@@ -683,8 +787,7 @@ void si_check_vm_faults(struct si_context *sctx)
        fprintf(f, "Device name: %s\n\n", screen->get_name(screen));
        fprintf(f, "Failing VM page: 0x%08x\n\n", addr);
 
-       si_dump_last_bo_list(sctx, f);
-       si_dump_last_ib(sctx, f);
+       si_dump_debug_state(&sctx->b.b, f, 0);
        fclose(f);
 
        fprintf(stderr, "Detected a VM fault, exiting...\n");