fec77632ef
* Fix issues with seedlist for AutomatedTesting Fixes error reporting so it will show the file hint in the tool. Removes any missing assets from the .seed file. Remove an unnecessary dependency from AutomatedTesting dependencies file. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Make ArchiveComponent use AZ::IO::IArchive Initial changes that will get the sychronous calls in ArchiveComponent to use IArchive interface rather than external zip/7z tools. Some of the asynchronous api are still in place, anything that wasn't being used has been removed for now. This may change later if we move towards all the api being asynchronous. Until then, we can't remove the reliance upon the external archive tools completely. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Updates AZStd::thread constructors Adds a variadic constructor which forwards args to the functor. Because of our thread_desc extension, there was confusion on the arugments, so the args were reordered to take the thread_desc first, before the functor and args. Also the thread_desc is taken as reference rather than by pointer. Update callsites to account for this change. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Async operation of ArchiveComponent api This sets up the ArchiveComponent to operate asynchronously. It uses promise/future to transfer results to caller. This is still broken, there's a few things that need to get fixed up, but this is a good checkpoint for the work as it solidifies the api, cleans up a bunch of unused code, and compiles. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Removes the platform-specific ArchiveComponen These are no longer needed, as they control the direct interaction with host OS tools like 7za.exe or /bin/zip. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Removes the platform-specific files from cmake Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Removes the 7za.exe (and legal notice) This tool is no longer needed in the repo. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Fixes usage of IArchive::GetFullPath() This changed to return a PathView, updated to reflect that. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Fix promises and threads Make sure promises are only set exactly once. This meant reworking some of the initial error checking. Detach threads when created. Adds [[nodiscard]] to the functions that return a future. Since threads are detached, the future is the main way to get communication from the thread. Clean up interface, add comments. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * More edits to thread creation Changes to thread construction to account for parameter change. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Fix some remaining issues with ArchiveComponent Put created threads inside a container, then join them at Deactivate. Fix asset bundler case when injecting a file with no working directory. Fix thread constructor that applies args to a function. Fix lambdas to take string args by value rather than reference. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Fixes some remaining bugs in ArchiveComponent Open archive as read-only during extract & list operations. Fixes paths issues. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Fix initialize of opaque thread handle in thread_UnixLike.h Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed unused variable in AssetBundleComponent.cpp to fix compiler warning Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fix some issues with archives File paths in the CDR and the local headers need to match, but there were issues with path separators and case that made it possible to get invalid headers errors in some archives. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Adds some new ArchiveComponent unit tests Adds new tests for extraction of archive and adding files from a file list to an archive. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Fix file data offset issues when opening archives When opening an INestedArchive it would run through the CDR headers to create file entries in the zip cache. The offsets to the compressed data were being calculated incorrectly because they were using the CDR headers rather than jumping to the local file headers and getting offsets from those sizes. Removed and refactored some archive validation flow and zip cache factory init methods to either init default or init w/ additional validation checks. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Addresses PR feedback Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Address more points of feedback in PR Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Address additional PR feedback Fixes up some error checks and uses of strings vs paths. Enable archive component tests on Linux so we can see if they will pass. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Address PR feedback Change the INestedArchive interface to list files as AZ::IO::Path. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Disabling the ArchiveComponent tests on Linux They failed so we will revisit them to attempt a fix. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Rename a member variable to be more accurate Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Address feedback on PR Bump version of Archive Components for serialize context. Improve error messages during archive open and validation. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Revert recent changes Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
707 lines
25 KiB
C++
707 lines
25 KiB
C++
/*
|
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
*
|
|
*/
|
|
|
|
#include <AzTest/AzTest.h>
|
|
#include <AzCore/Math/Random.h>
|
|
#include <AzCore/std/parallel/thread.h>
|
|
|
|
#include <Tests/PhysXGenericTestFixture.h>
|
|
#include <Tests/PhysXTestCommon.h>
|
|
|
|
#include <AzFramework/Physics/RigidBodyBus.h>
|
|
#include <AzFramework/Physics/ShapeConfiguration.h>
|
|
|
|
#ifdef PHYSX_ENABLE_MULTI_THREADING
|
|
|
|
//enable this define to enable some logs for debugging
|
|
//#define PHYSX_MT_DEBUG_LOGS
|
|
#ifdef PHYSX_MT_DEBUG_LOGS
|
|
#define Log_Help(window, message, ...) AZ_Printf(window, message, __VA_ARGS__);
|
|
#else
|
|
#define Log_Help(window, message, ...) ((void)0);
|
|
#endif //PHYSX_MT_DEBUG_LOGS
|
|
|
|
namespace PhysX
|
|
{
|
|
namespace Constants
|
|
{
|
|
static const int NumThreads = 50; //number of threads to create and use for the tests
|
|
|
|
//Entities to raycast / shapecast / Overlap against
|
|
static const AZ::Vector3 BoxDimensions = AZ::Vector3::CreateOne();
|
|
static const int NumBoxes = 18;
|
|
AZStd::array<AZ::Vector3, NumBoxes> BoxPositions = {
|
|
AZ::Vector3( 1000.0f, 1000.0f, 0.0f),
|
|
AZ::Vector3(-1000.0f, -1000.0f, 0.0f),
|
|
AZ::Vector3( 1000.0f, -1000.0f, 0.0f),
|
|
AZ::Vector3(-1000.0f, 1000.0f, 0.0f),
|
|
AZ::Vector3( 1000.0f, 0.0f, 1000.0f),
|
|
AZ::Vector3(-1000.0f, 0.0f, -1000.0f),
|
|
AZ::Vector3( 1000.0f, 0.0f, -1000.0f),
|
|
AZ::Vector3(-1000.0f, 0.0f, 1000.0f),
|
|
AZ::Vector3( 0.0f, 10.0f, 10.0f),
|
|
AZ::Vector3( 0.0f, -10.0f, -10.0f),
|
|
AZ::Vector3( 0.0f, -10.0f, 10.0f),
|
|
AZ::Vector3( 0.0f, 10.0f, -10.0f),
|
|
AZ::Vector3( 100.0f, 0.0f, 0.0f),
|
|
AZ::Vector3(-100.0f, 0.0f, 0.0f),
|
|
AZ::Vector3( 0.0f, 100.0f, 0.0f),
|
|
AZ::Vector3( 0.0f, -100.0f, 0.0f),
|
|
AZ::Vector3( 0.0f, 0.0f, 10.0f),
|
|
AZ::Vector3( 0.0f, 0.0f, -10.0f)
|
|
};
|
|
|
|
static const float ShpereShapeRadius = 2.0f;
|
|
}
|
|
|
|
namespace
|
|
{
|
|
void UpdateTestSceneOverTime(AzPhysics::Scene* scene, int updateTimeLimitMilliseconds)
|
|
{
|
|
const AZStd::chrono::milliseconds updateTimeLimit = AZStd::chrono::milliseconds(updateTimeLimitMilliseconds);
|
|
AZStd::chrono::milliseconds totalTime = AZStd::chrono::milliseconds(0);
|
|
do
|
|
{
|
|
AZStd::chrono::system_clock::time_point startTime = AZStd::chrono::system_clock::now();
|
|
PhysX::TestUtils::UpdateScene(scene, AzPhysics::SystemConfiguration::DefaultFixedTimestep, 1);
|
|
AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(1));
|
|
totalTime += AZStd::chrono::system_clock::now() - startTime;
|
|
} while (totalTime < updateTimeLimit);
|
|
}
|
|
}
|
|
|
|
class PhysXMultithreadingTest
|
|
: public PhysX::GenericPhysicsInterfaceTest
|
|
, public ::testing::WithParamInterface<int>
|
|
{
|
|
public:
|
|
virtual void SetUp() override
|
|
{
|
|
PhysX::GenericPhysicsInterfaceTest::SetUpInternal();
|
|
|
|
//create some boxes
|
|
for (int i = 0; i < Constants::NumBoxes; i++)
|
|
{
|
|
EntityPtr newEntity = TestUtils::CreateBoxEntity(m_testSceneHandle, Constants::BoxPositions[i], Constants::BoxDimensions);
|
|
m_boxes.emplace_back(newEntity);
|
|
|
|
//disable gravity so they don't move
|
|
Physics::RigidBodyRequestBus::Event(newEntity->GetId(), &Physics::RigidBodyRequestBus::Events::SetGravityEnabled, false);
|
|
}
|
|
}
|
|
|
|
virtual void TearDown() override
|
|
{
|
|
PhysX::GenericPhysicsInterfaceTest::TearDownInternal();
|
|
}
|
|
|
|
AZStd::vector<EntityPtr> m_boxes;
|
|
};
|
|
|
|
template<typename RequestType, typename ResultType>
|
|
struct SceneQueryBase
|
|
{
|
|
SceneQueryBase(const AZStd::thread_desc& threadDesc, const RequestType& request, AzPhysics::SceneHandle sceneHandle)
|
|
: m_threadDesc(threadDesc)
|
|
, m_request(request)
|
|
, m_sceneHandle(sceneHandle)
|
|
{
|
|
m_sceneInterface = AZ::Interface<AzPhysics::SceneInterface>::Get();
|
|
}
|
|
|
|
virtual ~SceneQueryBase() = default;
|
|
|
|
void Start(int waitTimeMilliseconds)
|
|
{
|
|
m_waitTimeMilliseconds = waitTimeMilliseconds;
|
|
m_thread = AZStd::thread(m_threadDesc, AZStd::bind(&SceneQueryBase::Tick, this));
|
|
}
|
|
|
|
void Join()
|
|
{
|
|
m_thread.join();
|
|
}
|
|
|
|
ResultType m_result;
|
|
|
|
const RequestType& GetRequest() const
|
|
{
|
|
return m_request;
|
|
}
|
|
|
|
private:
|
|
void Tick()
|
|
{
|
|
Log_Help(m_threadDesc.m_name, "Thread %d - sleeping for %dms\n", AZStd::this_thread::get_id(), m_waitTimeMilliseconds);
|
|
AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(m_waitTimeMilliseconds));
|
|
Log_Help(m_threadDesc.m_name, "Thread %d - running cast\n", AZStd::this_thread::get_id());
|
|
|
|
RunRequest();
|
|
|
|
Log_Help(m_threadDesc.m_name, "Thread %d - complete - time %dus\n", AZStd::this_thread::get_id(), exeTimeUS.count());
|
|
}
|
|
|
|
protected:
|
|
virtual void RunRequest() = 0;
|
|
|
|
AZStd::thread m_thread;
|
|
AZStd::thread_desc m_threadDesc;
|
|
int m_waitTimeMilliseconds;
|
|
RequestType m_request;
|
|
AzPhysics::SceneInterface* m_sceneInterface;
|
|
AzPhysics::SceneHandle m_sceneHandle;
|
|
};
|
|
|
|
struct RayCaster
|
|
: public SceneQueryBase<AzPhysics::RayCastRequest, AzPhysics::SceneQueryHits>
|
|
{
|
|
RayCaster(const AZStd::thread_desc& threadDesc, const AzPhysics::RayCastRequest& request, AzPhysics::SceneHandle sceneHandle)
|
|
: SceneQueryBase(threadDesc, request, sceneHandle)
|
|
{
|
|
|
|
}
|
|
|
|
private:
|
|
void RunRequest() override
|
|
{
|
|
m_result = m_sceneInterface->QueryScene(m_sceneHandle, &m_request);
|
|
}
|
|
};
|
|
|
|
TEST_P(PhysXMultithreadingTest, RaycastsQueryFromParallelThreads)
|
|
{
|
|
const int seed = GetParam();
|
|
|
|
//raycast thread pool
|
|
AZStd::vector<AZStd::unique_ptr<RayCaster>> rayCasters;
|
|
|
|
//common request data
|
|
AzPhysics::RayCastRequest request;
|
|
request.m_start = AZ::Vector3::CreateZero();
|
|
request.m_distance = 2000.0f;
|
|
|
|
AZStd::thread_desc threadDesc;
|
|
threadDesc.m_name = "RQFPThreads"; // RaycastsQueryFromParallelThreads
|
|
|
|
//create the raycasts
|
|
for (int i = 0; i < Constants::NumThreads; i++)
|
|
{
|
|
//pick a box to raycast against
|
|
const int boxTargetIdx = i % m_boxes.size();
|
|
request.m_direction = Constants::BoxPositions[boxTargetIdx].GetNormalized();
|
|
|
|
rayCasters.emplace_back(AZStd::make_unique<RayCaster>(threadDesc, request, m_testSceneHandle));
|
|
}
|
|
|
|
//start all threads
|
|
AZ::SimpleLcgRandom random(seed); //constant seed to have consistency.
|
|
for (auto& caster : rayCasters)
|
|
{
|
|
const int waitTimeMS = aznumeric_cast<int>((random.GetRandomFloat() + 0.25f) * 250.0f); //generate a time between 62.5 - 312.5 ms
|
|
caster->Start(waitTimeMS);
|
|
}
|
|
|
|
//update the world
|
|
Log_Help("RaycastsQueryFromParallelThreads", "Start world Update\n");
|
|
UpdateTestSceneOverTime(m_defaultScene, 500);
|
|
Log_Help("RaycastsQueryFromParallelThreads", "End world Update\n");
|
|
|
|
//each request should have completed, join to be sure. and each request should have a result.
|
|
int i = 0;
|
|
for (auto& caster : rayCasters)
|
|
{
|
|
caster->Join();
|
|
|
|
const int boxTargetIdx = i % m_boxes.size();
|
|
EXPECT_TRUE(caster->m_result);
|
|
EXPECT_TRUE(caster->m_result.m_hits[0].m_entityId == m_boxes[boxTargetIdx]->GetId());
|
|
|
|
caster.release();
|
|
i++;
|
|
}
|
|
rayCasters.clear();
|
|
}
|
|
|
|
struct RayCasterMultiple
|
|
: public SceneQueryBase<AzPhysics::RayCastRequest, AzPhysics::SceneQueryHits>
|
|
{
|
|
RayCasterMultiple(const AZStd::thread_desc& threadDesc, const AzPhysics::RayCastRequest& request, AzPhysics::SceneHandle sceneHandle)
|
|
: SceneQueryBase(threadDesc, request, sceneHandle)
|
|
{
|
|
|
|
}
|
|
|
|
private:
|
|
void RunRequest() override
|
|
{
|
|
m_request.m_reportMultipleHits = true;
|
|
m_result = m_sceneInterface->QueryScene(m_sceneHandle, &m_request);
|
|
}
|
|
};
|
|
|
|
TEST_P(PhysXMultithreadingTest, RaycastMultiplesQueryFromParallelThreads)
|
|
{
|
|
const int seed = GetParam();
|
|
|
|
//raycast thread pool
|
|
AZStd::vector<AZStd::unique_ptr<RayCasterMultiple>> rayCasters;
|
|
|
|
//common request data
|
|
AzPhysics::RayCastRequest request;
|
|
request.m_start = AZ::Vector3::CreateZero();
|
|
request.m_distance = 2000.0f;
|
|
|
|
AZStd::thread_desc threadDesc;
|
|
threadDesc.m_name = "RMQFPThreads"; // RaycastMultiplesQueryFromParallelThreads
|
|
|
|
//create the raycasts
|
|
for (int i = 0; i < Constants::NumThreads; i++)
|
|
{
|
|
//pick a box to raycast against
|
|
const int boxTargetIdx = i % m_boxes.size();
|
|
request.m_direction = Constants::BoxPositions[boxTargetIdx].GetNormalized();
|
|
|
|
rayCasters.emplace_back(AZStd::make_unique<RayCasterMultiple>(threadDesc, request, m_testSceneHandle));
|
|
}
|
|
|
|
//start all threads
|
|
AZ::SimpleLcgRandom random(seed);
|
|
for (auto& caster : rayCasters)
|
|
{
|
|
const int waitTimeMS = aznumeric_cast<int>((random.GetRandomFloat() + 0.25f) * 250.0f); //generate a time between 62.5 - 312.5 ms
|
|
caster->Start(waitTimeMS);
|
|
}
|
|
|
|
//update the world
|
|
Log_Help("RaycastMultiplesQueryFromParallelThreads", "Start world Update\n");
|
|
UpdateTestSceneOverTime(m_defaultScene, 500);
|
|
Log_Help("RaycastMultiplesQueryFromParallelThreads", "End world Update\n");
|
|
|
|
//each request should have completed, join to be sure. and each request should have a result.
|
|
int i = 0;
|
|
for (auto& caster : rayCasters)
|
|
{
|
|
caster->Join();
|
|
//we should have some results
|
|
EXPECT_TRUE(caster->m_result);
|
|
|
|
//check the list of result for the target
|
|
bool targetInList = false;
|
|
const int boxTargetIdx = i % m_boxes.size();
|
|
for (auto& hit : caster->m_result.m_hits)
|
|
{
|
|
if (hit && hit.m_entityId == m_boxes[boxTargetIdx]->GetId())
|
|
{
|
|
targetInList = true;
|
|
break;
|
|
}
|
|
}
|
|
EXPECT_TRUE(targetInList);
|
|
|
|
caster.release();
|
|
i++;
|
|
}
|
|
rayCasters.clear();
|
|
}
|
|
|
|
struct ShapeCaster
|
|
: public SceneQueryBase<AzPhysics::ShapeCastRequest, AzPhysics::SceneQueryHits>
|
|
{
|
|
ShapeCaster(const AZStd::thread_desc& threadDesc, const AzPhysics::ShapeCastRequest& request, AzPhysics::SceneHandle sceneHandle)
|
|
: SceneQueryBase(threadDesc, request, sceneHandle)
|
|
{
|
|
|
|
}
|
|
|
|
private:
|
|
void RunRequest() override
|
|
{
|
|
m_result = m_sceneInterface->QueryScene(m_sceneHandle, &m_request);
|
|
}
|
|
};
|
|
|
|
TEST_P(PhysXMultithreadingTest, ShapeCastsQueryFromParallelThreads)
|
|
{
|
|
const int seed = GetParam();
|
|
|
|
//shapecast thread pool
|
|
AZStd::vector<AZStd::unique_ptr<ShapeCaster>> shapeCasters;
|
|
|
|
//common request data
|
|
AzPhysics::ShapeCastRequest request;
|
|
request.m_start = AZ::Transform::CreateIdentity();
|
|
request.m_distance = 2000.0f;
|
|
request.m_shapeConfiguration = AZStd::make_shared<Physics::SphereShapeConfiguration>(Constants::ShpereShapeRadius);
|
|
|
|
AZStd::thread_desc threadDesc;
|
|
threadDesc.m_name = "SCQFPThreads"; // ShapeCastsQueryFromParallelThreads
|
|
|
|
//create the raycasts
|
|
for (int i = 0; i < Constants::NumThreads; i++)
|
|
{
|
|
//pick a box to raycast against
|
|
const int boxTargetIdx = i % m_boxes.size();
|
|
request.m_direction = Constants::BoxPositions[boxTargetIdx].GetNormalized();
|
|
|
|
shapeCasters.emplace_back(AZStd::make_unique<ShapeCaster>(threadDesc, request, m_testSceneHandle));
|
|
}
|
|
|
|
//start all threads
|
|
AZ::SimpleLcgRandom random(seed); //constant seed to have consistency.
|
|
for (auto& caster : shapeCasters)
|
|
{
|
|
const int waitTimeMS = aznumeric_cast<int>((random.GetRandomFloat() + 0.25f) * 250.0f); //generate a time between 62.5 - 312.5 ms
|
|
caster->Start(waitTimeMS);
|
|
}
|
|
|
|
//update the world
|
|
Log_Help("ShapeCastsQueryFromParallelThreads", "Start world Update\n");
|
|
UpdateTestSceneOverTime(m_defaultScene, 500);
|
|
Log_Help("ShapeCastsQueryFromParallelThreads", "End world Update\n");
|
|
|
|
//each request should have completed, join to be sure. and each request should have a result.
|
|
int i = 0;
|
|
for (auto& caster : shapeCasters)
|
|
{
|
|
caster->Join();
|
|
|
|
const int boxTargetIdx = i % m_boxes.size();
|
|
EXPECT_TRUE(caster->m_result);
|
|
EXPECT_EQ(caster->m_result.m_hits.size(), 1);
|
|
EXPECT_TRUE(caster->m_result.m_hits[0].m_entityId == m_boxes[boxTargetIdx]->GetId());
|
|
|
|
caster.release();
|
|
i++;
|
|
}
|
|
shapeCasters.clear();
|
|
}
|
|
|
|
struct ShapeCasterMultiple
|
|
: public SceneQueryBase<AzPhysics::ShapeCastRequest, AzPhysics::SceneQueryHits>
|
|
{
|
|
ShapeCasterMultiple(const AZStd::thread_desc& threadDesc, const AzPhysics::ShapeCastRequest& request, AzPhysics::SceneHandle sceneHandle)
|
|
: SceneQueryBase(threadDesc, request, sceneHandle)
|
|
{
|
|
|
|
}
|
|
|
|
private:
|
|
void RunRequest() override
|
|
{
|
|
m_request.m_reportMultipleHits = true;
|
|
m_result = m_sceneInterface->QueryScene(m_sceneHandle, &m_request);
|
|
}
|
|
};
|
|
|
|
TEST_P(PhysXMultithreadingTest, ShapeCastMultiplesQueryFromParallelThreads)
|
|
{
|
|
const int seed = GetParam();
|
|
|
|
//shapecast thread pool
|
|
AZStd::vector<AZStd::unique_ptr<ShapeCasterMultiple>> shapeCasters;
|
|
|
|
//common request data
|
|
AzPhysics::ShapeCastRequest request;
|
|
request.m_distance = 2000.0f;
|
|
request.m_shapeConfiguration = AZStd::make_shared<Physics::SphereShapeConfiguration>(Constants::ShpereShapeRadius);
|
|
|
|
AZStd::thread_desc threadDesc;
|
|
threadDesc.m_name = "SCMQFPThreads"; // ShapeCastMultiplesQueryFromParallelThreads
|
|
|
|
//create the shape casts
|
|
for (int i = 0; i < Constants::NumThreads; i++)
|
|
{
|
|
//pick a box
|
|
const int boxTargetIdx = i % m_boxes.size();
|
|
request.m_direction = Constants::BoxPositions[boxTargetIdx].GetNormalized();
|
|
|
|
shapeCasters.emplace_back(AZStd::make_unique<ShapeCasterMultiple>(threadDesc, request, m_testSceneHandle));
|
|
}
|
|
|
|
//start all threads
|
|
AZ::SimpleLcgRandom random(seed); //constant seed to have consistency.
|
|
for (auto& caster : shapeCasters)
|
|
{
|
|
const int waitTimeMS = aznumeric_cast<int>((random.GetRandomFloat() + 0.25f) * 250.0f); //generate a time between 62.5 - 312.5 ms
|
|
caster->Start(waitTimeMS);
|
|
}
|
|
|
|
//update the world
|
|
Log_Help("ShapeCastMultiplesQueryFromParallelThreads", "Start world Update\n");
|
|
UpdateTestSceneOverTime(m_defaultScene, 500);
|
|
Log_Help("ShapeCastMultiplesQueryFromParallelThreads", "End world Update\n");
|
|
|
|
//each request should have completed, join to be sure. and each request should have a result.
|
|
int i = 0;
|
|
for (auto& caster : shapeCasters)
|
|
{
|
|
caster->Join();
|
|
//we should have some results
|
|
EXPECT_TRUE(caster->m_result);
|
|
|
|
//check the list of result for the target
|
|
bool targetInList = false;
|
|
const int boxTargetIdx = i % m_boxes.size();
|
|
for (auto& hit : caster->m_result.m_hits)
|
|
{
|
|
if (hit && hit.m_entityId == m_boxes[boxTargetIdx]->GetId())
|
|
{
|
|
targetInList = true;
|
|
break;
|
|
}
|
|
}
|
|
EXPECT_TRUE(targetInList);
|
|
|
|
caster.release();
|
|
i++;
|
|
}
|
|
shapeCasters.clear();
|
|
}
|
|
|
|
struct OverlapQuery
|
|
: public SceneQueryBase<AzPhysics::OverlapRequest, AzPhysics::SceneQueryHits>
|
|
{
|
|
OverlapQuery(const AZStd::thread_desc& threadDesc, const AzPhysics::OverlapRequest& request, AzPhysics::SceneHandle sceneHandle)
|
|
: SceneQueryBase(threadDesc, request, sceneHandle)
|
|
{
|
|
|
|
}
|
|
|
|
private:
|
|
void RunRequest() override
|
|
{
|
|
m_result = m_sceneInterface->QueryScene(m_sceneHandle, &m_request);
|
|
}
|
|
};
|
|
|
|
TEST_P(PhysXMultithreadingTest, OverlapQueryFromParallelThreads)
|
|
{
|
|
const int seed = GetParam();
|
|
|
|
//Overlap thread pool
|
|
AZStd::vector<AZStd::unique_ptr<OverlapQuery>> overlapQuery;
|
|
|
|
//common request data
|
|
AzPhysics::OverlapRequest request;
|
|
request.m_shapeConfiguration = AZStd::make_shared<Physics::SphereShapeConfiguration>(Constants::ShpereShapeRadius);
|
|
|
|
AZStd::thread_desc threadDesc;
|
|
threadDesc.m_name = "OQFPThreads"; // OverlapQueryFromParallelThreads
|
|
|
|
//create the overlap request
|
|
for (int i = 0; i < Constants::NumThreads; i++)
|
|
{
|
|
//pick a box
|
|
const int boxTargetIdx = i % m_boxes.size();
|
|
request.m_pose = AZ::Transform::CreateTranslation(Constants::BoxPositions[boxTargetIdx]);
|
|
|
|
overlapQuery.emplace_back(AZStd::make_unique<OverlapQuery>(threadDesc, request, m_testSceneHandle));
|
|
}
|
|
|
|
//start all threads
|
|
AZ::SimpleLcgRandom random(seed); //constant seed to have consistency.
|
|
for (auto& caster : overlapQuery)
|
|
{
|
|
const int waitTimeMS = aznumeric_cast<int>((random.GetRandomFloat() + 0.25f) * 250.0f); //generate a time between 62.5 - 312.5 ms
|
|
caster->Start(waitTimeMS);
|
|
}
|
|
|
|
//update the world
|
|
Log_Help("OverlapQueryFromParallelThreads", "Start world Update\n");
|
|
UpdateTestSceneOverTime(m_defaultScene, 500);
|
|
Log_Help("OverlapQueryFromParallelThreads", "End world Update\n");
|
|
|
|
//each request should have completed, join to be sure. and each request should have a result.
|
|
int i = 0;
|
|
for (auto& caster : overlapQuery)
|
|
{
|
|
caster->Join();
|
|
//we should have some results
|
|
EXPECT_TRUE(caster->m_result);
|
|
EXPECT_TRUE(caster->m_result.m_hits.size() > 0);
|
|
|
|
//check the list of result for the target
|
|
bool targetInList = false;
|
|
const int boxTargetIdx = i % m_boxes.size();
|
|
for (auto& hit : caster->m_result.m_hits)
|
|
{
|
|
if (hit && hit.m_entityId == m_boxes[boxTargetIdx]->GetId())
|
|
{
|
|
targetInList = true;
|
|
break;
|
|
}
|
|
}
|
|
EXPECT_TRUE(targetInList);
|
|
|
|
caster.release();
|
|
i++;
|
|
}
|
|
overlapQuery.clear();
|
|
}
|
|
|
|
struct ShapeLocalPoseSetterGetter
|
|
: public SceneQueryBase<AZStd::pair<AZ::Vector3, AZ::Quaternion>, AZStd::pair<AZ::Vector3, AZ::Quaternion>>
|
|
{
|
|
ShapeLocalPoseSetterGetter(const AZStd::thread_desc& threadDesc,
|
|
const AZStd::pair<AZ::Vector3, AZ::Quaternion>& request,
|
|
AZStd::shared_ptr<Physics::Shape> shape)
|
|
: SceneQueryBase(threadDesc, request, AzPhysics::InvalidSceneHandle)
|
|
, m_shape(shape)
|
|
{
|
|
|
|
}
|
|
|
|
private:
|
|
|
|
AZStd::shared_ptr<Physics::Shape> m_shape;
|
|
|
|
void RunRequest() override
|
|
{
|
|
m_shape->SetLocalPose(m_request.first, m_request.second);
|
|
m_result = m_shape->GetLocalPose();
|
|
}
|
|
};
|
|
|
|
TEST_P(PhysXMultithreadingTest, SetGetLocalShapeFromParallelThreads)
|
|
{
|
|
const int seed = GetParam();
|
|
|
|
//Local pose setter getter thread pool
|
|
AZStd::vector<AZStd::unique_ptr<ShapeLocalPoseSetterGetter>> setterGetterQueries;
|
|
|
|
AZStd::thread_desc threadDesc;
|
|
threadDesc.m_name = "SGLSFPThreads"; // SetGetLocalShapeFromParallelThreads
|
|
|
|
//create the local pose set request
|
|
for (int i = 0; i < Constants::NumThreads; i++)
|
|
{
|
|
//pick a box
|
|
const int boxTargetIdx = i % m_boxes.size();
|
|
const AZ::EntityId entityId = m_boxes[boxTargetIdx]->GetId();
|
|
const AZStd::pair<AZ::Vector3, AZ::Quaternion> pose = { Constants::BoxPositions[boxTargetIdx], AZ::Quaternion::CreateIdentity() };
|
|
|
|
AZStd::vector<AZStd::shared_ptr<Physics::Shape>> shapes;
|
|
PhysX::ColliderComponentRequestBus::EventResult(shapes, entityId, &PhysX::ColliderComponentRequests::GetShapes);
|
|
|
|
setterGetterQueries.emplace_back(AZStd::make_unique<ShapeLocalPoseSetterGetter>(threadDesc, pose, shapes[0]));
|
|
}
|
|
|
|
//start all threads
|
|
AZ::SimpleLcgRandom random(seed); //constant seed to have consistency.
|
|
for (auto& query : setterGetterQueries)
|
|
{
|
|
const int waitTimeMS = aznumeric_cast<int>((random.GetRandomFloat() + 0.25f) * 250.0f); //generate a time between 62.5 - 312.5 ms
|
|
query->Start(waitTimeMS);
|
|
}
|
|
|
|
//update the world
|
|
Log_Help("SetGetLocalShapeFromParallelThreads", "Start world Update\n");
|
|
UpdateTestSceneOverTime(m_defaultScene, 500);
|
|
Log_Help("SetGetLocalShapeFromParallelThreads", "End world Update\n");
|
|
|
|
//each request should have completed, join to be sure. Each request data should be == to result
|
|
for (auto& query : setterGetterQueries)
|
|
{
|
|
query->Join();
|
|
EXPECT_EQ(query->GetRequest(), query->m_result);
|
|
query.release();
|
|
}
|
|
setterGetterQueries.clear();
|
|
|
|
}
|
|
|
|
struct RigidBodyRayCaster
|
|
: public SceneQueryBase<AzPhysics::RayCastRequest, AzPhysics::SceneQueryHit>
|
|
{
|
|
RigidBodyRayCaster(const AZStd::thread_desc& threadDesc,
|
|
const AzPhysics::RayCastRequest& request,
|
|
AzPhysics::RigidBody* rigidBody)
|
|
: SceneQueryBase(threadDesc, request, AzPhysics::InvalidSceneHandle)
|
|
, m_rigidBody(rigidBody)
|
|
{
|
|
|
|
}
|
|
|
|
private:
|
|
|
|
AzPhysics::RigidBody* m_rigidBody;
|
|
|
|
void RunRequest() override
|
|
{
|
|
m_result = m_rigidBody->RayCast(m_request);
|
|
}
|
|
};
|
|
|
|
TEST_P(PhysXMultithreadingTest, RigidBodyRayCaster)
|
|
{
|
|
const int seed = GetParam();
|
|
|
|
//raycast thread pool
|
|
AZStd::vector<AZStd::unique_ptr<RigidBodyRayCaster>> rayCasters;
|
|
|
|
//common request data
|
|
AzPhysics::RayCastRequest request;
|
|
request.m_start = AZ::Vector3::CreateZero();
|
|
request.m_distance = 2000.0f;
|
|
|
|
AZStd::thread_desc threadDesc;
|
|
threadDesc.m_name = "RBRQFPThreads"; // RigidBodyRaycastsQueryFromParallelThreads
|
|
|
|
//create the raycasts
|
|
for (int i = 0; i < Constants::NumThreads; i++)
|
|
{
|
|
//pick a box to raycast against
|
|
const int boxTargetIdx = i % m_boxes.size();
|
|
request.m_direction = Constants::BoxPositions[boxTargetIdx].GetNormalized();
|
|
AzPhysics::RigidBody* rigidBody = nullptr;
|
|
Physics::RigidBodyRequestBus::EventResult(rigidBody, m_boxes[boxTargetIdx]->GetId(), &Physics::RigidBodyRequests::GetRigidBody);
|
|
|
|
rayCasters.emplace_back(AZStd::make_unique<RigidBodyRayCaster>(threadDesc, request, rigidBody));
|
|
}
|
|
|
|
//start all threads
|
|
AZ::SimpleLcgRandom random(seed); //constant seed to have consistency.
|
|
for (auto& caster : rayCasters)
|
|
{
|
|
const int waitTimeMS = aznumeric_cast<int>((random.GetRandomFloat() + 0.25f) * 250.0f); //generate a time between 62.5 - 312.5 ms
|
|
caster->Start(waitTimeMS);
|
|
}
|
|
|
|
//update the world
|
|
Log_Help("RaycastsQueryFromParallelThreads", "Start world Update\n");
|
|
UpdateTestSceneOverTime(m_defaultScene, 500);
|
|
Log_Help("RaycastsQueryFromParallelThreads", "End world Update\n");
|
|
|
|
//each request should have completed, join to be sure. and each request should have a result.
|
|
int i = 0;
|
|
for (auto& caster : rayCasters)
|
|
{
|
|
caster->Join();
|
|
|
|
const int boxTargetIdx = i % m_boxes.size();
|
|
EXPECT_TRUE(caster->m_result);
|
|
EXPECT_TRUE(caster->m_result.m_entityId == m_boxes[boxTargetIdx]->GetId());
|
|
|
|
caster.release();
|
|
i++;
|
|
}
|
|
rayCasters.clear();
|
|
}
|
|
|
|
|
|
INSTANTIATE_TEST_CASE_P(PhysXMultithreading, PhysXMultithreadingTest, ::testing::Values(1, 42, 123, 1337, 1403, 5317, 133987258));
|
|
}
|
|
|
|
#ifdef PHYSX_MT_DEBUG_LOGS
|
|
#undef PHYSX_MT_DEBUG_LOGS
|
|
#undef Log_Help
|
|
#endif //PHYSX_MT_DEBUG_LOGS
|
|
|
|
|
|
#endif //PHYSX_ENABLE_MULTI_THREADING
|