added compile switches to select between thread wake factors

bskstrikker · Jul 25, 2019 · 895e7db · 895e7db
1 parent 64734e6
commit 895e7db
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/d912pxy/d912pxy_buffer_loader.cpp b/d912pxy/d912pxy_buffer_loader.cpp
@@ -35,7 +35,7 @@ d912pxy_buffer_loader::~d912pxy_buffer_loader()
 
 void d912pxy_buffer_loader::Init()
 {	
-	d912pxy_async_upload_thread::Init(PXY_INNER_MAX_ASYNC_BUFFERLOADS, PXY_INNER_THREADID_BUF_LOADER, 10, L"buffer upload thread", "d912pxy bufld");
+	d912pxy_async_upload_thread::Init(PXY_INNER_MAX_ASYNC_BUFFERLOADS, PXY_INNER_THREADID_BUF_LOADER, PXY_WAKE_FACTOR_BUFFER, L"buffer upload thread", "d912pxy bufld");
 
 	d912pxy_s.dx12.que.EnableGID(CLG_BUF, PXY_INNER_CLG_PRIO_ASYNC_LOAD);
 	Resume();

diff --git a/d912pxy/d912pxy_fwdecl.h b/d912pxy/d912pxy_fwdecl.h
@@ -51,6 +51,9 @@ SOFTWARE.
 //#define PER_BATCH_FLUSH_DEBUG 1
 //#define USE_PIX_EVENT_ANNOTATIONS
 
+#define THREAD_FAST_WAKE
+//#define THREAD_MODEST_WAKE
+
 #ifdef _DEBUG
 	#define ENABLE_METRICS
 	#define ENABLE_DEBUG_LOGGING
@@ -111,6 +114,18 @@ SOFTWARE.
 
 #define PXY_INNER_REPLAY_THREADS_MAX 4
 
+#ifdef THREAD_MODEST_WAKE
+	#define PXY_WAKE_FACTOR_TEXTURE 1
+	#define PXY_WAKE_FACTOR_BUFFER 10
+	#define PXY_WAKE_FACTOR_REPLAY 100
+#endif
+
+#ifdef THREAD_FAST_WAKE
+	#define PXY_WAKE_FACTOR_TEXTURE 1
+	#define PXY_WAKE_FACTOR_BUFFER 1
+	#define PXY_WAKE_FACTOR_REPLAY 10
+#endif
+
 //memory manager ============================
 
 #define PXY_MEM_MGR_TRIES 100

diff --git a/d912pxy/d912pxy_replay.cpp b/d912pxy/d912pxy_replay.cpp
@@ -448,7 +448,7 @@ void d912pxy_replay::IssueWork(UINT batch)
 		threads[cWorker]->SignalWork();
 
 	}
-	else if ((batch % 100) == 0) {
+	else if ((batch % PXY_WAKE_FACTOR_REPLAY) == 0) {
 		SyncStackTop();
 		threads[cWorker]->SignalWork();
 	}

diff --git a/d912pxy/d912pxy_texture_loader.cpp b/d912pxy/d912pxy_texture_loader.cpp
@@ -50,7 +50,7 @@ d912pxy_texture_loader::~d912pxy_texture_loader()
 
 void d912pxy_texture_loader::Init()
 {
-	d912pxy_async_upload_thread::Init(PXY_INNER_MAX_ASYNC_TEXLOADS, PXY_INNER_THREADID_TEX_LOADER, 1, L"texture upload thread", "d912pxy texld");
+	d912pxy_async_upload_thread::Init(PXY_INNER_MAX_ASYNC_TEXLOADS, PXY_INNER_THREADID_TEX_LOADER, PXY_WAKE_FACTOR_TEXTURE, L"texture upload thread", "d912pxy texld");
 
 	d912pxy_s.dx12.que.EnableGID(CLG_TEX, PXY_INNER_CLG_PRIO_ASYNC_LOAD);