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

aco: Const correctness for get_barrier_interaction.

Browse Source 
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4536>
This commit is contained in:
Timur Kristóf
2020-03-18 10:40:06 +01:00
committed by Marge Bot
parent f321dc33c8
commit 0c0691d43e
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/compiler/aco_ir.h
+1 -1
View File
@@ -1210,7 +1210,7 @@ static inline bool is_phi(aco_ptr<Instruction>& instr)
return is_phi(instr.get());
}
barrier_interaction get_barrier_interaction(Instruction* instr);
barrier_interaction get_barrier_interaction(const Instruction* instr);
bool is_dead(const std::vector<uint16_t>& uses, Instruction *instr);
src/amd/compiler/aco_scheduler.cpp
+10 -10
View File
@@ -338,40 +338,40 @@ bool can_reorder(Instruction* candidate)
}
}
bool is_gs_or_done_sendmsg(Instruction *instr)
bool is_gs_or_done_sendmsg(const Instruction *instr)
{
if (instr->opcode == aco_opcode::s_sendmsg) {
uint16_t imm = static_cast<SOPP_instruction*>(instr)->imm;
uint16_t imm = static_cast<const SOPP_instruction*>(instr)->imm;
return (imm & sendmsg_id_mask) == _sendmsg_gs ||
(imm & sendmsg_id_mask) == _sendmsg_gs_done;
}
return false;
}
bool is_done_sendmsg(Instruction *instr)
bool is_done_sendmsg(const Instruction *instr)
{
if (instr->opcode == aco_opcode::s_sendmsg) {
uint16_t imm = static_cast<SOPP_instruction*>(instr)->imm;
uint16_t imm = static_cast<const SOPP_instruction*>(instr)->imm;
return (imm & sendmsg_id_mask) == _sendmsg_gs_done;
}
return false;
}
barrier_interaction get_barrier_interaction(Instruction* instr)
barrier_interaction get_barrier_interaction(const Instruction* instr)
{
switch (instr->format) {
case Format::SMEM:
return static_cast<SMEM_instruction*>(instr)->barrier;
return static_cast<const SMEM_instruction*>(instr)->barrier;
case Format::MUBUF:
return static_cast<MUBUF_instruction*>(instr)->barrier;
return static_cast<const MUBUF_instruction*>(instr)->barrier;
case Format::MIMG:
return static_cast<MIMG_instruction*>(instr)->barrier;
return static_cast<const MIMG_instruction*>(instr)->barrier;
case Format::MTBUF:
return static_cast<MTBUF_instruction*>(instr)->barrier;
return static_cast<const MTBUF_instruction*>(instr)->barrier;
case Format::FLAT:
case Format::GLOBAL:
case Format::SCRATCH:
return static_cast<FLAT_instruction*>(instr)->barrier;
return static_cast<const FLAT_instruction*>(instr)->barrier;
case Format::DS:
return barrier_shared;
case Format::SOPP: