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

[LLVM] Fix thread limiter

Browse source 
Allow to apply max llvm threads setting as usual
This commit is contained in:
Nekotekina 2018-03-27 00:54:38 +03:00
parent c3a5e3f491
commit a3db2774f1
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1156,6 +1156,16 @@ extern void ppu_initialize(const ppu_module& info)
std::vector<ppu_function_t> funcs; std::vector<ppu_function_t> funcs;
}; };
struct jit_core_allocator
{
::semaphore<0x7fffffff> sem;
jit_core_allocator(s32 arg)
: sem(arg)
{
}
};
// Permanently loaded compiled PPU modules (name -> data) // Permanently loaded compiled PPU modules (name -> data)
jit_module& jit_mod = fxm::get_always<std::unordered_map<std::string, jit_module>>()->emplace(cache_path + info.name, jit_module{}).first->second; jit_module& jit_mod = fxm::get_always<std::unordered_map<std::string, jit_module>>()->emplace(cache_path + info.name, jit_module{}).first->second;
@ -1168,7 +1178,7 @@ extern void ppu_initialize(const ppu_module& info)
// Initialize global semaphore with the max number of threads // Initialize global semaphore with the max number of threads
u32 max_threads = static_cast<u32>(g_cfg.core.llvm_threads); u32 max_threads = static_cast<u32>(g_cfg.core.llvm_threads);
s32 thread_count = max_threads > 0 ? std::min(max_threads, std::thread::hardware_concurrency()) : std::thread::hardware_concurrency(); s32 thread_count = max_threads > 0 ? std::min(max_threads, std::thread::hardware_concurrency()) : std::thread::hardware_concurrency();
static semaphore<INT32_MAX> jcores(std::max<s32>(thread_count, 1)); const auto jcores = fxm::get_always<jit_core_allocator>(std::max<s32>(thread_count, 1));
// Worker threads // Worker threads
std::vector<std::thread> jthreads; std::vector<std::thread> jthreads;
@ -1349,14 +1359,14 @@ extern void ppu_initialize(const ppu_module& info)
} }
// Create worker thread for compilation // Create worker thread for compilation
jthreads.emplace_back([&jit, obj_name = obj_name, part = std::move(part), &cache_path, fragment_sync, findex = ::size32(jthreads)]() jthreads.emplace_back([&jit, obj_name = obj_name, part = std::move(part), &cache_path, fragment_sync, jcores, findex = ::size32(jthreads)]()
{ {
// Set low priority // Set low priority
thread_ctrl::set_native_priority(-1); thread_ctrl::set_native_priority(-1);
// Allocate "core" // Allocate "core"
{ {
semaphore_lock jlock(jcores); semaphore_lock jlock(jcores->sem);
if (Emu.IsStopped()) if (Emu.IsStopped())
{ {