SPU: Make recompilers lock-free.

RPCS3 · Oct 26, 2019 · 224bc09 · 224bc09
1 parent 9ac6ef6
commit 224bc09
Show file tree

Hide file tree

Showing 4 changed files with 240 additions and 252 deletions.
diff --git a/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp b/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp
@@ -45,24 +45,23 @@ void spu_recompiler::init()
 	}
 }
 
-spu_function_t spu_recompiler::compile(const std::vector<u32>& func, void* fn_location)
+spu_function_t spu_recompiler::compile(std::vector<u32>&& _func)
 {
-	if (!fn_location)
-	{
-		fn_location = m_spurt->find(func);
-	}
+	const auto add_loc = m_spurt->add_empty(std::move(_func));
 
-	if (fn_location == spu_runtime::g_dispatcher)
+	if (!add_loc)
 	{
-		return &dispatch;
+		return nullptr;
 	}
 
-	if (!fn_location)
+	if (add_loc->compiled)
 	{
-		return nullptr;
+		return add_loc->compiled;
 	}
 
-	if (auto cache = g_fxo->get<spu_cache>(); cache && g_cfg.core.spu_cache)
+	const std::vector<u32>& func = add_loc->data;
+
+	if (auto cache = g_fxo->get<spu_cache>(); cache && g_cfg.core.spu_cache && !add_loc->cached.exchange(1))
 	{
 		cache->add(func);
 	}
@@ -94,10 +93,10 @@ spu_function_t spu_recompiler::compile(const std::vector<u32>& func, void* fn_lo
 	X86Assembler compiler(&code);
 	this->c = &compiler;
 
-	if (g_cfg.core.spu_debug)
+	if (g_cfg.core.spu_debug && !add_loc->logged.exchange(1))
 	{
 		// Dump analyser data
-		this->dump(log);
+		this->dump(func, log);
 		fs::file(m_spurt->get_cache_path() + "spu.log", fs::write + fs::append).write(log);
 
 		// Set logger
@@ -892,12 +891,21 @@ spu_function_t spu_recompiler::compile(const std::vector<u32>& func, void* fn_lo
 		LOG_FATAL(SPU, "Failed to build a function");
 	}
 
-	if (!m_spurt->add(fn_location, fn))
+	// Install compiled function pointer
+	const bool added = !add_loc->compiled && add_loc->compiled.compare_and_swap_test(nullptr, fn);
+
+	// Rebuild trampoline if necessary
+	if (!m_spurt->rebuild_ubertrampoline(func[1]))
 	{
 		return nullptr;
 	}
 
-	if (g_cfg.core.spu_debug)
+	if (added)
+	{
+		add_loc->compiled.notify_all();
+	}
+
+	if (g_cfg.core.spu_debug && added)
 	{
 		// Add ASMJIT logs
 		fmt::append(log, "Address: %p\n\n", fn);

diff --git a/rpcs3/Emu/Cell/SPUASMJITRecompiler.h b/rpcs3/Emu/Cell/SPUASMJITRecompiler.h
@@ -13,7 +13,7 @@ class spu_recompiler : public spu_recompiler_base
 
 	virtual void init() override;
 
-	virtual spu_function_t compile(const std::vector<u32>&, void*) override;
+	virtual spu_function_t compile(std::vector<u32>&&) override;
 
 private:
 	// ASMJIT runtime