group->spec = ctx->spec;
group->variable = false;
group->fixed_length = fixed_length;
+ group->dword_length_field = NULL;
+ group->dw_length = 0;
+ group->engine_mask = I915_ENGINE_CLASS_TO_MASK(I915_ENGINE_CLASS_RENDER) |
+ I915_ENGINE_CLASS_TO_MASK(I915_ENGINE_CLASS_VIDEO) |
+ I915_ENGINE_CLASS_TO_MASK(I915_ENGINE_CLASS_COPY);
+ group->bias = 1;
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);
+ } else if (strcmp(atts[i], "bias") == 0) {
+ group->bias = strtoul(atts[i + 1], &p, 0);
+ } else if (strcmp(atts[i], "engine") == 0) {
+ void *mem_ctx = ralloc_context(NULL);
+ char *tmp = ralloc_strdup(mem_ctx, atts[i + 1]);
+ char *save_ptr;
+ char *tok = strtok_r(tmp, "|", &save_ptr);
+
+ group->engine_mask = 0;
+ while (tok != NULL) {
+ if (strcmp(tok, "render") == 0) {
+ group->engine_mask |= I915_ENGINE_CLASS_TO_MASK(I915_ENGINE_CLASS_RENDER);
+ } else if (strcmp(tok, "video") == 0) {
+ group->engine_mask |= I915_ENGINE_CLASS_TO_MASK(I915_ENGINE_CLASS_VIDEO);
+ } else if (strcmp(tok, "blitter") == 0) {
+ group->engine_mask |= I915_ENGINE_CLASS_TO_MASK(I915_ENGINE_CLASS_COPY);
+ } else {
+ fprintf(stderr, "unknown engine class defined for instruction \"%s\": %s\n", name, atts[i + 1]);
+ }
+
+ tok = strtok_r(NULL, "|", &save_ptr);
+ }
+
+ ralloc_free(mem_ctx);
}
}
for (int i = 0; atts[i]; i += 2) {
char *p;
- if (strcmp(atts[i], "name") == 0)
+ if (strcmp(atts[i], "name") == 0) {
field->name = ralloc_strdup(field, atts[i + 1]);
- else if (strcmp(atts[i], "start") == 0)
+ if (strcmp(field->name, "DWord Length") == 0) {
+ field->parent->dword_length_field = field;
+ }
+ } else if (strcmp(atts[i], "start") == 0) {
field->start = strtoul(atts[i + 1], &p, 0);
- else if (strcmp(atts[i], "end") == 0) {
+ } else if (strcmp(atts[i], "end") == 0) {
field->end = strtoul(atts[i + 1], &p, 0);
- } else if (strcmp(atts[i], "type") == 0)
+ } else if (strcmp(atts[i], "type") == 0) {
field->type = string_to_type(ctx, atts[i + 1]);
- else if (strcmp(atts[i], "default") == 0 &&
+ } else if (strcmp(atts[i], "default") == 0 &&
field->start >= 16 && field->end <= 31) {
field->has_default = true;
field->default_value = strtoul(atts[i + 1], &p, 0);
}
static int
-devinfo_to_gen(const struct gen_device_info *devinfo)
+devinfo_to_gen(const struct gen_device_info *devinfo, bool x10)
{
- int value = 10 * devinfo->gen;
-
- if (devinfo->is_baytrail || devinfo->is_haswell)
- value += 5;
+ if (devinfo->is_baytrail || devinfo->is_haswell) {
+ return devinfo->gen * 10 + 5;
+ }
- return value;
+ return x10 ? devinfo->gen * 10 : devinfo->gen;
}
static uint32_t zlib_inflate(const void *compressed_data,
return (uint32_t) (uintptr_t) key;
}
+static struct gen_spec *
+gen_spec_init(void)
+{
+ struct gen_spec *spec;
+ spec = rzalloc(NULL, struct gen_spec);
+ if (spec == NULL)
+ return NULL;
+
+ spec->commands =
+ _mesa_hash_table_create(spec, _mesa_hash_string, _mesa_key_string_equal);
+ spec->structs =
+ _mesa_hash_table_create(spec, _mesa_hash_string, _mesa_key_string_equal);
+ spec->registers_by_name =
+ _mesa_hash_table_create(spec, _mesa_hash_string, _mesa_key_string_equal);
+ spec->registers_by_offset =
+ _mesa_hash_table_create(spec, _hash_uint32, _mesa_key_pointer_equal);
+ spec->enums =
+ _mesa_hash_table_create(spec, _mesa_hash_string, _mesa_key_string_equal);
+ spec->access_cache =
+ _mesa_hash_table_create(spec, _mesa_hash_string, _mesa_key_string_equal);
+
+ return spec;
+}
+
struct gen_spec *
gen_spec_load(const struct gen_device_info *devinfo)
{
uint8_t *text_data = NULL;
uint32_t text_offset = 0, text_length = 0;
MAYBE_UNUSED uint32_t total_length;
- uint32_t gen_10 = devinfo_to_gen(devinfo);
+ uint32_t gen_10 = devinfo_to_gen(devinfo, true);
for (int i = 0; i < ARRAY_SIZE(genxml_files_table); i++) {
if (genxml_files_table[i].gen_10 == gen_10) {
XML_SetElementHandler(ctx.parser, start_element, end_element);
XML_SetCharacterDataHandler(ctx.parser, character_data);
- 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);
+ ctx.spec = gen_spec_init();
+ if (ctx.spec == NULL) {
+ fprintf(stderr, "Failed to create gen_spec\n");
+ return NULL;
+ }
total_length = zlib_inflate(compress_genxmls,
sizeof(compress_genxmls),
FILE *input;
len = snprintf(filename, filename_len, "%s/gen%i.xml",
- path, devinfo_to_gen(devinfo));
+ path, devinfo_to_gen(devinfo, false));
assert(len < filename_len);
input = fopen(filename, "r");
XML_SetElementHandler(ctx.parser, start_element, end_element);
XML_SetCharacterDataHandler(ctx.parser, character_data);
ctx.loc.filename = filename;
- ctx.spec = rzalloc(NULL, struct gen_spec);
+
+ ctx.spec = gen_spec_init();
+ if (ctx.spec == NULL) {
+ fprintf(stderr, "Failed to create gen_spec\n");
+ goto end;
+ }
do {
buf = XML_GetBuffer(ctx.parser, XML_BUFFER_SIZE);
len = fread(buf, 1, XML_BUFFER_SIZE, input);
- if (len == 0) {
+ if (ferror(input)) {
fprintf(stderr, "fread: %m\n");
- free(ctx.spec);
+ gen_spec_destroy(ctx.spec);
ctx.spec = NULL;
goto end;
- }
+ } else if (feof(input))
+ goto end;
+
if (XML_ParseBuffer(ctx.parser, len, len == 0) == 0) {
fprintf(stderr,
"Error parsing XML at line %ld col %ld: %s\n",
XML_GetCurrentLineNumber(ctx.parser),
XML_GetCurrentColumnNumber(ctx.parser),
XML_ErrorString(XML_GetErrorCode(ctx.parser)));
- free(ctx.spec);
+ gen_spec_destroy(ctx.spec);
ctx.spec = NULL;
goto end;
}
fclose(input);
free(filename);
+ /* free ctx.spec if genxml is empty */
+ if (ctx.spec && _mesa_hash_table_num_entries(ctx.spec->commands) == 0) {
+ gen_spec_destroy(ctx.spec);
+ return NULL;
+ }
+
return ctx.spec;
}
}
struct gen_group *
-gen_spec_find_instruction(struct gen_spec *spec, const uint32_t *p)
+gen_spec_find_instruction(struct gen_spec *spec,
+ enum drm_i915_gem_engine_class engine,
+ const uint32_t *p)
{
- 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)
+ if ((command->engine_mask & I915_ENGINE_CLASS_TO_MASK(engine)) &&
+ opcode == command->opcode)
return command;
}
int
gen_group_get_length(struct gen_group *group, const uint32_t *p)
{
- if (group && group->fixed_length)
- return group->dw_length;
+ if (group) {
+ if (group->fixed_length)
+ return group->dw_length;
+ else {
+ struct gen_field *field = group->dword_length_field;
+ if (field) {
+ return field_value(p[0], field->start, field->end) + group->bias;
+ }
+ }
+ }
uint32_t h = p[0];
uint32_t type = field_value(h, 29, 31);
iter_more_groups(const struct gen_field_iterator *iter)
{
if (iter->group->variable) {
+ int length = gen_group_get_length(iter->group, iter->p);
+ assert(length >= 0 && "error the length is unknown!");
return iter_group_offset_bits(iter, iter->group_iter + 1) <
- (gen_group_get_length(iter->group, iter->p) * 32);
+ (length * 32);
} else {
return (iter->group_iter + 1) < iter->group->group_count ||
iter->group->next != NULL;
}
}
+static void
+iter_start_field(struct gen_field_iterator *iter, struct gen_field *field)
+{
+ iter->field = field;
+
+ int group_member_offset = iter_group_offset_bits(iter, iter->group_iter);
+
+ iter->start_bit = group_member_offset + iter->field->start;
+ iter->end_bit = group_member_offset + iter->field->end;
+ iter->struct_desc = NULL;
+}
+
static void
iter_advance_group(struct gen_field_iterator *iter)
{
}
}
- iter->field = iter->group->fields;
+ iter_start_field(iter, iter->group->fields);
}
static bool
iter_advance_field(struct gen_field_iterator *iter)
{
if (iter_more_fields(iter)) {
- iter->field = iter->field->next;
+ iter_start_field(iter, iter->field->next);
} else {
if (!iter_more_groups(iter))
return false;
iter_advance_group(iter);
}
-
- if (iter->field->name)
- snprintf(iter->name, sizeof(iter->name), "%s", iter->field->name);
- else
- memset(iter->name, 0, sizeof(iter->name));
-
- int group_member_offset = iter_group_offset_bits(iter, iter->group_iter);
-
- iter->start_bit = group_member_offset + iter->field->start;
- iter->end_bit = group_member_offset + iter->field->end;
- iter->struct_desc = NULL;
-
return true;
}
int length = strlen(iter->value);
snprintf(iter->value + length, sizeof(iter->value) - length,
" (%s)", enum_name);
- } else if (strcmp(iter->name, "Surface Format") == 0) {
+ } else if (strcmp(iter->name, "Surface Format") == 0 ||
+ strcmp(iter->name, "Source Element Format") == 0) {
if (isl_format_is_valid((enum isl_format)v.qw)) {
const char *fmt_name = isl_format_get_name((enum isl_format)v.qw);
int length = strlen(iter->value);
iter->p_bit = p_bit;
int length = gen_group_get_length(iter->group, iter->p);
- iter->p_end = length > 0 ? &p[length] : NULL;
+ assert(length >= 0 && "error the length is unknown!");
+ iter->p_end = length >= 0 ? &p[length] : NULL;
iter->print_colors = print_colors;
}
/* Initial condition */
if (!iter->field) {
if (iter->group->fields)
- iter->field = iter->group->fields;
+ iter_start_field(iter, iter->group->fields);
else
- iter->field = iter->group->next->fields;
+ iter_start_field(iter, iter->group->next->fields);
bool result = iter_decode_field(iter);
- if (iter->p_end)
- assert(result);
+ if (!result && iter->p_end) {
+ /* We're dealing with a non empty struct of length=0 (BLEND_STATE on
+ * Gen 7.5)
+ */
+ assert(iter->group->dw_length == 0);
+ }
- return true;
+ return result;
}
if (!iter_advance_field(iter))
projects / mesa.git / blobdiff