Remove the ThreadHive from some subsystems

AnKi/Core/App.cpp

@@ -11,7 +11,6 @@
 #include <AnKi/Util/File.h>
 #include <AnKi/Util/Filesystem.h>
 #include <AnKi/Util/System.h>
-#include <AnKi/Util/ThreadHive.h>
 #include <AnKi/Util/Tracer.h>
 #include <AnKi/Util/HighRezTimer.h>
 #include <AnKi/Core/CoreTracer.h>
@@ -155,7 +154,6 @@ void App::cleanup()
 	UnifiedGeometryBuffer::freeSingleton();
 	GpuSceneBuffer::freeSingleton();
 	GpuReadbackMemoryPool::freeSingleton();
-	CoreThreadHive::freeSingleton();
 	CoreThreadJobManager::freeSingleton();
 	MaliHwCounters::freeSingleton();
 	GrManager::freeSingleton();
@@ -281,7 +279,6 @@ Error App::initInternal()
 	// ThreadPool
 	//
 	const Bool pinThreads = !ANKI_OS_ANDROID;
-	CoreThreadHive::allocateSingleton(g_jobThreadCountCVar.get(), pinThreads);
 	CoreThreadJobManager::allocateSingleton(g_jobThreadCountCVar.get(), pinThreads);
 
 	//

AnKi/Core/Common.h

@@ -9,7 +9,6 @@
 #include <AnKi/Util/StdTypes.h>
 #include <AnKi/Util/MemoryPool.h>
 #include <AnKi/Util/DynamicArray.h>
-#include <AnKi/Util/ThreadHive.h>
 #include <AnKi/Util/ThreadJobManager.h>
 
 namespace anki {
@@ -33,18 +32,6 @@ private:
 	~CoreMemoryPool() = default;
 };
 
-class CoreThreadHive : public ThreadHive, public MakeSingleton<CoreThreadHive>
-{
-	template<typename>
-	friend class MakeSingleton;
-
-public:
-	CoreThreadHive(U32 threadCount, Bool pinToCores = false)
-		: ThreadHive(threadCount, pinToCores)
-	{
-	}
-};
-
 class CoreThreadJobManager : public ThreadJobManager, public MakeSingleton<CoreThreadJobManager>
 {
 	template<typename>

AnKi/Importer/GltfImporter.cpp

@@ -5,7 +5,7 @@
 
 #include <AnKi/Importer/GltfImporter.h>
 #include <AnKi/Util/System.h>
-#include <AnKi/Util/ThreadHive.h>
+#include <AnKi/Util/ThreadJobManager.h>
 #include <AnKi/Util/StringList.h>
 #include <AnKi/Util/Xml.h>
 
@@ -162,7 +162,7 @@ GltfImporter::~GltfImporter()
 		m_gltf = nullptr;
 	}
 
-	deleteInstance(*m_pool, m_hive);
+	deleteInstance(*m_pool, m_jobManager);
 }
 
 Error GltfImporter::init(const GltfImporterInitInfo& initInfo)
@@ -211,7 +211,7 @@ Error GltfImporter::init(const GltfImporterInitInfo& initInfo)
 	if(initInfo.m_threadCount > 0)
 	{
 		const U32 threadCount = min(getCpuCoresCount(), initInfo.m_threadCount);
-		m_hive = newInstance<ThreadHive>(*m_pool, threadCount, true);
+		m_jobManager = newInstance<ThreadJobManager>(*m_pool, threadCount, true);
 	}
 
 	m_importTextures = initInfo.m_importTextures;
