#include "genxml/genX_xml.h"
#define XML_BUFFER_SIZE 4096
+#define MAX_VALUE_ITEMS 128
struct location {
const char *filename;
XML_Parser parser;
int foo;
struct location loc;
- const char *platform;
struct gen_group *group;
struct gen_enum *enoom;
- int nvalues;
- struct gen_value *values[256];
+ int n_values, n_allocated_values;
+ struct gen_value **values;
- struct gen_field *fields[256];
- int nfields;
+ struct gen_field *last_field;
struct gen_spec *spec;
};
struct gen_group *
gen_spec_find_struct(struct gen_spec *spec, const char *name)
{
- for (int i = 0; i < spec->nstructs; i++)
- if (strcmp(spec->structs[i]->name, name) == 0)
- return spec->structs[i];
-
- return NULL;
+ struct hash_entry *entry = _mesa_hash_table_search(spec->structs,
+ name);
+ return entry ? entry->data : NULL;
}
struct gen_group *
gen_spec_find_register(struct gen_spec *spec, uint32_t offset)
{
- for (int i = 0; i < spec->nregisters; i++)
- if (spec->registers[i]->register_offset == offset)
- return spec->registers[i];
-
- return NULL;
+ struct hash_entry *entry =
+ _mesa_hash_table_search(spec->registers_by_offset,
+ (void *) (uintptr_t) offset);
+ return entry ? entry->data : NULL;
}
struct gen_group *
gen_spec_find_register_by_name(struct gen_spec *spec, const char *name)
{
- for (int i = 0; i < spec->nregisters; i++) {
- if (strcmp(spec->registers[i]->name, name) == 0)
- return spec->registers[i];
- }
-
- return NULL;
+ struct hash_entry *entry =
+ _mesa_hash_table_search(spec->registers_by_name, name);
+ return entry ? entry->data : NULL;
}
struct gen_enum *
gen_spec_find_enum(struct gen_spec *spec, const char *name)
{
- for (int i = 0; i < spec->nenums; i++)
- if (strcmp(spec->enums[i]->name, name) == 0)
- return spec->enums[i];
-
- return NULL;
+ struct hash_entry *entry = _mesa_hash_table_search(spec->enums,
+ name);
+ return entry ? entry->data : NULL;
}
uint32_t
exit(EXIT_FAILURE);
}
-static void *
-fail_on_null(void *p)
-{
- if (p == NULL) {
- fprintf(stderr, "aubinator: out of memory\n");
- exit(EXIT_FAILURE);
- }
-
- return p;
-}
-
-static char *
-xstrdup(const char *s)
-{
- return fail_on_null(strdup(s));
-}
-
-static void *
-zalloc(size_t s)
-{
- return calloc(s, 1);
-}
-
-static void *
-xzalloc(size_t s)
-{
- return fail_on_null(zalloc(s));
-}
-
static void
get_group_offset_count(const char **atts, uint32_t *offset, uint32_t *count,
uint32_t *size, bool *variable)
{
- char *p;
- int i;
+ for (int i = 0; atts[i]; i += 2) {
+ char *p;
- for (i = 0; atts[i]; i += 2) {
if (strcmp(atts[i], "count") == 0) {
*count = strtoul(atts[i + 1], &p, 0);
if (*count == 0)
{
struct gen_group *group;
- group = xzalloc(sizeof(*group));
+ group = rzalloc(ctx->spec, struct gen_group);
if (name)
- group->name = xstrdup(name);
+ group->name = ralloc_strdup(group, name);
group->spec = ctx->spec;
- group->group_offset = 0;
- group->group_count = 0;
group->variable = false;
+ for (int i = 0; atts[i]; i += 2) {
+ char *p;
+ if (strcmp(atts[i], "length") == 0) {
+ group->dw_length = strtoul(atts[i + 1], &p, 0);
+ }
+ }
+
if (parent) {
group->parent = parent;
get_group_offset_count(atts,
{
struct gen_enum *e;
- e = xzalloc(sizeof(*e));
+ e = rzalloc(ctx->spec, struct gen_enum);
if (name)
- e->name = xstrdup(name);
-
- e->nvalues = 0;
+ e->name = ralloc_strdup(e, name);
return e;
}
static void
get_register_offset(const char **atts, uint32_t *offset)
{
- char *p;
- int i;
+ for (int i = 0; atts[i]; i += 2) {
+ char *p;
- for (i = 0; atts[i]; i += 2) {
if (strcmp(atts[i], "num") == 0)
*offset = strtoul(atts[i + 1], &p, 0);
}
}
static inline uint64_t
-field(uint64_t value, int start, int end)
+field_value(uint64_t value, int start, int end)
{
get_start_end_pos(&start, &end);
return (value & mask(start, end)) >> (start);
}
-static inline uint64_t
-field_address(uint64_t value, int start, int end)
-{
- /* no need to right shift for address/offset */
- get_start_end_pos(&start, &end);
- return (value & mask(start, end));
-}
-
static struct gen_type
string_to_type(struct parser_context *ctx, const char *s)
{
create_field(struct parser_context *ctx, const char **atts)
{
struct gen_field *field;
- char *p;
- int i;
- field = xzalloc(sizeof(*field));
+ field = rzalloc(ctx->group, struct gen_field);
+ field->parent = ctx->group;
+
+ for (int i = 0; atts[i]; i += 2) {
+ char *p;
- for (i = 0; atts[i]; i += 2) {
if (strcmp(atts[i], "name") == 0)
- field->name = xstrdup(atts[i + 1]);
+ field->name = ralloc_strdup(field, atts[i + 1]);
else if (strcmp(atts[i], "start") == 0)
field->start = strtoul(atts[i + 1], &p, 0);
else if (strcmp(atts[i], "end") == 0) {
static struct gen_value *
create_value(struct parser_context *ctx, const char **atts)
{
- struct gen_value *value = xzalloc(sizeof(*value));
+ struct gen_value *value = rzalloc(ctx->values, struct gen_value);
for (int i = 0; atts[i]; i += 2) {
if (strcmp(atts[i], "name") == 0)
- value->name = xstrdup(atts[i + 1]);
+ value->name = ralloc_strdup(value, atts[i + 1]);
else if (strcmp(atts[i], "value") == 0)
value->value = strtoul(atts[i + 1], NULL, 0);
}
start_element(void *data, const char *element_name, const char **atts)
{
struct parser_context *ctx = data;
- int i;
const char *name = NULL;
const char *gen = NULL;
ctx->loc.line_number = XML_GetCurrentLineNumber(ctx->parser);
- for (i = 0; atts[i]; i += 2) {
+ for (int i = 0; atts[i]; i += 2) {
if (strcmp(atts[i], "name") == 0)
name = atts[i + 1];
else if (strcmp(atts[i], "gen") == 0)
if (gen == NULL)
fail(&ctx->loc, "no gen given");
- ctx->platform = xstrdup(name);
int major, minor;
int n = sscanf(gen, "%d.%d", &major, &minor);
if (n == 0)
previous_group->next = group;
ctx->group = group;
} else if (strcmp(element_name, "field") == 0) {
- ctx->fields[ctx->nfields++] = create_and_append_field(ctx, atts);
+ ctx->last_field = create_and_append_field(ctx, atts);
} else if (strcmp(element_name, "enum") == 0) {
ctx->enoom = create_enum(ctx, name, atts);
} else if (strcmp(element_name, "value") == 0) {
- ctx->values[ctx->nvalues++] = create_value(ctx, atts);
- assert(ctx->nvalues < ARRAY_SIZE(ctx->values));
+ if (ctx->n_values >= ctx->n_allocated_values) {
+ ctx->n_allocated_values = MAX2(2, ctx->n_allocated_values * 2);
+ ctx->values = reralloc_array_size(ctx->spec, ctx->values,
+ sizeof(struct gen_value *),
+ ctx->n_allocated_values);
+ }
+ assert(ctx->n_values < ctx->n_allocated_values);
+ ctx->values[ctx->n_values++] = create_value(ctx, atts);
}
}
}
if (strcmp(name, "instruction") == 0)
- spec->commands[spec->ncommands++] = group;
+ _mesa_hash_table_insert(spec->commands, group->name, group);
else if (strcmp(name, "struct") == 0)
- spec->structs[spec->nstructs++] = group;
- else if (strcmp(name, "register") == 0)
- spec->registers[spec->nregisters++] = group;
-
- assert(spec->ncommands < ARRAY_SIZE(spec->commands));
- assert(spec->nstructs < ARRAY_SIZE(spec->structs));
- assert(spec->nregisters < ARRAY_SIZE(spec->registers));
+ _mesa_hash_table_insert(spec->structs, group->name, group);
+ else if (strcmp(name, "register") == 0) {
+ _mesa_hash_table_insert(spec->registers_by_name, group->name, group);
+ _mesa_hash_table_insert(spec->registers_by_offset,
+ (void *) (uintptr_t) group->register_offset,
+ group);
+ }
} else if (strcmp(name, "group") == 0) {
ctx->group = ctx->group->parent;
} else if (strcmp(name, "field") == 0) {
- struct gen_field *field = ctx->fields[ctx->nfields - 1];
- size_t size = ctx->nvalues * sizeof(ctx->values[0]);
- ctx->nfields--;
- assert(ctx->nfields >= 0);
- field->inline_enum.values = xzalloc(size);
- field->inline_enum.nvalues = ctx->nvalues;
- memcpy(field->inline_enum.values, ctx->values, size);
- ctx->nvalues = 0;
+ struct gen_field *field = ctx->last_field;
+ ctx->last_field = NULL;
+ field->inline_enum.values = ctx->values;
+ field->inline_enum.nvalues = ctx->n_values;
+ ctx->values = ralloc_array(ctx->spec, struct gen_value*, ctx->n_allocated_values = 2);
+ ctx->n_values = 0;
} else if (strcmp(name, "enum") == 0) {
struct gen_enum *e = ctx->enoom;
- size_t size = ctx->nvalues * sizeof(ctx->values[0]);
- e->values = xzalloc(size);
- e->nvalues = ctx->nvalues;
- memcpy(e->values, ctx->values, size);
- ctx->nvalues = 0;
+ e->values = ctx->values;
+ e->nvalues = ctx->n_values;
+ ctx->values = ralloc_array(ctx->spec, struct gen_value*, ctx->n_allocated_values = 2);
+ ctx->n_values = 0;
ctx->enoom = NULL;
- spec->enums[spec->nenums++] = e;
+ _mesa_hash_table_insert(spec->enums, e->name, e);
}
}
return zstream.total_out;
}
+static uint32_t _hash_uint32(const void *key)
+{
+ return (uint32_t) (uintptr_t) key;
+}
+
struct gen_spec *
gen_spec_load(const struct gen_device_info *devinfo)
{
XML_SetElementHandler(ctx.parser, start_element, end_element);
XML_SetCharacterDataHandler(ctx.parser, character_data);
- ctx.spec = xzalloc(sizeof(*ctx.spec));
+ ctx.spec = rzalloc(NULL, struct gen_spec);
+
+ ctx.spec->commands =
+ _mesa_hash_table_create(ctx.spec, _mesa_hash_string, _mesa_key_string_equal);
+ ctx.spec->structs =
+ _mesa_hash_table_create(ctx.spec, _mesa_hash_string, _mesa_key_string_equal);
+ ctx.spec->registers_by_name =
+ _mesa_hash_table_create(ctx.spec, _mesa_hash_string, _mesa_key_string_equal);
+ ctx.spec->registers_by_offset =
+ _mesa_hash_table_create(ctx.spec, _hash_uint32, _mesa_key_pointer_equal);
+ ctx.spec->enums =
+ _mesa_hash_table_create(ctx.spec, _mesa_hash_string, _mesa_key_string_equal);
+
+ ctx.spec->access_cache =
+ _mesa_hash_table_create(ctx.spec, _mesa_hash_string, _mesa_key_string_equal);
total_length = zlib_inflate(compress_genxmls,
sizeof(compress_genxmls),
XML_SetElementHandler(ctx.parser, start_element, end_element);
XML_SetCharacterDataHandler(ctx.parser, character_data);
ctx.loc.filename = filename;
- ctx.spec = xzalloc(sizeof(*ctx.spec));
+ ctx.spec = rzalloc(NULL, struct gen_spec);
do {
buf = XML_GetBuffer(ctx.parser, XML_BUFFER_SIZE);
return ctx.spec;
}
+void gen_spec_destroy(struct gen_spec *spec)
+{
+ ralloc_free(spec);
+}
+
struct gen_group *
gen_spec_find_instruction(struct gen_spec *spec, const uint32_t *p)
{
- for (int i = 0; i < spec->ncommands; i++) {
- uint32_t opcode = *p & spec->commands[i]->opcode_mask;
- if (opcode == spec->commands[i]->opcode)
- return spec->commands[i];
+ struct hash_entry *entry;
+
+ hash_table_foreach(spec->commands, entry) {
+ struct gen_group *command = entry->data;
+ uint32_t opcode = *p & command->opcode_mask;
+ if (opcode == command->opcode)
+ return command;
+ }
+
+ return NULL;
+}
+
+struct gen_field *
+gen_group_find_field(struct gen_group *group, const char *name)
+{
+ char path[256];
+ snprintf(path, sizeof(path), "%s/%s", group->name, name);
+
+ struct gen_spec *spec = group->spec;
+ struct hash_entry *entry = _mesa_hash_table_search(spec->access_cache,
+ path);
+ if (entry)
+ return entry->data;
+
+ struct gen_field *field = group->fields;
+ while (field) {
+ if (strcmp(field->name, name) == 0) {
+ _mesa_hash_table_insert(spec->access_cache,
+ ralloc_strdup(spec, path),
+ field);
+ return field;
+ }
+ field = field->next;
}
return NULL;
gen_group_get_length(struct gen_group *group, const uint32_t *p)
{
uint32_t h = p[0];
- uint32_t type = field(h, 29, 31);
+ uint32_t type = field_value(h, 29, 31);
switch (type) {
case 0: /* MI */ {
- uint32_t opcode = field(h, 23, 28);
+ uint32_t opcode = field_value(h, 23, 28);
if (opcode < 16)
return 1;
else
- return field(h, 0, 7) + 2;
+ return field_value(h, 0, 7) + 2;
break;
}
case 2: /* BLT */ {
- return field(h, 0, 7) + 2;
+ return field_value(h, 0, 7) + 2;
}
case 3: /* Render */ {
- uint32_t subtype = field(h, 27, 28);
- uint32_t opcode = field(h, 24, 26);
- uint16_t whole_opcode = field(h, 16, 31);
+ uint32_t subtype = field_value(h, 27, 28);
+ uint32_t opcode = field_value(h, 24, 26);
+ uint16_t whole_opcode = field_value(h, 16, 31);
switch (subtype) {
case 0:
if (whole_opcode == 0x6104 /* PIPELINE_SELECT_965 */)
return 1;
else if (opcode < 2)
- return field(h, 0, 7) + 2;
+ return field_value(h, 0, 7) + 2;
else
return -1;
case 1:
return -1;
case 2: {
if (opcode == 0)
- return field(h, 0, 7) + 2;
+ return field_value(h, 0, 7) + 2;
else if (opcode < 3)
- return field(h, 0, 15) + 2;
+ return field_value(h, 0, 15) + 2;
else
return -1;
}
if (whole_opcode == 0x780b)
return 1;
else if (opcode < 4)
- return field(h, 0, 7) + 2;
+ return field_value(h, 0, 7) + 2;
else
return -1;
}
return -1;
}
-void
-gen_field_iterator_init(struct gen_field_iterator *iter,
- struct gen_group *group,
- const uint32_t *p,
- bool print_colors)
-{
- memset(iter, 0, sizeof(*iter));
-
- iter->group = group;
- iter->field = group->fields;
- iter->p = p;
- iter->print_colors = print_colors;
-}
-
static const char *
gen_get_enum_name(struct gen_enum *e, uint64_t value)
{
static bool
iter_advance_field(struct gen_field_iterator *iter)
{
- while (!iter_more_fields(iter)) {
+ if (iter_more_fields(iter)) {
+ iter->field = iter->field->next;
+ } else {
if (!iter_more_groups(iter))
return false;
iter_advance_group(iter);
}
- iter->field = iter->field->next;
if (iter->field->name)
- strncpy(iter->name, iter->field->name, sizeof(iter->name));
+ strncpy(iter->name, iter->field->name, sizeof(iter->name));
else
memset(iter->name, 0, sizeof(iter->name));
int group_member_offset = iter_group_offset_bits(iter, iter->group_iter);
- iter->start = group_member_offset + iter->field->start;
- iter->end = group_member_offset + iter->field->end;
- iter->dword = iter->start / 32;
+ iter->bit = group_member_offset + iter->field->start;
iter->struct_desc = NULL;
return true;
}
-bool
-gen_field_iterator_next(struct gen_field_iterator *iter)
+static uint64_t
+iter_decode_field_raw(struct gen_field_iterator *iter)
+{
+ uint64_t qw = 0;
+
+ int field_start = iter->p_bit + iter->bit;
+ int field_end = field_start + (iter->field->end - iter->field->start);
+
+ const uint32_t *p = iter->p + (iter->bit / 32);
+ if ((field_end - field_start) > 32) {
+ if ((p + 1) < iter->p_end)
+ qw = ((uint64_t) p[1]) << 32;
+ qw |= p[0];
+ } else
+ qw = p[0];
+
+ qw = field_value(qw, field_start, field_end);
+
+ /* Address & offset types have to be aligned to dwords, their start bit is
+ * a reminder of the alignment requirement.
+ */
+ if (iter->field->type.kind == GEN_TYPE_ADDRESS ||
+ iter->field->type.kind == GEN_TYPE_OFFSET)
+ qw <<= field_start % 32;
+
+ return qw;
+}
+
+static void
+iter_decode_field(struct gen_field_iterator *iter)
{
union {
uint64_t qw;
float f;
} v;
- if (!iter_advance_field(iter))
- return false;
-
- if ((iter->end - iter->start) > 32)
- v.qw = ((uint64_t) iter->p[iter->dword+1] << 32) | iter->p[iter->dword];
+ if (iter->field->name)
+ strncpy(iter->name, iter->field->name, sizeof(iter->name));
else
- v.qw = iter->p[iter->dword];
+ memset(iter->name, 0, sizeof(iter->name));
+
+ memset(&v, 0, sizeof(v));
+
+ iter->raw_value = iter_decode_field_raw(iter);
const char *enum_name = NULL;
+ v.qw = iter->raw_value;
switch (iter->field->type.kind) {
case GEN_TYPE_UNKNOWN:
case GEN_TYPE_INT: {
- uint64_t value = field(v.qw, iter->start, iter->end);
- snprintf(iter->value, sizeof(iter->value), "%"PRId64, value);
- enum_name = gen_get_enum_name(&iter->field->inline_enum, value);
+ snprintf(iter->value, sizeof(iter->value), "%"PRId64, v.qw);
+ enum_name = gen_get_enum_name(&iter->field->inline_enum, v.qw);
break;
}
case GEN_TYPE_UINT: {
- uint64_t value = field(v.qw, iter->start, iter->end);
- snprintf(iter->value, sizeof(iter->value), "%"PRIu64, value);
- enum_name = gen_get_enum_name(&iter->field->inline_enum, value);
+ snprintf(iter->value, sizeof(iter->value), "%"PRIu64, v.qw);
+ enum_name = gen_get_enum_name(&iter->field->inline_enum, v.qw);
break;
}
case GEN_TYPE_BOOL: {
const char *true_string =
iter->print_colors ? "\e[0;35mtrue\e[0m" : "true";
snprintf(iter->value, sizeof(iter->value), "%s",
- field(v.qw, iter->start, iter->end) ?
- true_string : "false");
+ v.qw ? true_string : "false");
break;
}
case GEN_TYPE_FLOAT:
break;
case GEN_TYPE_ADDRESS:
case GEN_TYPE_OFFSET:
- snprintf(iter->value, sizeof(iter->value), "0x%08"PRIx64,
- field_address(v.qw, iter->start, iter->end));
+ snprintf(iter->value, sizeof(iter->value), "0x%08"PRIx64, v.qw);
break;
case GEN_TYPE_STRUCT:
snprintf(iter->value, sizeof(iter->value), "<struct %s>",
break;
case GEN_TYPE_UFIXED:
snprintf(iter->value, sizeof(iter->value), "%f",
- (float) field(v.qw, iter->start, iter->end) /
- (1 << iter->field->type.f));
+ (float) v.qw / (1 << iter->field->type.f));
break;
case GEN_TYPE_SFIXED:
/* FIXME: Sign extend extracted field. */
case GEN_TYPE_MBO:
break;
case GEN_TYPE_ENUM: {
- uint64_t value = field(v.qw, iter->start, iter->end);
- snprintf(iter->value, sizeof(iter->value),
- "%"PRId64, value);
- enum_name = gen_get_enum_name(iter->field->type.gen_enum, value);
+ snprintf(iter->value, sizeof(iter->value), "%"PRId64, v.qw);
+ enum_name = gen_get_enum_name(iter->field->type.gen_enum, v.qw);
break;
}
}
snprintf(iter->value + length, sizeof(iter->value) - length,
" (%s)", enum_name);
}
+}
+
+void
+gen_field_iterator_init(struct gen_field_iterator *iter,
+ struct gen_group *group,
+ const uint32_t *p, int p_bit,
+ bool print_colors)
+{
+ memset(iter, 0, sizeof(*iter));
+
+ iter->group = group;
+ if (group->fields)
+ iter->field = group->fields;
+ else
+ iter->field = group->next->fields;
+ iter->p = p;
+ iter->p_bit = p_bit;
+ iter->p_end = &p[gen_group_get_length(iter->group, iter->p)];
+ iter->print_colors = print_colors;
+
+ iter_decode_field(iter);
+}
+
+bool
+gen_field_iterator_next(struct gen_field_iterator *iter)
+{
+ if (!iter_advance_field(iter))
+ return false;
+
+ iter_decode_field(iter);
return true;
}
static void
print_dword_header(FILE *outfile,
- struct gen_field_iterator *iter, uint64_t offset)
+ struct gen_field_iterator *iter,
+ uint64_t offset, uint32_t dword)
{
fprintf(outfile, "0x%08"PRIx64": 0x%08x : Dword %d\n",
- offset + 4 * iter->dword, iter->p[iter->dword], iter->dword);
+ offset + 4 * dword, iter->p[dword], dword);
}
-static bool
-is_header_field(struct gen_group *group, struct gen_field *field)
+bool
+gen_field_is_header(struct gen_field *field)
{
uint32_t bits;
bits = (1U << (field->end - field->start + 1)) - 1;
bits <<= field->start;
- return (group->opcode_mask & bits) != 0;
+ return (field->parent->opcode_mask & bits) != 0;
}
void
-gen_print_group(FILE *outfile, struct gen_group *group,
- uint64_t offset, const uint32_t *p, bool color)
+gen_print_group(FILE *outfile, struct gen_group *group, uint64_t offset,
+ const uint32_t *p, int p_bit, bool color)
{
struct gen_field_iterator iter;
- int last_dword = 0;
+ int last_dword = -1;
- gen_field_iterator_init(&iter, group, p, color);
- while (gen_field_iterator_next(&iter)) {
- if (last_dword != iter.dword) {
- print_dword_header(outfile, &iter, offset);
- last_dword = iter.dword;
+ gen_field_iterator_init(&iter, group, p, p_bit, color);
+ do {
+ int iter_dword = iter.bit / 32;
+ if (last_dword != iter_dword) {
+ for (int i = last_dword + 1; i <= iter_dword; i++)
+ print_dword_header(outfile, &iter, offset, i);
+ last_dword = iter_dword;
}
- if (!is_header_field(group, iter.field)) {
+ if (!gen_field_is_header(iter.field)) {
fprintf(outfile, " %s: %s\n", iter.name, iter.value);
if (iter.struct_desc) {
- uint64_t struct_offset = offset + 4 * iter.dword;
+ uint64_t struct_offset = offset + 4 * iter_dword;
gen_print_group(outfile, iter.struct_desc, struct_offset,
- &p[iter.dword], color);
+ &p[iter_dword], iter.bit % 32, color);
}
}
- }
+ } while (gen_field_iterator_next(&iter));
}
projects / mesa.git / blobdiff