fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 13:40:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aco: move MIMG VDATA to its own operand

Browse source 
We will want both a VDATA operand and a sampler for some TFE/LWE MIMG
instructions.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7775>
This commit is contained in:
Rhys Perry 2020-11-19 17:13:56 +00:00 • committed by Marge Bot
parent 2aaf52bb85
commit 962c917cea
5 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/amd/compiler/aco_assembler.cpp
View file

@ -451,11 +451,11 @@ void emit_instruction(asm_context& ctx, std::vector<uint32_t>& out, Instruction*
encoding = (0xFF & instr->operands[2].physReg()); /* VADDR */
if (!instr->definitions.empty()) {
encoding |= (0xFF & instr->definitions[0].physReg()) << 8; /* VDATA */
} else if (instr->operands[1].regClass().type() == RegType::vgpr) {
encoding |= (0xFF & instr->operands[1].physReg()) << 8; /* VDATA */
} else if (instr->operands.size() >= 4) {
encoding |= (0xFF & instr->operands[3].physReg()) << 8; /* VDATA */
}
encoding |= (0x1F & (instr->operands[0].physReg() >> 2)) << 16; /* T# (resource) */
if (instr->operands[1].regClass().type() == RegType::sgpr)
if (!instr->operands[1].isUndefined())
encoding |= (0x1F & (instr->operands[1].physReg() >> 2)) << 21; /* sampler */
assert(!mimg->d16 || ctx.chip_class >= GFX9);

10
src/amd/compiler/aco_instruction_selection.cpp
View file

@ -6021,10 +6021,11 @@ void visit_image_store(isel_context *ctx, nir_intrinsic_instr *instr)
bool level_zero = nir_src_is_const(instr->src[4]) && nir_src_as_uint(instr->src[4]) == 0;
aco_opcode opcode = level_zero ? aco_opcode::image_store : aco_opcode::image_store_mip;
aco_ptr<MIMG_instruction> store{create_instruction<MIMG_instruction>(opcode, Format::MIMG, 3, 0)};
aco_ptr<MIMG_instruction> store{create_instruction<MIMG_instruction>(opcode, Format::MIMG, 4, 0)};
store->operands[0] = Operand(resource);
store->operands[1] = Operand(data);
store->operands[1] = Operand(s4); /* no sampler */
store->operands[2] = Operand(coords);
store->operands[3] = Operand(data);
store->glc = glc;
store->dlc = false;
store->dim = ac_get_image_dim(ctx->options->chip_class, dim, is_array);
@ -6148,10 +6149,11 @@ void visit_image_atomic(isel_context *ctx, nir_intrinsic_instr *instr)
Temp coords = get_image_coords(ctx, instr, type);
Temp resource = get_sampler_desc(ctx, nir_instr_as_deref(instr->src[0].ssa->parent_instr), ACO_DESC_IMAGE, nullptr, true, true);
aco_ptr<MIMG_instruction> mimg{create_instruction<MIMG_instruction>(image_op, Format::MIMG, 3, return_previous ? 1 : 0)};
aco_ptr<MIMG_instruction> mimg{create_instruction<MIMG_instruction>(image_op, Format::MIMG, 4, return_previous ? 1 : 0)};
mimg->operands[0] = Operand(resource);
mimg->operands[1] = Operand(data);
mimg->operands[1] = Operand(s4); /* no sampler */
mimg->operands[2] = Operand(coords);
mimg->operands[3] = Operand(data);
if (return_previous)
mimg->definitions[0] = Definition(dst);
mimg->glc = return_previous;

2
src/amd/compiler/aco_ir.h
View file

@ -1279,8 +1279,8 @@ static_assert(sizeof(MTBUF_instruction) == sizeof(Instruction) + 8, "Unexpected
* Vector Memory Image Instructions
* Operand(0) SRSRC - Scalar GPR that specifies the resource constant.
* Operand(1): SSAMP - Scalar GPR that specifies sampler constant.
* or VDATA - Vector GPR for write data.
* Operand(2): VADDR - Address source. Can carry an offset or an index.
* Operand(3): VDATA - Vector GPR for write data or zero if TFE/LWE=1.
* Definition(0): VDATA - Vector GPR for read result.
*
*/

4
src/amd/compiler/aco_register_allocation.cpp
View file

@ -2124,8 +2124,8 @@ void register_allocation(Program *program, std::vector<IDSet>& live_out_per_bloc
instr->definitions[0].setFixed(instr->operands[3].physReg());
} else if (instr->format == Format::MIMG &&
instr->definitions.size() == 1 &&
instr->operands[1].regClass().type() == RegType::vgpr) {
instr->definitions[0].setFixed(instr->operands[1].physReg());
instr->operands.size() >= 4) {
instr->definitions[0].setFixed(instr->operands[3].physReg());
}
ctx.defs_done.reset();

15
src/amd/compiler/aco_validate.cpp
View file

@ -435,15 +435,18 @@ bool validate_ir(Program* program)
break;
}
case Format::MIMG: {
check(instr->operands.size() == 3, "MIMG instructions must have exactly 3 operands", instr.get());
check(instr->operands.size() >= 3, "MIMG instructions must have 3 or 4 operands", instr.get());
check(instr->operands.size() <= 4, "MIMG instructions must have 3 or 4 operands", instr.get());
check(instr->operands[0].hasRegClass() && (instr->operands[0].regClass() == s4 || instr->operands[0].regClass() == s8),
"MIMG operands[0] (resource constant) must be in 4 or 8 SGPRs", instr.get());
if (instr->operands[1].hasRegClass() && instr->operands[1].regClass().type() == RegType::sgpr)
if (instr->operands[1].hasRegClass())
check(instr->operands[1].regClass() == s4, "MIMG operands[1] (sampler constant) must be 4 SGPRs", instr.get());
else if (instr->operands[1].hasRegClass() && instr->operands[1].regClass().type() == RegType::vgpr)
check((instr->definitions.empty() || instr->definitions[0].regClass() == instr->operands[1].regClass() ||
instr->opcode == aco_opcode::image_atomic_cmpswap || instr->opcode == aco_opcode::image_atomic_fcmpswap),
"MIMG operands[1] (VDATA) must be the same as definitions[0] for atomics", instr.get());
if (instr->operands.size() >= 4) {
bool is_cmpswap = instr->opcode == aco_opcode::image_atomic_cmpswap ||
instr->opcode == aco_opcode::image_atomic_fcmpswap;
check(instr->definitions.empty() || (instr->definitions[0].regClass() == instr->operands[3].regClass() || is_cmpswap),
"MIMG operands[3] (VDATA) must be the same as definitions[0] for atomics and TFE/LWE loads", instr.get());
}
check(instr->operands[2].hasRegClass() && instr->operands[2].regClass().type() == RegType::vgpr,
"MIMG operands[2] (VADDR) must be VGPR", instr.get());
check(instr->definitions.empty() || (instr->definitions[0].isTemp() && instr->definitions[0].regClass().type() == RegType::vgpr),