fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 21:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

i965/asm: Explicitly use a nir_instr for IR annotations

Browse source 
Now that everything goes through NIR, we don't need this to be a void
pointer anymore.

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
This commit is contained in:
Jason Ekstrand 2015-10-05 15:49:34 -07:00
parent b23a4859f4
commit e00314bc57
4 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_fs_generator.cpp
View file

@ -2187,7 +2187,7 @@ fs_generator::generate_code(const cfg_t *cfg, int dispatch_width)
100.0f * (before_size - after_size) / before_size);
dump_assembly(p->store, annotation.ann_count, annotation.ann,
p->devinfo, prog);
p->devinfo);
ralloc_free(annotation.ann);
}

2
src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
View file

@ -1663,7 +1663,7 @@ vec4_generator::generate_code(const cfg_t *cfg)
100.0f * (before_size - after_size) / before_size);
dump_assembly(p->store, annotation.ann_count, annotation.ann,
p->devinfo, prog);
p->devinfo);
ralloc_free(annotation.ann);
}

17
src/mesa/drivers/dri/i965/intel_asm_annotation.c
View file

@ -33,8 +33,7 @@
void
dump_assembly(void *assembly, int num_annotations, struct annotation *annotation,
const struct brw_device_info *devinfo,
const struct gl_program *prog)
const struct brw_device_info *devinfo)
{
const char *last_annotation_string = NULL;
const void *last_annotation_ir = NULL;
@ -57,19 +56,7 @@ dump_assembly(void *assembly, int num_annotations, struct annotation *annotation
last_annotation_ir = annotation[i].ir;
if (last_annotation_ir) {
fprintf(stderr, " ");
if (prog->nir)
nir_print_instr(annotation[i].ir, stderr);
else if (!prog->Instructions)
fprint_ir(stderr, annotation[i].ir);
else {
const struct prog_instruction *pi =
(const struct prog_instruction *)annotation[i].ir;
fprintf(stderr, "%d: ",
(int)(pi - prog->Instructions));
_mesa_fprint_instruction_opt(stderr,
pi,
0, PROG_PRINT_DEBUG, NULL);
}
nir_print_instr(annotation[i].ir, stderr);
fprintf(stderr, "\n");
}
}

3
src/mesa/drivers/dri/i965/intel_asm_annotation.h
View file

@ -60,8 +60,7 @@ struct annotation_info {
void
dump_assembly(void *assembly, int num_annotations, struct annotation *annotation,
const struct brw_device_info *devinfo,
const struct gl_program *prog);
const struct brw_device_info *devinfo);
void
annotate(const struct brw_device_info *devinfo,