Trace Tests: Scale results based on frames in capture.

src/tests/perf_tests/ANGLEPerfTest.cpp

@@ -190,6 +190,7 @@ ANGLEPerfTest::ANGLEPerfTest(const std::string &name,
       mSkipTest(false),
       mStepsToRun(gStepsToRunOverride),
       mNumStepsPerformed(0),
+      mStepsPerRunLoopStep(1),
       mIterationsPerStep(iterationsPerStep),
       mRunning(true)
 {
@@ -242,6 +243,12 @@ void ANGLEPerfTest::run()
     }
 }
 
+void ANGLEPerfTest::setStepsPerRunLoopStep(int stepsPerRunLoop)
+{
+    ASSERT(stepsPerRunLoop >= 1);
+    mStepsPerRunLoopStep = stepsPerRunLoop;
+}
+
 void ANGLEPerfTest::doRunLoop(double maxRunTime)
 {
     mNumStepsPerformed = 0;
@@ -255,7 +262,7 @@ void ANGLEPerfTest::doRunLoop(double maxRunTime)
         step();
         if (mRunning)
         {
-            ++mNumStepsPerformed;
+            mNumStepsPerformed += mStepsPerRunLoopStep;
             if (mTimer.getElapsedTime() > maxRunTime)
             {
                 mRunning = false;

src/tests/perf_tests/ANGLEPerfTest.h

@@ -82,7 +82,10 @@ class ANGLEPerfTest : public testing::Test, angle::NonCopyable
     // Call if the test step was aborted and the test should stop running.
     void abortTest() { mRunning = false; }
 
-    unsigned int getNumStepsPerformed() const { return mNumStepsPerformed; }
+    int getNumStepsPerformed() const { return mNumStepsPerformed; }
+
+    // Defaults to one step per run loop. Can be changed in any test.
+    void setStepsPerRunLoopStep(int stepsPerRunLoop);
     void doRunLoop(double maxRunTime);
 
     // Overriden in trace perf tests.
@@ -101,6 +104,7 @@ class ANGLEPerfTest : public testing::Test, angle::NonCopyable
     std::unique_ptr<perf_test::PerfResultReporter> mReporter;
     int mStepsToRun;
     int mNumStepsPerformed;
+    int mStepsPerRunLoopStep;
     int mIterationsPerStep;
     bool mRunning;
 };
@@ -156,7 +160,6 @@ class ANGLERenderTest : public ANGLEPerfTest
 
     void startGpuTimer();
     void stopGpuTimer();
-    void getGpuTimers();
 
     void beginInternalTraceEvent(const char *name);
     void endInternalTraceEvent(const char *name);

src/tests/perf_tests/TracePerfTest.cpp

@@ -163,6 +163,8 @@ void TracePerfTest::initializeBenchmark()
     mEndFrame                  = traceInfo.endFrame;
     SetBinaryDataDecompressCallback(params.testID, DecompressBinaryData);
 
+    setStepsPerRunLoopStep(mEndFrame - mStartFrame + 1);
+
     std::stringstream testDataDirStr;
     testDataDirStr << ANGLE_TRACE_DATA_DIR << "/" << traceInfo.name;
     std::string testDataDir = testDataDirStr.str();