Mesa (master): r600g/compute: Removed unused and untested code
Tom Stellard
tstellar at kemper.freedesktop.org
Thu Apr 25 20:34:38 UTC 2013
Module: Mesa
Branch: master
Commit: 53fbae7eace466d8fe22173c01518fbde7102d6c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=53fbae7eace466d8fe22173c01518fbde7102d6c
Author: Tom Stellard <thomas.stellard at amd.com>
Date: Mon Apr 22 09:12:07 2013 -0700
r600g/compute: Removed unused and untested code
There was a lot of code in evergreen_compute_internal.c that was not
being used at all and most of it was duplicating code from other parts
of the driver.
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
---
src/gallium/drivers/r600/Makefile.sources | 1 -
src/gallium/drivers/r600/compute_resource.def | 38 --
src/gallium/drivers/r600/evergreen_compute.c | 109 ++--
.../drivers/r600/evergreen_compute_internal.c | 627 --------------------
.../drivers/r600/evergreen_compute_internal.h | 67 ---
5 files changed, 66 insertions(+), 776 deletions(-)
diff --git a/src/gallium/drivers/r600/Makefile.sources b/src/gallium/drivers/r600/Makefile.sources
index 17ea03b..ec376ef 100644
--- a/src/gallium/drivers/r600/Makefile.sources
+++ b/src/gallium/drivers/r600/Makefile.sources
@@ -16,7 +16,6 @@ C_SOURCES = \
eg_asm.c \
r600_state_common.c \
evergreen_compute.c \
- evergreen_compute_internal.c \
compute_memory_pool.c \
r600_uvd.c
diff --git a/src/gallium/drivers/r600/compute_resource.def b/src/gallium/drivers/r600/compute_resource.def
deleted file mode 100644
index 161f506..0000000
--- a/src/gallium/drivers/r600/compute_resource.def
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, and/or sell copies of the Software, and to permit persons to whom
- * the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Adam Rak <adam.rak at streamnovation.com>
- */
-
-
-DECL_COMPUTE_RESOURCE(CONFIG, 1)
-DECL_COMPUTE_RESOURCE(CONST_MEM, 16)
-DECL_COMPUTE_RESOURCE(RAT, 12)
-DECL_COMPUTE_RESOURCE(VERT, 16)
-DECL_COMPUTE_RESOURCE(TEX, 16)
-DECL_COMPUTE_RESOURCE(SAMPLER, 18)
-DECL_COMPUTE_RESOURCE(LOOP, 32)
-DECL_COMPUTE_RESOURCE(LDS, 1)
-DECL_COMPUTE_RESOURCE(GDS, 1)
-DECL_COMPUTE_RESOURCE(EXPORT, 1)
-DECL_COMPUTE_RESOURCE(SHADER, 1)
-DECL_COMPUTE_RESOURCE(TMPRING, 4)
-DECL_COMPUTE_RESOURCE(DISPATCH, 1)
diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c
index b0151a8..489629f 100644
--- a/src/gallium/drivers/r600/evergreen_compute.c
+++ b/src/gallium/drivers/r600/evergreen_compute.c
@@ -81,6 +81,68 @@ writable images will consume TEX slots, VTX slots too because of linear indexing
*/
+struct r600_resource* r600_compute_buffer_alloc_vram(
+ struct r600_screen *screen,
+ unsigned size)
+{
+ struct pipe_resource * buffer = NULL;
+ assert(size);
+
+ buffer = pipe_buffer_create(
+ (struct pipe_screen*) screen,
+ PIPE_BIND_CUSTOM,
+ PIPE_USAGE_IMMUTABLE,
+ size);
+
+ return (struct r600_resource *)buffer;
+}
+
+
+static void evergreen_set_rat(
+ struct r600_pipe_compute *pipe,
+ int id,
+ struct r600_resource* bo,
+ int start,
+ int size)
+{
+ struct pipe_surface rat_templ;
+ struct r600_surface *surf = NULL;
+ struct r600_context *rctx = NULL;
+
+ assert(id < 12);
+ assert((size & 3) == 0);
+ assert((start & 0xFF) == 0);
+
+ rctx = pipe->ctx;
+
+ COMPUTE_DBG(rctx->screen, "bind rat: %i \n", id);
+
+ /* Create the RAT surface */
+ memset(&rat_templ, 0, sizeof(rat_templ));
+ rat_templ.format = PIPE_FORMAT_R32_UINT;
+ rat_templ.u.tex.level = 0;
+ rat_templ.u.tex.first_layer = 0;
+ rat_templ.u.tex.last_layer = 0;
+
+ /* Add the RAT the list of color buffers */
+ pipe->ctx->framebuffer.state.cbufs[id] = pipe->ctx->context.create_surface(
+ (struct pipe_context *)pipe->ctx,
+ (struct pipe_resource *)bo, &rat_templ);
+
+ /* Update the number of color buffers */
+ pipe->ctx->framebuffer.state.nr_cbufs =
+ MAX2(id + 1, pipe->ctx->framebuffer.state.nr_cbufs);
+
+ /* Update the cb_target_mask
+ * XXX: I think this is a potential spot for bugs once we start doing
+ * GL interop. cb_target_mask may be modified in the 3D sections
+ * of this driver. */
+ pipe->ctx->compute_cb_target_mask |= (0xf << (id * 4));
+
+ surf = (struct r600_surface*)pipe->ctx->framebuffer.state.cbufs[id];
+ evergreen_init_color_surface_rat(rctx, surf);
+}
+
static void evergreen_cs_set_vertex_buffer(
struct r600_context * rctx,
unsigned vb_index,
@@ -148,9 +210,6 @@ void *evergreen_create_compute_state(
#endif
shader->ctx = (struct r600_context*)ctx;
- shader->resources = (struct evergreen_compute_resource*)
- CALLOC(sizeof(struct evergreen_compute_resource),
- get_compute_resource_num());
shader->local_size = cso->req_local_mem; ///TODO: assert it
shader->private_size = cso->req_private_mem;
shader->input_size = cso->req_input_mem;
@@ -172,7 +231,6 @@ void evergreen_delete_compute_state(struct pipe_context *ctx, void* state)
{
struct r600_pipe_compute *shader = (struct r600_pipe_compute *)state;
- free(shader->resources);
free(shader);
}
@@ -326,8 +384,6 @@ static void compute_emit_cs(struct r600_context *ctx, const uint *block_layout,
struct radeon_winsys_cs *cs = ctx->rings.gfx.cs;
unsigned flush_flags = 0;
int i;
- struct evergreen_compute_resource *resources =
- ctx->cs_shader_state.shader->resources;
/* make sure that the gfx ring is only one active */
if (ctx->rings.dma.cs) {
@@ -387,38 +443,6 @@ static void compute_emit_cs(struct r600_context *ctx, const uint *block_layout,
/* Emit compute shader state */
r600_emit_atom(ctx, &ctx->cs_shader_state.atom);
- for (i = 0; i < get_compute_resource_num(); i++) {
- if (resources[i].enabled) {
- int j;
- 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]) {
- assert(resources[i].bo);
- evergreen_emit_ctx_reloc(ctx,
- resources[i].bo,
- resources[i].usage);
- }
-
- cs->buf[cs->cdw++] = resources[i].cs[j];
- }
-
- if (resources[i].bo) {
- evergreen_emit_ctx_reloc(ctx,
- resources[i].bo,
- resources[i].usage);
-
- ///special case for textures
- if (resources[i].do_reloc
- [resources[i].cs_end] == 2) {
- evergreen_emit_ctx_reloc(ctx,
- resources[i].bo,
- resources[i].usage);
- }
- }
- }
- }
-
/* Emit dispatch state and dispatch packet */
evergreen_emit_direct_dispatch(ctx, block_layout, grid_layout);
@@ -543,16 +567,16 @@ static void evergreen_set_cs_sampler_view(struct pipe_context *ctx_,
unsigned start_slot, unsigned count,
struct pipe_sampler_view **views)
{
- struct r600_context *ctx = (struct r600_context *)ctx_;
struct r600_pipe_sampler_view **resource =
(struct r600_pipe_sampler_view **)views;
for (int i = 0; i < count; i++) {
if (resource[i]) {
assert(i+1 < 12);
+ /* XXX: Implement */
+ assert(!"Compute samplers not implemented.");
///FETCH0 = VTX0 (param buffer),
//FETCH1 = VTX1 (global buffer pool), FETCH2... = TEX
- evergreen_set_tex_resource(ctx->cs_shader_state.shader, resource[i], i+2);
}
}
}
@@ -563,14 +587,13 @@ static void evergreen_bind_compute_sampler_states(
unsigned num_samplers,
void **samplers_)
{
- struct r600_context *ctx = (struct r600_context *)ctx_;
struct compute_sampler_state ** samplers =
(struct compute_sampler_state **)samplers_;
for (int i = 0; i < num_samplers; i++) {
if (samplers[i]) {
- evergreen_set_sampler_resource(
- ctx->cs_shader_state.shader, samplers[i], i);
+ /* XXX: Implement */
+ assert(!"Compute samplers not implemented.");
}
}
}
diff --git a/src/gallium/drivers/r600/evergreen_compute_internal.c b/src/gallium/drivers/r600/evergreen_compute_internal.c
deleted file mode 100644
index 66a5f39..0000000
--- a/src/gallium/drivers/r600/evergreen_compute_internal.c
+++ /dev/null
@@ -1,627 +0,0 @@
-/*
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, and/or sell copies of the Software, and to permit persons to whom
- * the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Adam Rak <adam.rak at streamnovation.com>
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "pipe/p_defines.h"
-#include "pipe/p_state.h"
-#include "pipe/p_context.h"
-#include "util/u_blitter.h"
-#include "util/u_double_list.h"
-#include "util/u_transfer.h"
-#include "util/u_surface.h"
-#include "util/u_pack_color.h"
-#include "util/u_memory.h"
-#include "util/u_inlines.h"
-#include "util/u_framebuffer.h"
-#include "r600_resource.h"
-#include "r600_shader.h"
-#include "r600_pipe.h"
-#include "r600_formats.h"
-#include "evergreend.h"
-#include "evergreen_compute.h"
-#include "evergreen_compute_internal.h"
-
-int get_compute_resource_num(void)
-{
- int num = 0;
-#define DECL_COMPUTE_RESOURCE(name, n) num += n;
-#include "compute_resource.def"
-#undef DECL_COMPUTE_RESOURCE
- return num;
-}
-
-void evergreen_emit_raw_value(
- struct evergreen_compute_resource* res,
- unsigned value)
-{
- res->cs[res->cs_end++] = value;
-}
-
-void evergreen_emit_ctx_value(struct r600_context *ctx, unsigned value)
-{
- struct radeon_winsys_cs *cs = ctx->rings.gfx.cs;
-
- cs->buf[cs->cdw++] = value;
-}
-
-void evergreen_mult_reg_set_(
- struct evergreen_compute_resource* res,
- int index,
- u32* array,
- int size)
-{
- int i = 0;
-
- evergreen_emit_raw_reg_set(res, index, size / 4);
-
- for (i = 0; i < size; i+=4) {
- res->cs[res->cs_end++] = array[i / 4];
- }
-}
-
-void evergreen_reg_set(
- struct evergreen_compute_resource* res,
- unsigned index,
- unsigned value)
-{
- evergreen_emit_raw_reg_set(res, index, 1);
- res->cs[res->cs_end++] = value;
-}
-
-struct evergreen_compute_resource* get_empty_res(
- struct r600_pipe_compute* pipe,
- enum evergreen_compute_resources res_code,
- int offset_index)
-{
- int code_index = -1;
- int code_size = -1;
- int index = 0;
- struct evergreen_compute_resource* res = NULL;
-
- {
- int i = 0;
- #define DECL_COMPUTE_RESOURCE(name, n) if (COMPUTE_RESOURCE_ ## name == res_code) {code_index = i; code_size = n;} i += n;
- #include "compute_resource.def"
- #undef DECL_COMPUTE_RESOURCE
- }
-
- assert(code_index != -1 && "internal error: resouce index not found");
- assert(offset_index < code_size && "internal error: overindexing resource");
-
- index = code_index + offset_index;
-
- res = &pipe->resources[index];
-
- res->enabled = true;
- res->bo = NULL;
- res->cs_end = 0;
- bzero(&res->do_reloc, sizeof(res->do_reloc));
-
- return res;
-}
-
-void evergreen_emit_raw_reg_set(
- struct evergreen_compute_resource* res,
- unsigned index,
- int num)
-{
- int cs_end = 0;
-
- res->enabled = 1;
- cs_end = res->cs_end;
-
- if (index >= EVERGREEN_CONFIG_REG_OFFSET
- && index < EVERGREEN_CONFIG_REG_END) {
- res->cs[cs_end] = PKT3C(PKT3_SET_CONFIG_REG, num, 0);
- res->cs[cs_end+1] = (index - EVERGREEN_CONFIG_REG_OFFSET) >> 2;
- } else if (index >= EVERGREEN_CONTEXT_REG_OFFSET
- && index < EVERGREEN_CONTEXT_REG_END) {
- res->cs[cs_end] = PKT3C(PKT3_SET_CONTEXT_REG, num, 0);
- res->cs[cs_end+1] = (index - EVERGREEN_CONTEXT_REG_OFFSET) >> 2;
- } else if (index >= EVERGREEN_RESOURCE_OFFSET
- && index < EVERGREEN_RESOURCE_END) {
- res->cs[cs_end] = PKT3C(PKT3_SET_RESOURCE, num, 0);
- res->cs[cs_end+1] = (index - EVERGREEN_RESOURCE_OFFSET) >> 2;
- } else if (index >= EVERGREEN_SAMPLER_OFFSET
- && index < EVERGREEN_SAMPLER_END) {
- res->cs[cs_end] = PKT3C(PKT3_SET_SAMPLER, num, 0);
- res->cs[cs_end+1] = (index - EVERGREEN_SAMPLER_OFFSET) >> 2;
- } else if (index >= EVERGREEN_CTL_CONST_OFFSET
- && index < EVERGREEN_CTL_CONST_END) {
- res->cs[cs_end] = PKT3C(PKT3_SET_CTL_CONST, num, 0);
- res->cs[cs_end+1] = (index - EVERGREEN_CTL_CONST_OFFSET) >> 2;
- } else if (index >= EVERGREEN_LOOP_CONST_OFFSET
- && index < EVERGREEN_LOOP_CONST_END) {
- res->cs[cs_end] = PKT3C(PKT3_SET_LOOP_CONST, num, 0);
- res->cs[cs_end+1] = (index - EVERGREEN_LOOP_CONST_OFFSET) >> 2;
- } else if (index >= EVERGREEN_BOOL_CONST_OFFSET
- && index < EVERGREEN_BOOL_CONST_END) {
- res->cs[cs_end] = PKT3C(PKT3_SET_BOOL_CONST, num, 0);
- res->cs[cs_end+1] = (index - EVERGREEN_BOOL_CONST_OFFSET) >> 2;
- } else {
- res->cs[cs_end] = PKT0(index, num-1);
- res->cs_end--;
- }
-
- res->cs_end += 2;
-}
-
-void evergreen_emit_force_reloc(struct evergreen_compute_resource* res)
-{
- res->do_reloc[res->cs_end] += 1;
-}
-
-void evergreen_emit_ctx_reg_set(
- struct r600_context *ctx,
- unsigned index,
- int num)
-{
- struct radeon_winsys_cs *cs = ctx->rings.gfx.cs;
-
- if (index >= EVERGREEN_CONFIG_REG_OFFSET
- && index < EVERGREEN_CONFIG_REG_END) {
- cs->buf[cs->cdw++] = PKT3C(PKT3_SET_CONFIG_REG, num, 0);
- cs->buf[cs->cdw++] = (index - EVERGREEN_CONFIG_REG_OFFSET) >> 2;
- } else if (index >= EVERGREEN_CONTEXT_REG_OFFSET
- && index < EVERGREEN_CONTEXT_REG_END) {
- cs->buf[cs->cdw++] = PKT3C(PKT3_SET_CONTEXT_REG, num, 0);
- cs->buf[cs->cdw++] = (index - EVERGREEN_CONTEXT_REG_OFFSET) >> 2;
- } else if (index >= EVERGREEN_RESOURCE_OFFSET
- && index < EVERGREEN_RESOURCE_END) {
- cs->buf[cs->cdw++] = PKT3C(PKT3_SET_RESOURCE, num, 0);
- cs->buf[cs->cdw++] = (index - EVERGREEN_RESOURCE_OFFSET) >> 2;
- } else if (index >= EVERGREEN_SAMPLER_OFFSET
- && index < EVERGREEN_SAMPLER_END) {
- cs->buf[cs->cdw++] = PKT3C(PKT3_SET_SAMPLER, num, 0);
- cs->buf[cs->cdw++] = (index - EVERGREEN_SAMPLER_OFFSET) >> 2;
- } else if (index >= EVERGREEN_CTL_CONST_OFFSET
- && index < EVERGREEN_CTL_CONST_END) {
- cs->buf[cs->cdw++] = PKT3C(PKT3_SET_CTL_CONST, num, 0);
- cs->buf[cs->cdw++] = (index - EVERGREEN_CTL_CONST_OFFSET) >> 2;
- } else if (index >= EVERGREEN_LOOP_CONST_OFFSET
- && index < EVERGREEN_LOOP_CONST_END) {
- cs->buf[cs->cdw++] = PKT3C(PKT3_SET_LOOP_CONST, num, 0);
- cs->buf[cs->cdw++] = (index - EVERGREEN_LOOP_CONST_OFFSET) >> 2;
- } else if (index >= EVERGREEN_BOOL_CONST_OFFSET
- && index < EVERGREEN_BOOL_CONST_END) {
- cs->buf[cs->cdw++] = PKT3C(PKT3_SET_BOOL_CONST, num, 0);
- cs->buf[cs->cdw++] = (index - EVERGREEN_BOOL_CONST_OFFSET) >> 2;
- } else {
- cs->buf[cs->cdw++] = PKT0(index, num-1);
- }
-}
-
-void evergreen_emit_ctx_reloc(
- struct r600_context *ctx,
- struct r600_resource *bo,
- enum radeon_bo_usage usage)
-{
- struct radeon_winsys_cs *cs = ctx->rings.gfx.cs;
- u32 rr = 0;
-
- assert(bo);
-
- cs->buf[cs->cdw++] = PKT3(PKT3_NOP, 0, 0);
- rr = r600_context_bo_reloc(ctx, &ctx->rings.gfx, bo, usage);
- cs->buf[cs->cdw++] = rr;
-}
-
-int evergreen_compute_get_gpu_format(
- struct number_type_and_format* fmt,
- struct r600_resource *bo)
-{
- switch (bo->b.b.format)
- {
- case PIPE_FORMAT_R8_UNORM:
- case PIPE_FORMAT_R32_UNORM:
- case PIPE_FORMAT_R32_UINT:
- fmt->format = V_028C70_COLOR_32;
- fmt->number_type = V_028C70_NUMBER_UNORM;
- fmt->num_format_all = 0;
- break;
- case PIPE_FORMAT_R32_FLOAT:
- fmt->format = V_028C70_COLOR_32_FLOAT;
- fmt->number_type = V_028C70_NUMBER_FLOAT;
- fmt->num_format_all = 0;
- break;
- case PIPE_FORMAT_R32G32B32A32_FLOAT:
- fmt->format = V_028C70_COLOR_32_32_32_32_FLOAT;
- fmt->number_type = V_028C70_NUMBER_FLOAT;
- fmt->num_format_all = 0;
- break;
-
- ///TODO: other formats...
-
- default:
- return 0;
- }
-
- return 1;
-}
-
-void evergreen_set_rat(
- struct r600_pipe_compute *pipe,
- int id,
- struct r600_resource* bo,
- int start,
- int size)
-{
- struct pipe_surface rat_templ;
- struct r600_surface *surf = NULL;
- struct r600_context *rctx = NULL;
-
- assert(id < 12);
- assert((size & 3) == 0);
- assert((start & 0xFF) == 0);
-
- rctx = pipe->ctx;
-
- COMPUTE_DBG(rctx->screen, "bind rat: %i \n", id);
-
- /* Create the RAT surface */
- memset(&rat_templ, 0, sizeof(rat_templ));
- rat_templ.format = PIPE_FORMAT_R32_UINT;
- rat_templ.u.tex.level = 0;
- rat_templ.u.tex.first_layer = 0;
- rat_templ.u.tex.last_layer = 0;
-
- /* Add the RAT the list of color buffers */
- pipe->ctx->framebuffer.state.cbufs[id] = pipe->ctx->context.create_surface(
- (struct pipe_context *)pipe->ctx,
- (struct pipe_resource *)bo, &rat_templ);
-
- /* Update the number of color buffers */
- pipe->ctx->framebuffer.state.nr_cbufs =
- MAX2(id + 1, pipe->ctx->framebuffer.state.nr_cbufs);
-
- /* Update the cb_target_mask
- * XXX: I think this is a potential spot for bugs once we start doing
- * GL interop. cb_target_mask may be modified in the 3D sections
- * of this driver. */
- pipe->ctx->compute_cb_target_mask |= (0xf << (id * 4));
-
- surf = (struct r600_surface*)pipe->ctx->framebuffer.state.cbufs[id];
- evergreen_init_color_surface_rat(rctx, surf);
-}
-
-void evergreen_set_gds(
- struct r600_pipe_compute *pipe,
- uint32_t addr,
- uint32_t size)
-{
- struct evergreen_compute_resource* res =
- get_empty_res(pipe, COMPUTE_RESOURCE_GDS, 0);
-
- evergreen_reg_set(res, R_028728_GDS_ORDERED_WAVE_PER_SE, 1);
- evergreen_reg_set(res, R_028720_GDS_ADDR_BASE, addr);
- evergreen_reg_set(res, R_028724_GDS_ADDR_SIZE, size);
-}
-
-void evergreen_set_export(
- struct r600_pipe_compute *pipe,
- struct r600_resource* bo,
- int offset, int size)
-{
- #define SX_MEMORY_EXPORT_BASE 0x9010
- #define SX_MEMORY_EXPORT_SIZE 0x9014
-
- struct evergreen_compute_resource* res =
- get_empty_res(pipe, COMPUTE_RESOURCE_EXPORT, 0);
-
- evergreen_reg_set(res, SX_MEMORY_EXPORT_SIZE, size);
-
- if (size) {
- evergreen_reg_set(res, SX_MEMORY_EXPORT_BASE, offset);
- res->bo = bo;
- res->usage = RADEON_USAGE_WRITE;
- res->coher_bo_size = size;
- res->flags = 0;
- }
-}
-
-void evergreen_set_loop_const(
- struct r600_pipe_compute *pipe,
- int id, int count, int init, int inc) {
-
- struct evergreen_compute_resource* res =
- get_empty_res(pipe, COMPUTE_RESOURCE_LOOP, id);
-
- assert(id < 32);
- assert(count <= 0xFFF);
- assert(init <= 0xFF);
- assert(inc <= 0xFF);
-
- /* Compute shaders use LOOP_CONST registers SQ_LOOP_CONST_160 to
- * SQ_LOOP_CONST_191 */
- evergreen_reg_set(res, R_03A200_SQ_LOOP_CONST_0 + (160 * 4) + (id * 4),
- count | init << 12 | inc << 24);
-}
-
-void evergreen_set_tmp_ring(
- struct r600_pipe_compute *pipe,
- struct r600_resource* bo,
- int offset, int size, int se)
-{
- #define SQ_LSTMP_RING_BASE 0x00008e10
- #define SQ_LSTMP_RING_SIZE 0x00008e14
- #define GRBM_GFX_INDEX 0x802C
- #define INSTANCE_INDEX(x) ((x) << 0)
- #define SE_INDEX(x) ((x) << 16)
- #define INSTANCE_BROADCAST_WRITES (1 << 30)
- #define SE_BROADCAST_WRITES (1 << 31)
-
- struct evergreen_compute_resource* res =
- get_empty_res(pipe, COMPUTE_RESOURCE_TMPRING, se);
-
- evergreen_reg_set(res,
- GRBM_GFX_INDEX,INSTANCE_INDEX(0)
- | SE_INDEX(se)
- | INSTANCE_BROADCAST_WRITES);
- evergreen_reg_set(res, SQ_LSTMP_RING_SIZE, size);
-
- if (size) {
- assert(bo);
-
- evergreen_reg_set(res, SQ_LSTMP_RING_BASE, offset);
- res->bo = bo;
- res->usage = RADEON_USAGE_WRITE;
- res->coher_bo_size = 0;
- res->flags = 0;
- }
-
- if (size) {
- evergreen_emit_force_reloc(res);
- }
-
- evergreen_reg_set(res,
- GRBM_GFX_INDEX,INSTANCE_INDEX(0)
- | SE_INDEX(0)
- | INSTANCE_BROADCAST_WRITES
- | SE_BROADCAST_WRITES);
-}
-
-static uint32_t r600_colorformat_endian_swap(uint32_t colorformat)
-{
- if (R600_BIG_ENDIAN) {
- switch(colorformat) {
- case V_028C70_COLOR_4_4:
- return ENDIAN_NONE;
-
- /* 8-bit buffers. */
- case V_028C70_COLOR_8:
- return ENDIAN_NONE;
-
- /* 16-bit buffers. */
- case V_028C70_COLOR_5_6_5:
- case V_028C70_COLOR_1_5_5_5:
- case V_028C70_COLOR_4_4_4_4:
- case V_028C70_COLOR_16:
- case V_028C70_COLOR_8_8:
- return ENDIAN_8IN16;
-
- /* 32-bit buffers. */
- case V_028C70_COLOR_8_8_8_8:
- case V_028C70_COLOR_2_10_10_10:
- case V_028C70_COLOR_8_24:
- case V_028C70_COLOR_24_8:
- case V_028C70_COLOR_32_FLOAT:
- case V_028C70_COLOR_16_16_FLOAT:
- case V_028C70_COLOR_16_16:
- return ENDIAN_8IN32;
-
- /* 64-bit buffers. */
- case V_028C70_COLOR_16_16_16_16:
- case V_028C70_COLOR_16_16_16_16_FLOAT:
- return ENDIAN_8IN16;
-
- case V_028C70_COLOR_32_32_FLOAT:
- case V_028C70_COLOR_32_32:
- case V_028C70_COLOR_X24_8_32_FLOAT:
- return ENDIAN_8IN32;
-
- /* 96-bit buffers. */
- case V_028C70_COLOR_32_32_32_FLOAT:
- /* 128-bit buffers. */
- case V_028C70_COLOR_32_32_32_32_FLOAT:
- case V_028C70_COLOR_32_32_32_32:
- return ENDIAN_8IN32;
- default:
- return ENDIAN_NONE; /* Unsupported. */
- }
- } else {
- return ENDIAN_NONE;
- }
-}
-
-static unsigned r600_tex_dim(unsigned dim)
-{
- switch (dim) {
- default:
- case PIPE_TEXTURE_1D:
- return V_030000_SQ_TEX_DIM_1D;
- case PIPE_TEXTURE_1D_ARRAY:
- return V_030000_SQ_TEX_DIM_1D_ARRAY;
- case PIPE_TEXTURE_2D:
- case PIPE_TEXTURE_RECT:
- return V_030000_SQ_TEX_DIM_2D;
- case PIPE_TEXTURE_2D_ARRAY:
- return V_030000_SQ_TEX_DIM_2D_ARRAY;
- case PIPE_TEXTURE_3D:
- return V_030000_SQ_TEX_DIM_3D;
- case PIPE_TEXTURE_CUBE:
- return V_030000_SQ_TEX_DIM_CUBEMAP;
- }
-}
-
-void evergreen_set_tex_resource(
- struct r600_pipe_compute *pipe,
- struct r600_pipe_sampler_view* view,
- int id)
-{
- struct evergreen_compute_resource* res =
- get_empty_res(pipe, COMPUTE_RESOURCE_TEX, id);
- struct r600_texture *tmp =
- (struct r600_texture*)view->base.texture;
-
- unsigned format, endian;
- uint32_t word4 = 0, yuv_format = 0, pitch = 0;
- unsigned char swizzle[4], array_mode = 0, non_disp_tiling = 0;
- unsigned height, depth;
-
- swizzle[0] = 0;
- swizzle[1] = 1;
- swizzle[2] = 2;
- swizzle[3] = 3;
-
- format = r600_translate_texformat((struct pipe_screen *)pipe->ctx->screen,
- view->base.format, swizzle, &word4, &yuv_format);
-
- if (format == ~0) {
- format = 0;
- }
-
- endian = r600_colorformat_endian_swap(format);
-
- height = view->base.texture->height0;
- depth = view->base.texture->depth0;
-
- pitch = align(tmp->surface.level[0].nblk_x *
- util_format_get_blockwidth(tmp->resource.b.b.format), 8);
- array_mode = tmp->array_mode[0];
- non_disp_tiling = tmp->non_disp_tiling;
-
- assert(view->base.texture->target != PIPE_TEXTURE_1D_ARRAY);
- assert(view->base.texture->target != PIPE_TEXTURE_2D_ARRAY);
-
- evergreen_emit_raw_value(res, PKT3C(PKT3_SET_RESOURCE, 8, 0));
- evergreen_emit_raw_value(res, (id+816)*32 >> 2); ///TODO: check this line
- evergreen_emit_raw_value(res,
- (S_030000_DIM(r600_tex_dim(view->base.texture->target)) |
- S_030000_PITCH((pitch / 8) - 1) |
- S_030000_NON_DISP_TILING_ORDER(non_disp_tiling) |
- S_030000_TEX_WIDTH(view->base.texture->width0 - 1)));
- evergreen_emit_raw_value(res, (S_030004_TEX_HEIGHT(height - 1) |
- S_030004_TEX_DEPTH(depth - 1) |
- S_030004_ARRAY_MODE(array_mode)));
- evergreen_emit_raw_value(res, tmp->surface.level[0].offset >> 8);
- evergreen_emit_raw_value(res, tmp->surface.level[0].offset >> 8);
- evergreen_emit_raw_value(res, (word4 |
- S_030010_SRF_MODE_ALL(V_030010_SRF_MODE_ZERO_CLAMP_MINUS_ONE) |
- S_030010_ENDIAN_SWAP(endian) |
- S_030010_BASE_LEVEL(0)));
- evergreen_emit_raw_value(res, (S_030014_LAST_LEVEL(0) |
- S_030014_BASE_ARRAY(0) |
- S_030014_LAST_ARRAY(0)));
- evergreen_emit_raw_value(res, (S_030018_MAX_ANISO(4 /* max 16 samples */)));
- evergreen_emit_raw_value(res,
- S_03001C_TYPE(V_03001C_SQ_TEX_VTX_VALID_TEXTURE)
- | S_03001C_DATA_FORMAT(format));
-
- res->bo = (struct r600_resource*)view->base.texture;
-
- res->usage = RADEON_USAGE_READ;
-
- res->coher_bo_size = tmp->surface.level[0].offset +
- util_format_get_blockwidth(tmp->resource.b.b.format) *
- view->base.texture->width0*height*depth;
-
- pipe->ctx->flags |= R600_CONTEXT_INVAL_READ_CACHES;
-
- evergreen_emit_force_reloc(res);
- evergreen_emit_force_reloc(res);
-}
-
-void evergreen_set_sampler_resource(
- struct r600_pipe_compute *pipe,
- struct compute_sampler_state *sampler,
- int id)
-{
- struct evergreen_compute_resource* res =
- get_empty_res(pipe, COMPUTE_RESOURCE_SAMPLER, id);
-
- unsigned aniso_flag_offset = sampler->state.max_anisotropy > 1 ? 2 : 0;
-
- evergreen_emit_raw_value(res, PKT3C(PKT3_SET_SAMPLER, 3, 0));
- evergreen_emit_raw_value(res, (id + 90)*3);
- evergreen_emit_raw_value(res,
- S_03C000_CLAMP_X(r600_tex_wrap(sampler->state.wrap_s)) |
- S_03C000_CLAMP_Y(r600_tex_wrap(sampler->state.wrap_t)) |
- S_03C000_CLAMP_Z(r600_tex_wrap(sampler->state.wrap_r)) |
- S_03C000_XY_MAG_FILTER(r600_tex_filter(sampler->state.mag_img_filter) | aniso_flag_offset) |
- S_03C000_XY_MIN_FILTER(r600_tex_filter(sampler->state.min_img_filter) | aniso_flag_offset) |
- S_03C000_BORDER_COLOR_TYPE(V_03C000_SQ_TEX_BORDER_COLOR_OPAQUE_BLACK)
- );
- evergreen_emit_raw_value(res,
- S_03C004_MIN_LOD(S_FIXED(CLAMP(sampler->state.min_lod, 0, 15), 8)) |
- S_03C004_MAX_LOD(S_FIXED(CLAMP(sampler->state.max_lod, 0, 15), 8))
- );
- evergreen_emit_raw_value(res,
- S_03C008_LOD_BIAS(S_FIXED(CLAMP(sampler->state.lod_bias, -16, 16), 8)) |
- (sampler->state.seamless_cube_map ? 0 : S_03C008_DISABLE_CUBE_WRAP(1)) |
- S_03C008_TYPE(1)
- );
-}
-
-void evergreen_set_const_cache(
- struct r600_pipe_compute *pipe,
- int cache_id,
- struct r600_resource* cbo,
- int size, int offset)
-{
- #define SQ_ALU_CONST_BUFFER_SIZE_LS_0 0x00028fc0
- #define SQ_ALU_CONST_CACHE_LS_0 0x00028f40
-
- struct evergreen_compute_resource* res =
- get_empty_res(pipe, COMPUTE_RESOURCE_CONST_MEM, cache_id);
-
- assert(size < 0x200);
- assert((offset & 0xFF) == 0);
- assert(cache_id < 16);
-
- evergreen_reg_set(res, SQ_ALU_CONST_BUFFER_SIZE_LS_0 + cache_id*4, size);
- evergreen_reg_set(res, SQ_ALU_CONST_CACHE_LS_0 + cache_id*4, offset >> 8);
- res->bo = cbo;
- res->usage = RADEON_USAGE_READ;
- res->coher_bo_size = size;
-
- pipe->ctx->flags |= R600_CONTEXT_INVAL_READ_CACHES;
-}
-
-struct r600_resource* r600_compute_buffer_alloc_vram(
- struct r600_screen *screen,
- unsigned size)
-{
- struct pipe_resource * buffer = NULL;
- assert(size);
-
- buffer = pipe_buffer_create(
- (struct pipe_screen*) screen,
- PIPE_BIND_CUSTOM,
- PIPE_USAGE_IMMUTABLE,
- size);
-
- return (struct r600_resource *)buffer;
-}
diff --git a/src/gallium/drivers/r600/evergreen_compute_internal.h b/src/gallium/drivers/r600/evergreen_compute_internal.h
index 463cc7d..f904d61 100644
--- a/src/gallium/drivers/r600/evergreen_compute_internal.h
+++ b/src/gallium/drivers/r600/evergreen_compute_internal.h
@@ -25,48 +25,8 @@
#ifndef EVERGREEN_COMPUTE_INTERNAL_H
#define EVERGREEN_COMPUTE_INTERNAL_H
-#include "compute_memory_pool.h"
#include "r600_asm.h"
-enum evergreen_compute_resources
-{
-#define DECL_COMPUTE_RESOURCE(name, n) COMPUTE_RESOURCE_ ## name ,
-#include "compute_resource.def"
-#undef DECL_COMPUTE_RESOURCE
-__COMPUTE_RESOURCE_END__
-};
-
-typedef unsigned u32;
-
-#define COMPUTE_RES_TC_FLUSH 0xF0001
-#define COMPUTE_RES_VC_FLUSH 0xF0002
-#define COMPUTE_RES_SH_FLUSH 0xF0004
-#define COMPUTE_RES_CB_FLUSH(x) (0xF0008 | x << 8)
-#define COMPUTE_RES_FULL_FLUSH 0xF0010
-
-struct evergreen_compute_resource {
- int enabled;
-
- int do_reloc[256];
- u32 cs[256];
- int cs_end;
-
- struct r600_resource *bo;
- int coher_bo_size;
- enum radeon_bo_usage usage;
- int flags; ///flags for COMPUTE_RES_*_FLUSH
-};
-
-struct compute_sampler_state {
- struct pipe_sampler_state state;
-};
-
-struct number_type_and_format {
- unsigned format;
- unsigned number_type;
- unsigned num_format_all;
-};
-
struct r600_kernel {
unsigned count;
#ifdef HAVE_OPENCL
@@ -81,7 +41,6 @@ struct r600_pipe_compute {
unsigned num_kernels;
struct r600_kernel *kernels;
- struct evergreen_compute_resource *resources;
unsigned local_size;
unsigned private_size;
@@ -89,32 +48,6 @@ struct r600_pipe_compute {
struct r600_resource *kernel_param;
};
-int evergreen_compute_get_gpu_format(struct number_type_and_format* fmt, struct r600_resource *bo); ///get hw format from resource, return 0 on faliure, nonzero on success
-
-
-void evergreen_emit_raw_reg_set(struct evergreen_compute_resource* res, unsigned index, int num);
-void evergreen_emit_ctx_reg_set(struct r600_context *ctx, unsigned index, int num);
-void evergreen_emit_raw_value(struct evergreen_compute_resource* res, unsigned value);
-void evergreen_emit_ctx_value(struct r600_context *ctx, unsigned value);
-void evergreen_mult_reg_set_(struct evergreen_compute_resource* res, int index, u32* array, int size);
-void evergreen_emit_ctx_reloc(struct r600_context *ctx, struct r600_resource *bo, enum radeon_bo_usage usage);
-void evergreen_reg_set(struct evergreen_compute_resource* res, unsigned index, unsigned value);
-void evergreen_emit_force_reloc(struct evergreen_compute_resource* res);
-
-struct evergreen_compute_resource* get_empty_res(struct r600_pipe_compute*, enum evergreen_compute_resources res_code, int index);
-int get_compute_resource_num(void);
-
-#define evergreen_mult_reg_set(res, index, array) evergreen_mult_reg_set_(res, index, array, sizeof(array))
-
-void evergreen_set_rat(struct r600_pipe_compute *pipe, int id, struct r600_resource* bo, int start, int size);
-void evergreen_set_gds(struct r600_pipe_compute *pipe, uint32_t addr, uint32_t size);
-void evergreen_set_export(struct r600_pipe_compute *pipe, struct r600_resource* bo, int offset, int size);
-void evergreen_set_loop_const(struct r600_pipe_compute *pipe, int id, int count, int init, int inc);
-void evergreen_set_tmp_ring(struct r600_pipe_compute *pipe, struct r600_resource* bo, int offset, int size, int se);
-void evergreen_set_tex_resource(struct r600_pipe_compute *pipe, struct r600_pipe_sampler_view* view, int id);
-void evergreen_set_sampler_resource(struct r600_pipe_compute *pipe, struct compute_sampler_state *sampler, int id);
-void evergreen_set_const_cache(struct r600_pipe_compute *pipe, int cache_id, struct r600_resource* cbo, int size);
-
struct r600_resource* r600_compute_buffer_alloc_vram(struct r600_screen *screen, unsigned size);
#endif
More information about the mesa-commit
mailing list