mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-09-05 17:16:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[gui] Show total number of llvm compilation dialogs

Browse source 
- Doesn't account for dynamic libraries loaded after the fact,
  but usually good enough since
  1) Those aren't even present in some games
  2) They usually only have about 1 or 2 fragments (dialogs) each.
This commit is contained in:
VelocityRa 2017-12-24 02:35:45 +02:00 • committed by Nekotekina
commit 383c501a35
1 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
rpcs3/Emu/Cell/PPUThread.cpp
View file

@ -165,7 +165,7 @@ extern const ppu_decoder<ppu_interpreter_fast> g_ppu_interpreter_fast([](auto& t
extern void ppu_initialize(); extern void ppu_initialize();
extern void ppu_initialize(const ppu_module& info); extern void ppu_initialize(const ppu_module& info);
static void ppu_initialize2(class jit_compiler& jit, const ppu_module& module_part, const std::string& cache_path, const std::string& obj_name); static void ppu_initialize2(jit_compiler& jit, const ppu_module& module_part, const std::string& cache_path, const std::string& obj_name, u32 fragment_index, atomic_t<u32>&);
extern void ppu_execute_syscall(ppu_thread& ppu, u64 code); extern void ppu_execute_syscall(ppu_thread& ppu, u64 code);
// Get pointer to executable cache // Get pointer to executable cache
@ -1172,6 +1172,10 @@ extern void ppu_initialize(const ppu_module& info)
// Difference between function name and current location // Difference between function name and current location
const u32 reloc = info.name.empty() ? 0 : info.segs.at(0).addr; const u32 reloc = info.name.empty() ? 0 : info.segs.at(0).addr;
atomic_t<u32> fragment_sync{0};
u32 fragment_count{0};
while (jit_mod.vars.empty() && fpos < info.funcs.size()) while (jit_mod.vars.empty() && fpos < info.funcs.size())
{ {
// Initialize compiler instance // Initialize compiler instance
@ -1299,12 +1303,13 @@ extern void ppu_initialize(const ppu_module& info)
{ {
semaphore_lock lock(jmutex); semaphore_lock lock(jmutex);
jit->add(cache_path + obj_name); jit->add(cache_path + obj_name);
LOG_SUCCESS(PPU, "LLVM: Loaded module %s", obj_name); LOG_SUCCESS(PPU, "LLVM: Loaded module %s", obj_name);
continue; continue;
} }
// Create worker thread for compilation // Create worker thread for compilation
jthreads.emplace_back([&jit, &jcores, obj_name = obj_name, part = std::move(part), &cache_path]() jthreads.emplace_back([&jit, &jcores, obj_name = obj_name, part = std::move(part), &cache_path, &fragment_sync, findex = ::size32(jthreads)]()
{ {
// Set low priority // Set low priority
thread_ctrl::set_native_priority(-1); thread_ctrl::set_native_priority(-1);
@ -1320,7 +1325,7 @@ extern void ppu_initialize(const ppu_module& info)
// Use another JIT instance // Use another JIT instance
jit_compiler jit2({}, g_cfg.core.llvm_cpu); jit_compiler jit2({}, g_cfg.core.llvm_cpu);
ppu_initialize2(jit2, part, cache_path, obj_name); ppu_initialize2(jit2, part, cache_path, obj_name, findex, fragment_sync);
} }
if (Emu.IsStopped() || !fs::is_file(cache_path + obj_name)) if (Emu.IsStopped() || !fs::is_file(cache_path + obj_name))
@ -1334,6 +1339,9 @@ extern void ppu_initialize(const ppu_module& info)
}); });
} }
// Initialize fragment count sync var
fragment_sync.exchange(::size32(jthreads));
// Join worker threads // Join worker threads
for (auto& thread : jthreads) for (auto& thread : jthreads)
{ {
@ -1417,7 +1425,7 @@ extern void ppu_initialize(const ppu_module& info)
#endif #endif
} }
static void ppu_initialize2(jit_compiler& jit, const ppu_module& module_part, const std::string& cache_path, const std::string& obj_name) static void ppu_initialize2(jit_compiler& jit, const ppu_module& module_part, const std::string& cache_path, const std::string& obj_name, u32 fragment_index, atomic_t<u32>& fragment_sync)
{ {
#ifdef LLVM_AVAILABLE #ifdef LLVM_AVAILABLE
using namespace llvm; using namespace llvm;
@ -1501,12 +1509,15 @@ static void ppu_initialize2(jit_compiler& jit, const ppu_module& module_part, co
if (module_part.funcs[fi].size) if (module_part.funcs[fi].size)
{ {
// Update dialog // Update dialog
Emu.CallAfter([=, max = module_part.funcs.size()]() Emu.CallAfter([=, max = module_part.funcs.size(), &fragment_sync]()
{ {
dlg->ProgressBarSetMsg(0, fmt::format("Compiling %u of %u", fi + 1, fmax)); dlg->ProgressBarSetMsg(0, fmt::format("Compiling %u of %u", fi + 1, fmax));
if (fi * 100 / fmax != (fi + 1) * 100 / fmax) if (fi * 100 / fmax != (fi + 1) * 100 / fmax)
dlg->ProgressBarInc(0, 1); dlg->ProgressBarInc(0, 1);
if (u32 fragment_count = fragment_sync.load())
dlg->SetMsg(fmt::format("Compiling PPU module (%u of %u):\n%s\nPlease wait...", fragment_index + 1, fragment_count, obj_name));
}); });
// Translate // Translate
@ -1532,10 +1543,13 @@ static void ppu_initialize2(jit_compiler& jit, const ppu_module& module_part, co
//mpm.run(*module); //mpm.run(*module);
// Update dialog // Update dialog
Emu.CallAfter([=]() Emu.CallAfter([=, &fragment_sync]()
{ {
dlg->ProgressBarSetMsg(0, "Generating code, this may take a long time..."); dlg->ProgressBarSetMsg(0, "Generating code, this may take a long time...");
dlg->ProgressBarInc(0, 100); dlg->ProgressBarInc(0, 100);
if (u32 fragment_count = fragment_sync.load())
dlg->SetMsg(fmt::format("Compiling PPU module (%u of %u):\n%s\nPlease wait...", fragment_index + 1, fragment_count, obj_name));
}); });
std::string result; std::string result;