1
0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-11 19:24:11 +01:00

[dxvk] Use dual queues for CS thread

Reduces lock contention since we can just swap out the entire queue
any time the worker thread runs out of stuff to do.
This commit is contained in:
Philip Rebohle 2023-07-21 21:19:50 +02:00
parent eed43c8524
commit f689ddd838
2 changed files with 24 additions and 23 deletions

View File

@ -119,7 +119,7 @@ namespace dxvk {
{ std::unique_lock<dxvk::mutex> lock(m_mutex); { std::unique_lock<dxvk::mutex> lock(m_mutex);
seq = ++m_chunksDispatched; seq = ++m_chunksDispatched;
m_chunksQueued.push(std::move(chunk)); m_chunksQueued.push_back(std::move(chunk));
} }
m_condOnAdd.notify_one(); m_condOnAdd.notify_one();
@ -152,35 +152,36 @@ namespace dxvk {
void DxvkCsThread::threadFunc() { void DxvkCsThread::threadFunc() {
env::setThreadName("dxvk-cs"); env::setThreadName("dxvk-cs");
DxvkCsChunkRef chunk; // Local chunk queue, we use two queues and swap between
// them in order to potentially reduce lock contention.
std::vector<DxvkCsChunkRef> chunks;
try { try {
while (!m_stopped.load()) { while (!m_stopped.load()) {
{ std::unique_lock<dxvk::mutex> lock(m_mutex); { std::unique_lock<dxvk::mutex> lock(m_mutex);
if (chunk) {
m_chunksExecuted++; m_condOnAdd.wait(lock, [this] {
m_condOnSync.notify_one(); return (!m_chunksQueued.empty())
|| (m_stopped.load());
chunk = DxvkCsChunkRef(); });
}
std::swap(chunks, m_chunksQueued);
if (m_chunksQueued.size() == 0) {
m_condOnAdd.wait(lock, [this] {
return (m_chunksQueued.size() != 0)
|| (m_stopped.load());
});
}
if (m_chunksQueued.size() != 0) {
chunk = std::move(m_chunksQueued.front());
m_chunksQueued.pop();
}
} }
if (chunk) { for (auto& chunk : chunks) {
m_context->addStatCtr(DxvkStatCounter::CsChunkCount, 1); m_context->addStatCtr(DxvkStatCounter::CsChunkCount, 1);
chunk->executeAll(m_context.ptr()); chunk->executeAll(m_context.ptr());
m_chunksExecuted += 1;
m_condOnSync.notify_one();
// Explicitly free chunk here to release
// references to any resources held by it
chunk = DxvkCsChunkRef();
} }
chunks.clear();
} }
} catch (const DxvkError& e) { } catch (const DxvkError& e) {
Logger::err("Exception on CS thread!"); Logger::err("Exception on CS thread!");

View File

@ -432,7 +432,7 @@ namespace dxvk {
dxvk::mutex m_mutex; dxvk::mutex m_mutex;
dxvk::condition_variable m_condOnAdd; dxvk::condition_variable m_condOnAdd;
dxvk::condition_variable m_condOnSync; dxvk::condition_variable m_condOnSync;
std::queue<DxvkCsChunkRef> m_chunksQueued; std::vector<DxvkCsChunkRef> m_chunksQueued;
dxvk::thread m_thread; dxvk::thread m_thread;
void threadFunc(); void threadFunc();