r600g: use a single env var R600_DEBUG, disable bytecode dumping

Only the disassembler is used to dump shaders. Here's a few examples
how to use R600_DEBUG.

Log compute info:
  R600_DEBUG=compute

Dump all shaders:
  R600_DEBUG=fs,vs,gs,ps,cs

Dump pixel shaders only:
  R600_DEBUG=ps

Disable Hyper-Z:
  R600_DEBUG=nohyperz

Disable the LLVM backend:
  R600_DEBUG=nollvm

Or use any combination of the above, or print all options:
  R600_DEBUG=help

Reviewed-by: Tom Stellard <[email protected]>

1 files changed, 18 insertions, 18 deletions

diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c
index 8b3104e40a1..796fcf1951f 100644
--- a/src/gallium/drivers/r600/evergreen_compute.c
+++ b/src/gallium/drivers/r600/evergreen_compute.c
@@ -127,7 +127,7 @@ void *evergreen_create_compute_state(
 	const unsigned char * code;
 	unsigned i;
 
-	COMPUTE_DBG("*** evergreen_create_compute_state\n");
+	COMPUTE_DBG(ctx->screen, "*** evergreen_create_compute_state\n");
 
 	header = cso->prog;
 	code = cso->prog + sizeof(struct pipe_llvm_program_header);
@@ -166,7 +166,7 @@ static void evergreen_bind_compute_state(struct pipe_context *ctx_, void *state)
 {
 	struct r600_context *ctx = (struct r600_context *)ctx_;
 
-	COMPUTE_DBG("*** evergreen_bind_compute_state\n");
+	COMPUTE_DBG(ctx->screen, "*** evergreen_bind_compute_state\n");
 
 	ctx->cs_shader_state.shader = (struct r600_pipe_compute *)state;
 }
@@ -231,7 +231,7 @@ void evergreen_compute_upload_input(
 
 	for (i = 0; i < (kernel_parameters_offset_bytes / 4) +
 					(shader->input_size / 4); i++) {
-		COMPUTE_DBG("input %i : %i\n", i,
+		COMPUTE_DBG(ctx->screen, "input %i : %i\n", i,
 			((unsigned*)num_work_groups_start)[i]);
 	}
 
@@ -272,7 +272,7 @@ static void evergreen_emit_direct_dispatch(
 	num_waves = (block_layout[0] * block_layout[1] * block_layout[2] +
 			wave_divisor - 1) / wave_divisor;
 
-	COMPUTE_DBG("Using %u pipes, there are %u wavefronts per thread block\n",
+	COMPUTE_DBG(rctx->screen, "Using %u pipes, there are %u wavefronts per thread block\n",
 							num_pipes, num_waves);
 
 	/* XXX: Partition the LDS between PS/CS.  By default half (4096 dwords
@@ -378,7 +378,7 @@ static void compute_emit_cs(struct r600_context *ctx, const uint *block_layout,
 	for (i = 0; i < get_compute_resource_num(); i++) {
 		if (resources[i].enabled) {
 			int j;
-			COMPUTE_DBG("resnum: %i, cdw: %i\n", i, cs->cdw);
+			COMPUTE_DBG(ctx->screen, "resnum: %i, cdw: %i\n", i, cs->cdw);
 
 			for (j = 0; j < resources[i].cs_end; j++) {
 				if (resources[i].do_reloc[j]) {
@@ -417,9 +417,9 @@ static void compute_emit_cs(struct r600_context *ctx, const uint *block_layout,
 	r600_flush_emit(ctx);
 
 #if 0
-	COMPUTE_DBG("cdw: %i\n", cs->cdw);
+	COMPUTE_DBG(ctx->screen, "cdw: %i\n", cs->cdw);
 	for (i = 0; i < cs->cdw; i++) {
-		COMPUTE_DBG("%4i : 0x%08X\n", i, ctx->cs->buf[i]);
+		COMPUTE_DBG(ctx->screen, "%4i : 0x%08X\n", i, ctx->cs->buf[i]);
 	}
 #endif
 
@@ -433,11 +433,11 @@ static void compute_emit_cs(struct r600_context *ctx, const uint *block_layout,
 	ctx->pm4_dirty_cdwords = 0;
 	ctx->flags = 0;
 
-	COMPUTE_DBG("shader started\n");
+	COMPUTE_DBG(ctx->screen, "shader started\n");
 
 	ctx->ws->buffer_wait(onebo->buf, 0);
 
-	COMPUTE_DBG("...\n");
+	COMPUTE_DBG(ctx->screen, "...\n");
 }
 
 
@@ -479,7 +479,7 @@ static void evergreen_launch_grid(
 	struct r600_context *ctx = (struct r600_context *)ctx_;
 
 #ifdef HAVE_OPENCL 
-	COMPUTE_DBG("*** evergreen_launch_grid: pc = %u\n", pc);
+	COMPUTE_DBG(ctx->screen, "*** evergreen_launch_grid: pc = %u\n", pc);
 
 	struct r600_pipe_compute *shader = ctx->cs_shader_state.shader;
 	if (!shader->kernels[pc].code_bo) {
@@ -506,7 +506,7 @@ static void evergreen_set_compute_resources(struct pipe_context * ctx_,
 	struct r600_context *ctx = (struct r600_context *)ctx_;
 	struct r600_surface **resources = (struct r600_surface **)surfaces;
 
-	COMPUTE_DBG("*** evergreen_set_compute_resources: start = %u count = %u\n",
+	COMPUTE_DBG(ctx->screen, "*** evergreen_set_compute_resources: start = %u count = %u\n",
 			start, count);
 
 	for (int i = 0; i < count; i++)	{
@@ -579,7 +579,7 @@ static void evergreen_set_global_binding(
 	struct r600_resource_global **buffers =
 		(struct r600_resource_global **)resources;
 
-	COMPUTE_DBG("*** evergreen_set_global_binding first = %u n = %u\n",
+	COMPUTE_DBG(ctx->screen, "*** evergreen_set_global_binding first = %u n = %u\n",
 			first, n);
 
 	if (!resources) {
@@ -817,8 +817,8 @@ struct pipe_resource *r600_compute_global_buffer_create(
 	CALLOC(sizeof(struct r600_resource_global), 1);
 	rscreen = (struct r600_screen*)screen;
 
-	COMPUTE_DBG("*** r600_compute_global_buffer_create\n");
-	COMPUTE_DBG("width = %u array_size = %u\n", templ->width0,
+	COMPUTE_DBG(rscreen, "*** r600_compute_global_buffer_create\n");
+	COMPUTE_DBG(rscreen, "width = %u array_size = %u\n", templ->width0,
 			templ->array_size);
 
 	result->base.b.vtbl = &r600_global_buffer_vtbl;
@@ -877,7 +877,7 @@ void *r600_compute_global_transfer_map(
 
 	assert(resource->target == PIPE_BUFFER);
 
-	COMPUTE_DBG("* r600_compute_global_get_transfer()\n"
+	COMPUTE_DBG(rctx->screen, "* r600_compute_global_get_transfer()\n"
 			"level = %u, usage = %u, box(x = %u, y = %u, z = %u "
 			"width = %u, height = %u, depth = %u)\n", level, usage,
 			box->x, box->y, box->z, box->width, box->height,
@@ -898,7 +898,7 @@ void *r600_compute_global_transfer_map(
 
 	///TODO: do it better, mapping is not possible if the pool is too big
 
-	COMPUTE_DBG("* r600_compute_global_transfer_map()\n");
+	COMPUTE_DBG(rctx->screen, "* r600_compute_global_transfer_map()\n");
 
 	if (!(map = r600_buffer_mmap_sync_with_rings(rctx, buffer->chunk->pool->bo, transfer->usage))) {
 		util_slab_free(&rctx->pool_transfers, transfer);
@@ -907,7 +907,7 @@ void *r600_compute_global_transfer_map(
 
 	*ptransfer = transfer;
 
-	COMPUTE_DBG("Buffer: %p + %u (buffer offset in global memory) "
+	COMPUTE_DBG(rctx->screen, "Buffer: %p + %u (buffer offset in global memory) "
 		"+ %u (box.x)\n", map, buffer->chunk->start_in_dw, transfer->box.x);
 	return ((char*)(map + buffer->chunk->start_in_dw)) + transfer->box.x;
 }
@@ -925,7 +925,7 @@ void r600_compute_global_transfer_unmap(
 	ctx = (struct r600_context *)ctx_;
 	buffer = (struct r600_resource_global*)transfer->resource;
 
-	COMPUTE_DBG("* r600_compute_global_transfer_unmap()\n");
+	COMPUTE_DBG(ctx->screen, "* r600_compute_global_transfer_unmap()\n");
 
 	ctx->ws->buffer_unmap(buffer->chunk->pool->bo->cs_buf);
 	util_slab_free(&ctx->pool_transfers, transfer);