From 48e779cf8e02f259c2ce3fca95f9312e42e8c707 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 23 Jun 2014 14:08:47 -0700 Subject: [PATCH] added some performance tests --- tests/octree/CMakeLists.txt | 15 ++- tests/octree/src/ModelTests.cpp | 226 ++++++++++++++++++++++++++++++++ tests/octree/src/ModelTests.h | 20 +++ tests/octree/src/main.cpp | 2 + 4 files changed, 258 insertions(+), 5 deletions(-) create mode 100644 tests/octree/src/ModelTests.cpp create mode 100644 tests/octree/src/ModelTests.h diff --git a/tests/octree/CMakeLists.txt b/tests/octree/CMakeLists.txt index cbdfd02054..1697064ff4 100644 --- a/tests/octree/CMakeLists.txt +++ b/tests/octree/CMakeLists.txt @@ -12,9 +12,9 @@ set(MACRO_DIR ${ROOT_DIR}/cmake/macros) # setup for find modules set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/") -#find_package(Qt5Network REQUIRED) -#find_package(Qt5Script REQUIRED) -#find_package(Qt5Widgets REQUIRED) +find_package(Qt5Network REQUIRED) +find_package(Qt5Script REQUIRED) +find_package(Qt5Widgets REQUIRED) include(${MACRO_DIR}/SetupHifiProject.cmake) setup_hifi_project(${TARGET_NAME} TRUE) @@ -22,7 +22,7 @@ setup_hifi_project(${TARGET_NAME} TRUE) include(${MACRO_DIR}/AutoMTC.cmake) auto_mtc(${TARGET_NAME} ${ROOT_DIR}) -#qt5_use_modules(${TARGET_NAME} Network Script Widgets) +qt5_use_modules(${TARGET_NAME} Network Script Widgets) #include glm include(${MACRO_DIR}/IncludeGLM.cmake) @@ -30,8 +30,13 @@ include_glm(${TARGET_NAME} ${ROOT_DIR}) # link in the shared libraries include(${MACRO_DIR}/LinkHifiLibrary.cmake) -link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR}) +link_hifi_library(animation ${TARGET_NAME} ${ROOT_DIR}) +link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR}) +link_hifi_library(fbx ${TARGET_NAME} ${ROOT_DIR}) +link_hifi_library(networking ${TARGET_NAME} ${ROOT_DIR}) +link_hifi_library(models ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(octree ${TARGET_NAME} ${ROOT_DIR}) +link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR}) IF (WIN32) #target_link_libraries(${TARGET_NAME} Winmm Ws2_32) diff --git a/tests/octree/src/ModelTests.cpp b/tests/octree/src/ModelTests.cpp new file mode 100644 index 0000000000..391b54cea9 --- /dev/null +++ b/tests/octree/src/ModelTests.cpp @@ -0,0 +1,226 @@ +// +// ModelTests.h +// tests/octree/src +// +// Created by Brad Hefta-Gaub on 06/04/2014. +// Copyright 2014 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// +// TODO: +// * need to add expected results and accumulation of test success/failure +// + +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "ModelTests.h" + + +void ModelTests::modelTreeTests(bool verbose) { + int testsTaken = 0; + int testsPassed = 0; + int testsFailed = 0; + + if (verbose) { + qDebug() << "******************************************************************************************"; + } + + qDebug() << "ModelTests::modelTreeTests()"; + + // Tree, id, and model properties used in many tests below... + ModelTree tree; + uint32_t id = 1; + ModelItemID modelID(id); + modelID.isKnownID = false; // this is a temporary workaround to allow local tree models to be added with known IDs + ModelItemProperties properties; + float oneMeter = 1.0f; + float halfMeter = oneMeter / 2.0f; + float halfOfDomain = TREE_SCALE * 0.5f; + glm::vec3 positionNearOriginInMeters(oneMeter, oneMeter, oneMeter); // when using properties, these are in meter not tree units + glm::vec3 positionAtCenterInMeters(halfOfDomain, halfOfDomain, halfOfDomain); + glm::vec3 positionNearOriginInTreeUnits = positionNearOriginInMeters / (float)TREE_SCALE; + glm::vec3 positionAtCenterInTreeUnits = positionAtCenterInMeters / (float)TREE_SCALE; + + { + testsTaken++; + QString testName = "add model to tree and search"; + if (verbose) { + qDebug() << "Test" << testsTaken <<":" << qPrintable(testName); + } + + properties.setPosition(positionAtCenterInMeters); + properties.setRadius(halfMeter); + properties.setModelURL("https://s3-us-west-1.amazonaws.com/highfidelity-public/ozan/theater.fbx"); + + tree.addModel(modelID, properties); + + float targetRadius = oneMeter * 2.0 / (float)TREE_SCALE; // in tree units + const ModelItem* foundModelByRadius = tree.findClosestModel(positionAtCenterInTreeUnits, targetRadius); + const ModelItem* foundModelByID = tree.findModelByID(id); + + if (verbose) { + qDebug() << "foundModelByRadius=" << foundModelByRadius; + qDebug() << "foundModelByID=" << foundModelByID; + } + + bool passed = foundModelByRadius && foundModelByID && (foundModelByRadius == foundModelByID); + if (passed) { + testsPassed++; + } else { + testsFailed++; + qDebug() << "FAILED - Test" << testsTaken <<":" << qPrintable(testName); + } + } + + modelID.isKnownID = true; // this is a temporary workaround to allow local tree models to be added with known IDs + + { + testsTaken++; + QString testName = "change position of model in tree"; + if (verbose) { + qDebug() << "Test" << testsTaken <<":" << qPrintable(testName); + } + + glm::vec3 newPosition = positionNearOriginInMeters; + + properties.setPosition(newPosition); + + tree.updateModel(modelID, properties); + + float targetRadius = oneMeter * 2.0 / (float)TREE_SCALE; // in tree units + const ModelItem* foundModelByRadius = tree.findClosestModel(positionNearOriginInTreeUnits, targetRadius); + const ModelItem* foundModelByID = tree.findModelByID(id); + + if (verbose) { + qDebug() << "foundModelByRadius=" << foundModelByRadius; + qDebug() << "foundModelByID=" << foundModelByID; + } + + // NOTE: This test is currently expected to fail in the production code. There's a bug in ModelTree::updateModel() + // that does not update the actual location of the model into the correct element when modified locally. So this + // test will fail. There's a new optimized and correctly working version of updateModel() that fixes this problem. + bool passed = foundModelByRadius && foundModelByID && (foundModelByRadius == foundModelByID); + if (passed) { + testsPassed++; + qDebug() << "NOTE: Expected to FAIL - Test" << testsTaken <<":" << qPrintable(testName); + } else { + testsFailed++; + qDebug() << "FAILED - Test" << testsTaken <<":" << qPrintable(testName); + qDebug() << "NOTE: Expected to FAIL - Test" << testsTaken <<":" << qPrintable(testName); + } + } + + { + testsTaken++; + QString testName = "change position of model in tree back to center"; + if (verbose) { + qDebug() << "Test" << testsTaken <<":" << qPrintable(testName); + } + + glm::vec3 newPosition = positionAtCenterInMeters; + + properties.setPosition(newPosition); + + tree.updateModel(modelID, properties); + + float targetRadius = oneMeter * 2.0 / (float)TREE_SCALE; // in tree units + const ModelItem* foundModelByRadius = tree.findClosestModel(positionAtCenterInTreeUnits, targetRadius); + const ModelItem* foundModelByID = tree.findModelByID(id); + + if (verbose) { + qDebug() << "foundModelByRadius=" << foundModelByRadius; + qDebug() << "foundModelByID=" << foundModelByID; + } + + bool passed = foundModelByRadius && foundModelByID && (foundModelByRadius == foundModelByID); + if (passed) { + testsPassed++; + } else { + testsFailed++; + qDebug() << "FAILED - Test" << testsTaken <<":" << qPrintable(testName); + } + } + + { + testsTaken++; + QString testName = "Performance - findClosestModel() 1,000,000 times"; + if (verbose) { + qDebug() << "Test" << testsTaken <<":" << qPrintable(testName); + } + + float targetRadius = oneMeter * 2.0 / (float)TREE_SCALE; // in tree units + const int TEST_ITERATIONS = 1000000; + quint64 start = usecTimestampNow(); + const ModelItem* foundModelByRadius = NULL; + for (int i = 0; i < TEST_ITERATIONS; i++) { + foundModelByRadius = tree.findClosestModel(positionAtCenterInTreeUnits, targetRadius); + } + quint64 end = usecTimestampNow(); + + if (verbose) { + qDebug() << "foundModelByRadius=" << foundModelByRadius; + } + + bool passed = foundModelByRadius; + if (passed) { + testsPassed++; + } else { + testsFailed++; + qDebug() << "FAILED - Test" << testsTaken <<":" << qPrintable(testName); + } + float USECS_PER_MSECS = 1000.0f; + float elapsedInMSecs = (float)(end - start) / USECS_PER_MSECS; + qDebug() << "TIME - Test" << testsTaken <<":" << qPrintable(testName) << "elapsed=" << elapsedInMSecs << "msecs"; + } + + { + testsTaken++; + QString testName = "Performance - findModelByID() 1,000,000 times"; + if (verbose) { + qDebug() << "Test" << testsTaken <<":" << qPrintable(testName); + } + + const int TEST_ITERATIONS = 1000000; + quint64 start = usecTimestampNow(); + const ModelItem* foundModelByID = NULL; + for (int i = 0; i < TEST_ITERATIONS; i++) { + foundModelByID = tree.findModelByID(id); + } + quint64 end = usecTimestampNow(); + + if (verbose) { + qDebug() << "foundModelByID=" << foundModelByID; + } + + bool passed = foundModelByID; + if (passed) { + testsPassed++; + } else { + testsFailed++; + qDebug() << "FAILED - Test" << testsTaken <<":" << qPrintable(testName); + } + float USECS_PER_MSECS = 1000.0f; + float elapsedInMSecs = (float)(end - start) / USECS_PER_MSECS; + qDebug() << "TIME - Test" << testsTaken <<":" << qPrintable(testName) << "elapsed=" << elapsedInMSecs << "msecs"; + } + + qDebug() << " tests passed:" << testsPassed << "out of" << testsTaken; + if (verbose) { + qDebug() << "******************************************************************************************"; + } +} + + +void ModelTests::runAllTests(bool verbose) { + modelTreeTests(verbose); +} + diff --git a/tests/octree/src/ModelTests.h b/tests/octree/src/ModelTests.h new file mode 100644 index 0000000000..dd764edf9d --- /dev/null +++ b/tests/octree/src/ModelTests.h @@ -0,0 +1,20 @@ +// +// ModelTests.h +// tests/octree/src +// +// Created by Brad Hefta-Gaub on 06/04/2014. +// Copyright 2014 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#ifndef hifi_ModelTests_h +#define hifi_ModelTests_h + +namespace ModelTests { + void modelTreeTests(bool verbose = false); + void runAllTests(bool verbose = false); +} + +#endif // hifi_ModelTests_h diff --git a/tests/octree/src/main.cpp b/tests/octree/src/main.cpp index de7b3926ae..590df268c3 100644 --- a/tests/octree/src/main.cpp +++ b/tests/octree/src/main.cpp @@ -8,11 +8,13 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // +#include "ModelTests.h" #include "OctreeTests.h" #include "AABoxCubeTests.h" int main(int argc, char** argv) { OctreeTests::runAllTests(); AABoxCubeTests::runAllTests(); + ModelTests::runAllTests(true); return 0; }