archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 17:58:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

SPU analyser: minor logic fix and cleanup

Browse source 
Don't fill any chunk info for now (design mistake).
This commit is contained in:
Nekotekina 2019-05-03 14:18:22 +03:00
parent 6c34d7104e
commit 4bd022f778
2 changed files with 6 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

34
rpcs3/Emu/Cell/SPURecompiler.cpp
View file

@ -1935,15 +1935,7 @@ const std::vector<u32>& spu_recompiler_base::analyse(const be_t<u32>* ls, u32 en
auto& block = m_bbs.at(addr); auto& block = m_bbs.at(addr);
const u32 _new = block.chunk; const u32 _new = block.chunk;
if (m_entry_info[addr / 4]) if (!m_entry_info[addr / 4])
{
// Register empty chunk
if (auto emp = m_chunks.try_emplace(addr); emp.second)
{
emp.first->second.joinable = m_ret_info[addr / 4];
}
}
else
{ {
// Check block predecessors // Check block predecessors
for (u32 pred : block.preds) for (u32 pred : block.preds)
@ -1992,7 +1984,7 @@ const std::vector<u32>& spu_recompiler_base::analyse(const be_t<u32>* ls, u32 en
m_entry_info[entry / 4] = true; m_entry_info[entry / 4] = true;
// Acknowledge artificial (reversible) chunk entry point // Acknowledge artificial (reversible) chunk entry point
m_chunks[entry].joinable = true; m_ret_info[entry / 4] = true;
} }
for (auto& bb : m_bbs) for (auto& bb : m_bbs)
@ -2002,14 +1994,6 @@ const std::vector<u32>& spu_recompiler_base::analyse(const be_t<u32>* ls, u32 en
} }
} }
// Fill chunk info
for (auto& bb : m_bbs)
{
auto& chunk = m_chunks.at(bb.second.chunk);
chunk.bbs.push_back(bb.first);
}
workload.clear(); workload.clear();
workload.push_back(entry_point); workload.push_back(entry_point);
@ -2055,7 +2039,7 @@ const std::vector<u32>& spu_recompiler_base::analyse(const be_t<u32>* ls, u32 en
} }
} }
if (m_entry_info[addr / 4] && !m_chunks.at(addr).joinable) if (m_entry_info[addr / 4] && !m_ret_info[addr / 4])
{ {
for (u32 i = 0; i < s_reg_max; i++) for (u32 i = 0; i < s_reg_max; i++)
{ {
@ -2089,7 +2073,7 @@ const std::vector<u32>& spu_recompiler_base::analyse(const be_t<u32>* ls, u32 en
} }
} }
if (tb.chunk != block.chunk && m_entry_info[target / 4] && !m_chunks.at(target).joinable) if (tb.chunk != block.chunk && !(m_entry_info[target / 4] && m_ret_info[target / 4]))
{ {
// Skip call targets completely // Skip call targets completely
continue; continue;
@ -2160,15 +2144,7 @@ void spu_recompiler_base::dump(std::string& out)
{ {
if (m_block_info[bb.first / 4]) if (m_block_info[bb.first / 4])
{ {
fmt::append(out, "?: [0x%05x] %s\n", bb.first, m_entry_info[bb.first / 4] ? (m_ret_info[bb.first / 4] ? "Return" : "Entry") : "Block"); fmt::append(out, "?: [0x%05x] %s\n", bb.first, m_entry_info[bb.first / 4] ? (m_ret_info[bb.first / 4] ? "Chunk" : "Entry") : "Block");
if (auto found = m_chunks.find(bb.first); found != m_chunks.end())
{
if (found->second.joinable)
fmt::append(out, "\tJoinable chunk.\n");
else
fmt::append(out, "\tNon-joinable chunk.\n");
}
for (u32 pred : bb.second.preds) for (u32 pred : bb.second.preds)
{ {

7
rpcs3/Emu/Cell/SPURecompiler.h
View file

@ -224,7 +224,7 @@ protected:
// List of function entry points and return points (set after BRSL, BRASL, BISL, BISLED) // List of function entry points and return points (set after BRSL, BRASL, BISL, BISLED)
std::bitset<0x10000> m_entry_info; std::bitset<0x10000> m_entry_info;
// Set after return points // Set after return points and disjoint chunks
std::bitset<0x10000> m_ret_info; std::bitset<0x10000> m_ret_info;
// Basic block information // Basic block information
@ -261,11 +261,6 @@ protected:
// Advanced block (chunk) information // Advanced block (chunk) information
struct chunk_info struct chunk_info
{ {
// Flag set for synthetic chunks (false for call targets and return locations)
bool joinable = false;
// List of basic blocks
std::basic_string<u32> bbs;
}; };
// Sorted chunk info // Sorted chunk info