fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 16:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

v3d: Add a separate flag for CLIF ABI output versus human-readable CLs.

Browse source 
A few of the upcoming changes would make the V3D_DEBUG=cl output less
readable, so let's make proper CLIF file production be under a separate
V3D_DEBUG=clif flag.
This commit is contained in:
Eric Anholt 2018-07-30 11:29:26 -07:00
parent 89ac6fa403
commit 103f21b13d
7 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/broadcom/clif/clif_dump.c
View file

@ -51,13 +51,14 @@ clif_dump_add_address_to_worklist(struct clif_dump *clif,
struct clif_dump *
clif_dump_init(const struct v3d_device_info *devinfo,
FILE *out)
FILE *out, bool pretty)
{
struct clif_dump *clif = rzalloc(NULL, struct clif_dump);
clif->devinfo = devinfo;
clif->out = out;
clif->spec = v3d_spec_load(devinfo);
clif->pretty = pretty;
list_inithead(&clif->worklist);

2
src/broadcom/clif/clif_dump.h
View file

@ -31,7 +31,7 @@ struct v3d_device_info;
struct clif_dump;
struct clif_dump *clif_dump_init(const struct v3d_device_info *devinfo,
FILE *output);
FILE *output, bool pretty);
void clif_dump(struct clif_dump *clif);
void clif_dump_destroy(struct clif_dump *clif);

6
src/broadcom/clif/clif_private.h
View file

@ -47,6 +47,12 @@ struct clif_dump {
struct clif_bo *bo;
int bo_count;
int bo_array_size;
/**
* Flag to switch from CLIF ABI to slightly more human-readable
* output.
*/
bool pretty;
};
enum reloc_worklist_type {

1
src/broadcom/common/v3d_debug.c
View file

@ -41,6 +41,7 @@ uint32_t V3D_DEBUG = 0;
static const struct debug_control debug_control[] = {
{ "cl", V3D_DEBUG_CL},
{ "clif", V3D_DEBUG_CLIF},
{ "qpu", V3D_DEBUG_QPU},
{ "vir", V3D_DEBUG_VIR},
{ "nir", V3D_DEBUG_NIR},

1
src/broadcom/common/v3d_debug.h
View file

@ -54,6 +54,7 @@ extern uint32_t V3D_DEBUG;
#define V3D_DEBUG_PERF (1 << 10)
#define V3D_DEBUG_NORAST (1 << 11)
#define V3D_DEBUG_ALWAYS_FLUSH (1 << 12)
#define V3D_DEBUG_CLIF (1 << 13)
#ifdef HAVE_ANDROID_PLATFORM
#define LOG_TAG "BROADCOM-MESA"

5
src/gallium/drivers/v3d/v3d_job.c
View file

@ -344,11 +344,12 @@ v3d_get_job_for_fbo(struct v3d_context *v3d)
static void
v3d_clif_dump(struct v3d_context *v3d, struct v3d_job *job)
{
if (!(V3D_DEBUG & V3D_DEBUG_CL))
if (!(V3D_DEBUG & (V3D_DEBUG_CL | V3D_DEBUG_CLIF)))
return;
struct clif_dump *clif = clif_dump_init(&v3d->screen->devinfo,
stderr);
stderr,
V3D_DEBUG & V3D_DEBUG_CL);
struct set_entry *entry;
set_foreach(job->bos, entry) {

2
src/gallium/drivers/vc4/vc4_cl_dump.c
View file

@ -42,7 +42,7 @@ vc4_dump_cl(void *cl, uint32_t size, bool is_render)
};
struct v3d_spec *spec = v3d_spec_load(&devinfo);
struct clif_dump *clif = clif_dump_init(&devinfo, stderr);
struct clif_dump *clif = clif_dump_init(&devinfo, stderr, true);
uint32_t offset = 0, hw_offset = 0;
uint8_t *p = cl;