KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radeonsi: Adapt to sample intrinsics changes. 

Fix up intrinsic names, and bitcast texture address parameters to integers.

NOTE: This is a candidate for the 9.1 branch.
This commit is contained in:
Michel Dänzer 2013-01-24 18:54:51 +01:00 committed by Michel Dänzer
parent 624528834f
commit e5fb7347a7
3 changed files with 55 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/radeon/radeon_llvm.h
View File

@ -155,7 +155,7 @@ static inline LLVMValueRef bitcast(
void radeon_llvm_emit_prepare_cube_coords(struct lp_build_tgsi_context * bld_base, void radeon_llvm_emit_prepare_cube_coords(struct lp_build_tgsi_context * bld_base,
struct lp_build_emit_data * emit_data, struct lp_build_emit_data * emit_data,
unsigned coord_arg); LLVMValueRef *coords_arg);
void radeon_llvm_context_init(struct radeon_llvm_context * ctx); void radeon_llvm_context_init(struct radeon_llvm_context * ctx);

50
src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
View File

@ -531,7 +531,7 @@ static void kil_emit(
void radeon_llvm_emit_prepare_cube_coords( void radeon_llvm_emit_prepare_cube_coords(
struct lp_build_tgsi_context * bld_base, struct lp_build_tgsi_context * bld_base,
struct lp_build_emit_data * emit_data, struct lp_build_emit_data * emit_data,
unsigned coord_arg) LLVMValueRef *coords_arg)
{ {
unsigned target = emit_data->inst->Texture.Texture; unsigned target = emit_data->inst->Texture.Texture;
@ -542,11 +542,13 @@ void radeon_llvm_emit_prepare_cube_coords(
LLVMValueRef coords[4]; LLVMValueRef coords[4];
LLVMValueRef mad_args[3]; LLVMValueRef mad_args[3];
LLVMValueRef idx; LLVMValueRef idx;
struct LLVMOpaqueValue *cube_vec;
LLVMValueRef v;
unsigned i; unsigned i;
LLVMValueRef v = build_intrinsic(builder, "llvm.AMDGPU.cube", cube_vec = lp_build_gather_values(bld_base->base.gallivm, coords_arg, 4);
LLVMVectorType(type, 4), v = build_intrinsic(builder, "llvm.AMDGPU.cube", LLVMVectorType(type, 4),
&emit_data->args[coord_arg], 1, LLVMReadNoneAttribute); &cube_vec, 1, LLVMReadNoneAttribute);
for (i = 0; i < 4; ++i) { for (i = 0; i < 4; ++i) {
idx = lp_build_const_int32(gallivm, i); idx = lp_build_const_int32(gallivm, i);
@ -579,18 +581,14 @@ void radeon_llvm_emit_prepare_cube_coords(
if (target != TGSI_TEXTURE_CUBE || if (target != TGSI_TEXTURE_CUBE ||
opcode != TGSI_OPCODE_TEX) { opcode != TGSI_OPCODE_TEX) {
/* load source coord.w component - array_index for cube arrays or
* compare value for SHADOWCUBE */
idx = lp_build_const_int32(gallivm, 3);
coords[3] = LLVMBuildExtractElement(builder,
emit_data->args[coord_arg], idx, "");
/* for cube arrays coord.z = coord.w(array_index) * 8 + face */ /* for cube arrays coord.z = coord.w(array_index) * 8 + face */
if (target == TGSI_TEXTURE_CUBE_ARRAY || if (target == TGSI_TEXTURE_CUBE_ARRAY ||
target == TGSI_TEXTURE_SHADOWCUBE_ARRAY) { target == TGSI_TEXTURE_SHADOWCUBE_ARRAY) {
/* coords_arg.w component - array_index for cube arrays or
* compare value for SHADOWCUBE */
coords[2] = lp_build_emit_llvm_ternary(bld_base, TGSI_OPCODE_MAD, coords[2] = lp_build_emit_llvm_ternary(bld_base, TGSI_OPCODE_MAD,
coords[3], lp_build_const_float(gallivm, 8.0), coords[2]); coords_arg[3], lp_build_const_float(gallivm, 8.0), coords[2]);
} }
/* for instructions that need additional src (compare/lod/bias), /* for instructions that need additional src (compare/lod/bias),
@ -598,12 +596,11 @@ void radeon_llvm_emit_prepare_cube_coords(
if (opcode == TGSI_OPCODE_TEX2 || if (opcode == TGSI_OPCODE_TEX2 ||
opcode == TGSI_OPCODE_TXB2 || opcode == TGSI_OPCODE_TXB2 ||
opcode == TGSI_OPCODE_TXL2) { opcode == TGSI_OPCODE_TXL2) {
coords[3] = emit_data->args[coord_arg + 1]; coords[3] = coords_arg[4];
} }
} }
emit_data->args[coord_arg] = memcpy(coords_arg, coords, sizeof(coords));
lp_build_gather_values(bld_base->base.gallivm, coords, 4);
} }
static void txd_fetch_args( static void txd_fetch_args(
@ -645,9 +642,6 @@ static void txp_fetch_args(
TGSI_OPCODE_DIV, arg, src_w); TGSI_OPCODE_DIV, arg, src_w);
} }
coords[3] = bld_base->base.one; coords[3] = bld_base->base.one;
emit_data->args[0] = lp_build_gather_values(bld_base->base.gallivm,
coords, 4);
emit_data->arg_count = 1;
if ((inst->Texture.Texture == TGSI_TEXTURE_CUBE || if ((inst->Texture.Texture == TGSI_TEXTURE_CUBE ||
inst->Texture.Texture == TGSI_TEXTURE_CUBE_ARRAY || inst->Texture.Texture == TGSI_TEXTURE_CUBE_ARRAY ||
@ -655,8 +649,12 @@ static void txp_fetch_args(
inst->Texture.Texture == TGSI_TEXTURE_SHADOWCUBE_ARRAY) && inst->Texture.Texture == TGSI_TEXTURE_SHADOWCUBE_ARRAY) &&
inst->Instruction.Opcode != TGSI_OPCODE_TXQ && inst->Instruction.Opcode != TGSI_OPCODE_TXQ &&
inst->Instruction.Opcode != TGSI_OPCODE_TXQ_LZ) { inst->Instruction.Opcode != TGSI_OPCODE_TXQ_LZ) {
radeon_llvm_emit_prepare_cube_coords(bld_base, emit_data, 0); radeon_llvm_emit_prepare_cube_coords(bld_base, emit_data, coords);
} }
emit_data->args[0] = lp_build_gather_values(bld_base->base.gallivm,
coords, 4);
emit_data->arg_count = 1;
} }
static void tex_fetch_args( static void tex_fetch_args(
@ -673,17 +671,12 @@ static void tex_fetch_args(
const struct tgsi_full_instruction * inst = emit_data->inst; const struct tgsi_full_instruction * inst = emit_data->inst;
LLVMValueRef coords[4]; LLVMValueRef coords[5];
unsigned chan; unsigned chan;
for (chan = 0; chan < 4; chan++) { for (chan = 0; chan < 4; chan++) {
coords[chan] = lp_build_emit_fetch(bld_base, inst, 0, chan); coords[chan] = lp_build_emit_fetch(bld_base, inst, 0, chan);
} }
emit_data->arg_count = 1;
emit_data->args[0] = lp_build_gather_values(bld_base->base.gallivm,
coords, 4);
emit_data->dst_type = LLVMVectorType(bld_base->base.elem_type, 4);
if (inst->Instruction.Opcode == TGSI_OPCODE_TEX2 || if (inst->Instruction.Opcode == TGSI_OPCODE_TEX2 ||
inst->Instruction.Opcode == TGSI_OPCODE_TXB2 || inst->Instruction.Opcode == TGSI_OPCODE_TXB2 ||
inst->Instruction.Opcode == TGSI_OPCODE_TXL2) { inst->Instruction.Opcode == TGSI_OPCODE_TXL2) {
@ -692,7 +685,7 @@ static void tex_fetch_args(
* That operand should be passed as a float value in the args array * That operand should be passed as a float value in the args array
* right after the coord vector. After packing it's not used anymore, * right after the coord vector. After packing it's not used anymore,
* that's why arg_count is not increased */ * that's why arg_count is not increased */
emit_data->args[1] = lp_build_emit_fetch(bld_base, inst, 1, 0); coords[4] = lp_build_emit_fetch(bld_base, inst, 1, 0);
} }
if ((inst->Texture.Texture == TGSI_TEXTURE_CUBE || if ((inst->Texture.Texture == TGSI_TEXTURE_CUBE ||
@ -701,8 +694,13 @@ static void tex_fetch_args(
inst->Texture.Texture == TGSI_TEXTURE_SHADOWCUBE_ARRAY) && inst->Texture.Texture == TGSI_TEXTURE_SHADOWCUBE_ARRAY) &&
inst->Instruction.Opcode != TGSI_OPCODE_TXQ && inst->Instruction.Opcode != TGSI_OPCODE_TXQ &&
inst->Instruction.Opcode != TGSI_OPCODE_TXQ_LZ) { inst->Instruction.Opcode != TGSI_OPCODE_TXQ_LZ) {
radeon_llvm_emit_prepare_cube_coords(bld_base, emit_data, 0); radeon_llvm_emit_prepare_cube_coords(bld_base, emit_data, coords);
} }
emit_data->arg_count = 1;
emit_data->args[0] = lp_build_gather_values(bld_base->base.gallivm,
coords, 4);
emit_data->dst_type = LLVMVectorType(bld_base->base.elem_type, 4);
} }
static void txf_fetch_args( static void txf_fetch_args(

53
src/gallium/drivers/radeonsi/radeonsi_shader.c
View File

@ -791,9 +791,12 @@ static void tex_fetch_args(
struct lp_build_tgsi_context * bld_base, struct lp_build_tgsi_context * bld_base,
struct lp_build_emit_data * emit_data) struct lp_build_emit_data * emit_data)
{ {
struct gallivm_state *gallivm = bld_base->base.gallivm;
const struct tgsi_full_instruction * inst = emit_data->inst; const struct tgsi_full_instruction * inst = emit_data->inst;
LLVMValueRef ptr; LLVMValueRef ptr;
LLVMValueRef offset; LLVMValueRef offset;
LLVMValueRef coords[5];
unsigned chan;
/* WriteMask */ /* WriteMask */
/* XXX: should be optimized using emit_data->inst->Dst[0].Register.WriteMask*/ /* XXX: should be optimized using emit_data->inst->Dst[0].Register.WriteMask*/
@ -801,27 +804,22 @@ static void tex_fetch_args(
/* Coordinates */ /* Coordinates */
/* XXX: Not all sample instructions need 4 address arguments. */ /* XXX: Not all sample instructions need 4 address arguments. */
if (inst->Instruction.Opcode == TGSI_OPCODE_TXP) { if (inst->Instruction.Opcode == TGSI_OPCODE_TXP)
LLVMValueRef src_w; coords[3] = lp_build_emit_fetch(bld_base, emit_data->inst, 0, TGSI_CHAN_W)
unsigned chan; ;
LLVMValueRef coords[4];
emit_data->dst_type = LLVMVectorType(bld_base->base.elem_type, 4); for (chan = 0; chan < 3; chan++ ) {
src_w = lp_build_emit_fetch(bld_base, emit_data->inst, 0, TGSI_CHAN_W); coords[chan] = lp_build_emit_fetch(bld_base,
emit_data->inst, 0,
for (chan = 0; chan < 3; chan++ ) { chan);
LLVMValueRef arg = lp_build_emit_fetch(bld_base, if (inst->Instruction.Opcode == TGSI_OPCODE_TXP)
emit_data->inst, 0, chan);
coords[chan] = lp_build_emit_llvm_binary(bld_base, coords[chan] = lp_build_emit_llvm_binary(bld_base,
TGSI_OPCODE_DIV, TGSI_OPCODE_DIV,
arg, src_w); coords[chan],
} coords[3]);
coords[3] = bld_base->base.one; }
emit_data->args[1] = lp_build_gather_values(bld_base->base.gallivm,
coords, 4); coords[3] = bld_base->base.one;
} else
emit_data->args[1] = lp_build_emit_fetch(bld_base, emit_data->inst,
0, LP_CHAN_ALL);
if (inst->Instruction.Opcode == TGSI_OPCODE_TEX2 || if (inst->Instruction.Opcode == TGSI_OPCODE_TEX2 ||
inst->Instruction.Opcode == TGSI_OPCODE_TXB2 || inst->Instruction.Opcode == TGSI_OPCODE_TXB2 ||
@ -831,15 +829,24 @@ static void tex_fetch_args(
* That operand should be passed as a float value in the args array * That operand should be passed as a float value in the args array
* right after the coord vector. After packing it's not used anymore, * right after the coord vector. After packing it's not used anymore,
* that's why arg_count is not increased */ * that's why arg_count is not increased */
emit_data->args[2] = lp_build_emit_fetch(bld_base, inst, 1, 0); coords[4] = lp_build_emit_fetch(bld_base, inst, 1, 0);
} }
if ((inst->Texture.Texture == TGSI_TEXTURE_CUBE || if ((inst->Texture.Texture == TGSI_TEXTURE_CUBE ||
inst->Texture.Texture == TGSI_TEXTURE_SHADOWCUBE) && inst->Texture.Texture == TGSI_TEXTURE_SHADOWCUBE) &&
inst->Instruction.Opcode != TGSI_OPCODE_TXQ) { inst->Instruction.Opcode != TGSI_OPCODE_TXQ) {
radeon_llvm_emit_prepare_cube_coords(bld_base, emit_data, 1); radeon_llvm_emit_prepare_cube_coords(bld_base, emit_data, coords);
} }
for (chan = 0; chan < 4; chan++ ) {
coords[chan] = LLVMBuildBitCast(gallivm->builder,
coords[chan],
LLVMInt32TypeInContext(gallivm->context),
"");
}
emit_data->args[1] = lp_build_gather_values(gallivm, coords, 4);
/* Resource */ /* Resource */
ptr = use_sgpr(bld_base->base.gallivm, SGPR_CONST_PTR_V8I32, SI_SGPR_RESOURCE); ptr = use_sgpr(bld_base->base.gallivm, SGPR_CONST_PTR_V8I32, SI_SGPR_RESOURCE);
offset = lp_build_const_int32(bld_base->base.gallivm, offset = lp_build_const_int32(bld_base->base.gallivm,
@ -869,19 +876,19 @@ static void tex_fetch_args(
static const struct lp_build_tgsi_action tex_action = { static const struct lp_build_tgsi_action tex_action = {
.fetch_args = tex_fetch_args, .fetch_args = tex_fetch_args,
.emit = lp_build_tgsi_intrinsic, .emit = lp_build_tgsi_intrinsic,
.intr_name = "llvm.SI.sample" .intr_name = "llvm.SI.sample."
}; };
static const struct lp_build_tgsi_action txb_action = { static const struct lp_build_tgsi_action txb_action = {
.fetch_args = tex_fetch_args, .fetch_args = tex_fetch_args,
.emit = lp_build_tgsi_intrinsic, .emit = lp_build_tgsi_intrinsic,
.intr_name = "llvm.SI.sample.bias" .intr_name = "llvm.SI.sampleb."
}; };
static const struct lp_build_tgsi_action txl_action = { static const struct lp_build_tgsi_action txl_action = {
.fetch_args = tex_fetch_args, .fetch_args = tex_fetch_args,
.emit = lp_build_tgsi_intrinsic, .emit = lp_build_tgsi_intrinsic,
.intr_name = "llvm.SI.sample.lod" .intr_name = "llvm.SI.samplel."
}; };