fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv/ac: Implement Float64 load/store var.

Browse source 
Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Bas Nieuwenhuizen 2017-01-08 01:31:07 +01:00
parent 91074bb11b
commit 03724af262
1 changed files with 49 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
src/amd/common/ac_nir_to_llvm.c
View file

@ -2305,24 +2305,31 @@ load_gs_input(struct nir_to_llvm_context *ctx,
static LLVMValueRef visit_load_var(struct nir_to_llvm_context *ctx, static LLVMValueRef visit_load_var(struct nir_to_llvm_context *ctx,
nir_intrinsic_instr *instr) nir_intrinsic_instr *instr)
{ {
LLVMValueRef values[4]; LLVMValueRef values[8];
int idx = instr->variables[0]->var->data.driver_location; int idx = instr->variables[0]->var->data.driver_location;
int ve = instr->dest.ssa.num_components; int ve = instr->dest.ssa.num_components;
LLVMValueRef indir_index; LLVMValueRef indir_index;
LLVMValueRef ret;
unsigned const_index; unsigned const_index;
bool vs_in = ctx->stage == MESA_SHADER_VERTEX &&
instr->variables[0]->var->data.mode == nir_var_shader_in;
radv_get_deref_offset(ctx, &instr->variables[0]->deref, vs_in, NULL,
&const_index, &indir_index);
if (instr->dest.ssa.bit_size == 64)
ve *= 2;
switch (instr->variables[0]->var->data.mode) { switch (instr->variables[0]->var->data.mode) {
case nir_var_shader_in: case nir_var_shader_in:
if (ctx->stage == MESA_SHADER_GEOMETRY) { if (ctx->stage == MESA_SHADER_GEOMETRY) {
return load_gs_input(ctx, instr); return load_gs_input(ctx, instr);
} }
radv_get_deref_offset(ctx, &instr->variables[0]->deref,
ctx->stage == MESA_SHADER_VERTEX, NULL,
&const_index, &indir_index);
for (unsigned chan = 0; chan < ve; chan++) { for (unsigned chan = 0; chan < ve; chan++) {
if (indir_index) { if (indir_index) {
unsigned count = glsl_count_attribute_slots( unsigned count = glsl_count_attribute_slots(
instr->variables[0]->var->type, instr->variables[0]->var->type,
ctx->stage == MESA_SHADER_VERTEX); ctx->stage == MESA_SHADER_VERTEX);
count -= chan / 4;
LLVMValueRef tmp_vec = ac_build_gather_values_extended( LLVMValueRef tmp_vec = ac_build_gather_values_extended(
&ctx->ac, ctx->inputs + idx + chan, count, &ctx->ac, ctx->inputs + idx + chan, count,
4, false); 4, false);
@ -2333,15 +2340,13 @@ static LLVMValueRef visit_load_var(struct nir_to_llvm_context *ctx,
} else } else
values[chan] = ctx->inputs[idx + chan + const_index * 4]; values[chan] = ctx->inputs[idx + chan + const_index * 4];
} }
return to_integer(ctx, ac_build_gather_values(&ctx->ac, values, ve));
break; break;
case nir_var_local: case nir_var_local:
radv_get_deref_offset(ctx, &instr->variables[0]->deref, false,
NULL, &const_index, &indir_index);
for (unsigned chan = 0; chan < ve; chan++) { for (unsigned chan = 0; chan < ve; chan++) {
if (indir_index) { if (indir_index) {
unsigned count = glsl_count_attribute_slots( unsigned count = glsl_count_attribute_slots(
instr->variables[0]->var->type, false); instr->variables[0]->var->type, false);
count -= chan / 4;
LLVMValueRef tmp_vec = ac_build_gather_values_extended( LLVMValueRef tmp_vec = ac_build_gather_values_extended(
&ctx->ac, ctx->locals + idx + chan, count, &ctx->ac, ctx->locals + idx + chan, count,
4, true); 4, true);
@ -2353,14 +2358,13 @@ static LLVMValueRef visit_load_var(struct nir_to_llvm_context *ctx,
values[chan] = LLVMBuildLoad(ctx->builder, ctx->locals[idx + chan + const_index * 4], ""); values[chan] = LLVMBuildLoad(ctx->builder, ctx->locals[idx + chan + const_index * 4], "");
} }
} }
return to_integer(ctx, ac_build_gather_values(&ctx->ac, values, ve)); break;
case nir_var_shader_out: case nir_var_shader_out:
radv_get_deref_offset(ctx, &instr->variables[0]->deref, false,
NULL, &const_index, &indir_index);
for (unsigned chan = 0; chan < ve; chan++) { for (unsigned chan = 0; chan < ve; chan++) {
if (indir_index) { if (indir_index) {
unsigned count = glsl_count_attribute_slots( unsigned count = glsl_count_attribute_slots(
instr->variables[0]->var->type, false); instr->variables[0]->var->type, false);
count -= chan / 4;
LLVMValueRef tmp_vec = ac_build_gather_values_extended( LLVMValueRef tmp_vec = ac_build_gather_values_extended(
&ctx->ac, ctx->outputs + idx + chan, count, &ctx->ac, ctx->outputs + idx + chan, count,
4, true); 4, true);
@ -2374,10 +2378,8 @@ static LLVMValueRef visit_load_var(struct nir_to_llvm_context *ctx,
""); "");
} }
} }
return to_integer(ctx, ac_build_gather_values(&ctx->ac, values, ve)); break;
case nir_var_shared: { case nir_var_shared: {
radv_get_deref_offset(ctx, &instr->variables[0]->deref, false,
NULL, &const_index, &indir_index);
LLVMValueRef ptr = get_shared_memory_ptr(ctx, idx, ctx->i32); LLVMValueRef ptr = get_shared_memory_ptr(ctx, idx, ctx->i32);
LLVMValueRef derived_ptr; LLVMValueRef derived_ptr;
@ -2386,14 +2388,16 @@ static LLVMValueRef visit_load_var(struct nir_to_llvm_context *ctx,
if (indir_index) if (indir_index)
index = LLVMBuildAdd(ctx->builder, index, indir_index, ""); index = LLVMBuildAdd(ctx->builder, index, indir_index, "");
derived_ptr = LLVMBuildGEP(ctx->builder, ptr, &index, 1, ""); derived_ptr = LLVMBuildGEP(ctx->builder, ptr, &index, 1, "");
values[chan] = LLVMBuildLoad(ctx->builder, derived_ptr, ""); values[chan] = LLVMBuildLoad(ctx->builder, derived_ptr, "");
} }
return to_integer(ctx, ac_build_gather_values(&ctx->ac, values, ve));
}
default:
break; break;
} }
return NULL; default:
unreachable("unhandle variable mode");
}
ret = ac_build_gather_values(&ctx->ac, values, ve);
return LLVMBuildBitCast(ctx->builder, ret, get_def_type(ctx, &instr->dest.ssa), "");
} }
static void static void
@ -2406,21 +2410,31 @@ visit_store_var(struct nir_to_llvm_context *ctx,
int writemask = instr->const_index[0]; int writemask = instr->const_index[0];
LLVMValueRef indir_index; LLVMValueRef indir_index;
unsigned const_index; unsigned const_index;
radv_get_deref_offset(ctx, &instr->variables[0]->deref, false,
NULL, &const_index, &indir_index);
if (get_elem_bits(ctx, LLVMTypeOf(src)) == 64) {
int old_writemask = writemask;
src = LLVMBuildBitCast(ctx->builder, src,
LLVMVectorType(ctx->f32, get_llvm_num_components(src) * 2),
"");
writemask = 0;
for (unsigned chan = 0; chan < 4; chan++) {
if (old_writemask & (1 << chan))
writemask |= 3u << (2 * chan);
}
}
switch (instr->variables[0]->var->data.mode) { switch (instr->variables[0]->var->data.mode) {
case nir_var_shader_out: case nir_var_shader_out:
radv_get_deref_offset(ctx, &instr->variables[0]->deref, false, for (unsigned chan = 0; chan < 8; chan++) {
NULL, &const_index, &indir_index);
for (unsigned chan = 0; chan < 4; chan++) {
int stride = 4; int stride = 4;
if (!(writemask & (1 << chan))) if (!(writemask & (1 << chan)))
continue; continue;
if (get_llvm_num_components(src) == 1)
value = src; value = llvm_extract_elem(ctx, src, chan);
else
value = LLVMBuildExtractElement(ctx->builder, src,
LLVMConstInt(ctx->i32,
chan, false),
"");
if (instr->variables[0]->var->data.location == VARYING_SLOT_CLIP_DIST0 || if (instr->variables[0]->var->data.location == VARYING_SLOT_CLIP_DIST0 ||
instr->variables[0]->var->data.location == VARYING_SLOT_CULL_DIST0) instr->variables[0]->var->data.location == VARYING_SLOT_CULL_DIST0)
@ -2428,6 +2442,7 @@ visit_store_var(struct nir_to_llvm_context *ctx,
if (indir_index) { if (indir_index) {
unsigned count = glsl_count_attribute_slots( unsigned count = glsl_count_attribute_slots(
instr->variables[0]->var->type, false); instr->variables[0]->var->type, false);
count -= chan / 4;
LLVMValueRef tmp_vec = ac_build_gather_values_extended( LLVMValueRef tmp_vec = ac_build_gather_values_extended(
&ctx->ac, ctx->outputs + idx + chan, count, &ctx->ac, ctx->outputs + idx + chan, count,
stride, true); stride, true);
@ -2448,20 +2463,15 @@ visit_store_var(struct nir_to_llvm_context *ctx,
} }
break; break;
case nir_var_local: case nir_var_local:
radv_get_deref_offset(ctx, &instr->variables[0]->deref, false, for (unsigned chan = 0; chan < 8; chan++) {
NULL, &const_index, &indir_index);
for (unsigned chan = 0; chan < 4; chan++) {
if (!(writemask & (1 << chan))) if (!(writemask & (1 << chan)))
continue; continue;
if (get_llvm_num_components(src) == 1) value = llvm_extract_elem(ctx, src, chan);
value = src;
else
value = LLVMBuildExtractElement(ctx->builder, src,
LLVMConstInt(ctx->i32, chan, false), "");
if (indir_index) { if (indir_index) {
unsigned count = glsl_count_attribute_slots( unsigned count = glsl_count_attribute_slots(
instr->variables[0]->var->type, false); instr->variables[0]->var->type, false);
count -= chan / 4;
LLVMValueRef tmp_vec = ac_build_gather_values_extended( LLVMValueRef tmp_vec = ac_build_gather_values_extended(
&ctx->ac, ctx->locals + idx + chan, count, &ctx->ac, ctx->locals + idx + chan, count,
4, true); 4, true);
@ -2478,33 +2488,18 @@ visit_store_var(struct nir_to_llvm_context *ctx,
} }
break; break;
case nir_var_shared: { case nir_var_shared: {
LLVMValueRef ptr; LLVMValueRef ptr = get_shared_memory_ptr(ctx, idx, ctx->i32);
radv_get_deref_offset(ctx, &instr->variables[0]->deref, false, for (unsigned chan = 0; chan < 8; chan++) {
NULL, &const_index, &indir_index);
ptr = get_shared_memory_ptr(ctx, idx, ctx->i32);
LLVMValueRef derived_ptr;
for (unsigned chan = 0; chan < 4; chan++) {
if (!(writemask & (1 << chan))) if (!(writemask & (1 << chan)))
continue; continue;
LLVMValueRef index = LLVMConstInt(ctx->i32, chan, false); LLVMValueRef index = LLVMConstInt(ctx->i32, chan, false);
LLVMValueRef derived_ptr;
if (get_llvm_num_components(src) == 1)
value = src;
else
value = LLVMBuildExtractElement(ctx->builder, src,
LLVMConstInt(ctx->i32,
chan, false),
"");
if (indir_index) if (indir_index)
index = LLVMBuildAdd(ctx->builder, index, indir_index, ""); index = LLVMBuildAdd(ctx->builder, index, indir_index, "");
derived_ptr = LLVMBuildGEP(ctx->builder, ptr, &index, 1, ""); derived_ptr = LLVMBuildGEP(ctx->builder, ptr, &index, 1, "");
LLVMBuildStore(ctx->builder, LLVMBuildStore(ctx->builder,
to_integer(ctx, value), derived_ptr); to_integer(ctx, src), derived_ptr);
} }
break; break;
} }