diff options
author | Rob Clark <[email protected]> | 2019-02-07 08:20:25 -0500 |
---|---|---|
committer | Rob Clark <[email protected]> | 2019-02-16 16:28:00 -0500 |
commit | 1af0c5d320f0067fa6654451b78b28e5ffa64b24 (patch) | |
tree | 2aee7d0b9b73c055240d45cbe3ec84a5ed991f78 | |
parent | 5118dcf8c36043d346ba0b4b45e31dbea0012e40 (diff) |
freedreno/a6xx: compute support
Signed-off-by: Rob Clark <[email protected]>
-rw-r--r-- | src/gallium/drivers/freedreno/Makefile.sources | 2 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/a6xx/fd6_compute.c | 211 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/a6xx/fd6_compute.h | 34 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/a6xx/fd6_context.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/a6xx/fd6_emit.c | 63 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/a6xx/fd6_program.c | 14 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/freedreno_screen.h | 2 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/meson.build | 2 |
8 files changed, 290 insertions, 40 deletions
diff --git a/src/gallium/drivers/freedreno/Makefile.sources b/src/gallium/drivers/freedreno/Makefile.sources index e11c42517c9..034a8dc109b 100644 --- a/src/gallium/drivers/freedreno/Makefile.sources +++ b/src/gallium/drivers/freedreno/Makefile.sources @@ -169,6 +169,8 @@ a6xx_SOURCES := \ a6xx/fd6_blend.h \ a6xx/fd6_blitter.c \ a6xx/fd6_blitter.h \ + a6xx/fd6_compute.c \ + a6xx/fd6_compute.h \ a6xx/fd6_context.c \ a6xx/fd6_context.h \ a6xx/fd6_draw.c \ diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_compute.c b/src/gallium/drivers/freedreno/a6xx/fd6_compute.c new file mode 100644 index 00000000000..fd6b2d08c6d --- /dev/null +++ b/src/gallium/drivers/freedreno/a6xx/fd6_compute.c @@ -0,0 +1,211 @@ +/* + * Copyright (C) 2019 Rob Clark <[email protected]> + * + * 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 + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * 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 NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS 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: + * Rob Clark <[email protected]> + */ + +#include "pipe/p_state.h" + +#include "freedreno_resource.h" + +#include "fd6_compute.h" +#include "fd6_context.h" +#include "fd6_emit.h" + +struct fd6_compute_stateobj { + struct ir3_shader *shader; +}; + + +static void * +fd6_create_compute_state(struct pipe_context *pctx, + const struct pipe_compute_state *cso) +{ + struct fd_context *ctx = fd_context(pctx); + + /* req_input_mem will only be non-zero for cl kernels (ie. clover). + * This isn't a perfect test because I guess it is possible (but + * uncommon) for none for the kernel parameters to be a global, + * but ctx->set_global_bindings() can't fail, so this is the next + * best place to fail if we need a newer version of kernel driver: + */ + if ((cso->req_input_mem > 0) && + fd_device_version(ctx->dev) < FD_VERSION_BO_IOVA) { + return NULL; + } + + struct ir3_compiler *compiler = ctx->screen->compiler; + struct fd6_compute_stateobj *so = CALLOC_STRUCT(fd6_compute_stateobj); + so->shader = ir3_shader_create_compute(compiler, cso, &ctx->debug); + return so; +} + +static void +fd6_delete_compute_state(struct pipe_context *pctx, void *hwcso) +{ + struct fd6_compute_stateobj *so = hwcso; + ir3_shader_destroy(so->shader); + free(so); +} + +/* maybe move to fd6_program? */ +static void +cs_program_emit(struct fd_ringbuffer *ring, struct ir3_shader_variant *v, + const struct pipe_grid_info *info) +{ + const struct ir3_info *i = &v->info; + enum a3xx_threadsize thrsz = FOUR_QUADS; + + OUT_PKT4(ring, REG_A6XX_HLSQ_UPDATE_CNTL, 1); + OUT_RING(ring, 0xff); + + unsigned constlen = align(v->constlen, 4); + OUT_PKT4(ring, REG_A6XX_HLSQ_CS_CNTL, 1); + OUT_RING(ring, A6XX_HLSQ_CS_CNTL_CONSTLEN(constlen) | + A6XX_HLSQ_CS_CNTL_ENABLED); + + OUT_PKT4(ring, REG_A6XX_SP_CS_CONFIG, 2); + OUT_RING(ring, A6XX_SP_CS_CONFIG_ENABLED | + A6XX_SP_CS_CONFIG_NIBO(v->image_mapping.num_ibo) | + A6XX_SP_CS_CONFIG_NTEX(v->num_samp) | + A6XX_SP_CS_CONFIG_NSAMP(v->num_samp)); /* SP_VS_CONFIG */ + OUT_RING(ring, v->instrlen); /* SP_VS_INSTRLEN */ + + OUT_PKT4(ring, REG_A6XX_SP_CS_CTRL_REG0, 1); + OUT_RING(ring, A6XX_SP_CS_CTRL_REG0_THREADSIZE(thrsz) | + A6XX_SP_CS_CTRL_REG0_FULLREGFOOTPRINT(i->max_reg + 1) | + A6XX_SP_CS_CTRL_REG0_MERGEDREGS | + A6XX_SP_CS_CTRL_REG0_BRANCHSTACK(v->branchstack) | + COND(v->num_samp > 0, A6XX_SP_CS_CTRL_REG0_PIXLODENABLE)); + + OUT_PKT4(ring, REG_A6XX_SP_CS_UNKNOWN_A9B1, 1); + OUT_RING(ring, 0x41); + + uint32_t local_invocation_id, work_group_id; + local_invocation_id = ir3_find_sysval_regid(v, SYSTEM_VALUE_LOCAL_INVOCATION_ID); + work_group_id = ir3_find_sysval_regid(v, SYSTEM_VALUE_WORK_GROUP_ID); + + OUT_PKT4(ring, REG_A6XX_HLSQ_CS_CNTL_0, 2); + OUT_RING(ring, A6XX_HLSQ_CS_CNTL_0_WGIDCONSTID(work_group_id) | + A6XX_HLSQ_CS_CNTL_0_UNK0(regid(63, 0)) | + A6XX_HLSQ_CS_CNTL_0_UNK1(regid(63, 0)) | + A6XX_HLSQ_CS_CNTL_0_LOCALIDREGID(local_invocation_id)); + OUT_RING(ring, 0x2fc); /* HLSQ_CS_UNKNOWN_B998 */ + + OUT_PKT4(ring, REG_A6XX_SP_CS_OBJ_START_LO, 2); + OUT_RELOC(ring, v->bo, 0, 0, 0); /* SP_CS_OBJ_START_LO/HI */ + + if (v->instrlen > 0) + fd6_emit_shader(ring, v); +} + +static void +fd6_launch_grid(struct fd_context *ctx, const struct pipe_grid_info *info) +{ + struct fd6_compute_stateobj *so = ctx->compute; + struct ir3_shader_key key = {}; + struct ir3_shader_variant *v; + struct fd_ringbuffer *ring = ctx->batch->draw; + unsigned i, nglobal = 0; + + fd6_emit_restore(ctx->batch, ring); + + v = ir3_shader_variant(so->shader, key, false, &ctx->debug); + if (!v) + return; + + if (ctx->dirty_shader[PIPE_SHADER_COMPUTE] & FD_DIRTY_SHADER_PROG) + cs_program_emit(ring, v, info); + + fd6_emit_cs_state(ctx, ring, v); + ir3_emit_cs_consts(v, ring, ctx, info); + + foreach_bit(i, ctx->global_bindings.enabled_mask) + nglobal++; + + if (nglobal > 0) { + /* global resources don't otherwise get an OUT_RELOC(), since + * the raw ptr address is emitted in ir3_emit_cs_consts(). + * So to make the kernel aware that these buffers are referenced + * by the batch, emit dummy reloc's as part of a no-op packet + * payload: + */ + OUT_PKT7(ring, CP_NOP, 2 * nglobal); + foreach_bit(i, ctx->global_bindings.enabled_mask) { + struct pipe_resource *prsc = ctx->global_bindings.buf[i]; + OUT_RELOCW(ring, fd_resource(prsc)->bo, 0, 0, 0); + } + } + + OUT_PKT7(ring, CP_SET_MARKER, 1); + OUT_RING(ring, A2XX_CP_SET_MARKER_0_MODE(0x8)); + + const unsigned *local_size = info->block; // v->shader->nir->info->cs.local_size; + const unsigned *num_groups = info->grid; + /* for some reason, mesa/st doesn't set info->work_dim, so just assume 3: */ + const unsigned work_dim = info->work_dim ? info->work_dim : 3; + OUT_PKT4(ring, REG_A6XX_HLSQ_CS_NDRANGE_0, 7); + OUT_RING(ring, A6XX_HLSQ_CS_NDRANGE_0_KERNELDIM(work_dim) | + A6XX_HLSQ_CS_NDRANGE_0_LOCALSIZEX(local_size[0] - 1) | + A6XX_HLSQ_CS_NDRANGE_0_LOCALSIZEY(local_size[1] - 1) | + A6XX_HLSQ_CS_NDRANGE_0_LOCALSIZEZ(local_size[2] - 1)); + OUT_RING(ring, A6XX_HLSQ_CS_NDRANGE_1_GLOBALSIZE_X(local_size[0] * num_groups[0])); + OUT_RING(ring, 0); /* HLSQ_CS_NDRANGE_2_GLOBALOFF_X */ + OUT_RING(ring, A6XX_HLSQ_CS_NDRANGE_3_GLOBALSIZE_Y(local_size[1] * num_groups[1])); + OUT_RING(ring, 0); /* HLSQ_CS_NDRANGE_4_GLOBALOFF_Y */ + OUT_RING(ring, A6XX_HLSQ_CS_NDRANGE_5_GLOBALSIZE_Z(local_size[2] * num_groups[2])); + OUT_RING(ring, 0); /* HLSQ_CS_NDRANGE_6_GLOBALOFF_Z */ + + OUT_PKT4(ring, REG_A6XX_HLSQ_CS_KERNEL_GROUP_X, 3); + OUT_RING(ring, 1); /* HLSQ_CS_KERNEL_GROUP_X */ + OUT_RING(ring, 1); /* HLSQ_CS_KERNEL_GROUP_Y */ + OUT_RING(ring, 1); /* HLSQ_CS_KERNEL_GROUP_Z */ + + if (info->indirect) { + struct fd_resource *rsc = fd_resource(info->indirect); + + OUT_PKT7(ring, CP_EXEC_CS_INDIRECT, 4); + OUT_RING(ring, 0x00000000); + OUT_RELOC(ring, rsc->bo, info->indirect_offset, 0, 0); /* ADDR_LO/HI */ + OUT_RING(ring, A5XX_CP_EXEC_CS_INDIRECT_3_LOCALSIZEX(local_size[0] - 1) | + A5XX_CP_EXEC_CS_INDIRECT_3_LOCALSIZEY(local_size[1] - 1) | + A5XX_CP_EXEC_CS_INDIRECT_3_LOCALSIZEZ(local_size[2] - 1)); + } else { + OUT_PKT7(ring, CP_EXEC_CS, 4); + OUT_RING(ring, 0x00000000); + OUT_RING(ring, CP_EXEC_CS_1_NGROUPS_X(info->grid[0])); + OUT_RING(ring, CP_EXEC_CS_2_NGROUPS_Y(info->grid[1])); + OUT_RING(ring, CP_EXEC_CS_3_NGROUPS_Z(info->grid[2])); + } + + OUT_WFI5(ring); +} + +void +fd6_compute_init(struct pipe_context *pctx) +{ + struct fd_context *ctx = fd_context(pctx); + ctx->launch_grid = fd6_launch_grid; + pctx->create_compute_state = fd6_create_compute_state; + pctx->delete_compute_state = fd6_delete_compute_state; +} diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_compute.h b/src/gallium/drivers/freedreno/a6xx/fd6_compute.h new file mode 100644 index 00000000000..61354f4b851 --- /dev/null +++ b/src/gallium/drivers/freedreno/a6xx/fd6_compute.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2019 Rob Clark <[email protected]> + * + * 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 + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * 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 NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS 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: + * Rob Clark <[email protected]> + */ + +#ifndef FD6_COMPUTE_H_ +#define FD6_COMPUTE_H_ + +#include "pipe/p_context.h" + +void fd6_compute_init(struct pipe_context *pctx); + +#endif /* FD6_COMPUTE_H_ */ diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_context.c b/src/gallium/drivers/freedreno/a6xx/fd6_context.c index b8939b1449c..7ba0926e3a0 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_context.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_context.c @@ -28,6 +28,7 @@ #include "freedreno_query_acc.h" #include "fd6_context.h" +#include "fd6_compute.h" #include "fd6_blend.h" #include "fd6_blitter.h" #include "fd6_draw.h" @@ -93,6 +94,7 @@ fd6_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags) pctx->create_depth_stencil_alpha_state = fd6_zsa_state_create; fd6_draw_init(pctx); + fd6_compute_init(pctx); fd6_gmem_init(pctx); fd6_texture_init(pctx); fd6_prog_init(pctx); diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c index 397c04390c7..bf9aed6e655 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c @@ -354,7 +354,7 @@ fd6_emit_textures(struct fd_pipe *pipe, struct fd_ringbuffer *ring, opcode = CP_LOAD_STATE6_FRAG; tex_samp_reg = REG_A6XX_SP_CS_TEX_SAMP_LO; tex_const_reg = REG_A6XX_SP_CS_TEX_CONST_LO; - tex_count_reg = 0; //REG_A6XX_SP_CS_TEX_COUNT; + tex_count_reg = REG_A6XX_SP_CS_TEX_COUNT; break; default: unreachable("bad state block"); @@ -468,10 +468,8 @@ fd6_emit_textures(struct fd_pipe *pipe, struct fd_ringbuffer *ring, fd_ringbuffer_del(state); } - if (tex_count_reg) { - OUT_PKT4(ring, tex_count_reg, 1); - OUT_RING(ring, num_merged_textures); - } + OUT_PKT4(ring, tex_count_reg, 1); + OUT_RING(ring, num_merged_textures); return needs_border; } @@ -996,43 +994,56 @@ fd6_emit_cs_state(struct fd_context *ctx, struct fd_ringbuffer *ring, { enum fd_dirty_shader_state dirty = ctx->dirty_shader[PIPE_SHADER_COMPUTE]; - if (dirty & FD_DIRTY_SHADER_TEX) { - bool needs_border = false; - needs_border |= fd6_emit_textures(ctx->pipe, ring, SB6_CS_TEX, - &ctx->tex[PIPE_SHADER_COMPUTE], 0, NULL, NULL, NULL); + if (dirty & (FD_DIRTY_SHADER_TEX | FD_DIRTY_SHADER_PROG | + FD_DIRTY_SHADER_IMAGE | FD_DIRTY_SHADER_SSBO)) { + struct fd_texture_stateobj *tex = &ctx->tex[PIPE_SHADER_COMPUTE]; + struct fd_shaderbuf_stateobj *buf = &ctx->shaderbuf[PIPE_SHADER_COMPUTE]; + struct fd_shaderimg_stateobj *img = &ctx->shaderimg[PIPE_SHADER_COMPUTE]; + unsigned bcolor_offset = fd6_border_color_offset(ctx, SB6_CS_TEX, tex); + + bool needs_border = fd6_emit_textures(ctx->pipe, ring, SB6_CS_TEX, tex, + bcolor_offset, cp, buf, img); if (needs_border) emit_border_color(ctx, ring); -#if 0 - OUT_PKT4(ring, REG_A6XX_TPL1_VS_TEX_COUNT, 1); + OUT_PKT4(ring, REG_A6XX_SP_VS_TEX_COUNT, 1); OUT_RING(ring, 0); - OUT_PKT4(ring, REG_A6XX_TPL1_HS_TEX_COUNT, 1); + OUT_PKT4(ring, REG_A6XX_SP_HS_TEX_COUNT, 1); OUT_RING(ring, 0); - OUT_PKT4(ring, REG_A6XX_TPL1_DS_TEX_COUNT, 1); + OUT_PKT4(ring, REG_A6XX_SP_DS_TEX_COUNT, 1); OUT_RING(ring, 0); - OUT_PKT4(ring, REG_A6XX_TPL1_GS_TEX_COUNT, 1); + OUT_PKT4(ring, REG_A6XX_SP_GS_TEX_COUNT, 1); OUT_RING(ring, 0); - OUT_PKT4(ring, REG_A6XX_TPL1_FS_TEX_COUNT, 1); + OUT_PKT4(ring, REG_A6XX_SP_FS_TEX_COUNT, 1); OUT_RING(ring, 0); -#endif } -#if 0 - OUT_PKT4(ring, REG_A6XX_TPL1_CS_TEX_COUNT, 1); - OUT_RING(ring, ctx->shaderimg[PIPE_SHADER_COMPUTE].enabled_mask ? - ~0 : ctx->tex[PIPE_SHADER_COMPUTE].num_textures); -#endif + if (dirty & (FD_DIRTY_SHADER_SSBO | FD_DIRTY_SHADER_IMAGE)) { + struct fd_ringbuffer *state = + fd6_build_ibo_state(ctx, cp, PIPE_SHADER_COMPUTE); + const struct ir3_ibo_mapping *mapping = &cp->image_mapping; -// if (dirty & FD_DIRTY_SHADER_SSBO) -// fd6_emit_ssbos(ctx, ring, PIPE_SHADER_COMPUTE); -// -// if (dirty & FD_DIRTY_SHADER_IMAGE) -// fd6_emit_images(ctx, ring, PIPE_SHADER_COMPUTE); + OUT_PKT7(ring, CP_LOAD_STATE6_FRAG, 3); + OUT_RING(ring, CP_LOAD_STATE6_0_DST_OFF(0) | + CP_LOAD_STATE6_0_STATE_TYPE(ST6_IBO) | + CP_LOAD_STATE6_0_STATE_SRC(SS6_INDIRECT) | + CP_LOAD_STATE6_0_STATE_BLOCK(SB6_CS_SHADER) | + CP_LOAD_STATE6_0_NUM_UNIT(mapping->num_ibo)); + OUT_RB(ring, state); + + OUT_PKT4(ring, REG_A6XX_SP_CS_IBO_LO, 2); + OUT_RB(ring, state); + + OUT_PKT4(ring, REG_A6XX_SP_CS_IBO_COUNT, 1); + OUT_RING(ring, mapping->num_ibo); + + fd_ringbuffer_del(state); + } } diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_program.c b/src/gallium/drivers/freedreno/a6xx/fd6_program.c index a9d8384aff7..5527b8cfd76 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_program.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_program.c @@ -238,11 +238,9 @@ setup_stream_out(struct fd6_program_state *state, const struct ir3_shader_varian struct stage { const struct ir3_shader_variant *v; const struct ir3_info *i; - /* const sizes are in units of 4 * vec4 */ - uint8_t constoff; + /* const sizes are in units of vec4, aligned to 4*vec4 */ uint8_t constlen; /* instr sizes are in units of 16 instructions */ - uint8_t instroff; uint8_t instrlen; }; @@ -287,16 +285,6 @@ setup_stages(struct fd6_program_state *state, struct stage *s, bool binning_pass s[i].instrlen = 0; } } - - unsigned constoff = 0; - for (i = 0; i < MAX_STAGES; i++) { - s[i].constoff = constoff; - constoff += s[i].constlen; - } - - s[VS].instroff = 0; - s[FS].instroff = 64 - s[FS].instrlen; - s[HS].instroff = s[DS].instroff = s[GS].instroff = s[FS].instroff; } static void diff --git a/src/gallium/drivers/freedreno/freedreno_screen.h b/src/gallium/drivers/freedreno/freedreno_screen.h index 3afca8ceb0e..d8d045a4642 100644 --- a/src/gallium/drivers/freedreno/freedreno_screen.h +++ b/src/gallium/drivers/freedreno/freedreno_screen.h @@ -177,7 +177,7 @@ is_ir3(struct fd_screen *screen) static inline bool has_compute(struct fd_screen *screen) { - return is_a5xx(screen); + return is_a5xx(screen) || is_a6xx(screen); } #endif /* FREEDRENO_SCREEN_H_ */ diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build index 90c0b62aeb6..c0f3ff45e9c 100644 --- a/src/gallium/drivers/freedreno/meson.build +++ b/src/gallium/drivers/freedreno/meson.build @@ -179,6 +179,8 @@ files_libfreedreno = files( 'a6xx/fd6_blend.h', 'a6xx/fd6_blitter.c', 'a6xx/fd6_blitter.h', + 'a6xx/fd6_compute.c', + 'a6xx/fd6_compute.h', 'a6xx/fd6_context.c', 'a6xx/fd6_context.h', 'a6xx/fd6_draw.c', |