On 8 January 2018 at 16:45, Timothy Arceri <[email protected]> wrote: > nir_to_llvm_context will always be NULL for radeonsi so we need > work around this.
Reviewed-by: Dave Airlie <[email protected]> > --- > src/amd/common/ac_nir_to_llvm.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c > index 5203b78537..a729fe5f6d 100644 > --- a/src/amd/common/ac_nir_to_llvm.c > +++ b/src/amd/common/ac_nir_to_llvm.c > @@ -3826,19 +3826,18 @@ static void emit_membar(struct nir_to_llvm_context > *ctx, > ac_build_waitcnt(&ctx->ac, waitcnt); > } > > -static void emit_barrier(struct nir_to_llvm_context *ctx) > +static void emit_barrier(struct ac_llvm_context *ac, gl_shader_stage stage) > { > /* SI only (thanks to a hw bug workaround): > * The real barrier instruction isn’t needed, because an entire patch > * always fits into a single wave. > */ > - if (ctx->options->chip_class == SI && > - ctx->stage == MESA_SHADER_TESS_CTRL) { > - ac_build_waitcnt(&ctx->ac, LGKM_CNT & VM_CNT); > + if (ac->chip_class == SI && stage == MESA_SHADER_TESS_CTRL) { > + ac_build_waitcnt(ac, LGKM_CNT & VM_CNT); > return; > } > - ac_build_intrinsic(&ctx->ac, "llvm.amdgcn.s.barrier", > - ctx->ac.voidt, NULL, 0, AC_FUNC_ATTR_CONVERGENT); > + ac_build_intrinsic(ac, "llvm.amdgcn.s.barrier", > + ac->voidt, NULL, 0, AC_FUNC_ATTR_CONVERGENT); > } > > static void emit_discard_if(struct ac_nir_context *ctx, > @@ -4331,7 +4330,7 @@ static void visit_intrinsic(struct ac_nir_context *ctx, > emit_membar(ctx->nctx, instr); > break; > case nir_intrinsic_barrier: > - emit_barrier(ctx->nctx); > + emit_barrier(&ctx->ac, ctx->stage); > break; > case nir_intrinsic_var_atomic_add: > case nir_intrinsic_var_atomic_imin: > @@ -6169,7 +6168,7 @@ write_tess_factors(struct nir_to_llvm_context *ctx) > LLVMValueRef lds_base, lds_inner, lds_outer, byteoffset, buffer; > LLVMValueRef out[6], vec0, vec1, tf_base, inner[4], outer[4]; > int i; > - emit_barrier(ctx); > + emit_barrier(&ctx->ac, ctx->stage); > > switch (ctx->options->key.tcs.primitive_mode) { > case GL_ISOLINES: > @@ -6712,7 +6711,7 @@ LLVMModuleRef > ac_translate_nir_to_llvm(LLVMTargetMachineRef tm, > } > > if (i) > - emit_barrier(&ctx); > + emit_barrier(&ctx.ac, ctx.stage); > > ac_setup_rings(&ctx); > > -- > 2.14.3 > > _______________________________________________ > mesa-dev mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
