Tolerate flush/finish test assumption failures.

These tests assume that draw calls are queued up until they're forced
to be executed by a ReadPixels, Flush, or Finish call. The spec does
not require this, and implementations are free to eagerly start
execution of draw calls.

Thus this change reports a CompatibilityWarning if the assumption isn't
met, instead of a Failure.

Google bug: b/71858368
Components: AOSP
Tests: dEQP-GLES2.functional.flush_finish,
dEQP-GLES3.functional.flush_finish

diff --git a/framework/common/tcuApp.cpp b/framework/common/tcuApp.cpp
index 949f083..fa76c7d 100644 (file)
--- a/framework/common/tcuApp.cpp
+++ b/framework/common/tcuApp.cpp
@@ -98,7 +98,7 @@ App::App (Platform& platform, Archive& archive, TestLog& log, const CommandLine&
 
                // Initialize watchdog
                if (cmdLine.isWatchDogEnabled())
-                       TCU_CHECK_INTERNAL(m_watchDog = qpWatchDog_create(onWatchdogTimeout, this, 300, 30));
+                       TCU_CHECK_INTERNAL(m_watchDog = qpWatchDog_create(onWatchdogTimeout, this, WATCHDOG_TOTAL_TIME_LIMIT_SECS, WATCHDOG_INTERVAL_TIME_LIMIT_SECS));
 
                // Initialize crash handler.
                if (cmdLine.isCrashHandlingEnabled())

diff --git a/framework/common/tcuApp.hpp b/framework/common/tcuApp.hpp
index e714160..5c25fe1 100644 (file)
--- a/framework/common/tcuApp.hpp
+++ b/framework/common/tcuApp.hpp
@@ -42,6 +42,12 @@ class CommandLine;
 class TestLog;
 class TestPackageRoot;
 
+enum
+{
+       WATCHDOG_TOTAL_TIME_LIMIT_SECS          = 300,
+       WATCHDOG_INTERVAL_TIME_LIMIT_SECS       = 30
+};
+
 /*--------------------------------------------------------------------*//*!
  * \brief Test application
  *

diff --git a/modules/gles2/functional/es2fFlushFinishTests.cpp b/modules/gles2/functional/es2fFlushFinishTests.cpp
index 0c865a3..1a2dbbc 100644 (file)
--- a/modules/gles2/functional/es2fFlushFinishTests.cpp
+++ b/modules/gles2/functional/es2fFlushFinishTests.cpp
@@ -413,7 +413,7 @@ void FlushFinishCase::analyzeResults (const std::vector<Sample>& samples, const
                }
        }
 
-       m_testCtx.setTestResult(allOk ? QP_TEST_RESULT_PASS     : QP_TEST_RESULT_FAIL,
+       m_testCtx.setTestResult(allOk ? QP_TEST_RESULT_PASS     : QP_TEST_RESULT_COMPATIBILITY_WARNING,
                                                        allOk ? "Pass"                          : "Suspicious performance behavior");
 }
 

diff --git a/modules/gles3/functional/es3fFlushFinishTests.cpp b/modules/gles3/functional/es3fFlushFinishTests.cpp
index 05802a1..3c822ea 100644 (file)
--- a/modules/gles3/functional/es3fFlushFinishTests.cpp
+++ b/modules/gles3/functional/es3fFlushFinishTests.cpp
@@ -33,6 +33,7 @@
 #include "tcuTestLog.hpp"
 #include "tcuRenderTarget.hpp"
 #include "tcuCPUWarmup.hpp"
+#include "tcuApp.hpp"
 
 #include "glwEnums.hpp"
 #include "glwFunctions.hpp"
@@ -66,6 +67,7 @@ enum
 {
        MAX_VIEWPORT_SIZE                       = 256,
        MAX_SAMPLE_DURATION_US          = 150*1000,
+       MAX_CALIBRATE_DURATION_US       = tcu::WATCHDOG_INTERVAL_TIME_LIMIT_SECS/3*1000*1000,   // Abort when the watch dog gets nervous
        WAIT_TIME_MS                            = 200,
        MIN_DRAW_CALL_COUNT                     = 10,
        MAX_DRAW_CALL_COUNT                     = 1<<20,
@@ -291,6 +293,8 @@ FlushFinishCase::CalibrationParams FlushFinishCase::calibrate (void)
        tcu::ScopedLogSection           section                         (m_testCtx.getLog(), "CalibrationInfo", "Calibration info");
        CalibrationParams                       params;
 
+       const deUint64 calibrateStartTime = deGetMicroseconds();
+
        // Step 1: find iteration count that results in rougly 1/10th of target maximum sample duration.
        {
                const deUint64          targetDurationUs                = MAX_SAMPLE_DURATION_US/100;
@@ -302,6 +306,7 @@ FlushFinishCase::CalibrationParams FlushFinishCase::calibrate (void)
 
                for (;;)
                {
+                       deUint64 endTime;
                        deUint64 curDuration;
 
                        setShaderIterCount(curIterCount);
@@ -310,7 +315,8 @@ FlushFinishCase::CalibrationParams FlushFinishCase::calibrate (void)
                        {
                                const deUint64 startTime = deGetMicroseconds();
                                readPixels();
-                               curDuration = deGetMicroseconds()-startTime;
+                               endTime = deGetMicroseconds();
+                               curDuration = endTime-startTime;
                        }
 
                        m_testCtx.getLog() << TestLog::Message << "Duration with " << curIterCount << " iterations = " << curDuration << " us" << TestLog::EndMessage;
@@ -332,6 +338,11 @@ FlushFinishCase::CalibrationParams FlushFinishCase::calibrate (void)
                        }
                        else if (curIterCount >= MAX_SHADER_ITER_COUNT)
                                break; // Settle on maximum.
+                       else if (endTime - calibrateStartTime > MAX_CALIBRATE_DURATION_US)
+                       {
+                               // Calibration is taking longer than expected. This can be due to eager draw call execution.
+                               throw CalibrationFailedException("Calibration failed, target duration not reached within expected time");
+                       }
                        else
                        {
                                prevIterCount   = curIterCount;
@@ -357,6 +368,7 @@ FlushFinishCase::CalibrationParams FlushFinishCase::calibrate (void)
 
                for (;;)
                {
+                       deUint64 endTime;
                        deUint64 curDuration;
 
                        render(curDrawCount); // \note Submit time is ignored
@@ -364,7 +376,8 @@ FlushFinishCase::CalibrationParams FlushFinishCase::calibrate (void)
                        {
                                const deUint64 startTime = deGetMicroseconds();
                                readPixels();
-                               curDuration = deGetMicroseconds()-startTime;
+                               endTime = deGetMicroseconds();
+                               curDuration = endTime-startTime;
                        }
 
                        m_testCtx.getLog() << TestLog::Message << "Duration with " << curDrawCount << " draw calls = " << curDuration << " us" << TestLog::EndMessage;
@@ -386,6 +399,11 @@ FlushFinishCase::CalibrationParams FlushFinishCase::calibrate (void)
                        }
                        else if (curDrawCount >= MAX_DRAW_CALL_COUNT)
                                break; // Settle on maximum.
+                       else if (endTime - calibrateStartTime > MAX_CALIBRATE_DURATION_US)
+                       {
+                               // Calibration is taking longer than expected. This can be due to eager draw call execution.
+                               throw CalibrationFailedException("Calibration failed, target duration not reached within expected time");
+                       }
                        else
                        {
                                prevDrawCount   = curDrawCount;
@@ -522,7 +540,7 @@ void FlushFinishCase::analyzeResults (const std::vector<Sample>& samples, const
                }
        }
 
-       m_testCtx.setTestResult(allOk ? QP_TEST_RESULT_PASS     : QP_TEST_RESULT_FAIL,
+       m_testCtx.setTestResult(allOk ? QP_TEST_RESULT_PASS     : QP_TEST_RESULT_COMPATIBILITY_WARNING,
                                                        allOk ? "Pass"                          : "Suspicious performance behavior");
 }