@@ -241,25 +241,21 @@ Error GltfImporter::writeAll()
 	// Fire up all requests
 	for(auto& req : m_meshImportRequests)
 	{
-		if(m_hive)
+		if(m_jobManager)
 		{
-			m_hive->submitTask(
-				[](void* userData, [[maybe_unused]] U32 threadId, [[maybe_unused]] ThreadHive& hive,
-				   [[maybe_unused]] ThreadHiveSemaphore* signalSemaphore) {
-					ImportRequest<const cgltf_mesh*>* req = static_cast<ImportRequest<const cgltf_mesh*>*>(userData);
-					Error err = req->m_importer->m_errorInThread.load();
+			m_jobManager->dispatchTask([&req]([[maybe_unused]] U32 threadId) {
+				Error err = req.m_importer->m_errorInThread.load();
 
-					if(!err)
-					{
-						err = req->m_importer->writeMesh(*req->m_value);
-					}
+				if(!err)
+				{
+					err = req.m_importer->writeMesh(*req.m_value);
+				}
 
-					if(err)
-					{
-						req->m_importer->m_errorInThread.store(err._getCode());
-					}
-				},
-				&req);
+				if(err)
+				{
+					req.m_importer->m_errorInThread.store(err._getCode());
+				}
+			});
 		}
 		else
 		{
@@ -269,25 +265,21 @@ Error GltfImporter::writeAll()
 
 	for(auto& req : m_materialImportRequests)
 	{
-		if(m_hive)
+		if(m_jobManager)
 		{
-			m_hive->submitTask(
-				[](void* userData, [[maybe_unused]] U32 threadId, [[maybe_unused]] ThreadHive& hive,
-				   [[maybe_unused]] ThreadHiveSemaphore* signalSemaphore) {
-					ImportRequest<MaterialImportRequest>* req = static_cast<ImportRequest<MaterialImportRequest>*>(userData);
-					Error err = req->m_importer->m_errorInThread.load();
+			m_jobManager->dispatchTask([&req]([[maybe_unused]] U32 threadId) {
+				Error err = req.m_importer->m_errorInThread.load();
 
-					if(!err)
-					{
-						err = req->m_importer->writeMaterial(*req->m_value.m_cgltfMaterial, req->m_value.m_writeRt);
-					}
+				if(!err)
+				{
+					err = req.m_importer->writeMaterial(*req.m_value.m_cgltfMaterial, req.m_value.m_writeRt);
+				}
 
-					if(err)
-					{
-						req->m_importer->m_errorInThread.store(err._getCode());
-					}
-				},
-				&req);
+				if(err)
+				{
+					req.m_importer->m_errorInThread.store(err._getCode());
+				}
+			});
 		}
 		else
 		{
@@ -297,25 +289,21 @@ Error GltfImporter::writeAll()
 
 	for(auto& req : m_skinImportRequests)
 	{
-		if(m_hive)
+		if(m_jobManager)
 		{
-			m_hive->submitTask(
-				[](void* userData, [[maybe_unused]] U32 threadId, [[maybe_unused]] ThreadHive& hive,
-				   [[maybe_unused]] ThreadHiveSemaphore* signalSemaphore) {
-					ImportRequest<const cgltf_skin*>* req = static_cast<ImportRequest<const cgltf_skin*>*>(userData);
-					Error err = req->m_importer->m_errorInThread.load();
+			m_jobManager->dispatchTask([&req]([[maybe_unused]] U32 threadId) {
+				Error err = req.m_importer->m_errorInThread.load();
 
-					if(!err)
-					{
-						err = req->m_importer->writeSkeleton(*req->m_value);
-					}
+				if(!err)
+				{
+					err = req.m_importer->writeSkeleton(*req.m_value);
+				}
 
-					if(err)
-					{
-						req->m_importer->m_errorInThread.store(err._getCode());
-					}
-				},
-				&req);
+				if(err)
+				{
+					req.m_importer->m_errorInThread.store(err._getCode());
+				}
+			});
 		}
 		else
 		{
@@ -325,25 +313,21 @@ Error GltfImporter::writeAll()
 
 	for(auto& req : m_modelImportRequests)
 	{
-		if(m_hive)
+		if(m_jobManager)
 		{
-			m_hive->submitTask(
-				[](void* userData, [[maybe_unused]] U32 threadId, [[maybe_unused]] ThreadHive& hive,
-				   [[maybe_unused]] ThreadHiveSemaphore* signalSemaphore) {
-					ImportRequest<const cgltf_mesh*>* req = static_cast<ImportRequest<const cgltf_mesh*>*>(userData);
-					Error err = req->m_importer->m_errorInThread.load();
+			m_jobManager->dispatchTask([&req]([[maybe_unused]] U32 threadId) {
+				Error err = req.m_importer->m_errorInThread.load();
 
-					if(!err)
-					{
-						err = req->m_importer->writeModel(*req->m_value);
-					}
+				if(!err)
+				{
+					err = req.m_importer->writeModel(*req.m_value);
+				}
 
-					if(err)
-					{
-						req->m_importer->m_errorInThread.store(err._getCode());
-					}
-				},
-				&req);
+				if(err)
+				{
+					req.m_importer->m_errorInThread.store(err._getCode());
+				}
+			});
 		}
 		else
 		{
@@ -351,9 +335,9 @@ Error GltfImporter::writeAll()
 		}
 	}
 
-	if(m_hive)
+	if(m_jobManager)
 	{
-		m_hive->waitAllTasks();
+		m_jobManager->waitForAllTasksToFinish();
 
 		const Error threadErr = m_errorInThread.load();
 		if(threadErr)

AnKi/Importer/GltfImporter.h

@@ -62,7 +62,7 @@ private:
 
 	F32 m_normalsMergeAngle = toRad(30.0f);
 
-	ThreadHive* m_hive = nullptr;
+	ThreadJobManager* m_jobManager = nullptr;
 
 	File m_sceneFile;
 

AnKi/Renderer/MainRenderer.cpp

@@ -15,7 +15,6 @@
 #include <AnKi/Core/CVarSet.h>
 #include <AnKi/Core/StatsSet.h>
 #include <AnKi/Util/HighRezTimer.h>
-#include <AnKi/Util/ThreadHive.h>
 
 namespace anki {
 

AnKi/Renderer/Renderer.cpp

@@ -5,7 +5,6 @@
 
 #include <AnKi/Renderer/Renderer.h>
 #include <AnKi/Util/Tracer.h>
-#include <AnKi/Util/ThreadHive.h>
 #include <AnKi/Core/CVarSet.h>
 #include <AnKi/Util/HighRezTimer.h>
 #include <AnKi/Collision/Aabb.h>

AnKi/Renderer/RendererObject.cpp

@@ -7,7 +7,6 @@
 #include <AnKi/Renderer/Renderer.h>
 #include <AnKi/Renderer/MainRenderer.h>
 #include <AnKi/Util/Enum.h>
-#include <AnKi/Util/ThreadHive.h>
 
 namespace anki {
 

AnKi/Renderer/ShadowMapping.cpp

@@ -10,7 +10,6 @@
 #include <AnKi/Core/App.h>
 #include <AnKi/Core/StatsSet.h>
 #include <AnKi/Core/GpuMemory/GpuVisibleTransientMemoryPool.h>
-#include <AnKi/Util/ThreadHive.h>
 #include <AnKi/Util/Tracer.h>
 #include <AnKi/Scene/Components/LightComponent.h>
 #include <AnKi/Scene/Components/CameraComponent.h>

AnKi/Resource/ShaderProgramResourceSystem.cpp

@@ -10,7 +10,6 @@
 #include <AnKi/Gr/GrManager.h>
 #include <AnKi/ShaderCompiler/ShaderProgramCompiler.h>
 #include <AnKi/Util/Filesystem.h>
-#include <AnKi/Util/ThreadHive.h>
 #include <AnKi/Util/System.h>
 #include <AnKi/Util/BitSet.h>
 #include <AnKi/Core/CVarSet.h>

AnKi/Scene/SceneGraph.cpp

@@ -10,7 +10,6 @@
 #include <AnKi/Renderer/MainRenderer.h>
 #include <AnKi/Core/CVarSet.h>
 #include <AnKi/Core/StatsSet.h>
-#include <AnKi/Util/ThreadHive.h>
 #include <AnKi/Util/Tracer.h>
 #include <AnKi/Util/HighRezTimer.h>
 #include <AnKi/Core/App.h>

AnKi/Util.h

@@ -31,7 +31,7 @@
 #include <AnKi/Util/System.h>
 #include <AnKi/Util/Thread.h>
 #include <AnKi/Util/ThreadPool.h>
-#include <AnKi/Util/ThreadHive.h>
+#include <AnKi/Util/ThreadJobManager.h>
 #include <AnKi/Util/Visitor.h>
 #include <AnKi/Util/INotify.h>
 #include <AnKi/Util/SparseArray.h>

AnKi/Util/Forward.h

@@ -54,6 +54,7 @@ template<typename>
 class BaseStringList;
 
 class ThreadHive;
+class ThreadJobManager;
 
 template<typename TFunc, typename TMemoryPool = SingletonMemoryPoolWrapper<DefaultMemoryPool>, PtrSize kPreallocatedStorage = ANKI_SAFE_ALIGNMENT>
 class Function;

AnKi/Util/ThreadJobManager.cpp

@@ -5,7 +5,6 @@
 
 #include <AnKi/Util/ThreadJobManager.h>
 #include <AnKi/Util/String.h>
-#include <AnKi/Util/Tracer.h>
 
 namespace anki {
 
@@ -109,7 +108,6 @@ void ThreadJobManager::threadRun(U32 threadId)
 				break;
 			}
 
-			ANKI_TRACE_SCOPED_EVENT(ThreadJobManagerJob);
 			func(threadId);
 			[[maybe_unused]] const U32 count = m_tasksInFlightCount.fetchSub(1);
 			ANKI_ASSERT(count > 0);

Tests/Gr/Gr.cpp

@@ -2595,11 +2595,17 @@ void main()
 		CommandBufferPtr cmdb = g_gr->newCommandBuffer(cinit);
 
 		setAccelerationStructureBarrier(cmdb, blas, AccelerationStructureUsageBit::kNone, AccelerationStructureUsageBit::kBuild);
-		cmdb->buildAccelerationStructure(blas.get());
+		BufferInitInfo scratchInit;
+		scratchInit.m_size = blas->getBuildScratchBufferSize();
+		scratchInit.m_usage = BufferUsageBit::kAccelerationStructureBuildScratch;
+		BufferPtr scratchBuff = GrManager::getSingleton().newBuffer(scratchInit);
+		cmdb->buildAccelerationStructure(blas.get(), scratchBuff.get(), 0);
 		setAccelerationStructureBarrier(cmdb, blas, AccelerationStructureUsageBit::kBuild, AccelerationStructureUsageBit::kAttach);
 
 		setAccelerationStructureBarrier(cmdb, tlas, AccelerationStructureUsageBit::kNone, AccelerationStructureUsageBit::kBuild);
-		cmdb->buildAccelerationStructure(tlas.get());
+		scratchInit.m_size = tlas->getBuildScratchBufferSize();
+		scratchBuff = GrManager::getSingleton().newBuffer(scratchInit);
+		cmdb->buildAccelerationStructure(tlas.get(), scratchBuff.get(), 0);
 		setAccelerationStructureBarrier(cmdb, tlas, AccelerationStructureUsageBit::kBuild, AccelerationStructureUsageBit::kFragmentRead);
 
 		cmdb->flush();
@@ -3418,7 +3424,11 @@ void main()
 
 			for(const Geom& g : geometries)
 			{
-				cmdb->buildAccelerationStructure(g.m_blas.get());
+				BufferInitInfo scratchInit;
+				scratchInit.m_size = g.m_blas->getBuildScratchBufferSize();
+				scratchInit.m_usage = BufferUsageBit::kAccelerationStructureBuildScratch;
+				BufferPtr scratchBuff = GrManager::getSingleton().newBuffer(scratchInit);
+				cmdb->buildAccelerationStructure(g.m_blas.get(), scratchBuff.get(), 0);
 			}
 
 			for(const Geom& g : geometries)
@@ -3427,7 +3437,11 @@ void main()
 			}
 
 			setAccelerationStructureBarrier(cmdb, tlas, AccelerationStructureUsageBit::kNone, AccelerationStructureUsageBit::kBuild);
-			cmdb->buildAccelerationStructure(tlas.get());
+			BufferInitInfo scratchInit;
+			scratchInit.m_size = tlas->getBuildScratchBufferSize();
+			scratchInit.m_usage = BufferUsageBit::kAccelerationStructureBuildScratch;
+			BufferPtr scratchBuff = GrManager::getSingleton().newBuffer(scratchInit);
+			cmdb->buildAccelerationStructure(tlas.get(), scratchBuff.get(), 0);
 			setAccelerationStructureBarrier(cmdb, tlas, AccelerationStructureUsageBit::kBuild, AccelerationStructureUsageBit::kTraceRaysRead);
 		}
 

Tools/Shader/ShaderProgramCompilerMain.cpp

@@ -159,36 +159,23 @@ static Error work(const CmdLineArgs& info)
 	class TaskManager : public ShaderProgramAsyncTaskInterface
 	{
 	public:
-		UniquePtr<ThreadHive, SingletonMemoryPoolDeleter<DefaultMemoryPool>> m_hive;
+		UniquePtr<ThreadJobManager, SingletonMemoryPoolDeleter<DefaultMemoryPool>> m_jobManager;
 
-		void enqueueTask(void (*callback)(void* userData), void* userData)
+		void enqueueTask(void (*callback)(void* userData), void* userData) final
 		{
-			struct Ctx
-			{
-				void (*m_callback)(void* userData);
-				void* m_userData;
-			};
-			Ctx* ctx = newInstance<Ctx>(DefaultMemoryPool::getSingleton());
-			ctx->m_callback = callback;
-			ctx->m_userData = userData;
-
-			m_hive->submitTask(
-				[](void* userData, [[maybe_unused]] U32 threadId, [[maybe_unused]] ThreadHive& hive,
-				   [[maybe_unused]] ThreadHiveSemaphore* signalSemaphore) {
-					Ctx* ctx = static_cast<Ctx*>(userData);
-					ctx->m_callback(ctx->m_userData);
-					deleteInstance(DefaultMemoryPool::getSingleton(), ctx);
-				},
-				ctx);
+			m_jobManager->dispatchTask([callback, userData]([[maybe_unused]] U32 threadIdx) {
+				callback(userData);
+			});
 		}
 
 		Error joinTasks()
 		{
-			m_hive->waitAllTasks();
+			m_jobManager->waitForAllTasksToFinish();
 			return Error::kNone;
 		}
 	} taskManager;
-	taskManager.m_hive.reset((info.m_threadCount) ? newInstance<ThreadHive>(DefaultMemoryPool::getSingleton(), info.m_threadCount, true) : nullptr);
+	taskManager.m_jobManager.reset((info.m_threadCount) ? newInstance<ThreadJobManager>(DefaultMemoryPool::getSingleton(), info.m_threadCount, true)
+														: nullptr);
 
 	// Compiler options
 	ShaderCompilerOptions compilerOptions;