#include <sys/wait.h>
#include <sys/mman.h>
-#include "util/list.h"
#include "util/macros.h"
-#include "util/rb_tree.h"
-#include "common/gen_decoder.h"
-#include "common/gen_disasm.h"
-#include "common/gen_gem.h"
-#include "intel_aub.h"
-
-#ifndef HAVE_MEMFD_CREATE
-#include <sys/syscall.h>
-
-static inline int
-memfd_create(const char *name, unsigned int flags)
-{
- return syscall(SYS_memfd_create, name, flags);
-}
-#endif
-
-/* Below is the only command missing from intel_aub.h in libdrm
- * So, reuse intel_aub.h from libdrm and #define the
- * AUB_MI_BATCH_BUFFER_END as below
- */
-#define AUB_MI_BATCH_BUFFER_END (0x0500 << 16)
+#include "aub_read.h"
+#include "aub_mem.h"
#define CSI "\e["
#define BLUE_HEADER CSI "0;44m"
char *input_file = NULL, *xml_path = NULL;
struct gen_device_info devinfo;
struct gen_batch_decode_ctx batch_ctx;
-
-struct bo_map {
- struct list_head link;
- struct gen_batch_decode_bo bo;
- bool unmap_after_use;
-};
-
-struct ggtt_entry {
- struct rb_node node;
- uint64_t virt_addr;
- uint64_t phys_addr;
-};
-
-struct phys_mem {
- struct rb_node node;
- uint64_t fd_offset;
- uint64_t phys_addr;
- uint8_t *data;
-};
-
-static struct list_head maps;
-static struct rb_tree ggtt = {NULL};
-static struct rb_tree mem = {NULL};
-int mem_fd = -1;
-off_t mem_fd_len = 0;
+struct aub_mem mem;
FILE *outfile;
struct brw_instruction;
static void
-add_gtt_bo_map(struct gen_batch_decode_bo bo, bool unmap_after_use)
+aubinator_error(void *user_data, const void *aub_data, const char *msg)
{
- struct bo_map *m = calloc(1, sizeof(*m));
-
- m->bo = bo;
- m->unmap_after_use = unmap_after_use;
- list_add(&m->link, &maps);
+ fprintf(stderr, "%s", msg);
}
static void
-clear_bo_maps(void)
-{
- list_for_each_entry_safe(struct bo_map, i, &maps, link) {
- if (i->unmap_after_use)
- munmap((void *)i->bo.map, i->bo.size);
- list_del(&i->link);
- free(i);
- }
-}
-
-static inline struct ggtt_entry *
-ggtt_entry_next(struct ggtt_entry *entry)
-{
- if (!entry)
- return NULL;
- struct rb_node *node = rb_node_next(&entry->node);
- if (!node)
- return NULL;
- return rb_node_data(struct ggtt_entry, node, node);
-}
-
-static inline int
-cmp_uint64(uint64_t a, uint64_t b)
-{
- if (a < b)
- return -1;
- if (a > b)
- return 1;
- return 0;
-}
-
-static inline int
-cmp_ggtt_entry(const struct rb_node *node, const void *addr)
-{
- struct ggtt_entry *entry = rb_node_data(struct ggtt_entry, node, node);
- return cmp_uint64(entry->virt_addr, *(const uint64_t *)addr);
-}
-
-static struct ggtt_entry *
-ensure_ggtt_entry(struct rb_tree *tree, uint64_t virt_addr)
-{
- struct rb_node *node = rb_tree_search_sloppy(&ggtt, &virt_addr,
- cmp_ggtt_entry);
- int cmp = 0;
- if (!node || (cmp = cmp_ggtt_entry(node, &virt_addr))) {
- struct ggtt_entry *new_entry = calloc(1, sizeof(*new_entry));
- new_entry->virt_addr = virt_addr;
- rb_tree_insert_at(&ggtt, node, &new_entry->node, cmp > 0);
- node = &new_entry->node;
- }
-
- return rb_node_data(struct ggtt_entry, node, node);
-}
-
-static struct ggtt_entry *
-search_ggtt_entry(uint64_t virt_addr)
-{
- virt_addr &= ~0xfff;
-
- struct rb_node *node = rb_tree_search(&ggtt, &virt_addr, cmp_ggtt_entry);
-
- if (!node)
- return NULL;
-
- return rb_node_data(struct ggtt_entry, node, node);
-}
-
-static inline int
-cmp_phys_mem(const struct rb_node *node, const void *addr)
-{
- struct phys_mem *mem = rb_node_data(struct phys_mem, node, node);
- return cmp_uint64(mem->phys_addr, *(uint64_t *)addr);
-}
-
-static struct phys_mem *
-ensure_phys_mem(uint64_t phys_addr)
+aubinator_init(void *user_data, int aub_pci_id, const char *app_name)
{
- struct rb_node *node = rb_tree_search_sloppy(&mem, &phys_addr, cmp_phys_mem);
- int cmp = 0;
- if (!node || (cmp = cmp_phys_mem(node, &phys_addr))) {
- struct phys_mem *new_mem = calloc(1, sizeof(*new_mem));
- new_mem->phys_addr = phys_addr;
- new_mem->fd_offset = mem_fd_len;
-
- int ftruncate_res = ftruncate(mem_fd, mem_fd_len += 4096);
- assert(ftruncate_res == 0);
-
- new_mem->data = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED,
- mem_fd, new_mem->fd_offset);
- assert(new_mem->data != MAP_FAILED);
-
- rb_tree_insert_at(&mem, node, &new_mem->node, cmp > 0);
- node = &new_mem->node;
- }
-
- return rb_node_data(struct phys_mem, node, node);
-}
-
-static struct phys_mem *
-search_phys_mem(uint64_t phys_addr)
-{
- phys_addr &= ~0xfff;
-
- struct rb_node *node = rb_tree_search(&mem, &phys_addr, cmp_phys_mem);
-
- if (!node)
- return NULL;
-
- return rb_node_data(struct phys_mem, node, node);
-}
-
-static void
-handle_ggtt_entry_write(uint64_t address, const void *_data, uint32_t _size)
-{
- uint64_t virt_addr = (address / sizeof(uint64_t)) << 12;
- const uint64_t *data = _data;
- size_t size = _size / sizeof(*data);
- for (const uint64_t *entry = data;
- entry < data + size;
- entry++, virt_addr += 4096) {
- struct ggtt_entry *pt = ensure_ggtt_entry(&ggtt, virt_addr);
- pt->phys_addr = *entry;
- }
-}
-
-static void
-handle_physical_write(uint64_t phys_address, const void *data, uint32_t size)
-{
- uint32_t to_write = size;
- for (uint64_t page = phys_address & ~0xfff; page < phys_address + size; page += 4096) {
- struct phys_mem *mem = ensure_phys_mem(page);
- uint64_t offset = MAX2(page, phys_address) - page;
- uint32_t size_this_page = MIN2(to_write, 4096 - offset);
- to_write -= size_this_page;
- memcpy(mem->data + offset, data, size_this_page);
- data = (const uint8_t *)data + size_this_page;
- }
-}
-
-static void
-handle_ggtt_write(uint64_t virt_address, const void *data, uint32_t size)
-{
- uint32_t to_write = size;
- for (uint64_t page = virt_address & ~0xfff; page < virt_address + size; page += 4096) {
- struct ggtt_entry *entry = search_ggtt_entry(page);
- assert(entry && entry->phys_addr & 0x1);
-
- uint64_t offset = MAX2(page, virt_address) - page;
- uint32_t size_this_page = MIN2(to_write, 4096 - offset);
- to_write -= size_this_page;
-
- uint64_t phys_page = entry->phys_addr & ~0xfff; /* Clear the validity bits. */
- handle_physical_write(phys_page + offset, data, size_this_page);
- data = (const uint8_t *)data + size_this_page;
- }
-}
-
-static struct gen_batch_decode_bo
-get_ggtt_batch_bo(void *user_data, uint64_t address)
-{
- struct gen_batch_decode_bo bo = {0};
-
- list_for_each_entry(struct bo_map, i, &maps, link)
- if (i->bo.addr <= address && i->bo.addr + i->bo.size > address)
- return i->bo;
-
- address &= ~0xfff;
-
- struct ggtt_entry *start =
- (struct ggtt_entry *)rb_tree_search_sloppy(&ggtt, &address,
- cmp_ggtt_entry);
- if (start && start->virt_addr < address)
- start = ggtt_entry_next(start);
- if (!start)
- return bo;
-
- struct ggtt_entry *last = start;
- for (struct ggtt_entry *i = ggtt_entry_next(last);
- i && last->virt_addr + 4096 == i->virt_addr;
- last = i, i = ggtt_entry_next(last))
- ;
-
- bo.addr = MIN2(address, start->virt_addr);
- bo.size = last->virt_addr - bo.addr + 4096;
- bo.map = mmap(NULL, bo.size, PROT_READ, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
- assert(bo.map != MAP_FAILED);
-
- for (struct ggtt_entry *i = start;
- i;
- i = i == last ? NULL : ggtt_entry_next(i)) {
- uint64_t phys_addr = i->phys_addr & ~0xfff;
- struct phys_mem *phys_mem = search_phys_mem(phys_addr);
-
- if (!phys_mem)
- continue;
-
- uint32_t map_offset = i->virt_addr - address;
- void *res = mmap((uint8_t *)bo.map + map_offset, 4096, PROT_READ,
- MAP_SHARED | MAP_FIXED, mem_fd, phys_mem->fd_offset);
- assert(res != MAP_FAILED);
- }
-
- add_gtt_bo_map(bo, true);
-
- return bo;
-}
-
-static struct phys_mem *
-ppgtt_walk(uint64_t pml4, uint64_t address)
-{
- uint64_t shift = 39;
- uint64_t addr = pml4;
- for (int level = 4; level > 0; level--) {
- struct phys_mem *table = search_phys_mem(addr);
- if (!table)
- return NULL;
- int index = (address >> shift) & 0x1ff;
- uint64_t entry = ((uint64_t *)table->data)[index];
- if (!(entry & 1))
- return NULL;
- addr = entry & ~0xfff;
- shift -= 9;
- }
- return search_phys_mem(addr);
-}
-
-static bool
-ppgtt_mapped(uint64_t pml4, uint64_t address)
-{
- return ppgtt_walk(pml4, address) != NULL;
-}
-
-static struct gen_batch_decode_bo
-get_ppgtt_batch_bo(void *user_data, uint64_t address)
-{
- struct gen_batch_decode_bo bo = {0};
- uint64_t pml4 = *(uint64_t *)user_data;
-
- address &= ~0xfff;
+ pci_id = aub_pci_id;
- if (!ppgtt_mapped(pml4, address))
- return bo;
-
- /* Map everything until the first gap since we don't know how much the
- * decoder actually needs.
- */
- uint64_t end = address;
- while (ppgtt_mapped(pml4, end))
- end += 4096;
-
- bo.addr = address;
- bo.size = end - address;
- bo.map = mmap(NULL, bo.size, PROT_READ, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
- assert(bo.map != MAP_FAILED);
-
- for (uint64_t page = address; page < end; page += 4096) {
- struct phys_mem *phys_mem = ppgtt_walk(pml4, page);
-
- void *res = mmap((uint8_t *)bo.map + (page - bo.addr), 4096, PROT_READ,
- MAP_SHARED | MAP_FIXED, mem_fd, phys_mem->fd_offset);
- assert(res != MAP_FAILED);
- }
-
- add_gtt_bo_map(bo, true);
-
- return bo;
-}
-
-#define GEN_ENGINE_RENDER 1
-#define GEN_ENGINE_BLITTER 2
-
-static void
-handle_trace_block(uint32_t *p)
-{
- int operation = p[1] & AUB_TRACE_OPERATION_MASK;
- int type = p[1] & AUB_TRACE_TYPE_MASK;
- int address_space = p[1] & AUB_TRACE_ADDRESS_SPACE_MASK;
- int header_length = p[0] & 0xffff;
- int engine = GEN_ENGINE_RENDER;
- struct gen_batch_decode_bo bo = {
- .map = p + header_length + 2,
- /* Addresses written by aubdump here are in canonical form but the batch
- * decoder always gives us addresses with the top 16bits zeroed, so do
- * the same here.
- */
- .addr = gen_48b_address((devinfo.gen >= 8 ? ((uint64_t) p[5] << 32) : 0) |
- ((uint64_t) p[3])),
- .size = p[4],
- };
-
- switch (operation) {
- case AUB_TRACE_OP_DATA_WRITE:
- if (address_space == AUB_TRACE_MEMTYPE_GTT)
- add_gtt_bo_map(bo, false);
- break;
- case AUB_TRACE_OP_COMMAND_WRITE:
- switch (type) {
- case AUB_TRACE_TYPE_RING_PRB0:
- engine = GEN_ENGINE_RENDER;
- break;
- case AUB_TRACE_TYPE_RING_PRB2:
- engine = GEN_ENGINE_BLITTER;
- break;
- default:
- fprintf(outfile, "command write to unknown ring %d\n", type);
- break;
- }
-
- (void)engine; /* TODO */
- batch_ctx.get_bo = get_ggtt_batch_bo;
- gen_print_batch(&batch_ctx, bo.map, bo.size, 0);
-
- clear_bo_maps();
- break;
- }
-}
-
-static void
-aubinator_init(uint16_t aub_pci_id, const char *app_name)
-{
- if (!gen_get_device_info(pci_id, &devinfo)) {
+ if (!gen_get_device_info_from_pci_id(pci_id, &devinfo)) {
fprintf(stderr, "can't find device information: pci_id=0x%x\n", pci_id);
exit(EXIT_FAILURE);
}
gen_batch_decode_ctx_init(&batch_ctx, &devinfo, outfile, batch_flags,
xml_path, NULL, NULL, NULL);
+
+ /* Check for valid spec instance, if wrong xml_path is passed then spec
+ * instance is not initialized properly
+ */
+ if (!batch_ctx.spec) {
+ fprintf(stderr, "Failed to initialize gen_batch_decode_ctx "
+ "spec instance\n");
+ free(xml_path);
+ gen_batch_decode_ctx_finish(&batch_ctx);
+ exit(EXIT_FAILURE);
+ }
+
batch_ctx.max_vbo_decoded_lines = max_vbo_lines;
char *color = GREEN_HEADER, *reset_color = NORMAL;
fprintf(outfile, "\n");
}
-static void
-handle_trace_header(uint32_t *p)
-{
- /* The intel_aubdump tool from IGT is kind enough to put a PCI-ID= tag in
- * the AUB header comment. If the user hasn't specified a hardware
- * generation, try to use the one from the AUB file.
- */
- uint32_t *end = p + (p[0] & 0xffff) + 2;
- int aub_pci_id = 0;
- if (end > &p[12] && p[12] > 0)
- sscanf((char *)&p[13], "PCI-ID=%i", &aub_pci_id);
-
- if (pci_id == 0)
- pci_id = aub_pci_id;
-
- char app_name[33];
- strncpy(app_name, (char *)&p[2], 32);
- app_name[32] = 0;
-
- aubinator_init(aub_pci_id, app_name);
-}
-
-static void
-handle_memtrace_version(uint32_t *p)
+static struct gen_batch_decode_bo
+get_bo(void *user_data, bool ppgtt, uint64_t addr)
{
- int header_length = p[0] & 0xffff;
- char app_name[64];
- int app_name_len = MIN2(4 * (header_length + 1 - 5), ARRAY_SIZE(app_name) - 1);
- int pci_id_len = 0;
- int aub_pci_id = 0;
-
- strncpy(app_name, (char *)&p[5], app_name_len);
- app_name[app_name_len] = 0;
- sscanf(app_name, "PCI-ID=%i %n", &aub_pci_id, &pci_id_len);
- if (pci_id == 0)
- pci_id = aub_pci_id;
- aubinator_init(aub_pci_id, app_name + pci_id_len);
+ if (ppgtt)
+ return aub_mem_get_ppgtt_bo(user_data, addr);
+ else
+ return aub_mem_get_ggtt_bo(user_data, addr);
}
static void
-handle_memtrace_reg_write(uint32_t *p)
+handle_execlist_write(void *user_data, enum drm_i915_gem_engine_class engine, uint64_t context_descriptor)
{
- static struct execlist_regs {
- uint32_t render_elsp[4];
- int render_elsp_index;
- uint32_t blitter_elsp[4];
- int blitter_elsp_index;
- } state = {};
-
- uint32_t offset = p[1];
- uint32_t value = p[5];
-
- int engine;
- uint64_t context_descriptor;
-
- switch (offset) {
- case 0x2230: /* render elsp */
- state.render_elsp[state.render_elsp_index++] = value;
- if (state.render_elsp_index < 4)
- return;
-
- state.render_elsp_index = 0;
- engine = GEN_ENGINE_RENDER;
- context_descriptor = (uint64_t)state.render_elsp[2] << 32 |
- state.render_elsp[3];
- break;
- case 0x22230: /* blitter elsp */
- state.blitter_elsp[state.blitter_elsp_index++] = value;
- if (state.blitter_elsp_index < 4)
- return;
-
- state.blitter_elsp_index = 0;
- engine = GEN_ENGINE_BLITTER;
- context_descriptor = (uint64_t)state.blitter_elsp[2] << 32 |
- state.blitter_elsp[3];
- break;
- case 0x2510: /* render elsq0 lo */
- state.render_elsp[3] = value;
- return;
- break;
- case 0x2514: /* render elsq0 hi */
- state.render_elsp[2] = value;
- return;
- break;
- case 0x22510: /* blitter elsq0 lo */
- state.blitter_elsp[3] = value;
- return;
- break;
- case 0x22514: /* blitter elsq0 hi */
- state.blitter_elsp[2] = value;
- return;
- break;
- case 0x2550: /* render elsc */
- engine = GEN_ENGINE_RENDER;
- context_descriptor = (uint64_t)state.render_elsp[2] << 32 |
- state.render_elsp[3];
- break;
- case 0x22550: /* blitter elsc */
- engine = GEN_ENGINE_BLITTER;
- context_descriptor = (uint64_t)state.blitter_elsp[2] << 32 |
- state.blitter_elsp[3];
- break;
- default:
- return;
- }
-
const uint32_t pphwsp_size = 4096;
uint32_t pphwsp_addr = context_descriptor & 0xfffff000;
- struct gen_batch_decode_bo pphwsp_bo = get_ggtt_batch_bo(NULL, pphwsp_addr);
+ struct gen_batch_decode_bo pphwsp_bo = aub_mem_get_ggtt_bo(&mem, pphwsp_addr);
uint32_t *context = (uint32_t *)((uint8_t *)pphwsp_bo.map +
(pphwsp_addr - pphwsp_bo.addr) +
pphwsp_size);
uint32_t ring_buffer_head = context[5];
uint32_t ring_buffer_tail = context[7];
uint32_t ring_buffer_start = context[9];
- uint64_t pml4 = (uint64_t)context[49] << 32 | context[51];
+ uint32_t ring_buffer_length = (context[11] & 0x1ff000) + 4096;
- struct gen_batch_decode_bo ring_bo = get_ggtt_batch_bo(NULL,
- ring_buffer_start);
+ mem.pml4 = (uint64_t)context[49] << 32 | context[51];
+ batch_ctx.user_data = &mem;
+
+ struct gen_batch_decode_bo ring_bo = aub_mem_get_ggtt_bo(&mem,
+ ring_buffer_start);
assert(ring_bo.size > 0);
- void *commands = (uint8_t *)ring_bo.map + (ring_buffer_start - ring_bo.addr);
+ void *commands = (uint8_t *)ring_bo.map + (ring_buffer_start - ring_bo.addr) + ring_buffer_head;
- if (context_descriptor & 0x100 /* ppgtt */) {
- batch_ctx.get_bo = get_ppgtt_batch_bo;
- batch_ctx.user_data = &pml4;
- } else {
- batch_ctx.get_bo = get_ggtt_batch_bo;
- }
+ batch_ctx.get_bo = get_bo;
- (void)engine; /* TODO */
- gen_print_batch(&batch_ctx, commands, ring_buffer_tail - ring_buffer_head,
- 0);
- clear_bo_maps();
+ batch_ctx.engine = engine;
+ gen_print_batch(&batch_ctx, commands,
+ MIN2(ring_buffer_tail - ring_buffer_head, ring_buffer_length),
+ ring_bo.addr + ring_buffer_head, true);
+ aub_mem_clear_bo_maps(&mem);
+}
+
+static struct gen_batch_decode_bo
+get_legacy_bo(void *user_data, bool ppgtt, uint64_t addr)
+{
+ return aub_mem_get_ggtt_bo(user_data, addr);
}
static void
-handle_memtrace_mem_write(uint32_t *p)
+handle_ring_write(void *user_data, enum drm_i915_gem_engine_class engine,
+ const void *data, uint32_t data_len)
{
- struct gen_batch_decode_bo bo = {
- .map = p + 5,
- /* Addresses written by aubdump here are in canonical form but the batch
- * decoder always gives us addresses with the top 16bits zeroed, so do
- * the same here.
- */
- .addr = gen_48b_address(*(uint64_t*)&p[1]),
- .size = p[4],
- };
- uint32_t address_space = p[3] >> 28;
-
- switch (address_space) {
- case 0: /* GGTT */
- handle_ggtt_write(bo.addr, bo.map, bo.size);
- break;
- case 1: /* Local */
- add_gtt_bo_map(bo, false);
- break;
- case 2: /* Physical */
- handle_physical_write(bo.addr, bo.map, bo.size);
- break;
- case 4: /* GGTT Entry */
- handle_ggtt_entry_write(bo.addr, bo.map, bo.size);
- break;
- }
+ batch_ctx.user_data = &mem;
+ batch_ctx.get_bo = get_legacy_bo;
+
+ batch_ctx.engine = engine;
+ gen_print_batch(&batch_ctx, data, data_len, 0, false);
+
+ aub_mem_clear_bo_maps(&mem);
}
struct aub_file {
FILE *stream;
- uint32_t *map, *end, *cursor;
- uint32_t *mem_end;
+ void *map, *end, *cursor;
};
static struct aub_file *
int fd;
file = calloc(1, sizeof *file);
+ if (file == NULL)
+ return NULL;
+
fd = open(filename, O_RDONLY);
if (fd == -1) {
fprintf(stderr, "open %s failed: %s\n", filename, strerror(errno));
+ free(file);
exit(EXIT_FAILURE);
}
if (fstat(fd, &sb) == -1) {
fprintf(stderr, "stat failed: %s\n", strerror(errno));
+ free(file);
exit(EXIT_FAILURE);
}
PROT_READ, MAP_SHARED, fd, 0);
if (file->map == MAP_FAILED) {
fprintf(stderr, "mmap failed: %s\n", strerror(errno));
+ free(file);
exit(EXIT_FAILURE);
}
close(fd);
file->cursor = file->map;
- file->end = file->map + sb.st_size / 4;
+ file->end = file->map + sb.st_size;
return file;
}
-#define TYPE(dw) (((dw) >> 29) & 7)
-#define OPCODE(dw) (((dw) >> 23) & 0x3f)
-#define SUBOPCODE(dw) (((dw) >> 16) & 0x7f)
-
-#define MAKE_HEADER(type, opcode, subopcode) \
- (((type) << 29) | ((opcode) << 23) | ((subopcode) << 16))
-
-#define TYPE_AUB 0x7
-
-/* Classic AUB opcodes */
-#define OPCODE_AUB 0x01
-#define SUBOPCODE_HEADER 0x05
-#define SUBOPCODE_BLOCK 0x41
-#define SUBOPCODE_BMP 0x1e
-
-/* Newer version AUB opcode */
-#define OPCODE_NEW_AUB 0x2e
-#define SUBOPCODE_REG_POLL 0x02
-#define SUBOPCODE_REG_WRITE 0x03
-#define SUBOPCODE_MEM_POLL 0x05
-#define SUBOPCODE_MEM_WRITE 0x06
-#define SUBOPCODE_VERSION 0x0e
-
-#define MAKE_GEN(major, minor) ( ((major) << 8) | (minor) )
-
-static bool
-aub_file_decode_batch(struct aub_file *file)
-{
- uint32_t *p, h, *new_cursor;
- int header_length, bias;
-
- assert(file->cursor < file->end);
-
- p = file->cursor;
- h = *p;
- header_length = h & 0xffff;
-
- switch (OPCODE(h)) {
- case OPCODE_AUB:
- bias = 2;
- break;
- case OPCODE_NEW_AUB:
- bias = 1;
- break;
- default:
- fprintf(outfile, "unknown opcode %d at %td/%td\n",
- OPCODE(h), file->cursor - file->map,
- file->end - file->map);
- return false;
- }
-
- new_cursor = p + header_length + bias;
- if ((h & 0xffff0000) == MAKE_HEADER(TYPE_AUB, OPCODE_AUB, SUBOPCODE_BLOCK)) {
- assert(file->end - file->cursor >= 4);
- new_cursor += p[4] / 4;
- }
-
- assert(new_cursor <= file->end);
-
- switch (h & 0xffff0000) {
- case MAKE_HEADER(TYPE_AUB, OPCODE_AUB, SUBOPCODE_HEADER):
- handle_trace_header(p);
- break;
- case MAKE_HEADER(TYPE_AUB, OPCODE_AUB, SUBOPCODE_BLOCK):
- handle_trace_block(p);
- break;
- case MAKE_HEADER(TYPE_AUB, OPCODE_AUB, SUBOPCODE_BMP):
- break;
- case MAKE_HEADER(TYPE_AUB, OPCODE_NEW_AUB, SUBOPCODE_VERSION):
- handle_memtrace_version(p);
- break;
- case MAKE_HEADER(TYPE_AUB, OPCODE_NEW_AUB, SUBOPCODE_REG_WRITE):
- handle_memtrace_reg_write(p);
- break;
- case MAKE_HEADER(TYPE_AUB, OPCODE_NEW_AUB, SUBOPCODE_MEM_WRITE):
- handle_memtrace_mem_write(p);
- break;
- case MAKE_HEADER(TYPE_AUB, OPCODE_NEW_AUB, SUBOPCODE_MEM_POLL):
- fprintf(outfile, "memory poll block (dwords %d):\n", h & 0xffff);
- break;
- case MAKE_HEADER(TYPE_AUB, OPCODE_NEW_AUB, SUBOPCODE_REG_POLL):
- break;
- default:
- fprintf(outfile, "unknown block type=0x%x, opcode=0x%x, "
- "subopcode=0x%x (%08x)\n", TYPE(h), OPCODE(h), SUBOPCODE(h), h);
- break;
- }
- file->cursor = new_cursor;
-
- return true;
-}
-
static int
aub_file_more_stuff(struct aub_file *file)
{
case 'g': {
const int id = gen_device_name_to_pci_device_id(optarg);
if (id < 0) {
- fprintf(stderr, "can't parse gen: '%s', expected ivb, byt, hsw, "
- "bdw, chv, skl, kbl or bxt\n", optarg);
+ fprintf(stderr, "can't parse gen: '%s', expected brw, g4x, ilk, "
+ "snb, ivb, hsw, byt, bdw, chv, skl, bxt, kbl, "
+ "aml, glk, cfl, whl, cnl, icl", optarg);
exit(EXIT_FAILURE);
} else {
pci_id = id;
if (isatty(1) && pager)
setup_pager();
- mem_fd = memfd_create("phys memory", 0);
-
- list_inithead(&maps);
+ if (!aub_mem_init(&mem)) {
+ fprintf(stderr, "Unable to create GTT\n");
+ exit(EXIT_FAILURE);
+ }
file = aub_file_open(input_file);
+ if (!file) {
+ fprintf(stderr, "Unable to allocate buffer to open aub file\n");
+ free(xml_path);
+ exit(EXIT_FAILURE);
+ }
+ struct aub_read aub_read = {
+ .user_data = &mem,
+ .error = aubinator_error,
+ .info = aubinator_init,
+
+ .local_write = aub_mem_local_write,
+ .phys_write = aub_mem_phys_write,
+ .ggtt_write = aub_mem_ggtt_write,
+ .ggtt_entry_write = aub_mem_ggtt_entry_write,
+
+ .execlist_write = handle_execlist_write,
+ .ring_write = handle_ring_write,
+ };
+ int consumed;
while (aub_file_more_stuff(file) &&
- aub_file_decode_batch(file));
+ (consumed = aub_read_command(&aub_read, file->cursor,
+ file->end - file->cursor)) > 0) {
+ file->cursor += consumed;
+ }
+
+ aub_mem_fini(&mem);
fflush(stdout);
/* close the stdout which is opened to write the output */
close(1);
+ free(file);
free(xml_path);
wait(NULL);
+ gen_batch_decode_ctx_finish(&batch_ctx);
return EXIT_SUCCESS;
}
projects / mesa.git / blobdiff