mirror of
https://github.com/doitsujin/dxvk.git
synced 2024-12-12 13:08:50 +01:00
[d3d11] Use new flush heuristic
This commit is contained in:
Philip Rebohle
Philip Rebohle
parent
f952418958
commit
2a3d7ee7dc
@ -2194,9 +2194,6 @@ namespace dxvk {
|
||||
ID3D11DepthStencilView* pDepthStencilView) {
|
||||
D3D10DeviceLock lock = LockContext();
|
||||
|
||||
if constexpr (!IsDeferred)
|
||||
GetTypedContext()->FlushImplicit(true);
|
||||
|
||||
SetRenderTargetsAndUnorderedAccessViews(
|
||||
NumViews, ppRenderTargetViews, pDepthStencilView,
|
||||
NumViews, 0, nullptr, nullptr);
|
||||
@ -2214,9 +2211,6 @@ namespace dxvk {
|
||||
const UINT* pUAVInitialCounts) {
|
||||
D3D10DeviceLock lock = LockContext();
|
||||
|
||||
if constexpr (!IsDeferred)
|
||||
GetTypedContext()->FlushImplicit(true);
|
||||
|
||||
SetRenderTargetsAndUnorderedAccessViews(
|
||||
NumRTVs, ppRenderTargetViews, pDepthStencilView,
|
||||
UAVStartSlot, NumUAVs, ppUnorderedAccessViews, pUAVInitialCounts);
|
||||
@ -2671,7 +2665,7 @@ namespace dxvk {
|
||||
return E_INVALIDARG;
|
||||
|
||||
if constexpr (!IsDeferred)
|
||||
GetTypedContext()->FlushImplicit(false);
|
||||
GetTypedContext()->ConsiderFlush(GpuFlushType::ImplicitWeakHint);
|
||||
|
||||
DxvkSparseBindInfo bindInfo;
|
||||
bindInfo.dstResource = GetPagedResource(pDestTiledResource);
|
||||
@ -2808,7 +2802,7 @@ namespace dxvk {
|
||||
return E_INVALIDARG;
|
||||
|
||||
if constexpr (!IsDeferred)
|
||||
GetTypedContext()->FlushImplicit(false);
|
||||
GetTypedContext()->ConsiderFlush(GpuFlushType::ImplicitWeakHint);
|
||||
|
||||
// Find sparse allocator if the tile pool is defined
|
||||
DxvkSparseBindInfo bindInfo;
|
||||
@ -4921,8 +4915,12 @@ namespace dxvk {
|
||||
}
|
||||
}
|
||||
|
||||
if (needsUpdate)
|
||||
if (needsUpdate) {
|
||||
BindFramebuffer();
|
||||
|
||||
if constexpr (!IsDeferred)
|
||||
GetTypedContext()->ConsiderFlush(GpuFlushType::ImplicitWeakHint);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -18,6 +18,7 @@ namespace dxvk {
|
||||
: D3D11CommonContext<D3D11ImmediateContext>(pParent, Device, 0, DxvkCsChunkFlag::SingleUse),
|
||||
m_csThread(Device, Device->createContext(DxvkContextType::Primary)),
|
||||
m_maxImplicitDiscardSize(pParent->GetOptions()->maxImplicitDiscardSize),
|
||||
m_submissionFence(new sync::CallbackFence()),
|
||||
m_multithread(this, false, pParent->GetOptions()->enableContextLock),
|
||||
m_videoContext(this, Device) {
|
||||
EmitCs([
|
||||
@ -48,7 +49,7 @@ namespace dxvk {
|
||||
if (this_thread::isInModuleDetachment())
|
||||
return;
|
||||
|
||||
Flush();
|
||||
ExecuteFlush(GpuFlushType::ExplicitFlush, nullptr);
|
||||
SynchronizeCsThread(DxvkCsThread::SynchronizeAll);
|
||||
SynchronizeDevice();
|
||||
}
|
||||
@ -99,7 +100,8 @@ namespace dxvk {
|
||||
|
||||
// Ignore the DONOTFLUSH flag here as some games will spin
|
||||
// on queries without ever flushing the context otherwise.
|
||||
FlushImplicit(FALSE);
|
||||
D3D10DeviceLock lock = LockContext();
|
||||
ConsiderFlush(GpuFlushType::ImplicitSynchronization);
|
||||
}
|
||||
|
||||
return hr;
|
||||
@ -148,47 +150,33 @@ namespace dxvk {
|
||||
query->NotifyEnd();
|
||||
|
||||
if (query->IsStalling())
|
||||
Flush();
|
||||
ExecuteFlush(GpuFlushType::ImplicitSynchronization, nullptr);
|
||||
else if (query->IsEvent())
|
||||
FlushImplicit(TRUE);
|
||||
ConsiderFlush(GpuFlushType::ImplicitStrongHint);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void STDMETHODCALLTYPE D3D11ImmediateContext::Flush() {
|
||||
Flush1(D3D11_CONTEXT_TYPE_ALL, nullptr);
|
||||
D3D10DeviceLock lock = LockContext();
|
||||
|
||||
ExecuteFlush(GpuFlushType::ExplicitFlush, nullptr);
|
||||
}
|
||||
|
||||
|
||||
void STDMETHODCALLTYPE D3D11ImmediateContext::Flush1(
|
||||
D3D11_CONTEXT_TYPE ContextType,
|
||||
HANDLE hEvent) {
|
||||
m_parent->FlushInitContext();
|
||||
|
||||
if (hEvent)
|
||||
SignalEvent(hEvent);
|
||||
|
||||
D3D10DeviceLock lock = LockContext();
|
||||
|
||||
if (GetPendingCsChunks()) {
|
||||
// Add commands to flush the threaded
|
||||
// context, then flush the command list
|
||||
EmitCs([] (DxvkContext* ctx) {
|
||||
ctx->flushCommandList();
|
||||
});
|
||||
|
||||
FlushCsChunk();
|
||||
|
||||
// Reset flush timer used for implicit flushes
|
||||
m_lastFlush = dxvk::high_resolution_clock::now();
|
||||
m_flushSeqNum = m_csSeqNum;
|
||||
}
|
||||
|
||||
ExecuteFlush(GpuFlushType::ExplicitFlush, hEvent);
|
||||
}
|
||||
|
||||
|
||||
HRESULT STDMETHODCALLTYPE D3D11ImmediateContext::Signal(
|
||||
ID3D11Fence* pFence,
|
||||
UINT64 Value) {
|
||||
D3D10DeviceLock lock = LockContext();
|
||||
auto fence = static_cast<D3D11Fence*>(pFence);
|
||||
|
||||
if (!fence)
|
||||
@ -201,7 +189,7 @@ namespace dxvk {
|
||||
ctx->signalFence(cFence, cValue);
|
||||
});
|
||||
|
||||
Flush();
|
||||
ExecuteFlush(GpuFlushType::ExplicitFlush, nullptr);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
@ -209,12 +197,13 @@ namespace dxvk {
|
||||
HRESULT STDMETHODCALLTYPE D3D11ImmediateContext::Wait(
|
||||
ID3D11Fence* pFence,
|
||||
UINT64 Value) {
|
||||
D3D10DeviceLock lock = LockContext();
|
||||
auto fence = static_cast<D3D11Fence*>(pFence);
|
||||
|
||||
if (!fence)
|
||||
return E_INVALIDARG;
|
||||
|
||||
Flush();
|
||||
ExecuteFlush(GpuFlushType::ExplicitFlush, nullptr);
|
||||
|
||||
EmitCs([
|
||||
cFence = fence->GetFence(),
|
||||
@ -246,7 +235,7 @@ namespace dxvk {
|
||||
|
||||
// As an optimization, flush everything if the
|
||||
// number of pending draw calls is high enough.
|
||||
FlushImplicit(FALSE);
|
||||
ConsiderFlush(GpuFlushType::ImplicitWeakHint);
|
||||
|
||||
// Dispatch command list to the CS thread and
|
||||
// restore the immediate context's state
|
||||
@ -257,6 +246,9 @@ namespace dxvk {
|
||||
RestoreCommandListState();
|
||||
else
|
||||
ResetContextState();
|
||||
|
||||
// Flush after if the command list was sufficiently long
|
||||
ConsiderFlush(GpuFlushType::ImplicitWeakHint);
|
||||
}
|
||||
|
||||
|
||||
@ -386,7 +378,7 @@ namespace dxvk {
|
||||
}
|
||||
|
||||
if (doInvalidatePreserve) {
|
||||
FlushImplicit(TRUE);
|
||||
ConsiderFlush(GpuFlushType::ImplicitWeakHint);
|
||||
|
||||
auto prevSlice = pResource->GetMappedSlice();
|
||||
auto physSlice = pResource->DiscardSlice();
|
||||
@ -533,7 +525,7 @@ namespace dxvk {
|
||||
}
|
||||
|
||||
if (doFlags & DoInvalidate) {
|
||||
FlushImplicit(TRUE);
|
||||
ConsiderFlush(GpuFlushType::ImplicitWeakHint);
|
||||
|
||||
DxvkBufferSliceHandle prevSlice = pResource->GetMappedSlice(Subresource);
|
||||
DxvkBufferSliceHandle physSlice = pResource->DiscardSlice(Subresource);
|
||||
@ -809,14 +801,14 @@ namespace dxvk {
|
||||
// We don't have to wait, but misbehaving games may
|
||||
// still try to spin on `Map` until the resource is
|
||||
// idle, so we should flush pending commands
|
||||
FlushImplicit(FALSE);
|
||||
ConsiderFlush(GpuFlushType::ImplicitSynchronization);
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
if (isInUse) {
|
||||
// Make sure pending commands using the resource get
|
||||
// executed on the the GPU if we have to wait for it
|
||||
Flush();
|
||||
ExecuteFlush(GpuFlushType::ImplicitSynchronization, nullptr);
|
||||
SynchronizeCsThread(SequenceNumber);
|
||||
|
||||
m_device->waitForResource(Resource, access);
|
||||
@ -838,7 +830,7 @@ namespace dxvk {
|
||||
uint64_t sequenceNumber = GetCurrentSequenceNumber();
|
||||
pResource->TrackSequenceNumber(Subresource, sequenceNumber);
|
||||
|
||||
FlushImplicit(TRUE);
|
||||
ConsiderFlush(GpuFlushType::ImplicitStrongHint);
|
||||
}
|
||||
|
||||
|
||||
@ -847,7 +839,7 @@ namespace dxvk {
|
||||
uint64_t sequenceNumber = GetCurrentSequenceNumber();
|
||||
pResource->TrackSequenceNumber(sequenceNumber);
|
||||
|
||||
FlushImplicit(TRUE);
|
||||
ConsiderFlush(GpuFlushType::ImplicitStrongHint);
|
||||
}
|
||||
|
||||
|
||||
@ -864,40 +856,50 @@ namespace dxvk {
|
||||
}
|
||||
|
||||
|
||||
void D3D11ImmediateContext::FlushImplicit(BOOL StrongHint) {
|
||||
// Flush only if the GPU is about to go idle, in
|
||||
// order to keep the number of submissions low.
|
||||
uint32_t pending = m_device->pendingSubmissions();
|
||||
void D3D11ImmediateContext::ConsiderFlush(
|
||||
GpuFlushType FlushType) {
|
||||
uint64_t chunkId = GetCurrentSequenceNumber();
|
||||
uint64_t submissionId = m_submissionFence->value();
|
||||
|
||||
if (StrongHint || pending <= MaxPendingSubmits) {
|
||||
auto now = dxvk::high_resolution_clock::now();
|
||||
|
||||
uint32_t delay = MinFlushIntervalUs
|
||||
+ IncFlushIntervalUs * pending;
|
||||
|
||||
// Prevent flushing too often in short intervals.
|
||||
if (now - m_lastFlush >= std::chrono::microseconds(delay))
|
||||
Flush();
|
||||
}
|
||||
if (m_flushTracker.considerFlush(FlushType, chunkId, submissionId))
|
||||
ExecuteFlush(FlushType, nullptr);
|
||||
}
|
||||
|
||||
|
||||
void D3D11ImmediateContext::SignalEvent(HANDLE hEvent) {
|
||||
uint64_t value = ++m_eventCount;
|
||||
void D3D11ImmediateContext::ExecuteFlush(
|
||||
GpuFlushType FlushType,
|
||||
HANDLE hEvent) {
|
||||
// Flush init context so that new resources are fully initialized
|
||||
// before the app can access them in any way. This has to happen
|
||||
// unconditionally since we may otherwise deadlock on Map.
|
||||
m_parent->FlushInitContext();
|
||||
|
||||
if (m_eventSignal == nullptr)
|
||||
m_eventSignal = new sync::CallbackFence();
|
||||
// Exit early if there's nothing to do
|
||||
if (!GetPendingCsChunks() && !hEvent)
|
||||
return;
|
||||
|
||||
m_eventSignal->setCallback(value, [hEvent] {
|
||||
SetEvent(hEvent);
|
||||
});
|
||||
// Signal the submission fence and flush the command list
|
||||
uint64_t submissionId = ++m_submissionId;
|
||||
|
||||
if (hEvent) {
|
||||
m_submissionFence->setCallback(submissionId, [hEvent] {
|
||||
SetEvent(hEvent);
|
||||
});
|
||||
}
|
||||
|
||||
EmitCs([
|
||||
cSignal = m_eventSignal,
|
||||
cValue = value
|
||||
cSubmissionFence = m_submissionFence,
|
||||
cSubmissionId = submissionId
|
||||
] (DxvkContext* ctx) {
|
||||
ctx->signal(cSignal, cValue);
|
||||
ctx->signal(cSubmissionFence, cSubmissionId);
|
||||
ctx->flushCommandList();
|
||||
});
|
||||
|
||||
FlushCsChunk();
|
||||
|
||||
// Notify flush tracker about the flush
|
||||
m_flushSeqNum = m_csSeqNum;
|
||||
m_flushTracker.notifyFlush(m_flushSeqNum, submissionId);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "../util/util_flush.h"
|
||||
#include "../util/util_time.h"
|
||||
|
||||
#include "../util/sync/sync_signal.h"
|
||||
@ -12,7 +13,7 @@ namespace dxvk {
|
||||
|
||||
class D3D11Buffer;
|
||||
class D3D11CommonTexture;
|
||||
|
||||
|
||||
class D3D11ImmediateContext : public D3D11CommonContext<D3D11ImmediateContext> {
|
||||
friend class D3D11CommonContext<D3D11ImmediateContext>;
|
||||
friend class D3D11SwapChain;
|
||||
@ -89,20 +90,18 @@ namespace dxvk {
|
||||
DxvkCsThread m_csThread;
|
||||
uint64_t m_csSeqNum = 0ull;
|
||||
|
||||
Rc<sync::CallbackFence> m_eventSignal;
|
||||
uint64_t m_eventCount = 0ull;
|
||||
uint32_t m_mappedImageCount = 0u;
|
||||
|
||||
VkDeviceSize m_maxImplicitDiscardSize = 0ull;
|
||||
|
||||
Rc<sync::CallbackFence> m_submissionFence;
|
||||
uint64_t m_submissionId = 0ull;
|
||||
|
||||
uint64_t m_flushSeqNum = 0ull;
|
||||
GpuFlushTracker m_flushTracker;
|
||||
|
||||
|
||||
dxvk::high_resolution_clock::time_point m_lastFlush
|
||||
= dxvk::high_resolution_clock::now();
|
||||
|
||||
D3D10Multithread m_multithread;
|
||||
D3D11VideoContext m_videoContext;
|
||||
D3D10Multithread m_multithread;
|
||||
D3D11VideoContext m_videoContext;
|
||||
|
||||
Com<D3D11DeviceContextState, false> m_stateObject;
|
||||
|
||||
@ -133,21 +132,21 @@ namespace dxvk {
|
||||
const D3D11_COMMON_TEXTURE_REGION* pRegion);
|
||||
|
||||
void UpdateMappedBuffer(
|
||||
D3D11Buffer* pDstBuffer,
|
||||
UINT Offset,
|
||||
UINT Length,
|
||||
const void* pSrcData,
|
||||
UINT CopyFlags);
|
||||
D3D11Buffer* pDstBuffer,
|
||||
UINT Offset,
|
||||
UINT Length,
|
||||
const void* pSrcData,
|
||||
UINT CopyFlags);
|
||||
|
||||
void SynchronizeDevice();
|
||||
|
||||
void EndFrame();
|
||||
|
||||
bool WaitForResource(
|
||||
const Rc<DxvkResource>& Resource,
|
||||
uint64_t SequenceNumber,
|
||||
D3D11_MAP MapType,
|
||||
UINT MapFlags);
|
||||
const Rc<DxvkResource>& Resource,
|
||||
uint64_t SequenceNumber,
|
||||
D3D11_MAP MapType,
|
||||
UINT MapFlags);
|
||||
|
||||
void EmitCsChunk(DxvkCsChunkRef&& chunk);
|
||||
|
||||
@ -162,10 +161,13 @@ namespace dxvk {
|
||||
|
||||
uint64_t GetPendingCsChunks();
|
||||
|
||||
void FlushImplicit(BOOL StrongHint);
|
||||
void ConsiderFlush(
|
||||
GpuFlushType FlushType);
|
||||
|
||||
void ExecuteFlush(
|
||||
GpuFlushType FlushType,
|
||||
HANDLE hEvent);
|
||||
|
||||
void SignalEvent(HANDLE hEvent);
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user