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

r600/sfn: Handle mem barrier and image barrier by using ACK 

When reading from and writing to the same image in a shader the
memory_barrier can possibly be handled by emitting an ack-write and then
wait for the ack when the memory barrier is set.

Not sure whow well this goes with the syncronization across all shader
invocations though.

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7142>
This commit is contained in:
Gert Wollny 2020-10-07 10:42:17 +02:00 committed by Marge Bot
parent f664fc1c7b
commit 02e39b737a
4 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/gallium/drivers/r600/sfn/sfn_emitssboinstruction.cpp
View File

@ -100,6 +100,11 @@ bool EmitSSBOInstruction::do_emit(nir_instr* instr)
return emit_image_size(intr);
case nir_intrinsic_get_ssbo_size:
return emit_buffer_size(intr);
case nir_intrinsic_memory_barrier:
case nir_intrinsic_memory_barrier_image:
case nir_intrinsic_memory_barrier_buffer:
case nir_intrinsic_group_memory_barrier:
return make_stores_ack_and_waitack();
default:
return false;
}
@ -352,17 +357,21 @@ bool EmitSSBOInstruction::emit_store_ssbo(const nir_intrinsic_instr* instr)
auto values = vec_from_nir_with_fetch_constant(instr->src[0],
(1 << nir_src_num_components(instr->src[0])) - 1, {0,1,2,3}, true);
emit_instruction(new RatInstruction(cf_mem_rat, RatInstruction::STORE_TYPED,
values, addr_vec, m_ssbo_image_offset, rat_id, 1,
1, 0, false));
auto store = new RatInstruction(cf_mem_rat, RatInstruction::STORE_TYPED,
values, addr_vec, m_ssbo_image_offset, rat_id, 1,
1, 0, false);
emit_instruction(store);
m_store_ops.push_back(store);
for (unsigned i = 1; i < nir_src_num_components(instr->src[0]); ++i) {
emit_instruction(new AluInstruction(op1_mov, temp2.reg_i(0), from_nir(instr->src[0], i), write));
emit_instruction(new AluInstruction(op2_add_int, addr_vec.reg_i(0),
{addr_vec.reg_i(0), Value::one_i}, last_write));
emit_instruction(new RatInstruction(cf_mem_rat, RatInstruction::STORE_TYPED,
temp2, addr_vec, 0, rat_id, 1,
1, 0, false));
store = new RatInstruction(cf_mem_rat, RatInstruction::STORE_TYPED,
temp2, addr_vec, 0, rat_id, 1,
1, 0, false);
emit_instruction(store);
m_store_ops.push_back(store);
}
#endif
return true;
@ -392,6 +401,8 @@ EmitSSBOInstruction::emit_image_store(const nir_intrinsic_instr *intrin)
auto store = new RatInstruction(cf_mem_rat, RatInstruction::STORE_TYPED, value, coord, imageid,
image_offset, 1, 0xf, 0, false);
m_store_ops.push_back(store);
emit_instruction(store);
return true;
}
@ -617,6 +628,19 @@ bool EmitSSBOInstruction::emit_buffer_size(const nir_intrinsic_instr *intr)
return true;
}
bool EmitSSBOInstruction::make_stores_ack_and_waitack()
{
for (auto&& store: m_store_ops)
store->set_ack();
if (!m_store_ops.empty())
emit_instruction(new WaitAck(0));
m_store_ops.clear();
return true;
}
GPRVector EmitSSBOInstruction::make_dest(const nir_intrinsic_instr* ir)
{
GPRVector::Values v;

3
src/gallium/drivers/r600/sfn/sfn_emitssboinstruction.h
View File

@ -37,6 +37,8 @@ private:
bool fetch_return_value(const nir_intrinsic_instr *intrin);
bool make_stores_ack_and_waitack();
ESDOp get_opcode(nir_intrinsic_op opcode);
RatInstruction::ERatOp get_rat_opcode(const nir_intrinsic_op opcode, pipe_format format) const;
@ -47,6 +49,7 @@ private:
bool m_require_rat_return_address;
GPRVector m_rat_return_address;
int m_ssbo_image_offset;
std::vector<RatInstruction *> m_store_ops;
};
}

2
src/gallium/drivers/r600/sfn/sfn_instruction_gds.h
View File

@ -168,6 +168,8 @@ public:
int data_swz(int chan) const {return m_data.chan_i(chan);}
void set_ack() {m_need_ack = true; }
private:
bool is_equal_to(const Instruction& lhs) const override;

2
src/gallium/drivers/r600/sfn/sfn_shader_base.cpp
View File

@ -678,8 +678,8 @@ bool ShaderFromNirProcessor::emit_intrinsic_instruction(nir_intrinsic_instr* ins
case nir_intrinsic_control_barrier:
case nir_intrinsic_memory_barrier_tcs_patch:
case nir_intrinsic_memory_barrier_shared:
case nir_intrinsic_memory_barrier:
case nir_intrinsic_memory_barrier_buffer:
case nir_intrinsic_memory_barrier:
case nir_intrinsic_memory_barrier_image:
case nir_intrinsic_group_memory_barrier:
return emit_barrier(instr);