I can't test it with my 6870 HD, piglit clock2x32
need OGL 4.3 (wich I force), and then it fails with
evergreen_state.c:4762: evergreen_emit_atomic_buffer_setup:
Assertion `resource' failed.
Compute shader piglits with atomics work though.
The patch itself looks fine, so
Reviewed-by: Gert Wollny <gw.fosse...@gmail.com>
Am Mittwoch, den 10.01.2018, 10:59 +1000 schrieb Dave Airlie:
> From: Dave Airlie <airl...@redhat.com>
>
> ---
> docs/features.txt | 2 +-
> src/gallium/drivers/r600/r600_pipe.c | 2 +-
> src/gallium/drivers/r600/r600_shader.c | 29
> ++++++++++++++++++++++++++---
> src/gallium/drivers/r600/r600_sq.h | 3 ++-
> 4 files changed, 30 insertions(+), 6 deletions(-)
>
> diff --git a/docs/features.txt b/docs/features.txt
> index a5f34edd41..80e6c5aaa4 100644
> --- a/docs/features.txt
> +++ b/docs/features.txt
> @@ -305,7 +305,7 @@ Khronos, ARB, and OES extensions that are not
> part of any OpenGL or OpenGL ES ve
> GL_ARB_sample_locations not started
> GL_ARB_seamless_cubemap_per_texture DONE (i965,
> nvc0, radeonsi, r600, softpipe, swr)
> GL_ARB_shader_ballot DONE
> (i965/gen8+, nvc0, radeonsi)
> - GL_ARB_shader_clock DONE
> (i965/gen7+, nv50, nvc0, radeonsi)
> + GL_ARB_shader_clock DONE
> (i965/gen7+, nv50, nvc0, r600, radeonsi)
> GL_ARB_shader_stencil_export DONE
> (i965/gen9+, r600, radeonsi, softpipe, llvmpipe, swr)
> GL_ARB_shader_viewport_layer_array DONE
> (i965/gen6+, nvc0, radeonsi)
> GL_ARB_sparse_buffer DONE
> (radeonsi/CIK+)
> diff --git a/src/gallium/drivers/r600/r600_pipe.c
> b/src/gallium/drivers/r600/r600_pipe.c
> index 95aa2e5383..a8cedb3b90 100644
> --- a/src/gallium/drivers/r600/r600_pipe.c
> +++ b/src/gallium/drivers/r600/r600_pipe.c
> @@ -353,6 +353,7 @@ static int r600_get_param(struct pipe_screen*
> pscreen, enum pipe_cap param)
> case PIPE_CAP_TGSI_FS_FINE_DERIVATIVE:
> case PIPE_CAP_SAMPLER_VIEW_TARGET:
> case PIPE_CAP_TGSI_PACK_HALF_FLOAT:
> + case PIPE_CAP_TGSI_CLOCK:
> return family >= CHIP_CEDAR ? 1 : 0;
> case PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS:
> return family >= CHIP_CEDAR ? 4 : 0;
> @@ -397,7 +398,6 @@ static int r600_get_param(struct pipe_screen*
> pscreen, enum pipe_cap param)
> case PIPE_CAP_INT64:
> case PIPE_CAP_INT64_DIVMOD:
> case PIPE_CAP_TGSI_TEX_TXF_LZ:
> - case PIPE_CAP_TGSI_CLOCK:
> case PIPE_CAP_POLYGON_MODE_FILL_RECTANGLE:
> case PIPE_CAP_SPARSE_BUFFER_PAGE_SIZE:
> case PIPE_CAP_TGSI_BALLOT:
> diff --git a/src/gallium/drivers/r600/r600_shader.c
> b/src/gallium/drivers/r600/r600_shader.c
> index f6ff2055ee..f0d5277b2c 100644
> --- a/src/gallium/drivers/r600/r600_shader.c
> +++ b/src/gallium/drivers/r600/r600_shader.c
> @@ -10168,6 +10168,29 @@ static int tgsi_bfe(struct r600_shader_ctx
> *ctx)
> return 0;
> }
>
> +static int tgsi_clock(struct r600_shader_ctx *ctx)
> +{
> + struct tgsi_full_instruction *inst = &ctx-
> >parse.FullToken.FullInstruction;
> + struct r600_bytecode_alu alu;
> + int r;
> +
> + memset(&alu, 0, sizeof(struct r600_bytecode_alu));
> + alu.op = ALU_OP1_MOV;
> + tgsi_dst(ctx, &inst->Dst[0], 0, &alu.dst);
> + alu.src[0].sel = EG_V_SQ_ALU_SRC_TIME_LO;
> + r = r600_bytecode_add_alu(ctx->bc, &alu);
> + if (r)
> + return r;
> + memset(&alu, 0, sizeof(struct r600_bytecode_alu));
> + alu.op = ALU_OP1_MOV;
> + tgsi_dst(ctx, &inst->Dst[0], 1, &alu.dst);
> + alu.src[0].sel = EG_V_SQ_ALU_SRC_TIME_HI;
> + r = r600_bytecode_add_alu(ctx->bc, &alu);
> + if (r)
> + return r;
> + return 0;
> +}
> +
> static const struct r600_shader_tgsi_instruction
> r600_shader_tgsi_instruction[] = {
> [TGSI_OPCODE_ARL] = { ALU_OP0_NOP, tgsi_r600_arl},
> [TGSI_OPCODE_MOV] = { ALU_OP1_MOV, tgsi_op2},
> @@ -10204,7 +10227,7 @@ static const struct
> r600_shader_tgsi_instruction r600_shader_tgsi_instruction[]
> [TGSI_OPCODE_POW] = { ALU_OP0_NOP, tgsi_pow},
> [31] = { ALU_OP0_NOP, tgsi_unsupported},
> [32] = { ALU_OP0_NOP,
> tgsi_unsupported},
> - [33] = { ALU_OP0_NOP,
> tgsi_unsupported},
> + [TGSI_OPCODE_CLOCK] = { ALU_OP0_NOP, tgsi_unsupported},
> [34] = { ALU_OP0_NOP,
> tgsi_unsupported},
> [35] = { ALU_OP0_NOP,
> tgsi_unsupported},
> [TGSI_OPCODE_COS] = { ALU_OP1_COS, tgsi_trig},
> @@ -10402,7 +10425,7 @@ static const struct
> r600_shader_tgsi_instruction eg_shader_tgsi_instruction[] =
> [TGSI_OPCODE_POW] = { ALU_OP0_NOP, tgsi_pow},
> [31] = { ALU_OP0_NOP, tgsi_unsupported},
> [32] = { ALU_OP0_NOP,
> tgsi_unsupported},
> - [33] = { ALU_OP0_NOP,
> tgsi_unsupported},
> + [TGSI_OPCODE_CLOCK] = { ALU_OP0_NOP, tgsi_clock},
> [34] = { ALU_OP0_NOP,
> tgsi_unsupported},
> [35] = { ALU_OP0_NOP,
> tgsi_unsupported},
> [TGSI_OPCODE_COS] = { ALU_OP1_COS, tgsi_trig},
> @@ -10624,7 +10647,7 @@ static const struct
> r600_shader_tgsi_instruction cm_shader_tgsi_instruction[] =
> [TGSI_OPCODE_POW] = { ALU_OP0_NOP, cayman_pow},
> [31] = { ALU_OP0_NOP, tgsi_unsupported},
> [32] = { ALU_OP0_NOP,
> tgsi_unsupported},
> - [33] = { ALU_OP0_NOP,
> tgsi_unsupported},
> + [TGSI_OPCODE_CLOCK] = { ALU_OP0_NOP, tgsi_clock},
> [34] = { ALU_OP0_NOP,
> tgsi_unsupported},
> [35] = { ALU_OP0_NOP,
> tgsi_unsupported},
> [TGSI_OPCODE_COS] = { ALU_OP1_COS, cayman_trig},
> diff --git a/src/gallium/drivers/r600/r600_sq.h
> b/src/gallium/drivers/r600/r600_sq.h
> index aa38381328..f51ffcf9e2 100644
> --- a/src/gallium/drivers/r600/r600_sq.h
> +++ b/src/gallium/drivers/r600/r600_sq.h
> @@ -196,7 +196,8 @@
> #define EG_V_SQ_ALU_SRC_LDS_OQ_B_POP
> 0x000000DE
> #define EG_V_SQ_ALU_SRC_LDS_DIRECT_A
> 0x000000DF
> #define EG_V_SQ_ALU_SRC_LDS_DIRECT_B
> 0x000000E0
> -
> +#define EG_V_SQ_ALU_SRC_TIME_HI
> 0x000000E3
> +#define EG_V_SQ_ALU_SRC_TIME_LO
> 0x000000E4
> #define EG_V_SQ_ALU_SRC_HW_WAVE_ID
> 0x000000E7
> #define EG_V_SQ_ALU_SRC_SIMD_ID
> 0x000000E8
> #define EG_V_SQ_ALU_SRC_SE_ID
> 0x000000E9
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
