commit 50038d6dd222518610bc80b5bf51b2c15832d9e0
author Alexis Hétu <sugoi@google.com> Tue Sep 24 15:37:24 2019 +0000
committer Alexis Hétu <sugoi@google.com> Tue Sep 24 16:42:07 2019 +0000
tree a1cccacea88c60350d0564ba48bd9214eb609589
parent e3a5983705da24448382bc696b0663dc5d0a3ed7

Revert "Do not call Scheduler destructor in libVulkan."

This reverts commit 1f89f58faeb8287f29e3e5ba7d03d62f667404a0.

Original cl:
https://swiftshader-review.googlesource.com/c/SwiftShader/+/36548

Reason for revert: Causes timeout flakes on Regres

Bug: b/141380274

Change-Id: I184e96c586e449b7dcd5b445078064cbafb7df72
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/36592
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

src/Vulkan/VkPhysicalDevice.cpp

diff --git a/src/Vulkan/VkPhysicalDevice.cpp b/src/Vulkan/VkPhysicalDevice.cpp
index 69d1107..1112b56 100644
--- a/src/Vulkan/VkPhysicalDevice.cpp
+++ b/src/Vulkan/VkPhysicalDevice.cpp
@@ -16,9 +16,6 @@
 
 #include "VkConfig.h"
 #include "Pipeline/SpirvShader.hpp" // sw::SIMD::Width
-#include "System/CPUID.hpp"
-
-#include "marl/thread.h"
 
 #include <limits>
 #include <cstring>
@@ -26,13 +23,8 @@
 namespace vk
 {
 
-PhysicalDevice::PhysicalDevice(const void*, void* mem) : scheduler(new marl::Scheduler())
+PhysicalDevice::PhysicalDevice(const void*, void* mem)
 {
-	scheduler->setThreadInitializer([] {
-		sw::CPUID::setFlushToZero(true);
-		sw::CPUID::setDenormalsAreZero(true);
-	});
-	scheduler->setWorkerThreadCount(std::min<size_t>(marl::Thread::numLogicalCPUs(), 16));
 }
 
 const VkPhysicalDeviceFeatures& PhysicalDevice::getFeatures() const
@@ -803,9 +795,4 @@
 	return properties;
 }
 
-marl::Scheduler* PhysicalDevice::getScheduler() const
-{
-	return scheduler.get();
-}
-
 } // namespace vk

src/Vulkan/VkPhysicalDevice.hpp

diff --git a/src/Vulkan/VkPhysicalDevice.hpp b/src/Vulkan/VkPhysicalDevice.hpp
index f824851..c126675 100644
--- a/src/Vulkan/VkPhysicalDevice.hpp
+++ b/src/Vulkan/VkPhysicalDevice.hpp
@@ -18,8 +18,6 @@
 #include "VkObject.hpp"
 #include "VkFormat.h"
 
-#include "marl/scheduler.h"
-
 #ifdef VK_USE_PLATFORM_ANDROID_KHR
 #include <vulkan/vk_android_native_buffer.h>
 #endif
@@ -72,13 +70,9 @@
 	                              VkQueueFamilyProperties* pQueueFamilyProperties) const;
 	const VkPhysicalDeviceMemoryProperties& getMemoryProperties() const;
 
-	marl::Scheduler *getScheduler() const;
-
 private:
 	const VkPhysicalDeviceLimits& getLimits() const;
 	VkSampleCountFlags getSampleCounts() const;
-
-	std::unique_ptr<marl::Scheduler> scheduler;
 };
 
 using DispatchablePhysicalDevice = DispatchableObject<PhysicalDevice, VkPhysicalDevice>;

src/Vulkan/libVulkan.cpp

diff --git a/src/Vulkan/libVulkan.cpp b/src/Vulkan/libVulkan.cpp
index 996cfd3..c300382 100644
--- a/src/Vulkan/libVulkan.cpp
+++ b/src/Vulkan/libVulkan.cpp
@@ -68,6 +68,9 @@
 
 #include "Reactor/Nucleus.hpp"
 
+#include "marl/scheduler.h"
+#include "marl/thread.h"
+
 #include "System/CPUID.hpp"
 
 #include <algorithm>
@@ -117,6 +120,17 @@
 	sw::CPUID::setEnableSSE(true);
 }
 
+marl::Scheduler* getOrCreateScheduler()
+{
+	static auto scheduler = std::unique_ptr<marl::Scheduler>(new marl::Scheduler());
+	scheduler->setThreadInitializer([] {
+		sw::CPUID::setFlushToZero(true);
+		sw::CPUID::setDenormalsAreZero(true);
+	});
+	scheduler->setWorkerThreadCount(std::min<size_t>(marl::Thread::numLogicalCPUs(), 16));
+	return scheduler.get();
+}
+
 // initializeLibrary() is called by vkCreateInstance() to perform one-off global
 // initialization of the swiftshader driver.
 void initializeLibrary()
@@ -588,7 +602,7 @@
 		(void)queueFamilyPropertyCount; // Silence unused variable warning
 	}
 
-	auto scheduler = vk::Cast(physicalDevice)->getScheduler();
+	auto scheduler = getOrCreateScheduler();
 	return vk::DispatchableDevice::Create(pAllocator, pCreateInfo, pDevice, vk::Cast(physicalDevice), enabledFeatures, scheduler);
 }