Commit 6a6199b4 by Martin Radev Committed by Geoff Lang

Add multiview performance tests

The patch adds two tests to measure the performance of the ANGLE_multiview extension implementation: 1) The first test renders onto two views by issuing thousands of state changes and draw calls. The aim of the test is to stress the CPU. 2) The second test renders onto two views by drawing with one draw call half a million quads with multiple attributes per vertex. The attributes are passed to the fragment shader where they are used for computing the color. The aim of the test is to stress the GPU's memory system. The patch also extends the ANGLEPerfTest's functionality to only run the benchmark if the necessary extensions are available. BUG=angleproject:2062 TEST=angle_end2end_tests Change-Id: Ic63d54a69fdddb72439eeeb1951a500fb1247e95 Reviewed-on: https://chromium-review.googlesource.com/597630Reviewed-by: 's avatarOlli Etuaho <oetuaho@nvidia.com>
parent a438f4e7
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
'<(angle_path)/src/tests/perf_tests/InstancingPerf.cpp', '<(angle_path)/src/tests/perf_tests/InstancingPerf.cpp',
'<(angle_path)/src/tests/perf_tests/InterleavedAttributeData.cpp', '<(angle_path)/src/tests/perf_tests/InterleavedAttributeData.cpp',
'<(angle_path)/src/tests/perf_tests/LinkProgramPerfTest.cpp', '<(angle_path)/src/tests/perf_tests/LinkProgramPerfTest.cpp',
'<(angle_path)/src/tests/perf_tests/MultiviewPerf.cpp',
'<(angle_path)/src/tests/perf_tests/PointSprites.cpp', '<(angle_path)/src/tests/perf_tests/PointSprites.cpp',
'<(angle_path)/src/tests/perf_tests/TexSubImage.cpp', '<(angle_path)/src/tests/perf_tests/TexSubImage.cpp',
'<(angle_path)/src/tests/perf_tests/TextureSampling.cpp', '<(angle_path)/src/tests/perf_tests/TextureSampling.cpp',
......
...@@ -18,12 +18,12 @@ ...@@ -18,12 +18,12 @@
ANGLEPerfTest::ANGLEPerfTest(const std::string &name, const std::string &suffix) ANGLEPerfTest::ANGLEPerfTest(const std::string &name, const std::string &suffix)
: mName(name), : mName(name),
mSuffix(suffix), mSuffix(suffix),
mTimer(nullptr), mTimer(CreateTimer()),
mRunTimeSeconds(5.0), mRunTimeSeconds(5.0),
mSkipTest(false),
mNumStepsPerformed(0), mNumStepsPerformed(0),
mRunning(true) mRunning(true)
{ {
mTimer = CreateTimer();
} }
ANGLEPerfTest::~ANGLEPerfTest() ANGLEPerfTest::~ANGLEPerfTest()
...@@ -33,6 +33,11 @@ ANGLEPerfTest::~ANGLEPerfTest() ...@@ -33,6 +33,11 @@ ANGLEPerfTest::~ANGLEPerfTest()
void ANGLEPerfTest::run() void ANGLEPerfTest::run()
{ {
if (mSkipTest)
{
return;
}
mTimer->start(); mTimer->start();
while (mRunning) while (mRunning)
{ {
...@@ -66,6 +71,10 @@ void ANGLEPerfTest::SetUp() ...@@ -66,6 +71,10 @@ void ANGLEPerfTest::SetUp()
void ANGLEPerfTest::TearDown() void ANGLEPerfTest::TearDown()
{ {
if (mSkipTest)
{
return;
}
double relativeScore = static_cast<double>(mNumStepsPerformed) / mTimer->getElapsedTime(); double relativeScore = static_cast<double>(mNumStepsPerformed) / mTimer->getElapsedTime();
printResult("score", static_cast<size_t>(std::round(relativeScore)), "score", true); printResult("score", static_cast<size_t>(std::round(relativeScore)), "score", true);
} }
...@@ -105,6 +114,17 @@ ANGLERenderTest::ANGLERenderTest(const std::string &name, const RenderTestParams ...@@ -105,6 +114,17 @@ ANGLERenderTest::ANGLERenderTest(const std::string &name, const RenderTestParams
{ {
} }
ANGLERenderTest::ANGLERenderTest(const std::string &name,
const RenderTestParams &testParams,
const std::vector<std::string> &extensionPrerequisites)
: ANGLEPerfTest(name, testParams.suffix()),
mTestParams(testParams),
mEGLWindow(nullptr),
mOSWindow(nullptr),
mExtensionPrerequisites(extensionPrerequisites)
{
}
ANGLERenderTest::~ANGLERenderTest() ANGLERenderTest::~ANGLERenderTest()
{ {
SafeDelete(mOSWindow); SafeDelete(mOSWindow);
...@@ -113,6 +133,8 @@ ANGLERenderTest::~ANGLERenderTest() ...@@ -113,6 +133,8 @@ ANGLERenderTest::~ANGLERenderTest()
void ANGLERenderTest::SetUp() void ANGLERenderTest::SetUp()
{ {
ANGLEPerfTest::SetUp();
mOSWindow = CreateOSWindow(); mOSWindow = CreateOSWindow();
mEGLWindow = new EGLWindow(mTestParams.majorVersion, mTestParams.minorVersion, mEGLWindow = new EGLWindow(mTestParams.majorVersion, mTestParams.minorVersion,
mTestParams.eglParameters); mTestParams.eglParameters);
...@@ -130,19 +152,28 @@ void ANGLERenderTest::SetUp() ...@@ -130,19 +152,28 @@ void ANGLERenderTest::SetUp()
return; return;
} }
initializeBenchmark(); if (!areExtensionPrerequisitesFulfilled())
{
mSkipTest = true;
}
ANGLEPerfTest::SetUp(); if (mSkipTest)
{
std::cout << "Test skipped due to missing extension." << std::endl;
return;
}
initializeBenchmark();
} }
void ANGLERenderTest::TearDown() void ANGLERenderTest::TearDown()
{ {
ANGLEPerfTest::TearDown();
destroyBenchmark(); destroyBenchmark();
mEGLWindow->destroyGL(); mEGLWindow->destroyGL();
mOSWindow->destroy(); mOSWindow->destroy();
ANGLEPerfTest::TearDown();
} }
void ANGLERenderTest::step() void ANGLERenderTest::step()
...@@ -194,3 +225,16 @@ OSWindow *ANGLERenderTest::getWindow() ...@@ -194,3 +225,16 @@ OSWindow *ANGLERenderTest::getWindow()
{ {
return mOSWindow; return mOSWindow;
} }
bool ANGLERenderTest::areExtensionPrerequisitesFulfilled() const
{
for (const auto &extension : mExtensionPrerequisites)
{
if (!CheckExtensionExists(reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)),
extension))
{
return false;
}
}
return true;
}
\ No newline at end of file
...@@ -66,6 +66,7 @@ class ANGLEPerfTest : public testing::Test, angle::NonCopyable ...@@ -66,6 +66,7 @@ class ANGLEPerfTest : public testing::Test, angle::NonCopyable
std::string mSuffix; std::string mSuffix;
Timer *mTimer; Timer *mTimer;
double mRunTimeSeconds; double mRunTimeSeconds;
bool mSkipTest;
private: private:
unsigned int mNumStepsPerformed; unsigned int mNumStepsPerformed;
...@@ -84,6 +85,9 @@ class ANGLERenderTest : public ANGLEPerfTest ...@@ -84,6 +85,9 @@ class ANGLERenderTest : public ANGLEPerfTest
{ {
public: public:
ANGLERenderTest(const std::string &name, const RenderTestParams &testParams); ANGLERenderTest(const std::string &name, const RenderTestParams &testParams);
ANGLERenderTest(const std::string &name,
const RenderTestParams &testParams,
const std::vector<std::string> &extensionPrerequisites);
~ANGLERenderTest(); ~ANGLERenderTest();
virtual void initializeBenchmark() { } virtual void initializeBenchmark() { }
...@@ -105,8 +109,11 @@ class ANGLERenderTest : public ANGLEPerfTest ...@@ -105,8 +109,11 @@ class ANGLERenderTest : public ANGLEPerfTest
void step() override; void step() override;
void finishTest() override; void finishTest() override;
bool areExtensionPrerequisitesFulfilled() const;
EGLWindow *mEGLWindow; EGLWindow *mEGLWindow;
OSWindow *mOSWindow; OSWindow *mOSWindow;
std::vector<std::string> mExtensionPrerequisites;
}; };
#endif // PERF_TESTS_ANGLE_PERF_TEST_H_ #endif // PERF_TESTS_ANGLE_PERF_TEST_H_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment