projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b4c6add)
CP: Update runtime hints for master and Nougat
authorKalle Raita <kraita@google.com>
Thu, 30 Mar 2017 18:15:44 +0000 (11:15 -0700)
committerKalle Raita <kraita@google.com>
Thu, 30 Mar 2017 21:38:14 +0000 (14:38 -0700)
Original change:

2b1250ebaa646ec10989c132686e9ea3e19dd7a8
Update runtime hints used by the Android CTS to reflect measured times
for recent automated runs.

Test: run build_android_mustpass.py and diff check
Bug: 36776549
Change-Id: I77b0e95666ca6e220b2a618280fcece0b1c3a858

android/cts/AndroidTest.xml patch | blob | history
scripts/build_android_mustpass.py patch | blob | history

diff --git a/android/cts/AndroidTest.xml b/android/cts/AndroidTest.xml
index 0484be6..5838cfd 100644 (file)
--- a/android/cts/AndroidTest.xml
+++ b/android/cts/AndroidTest.xml
@@ -24,7 +24,7 @@
                <option name="deqp-gl-config-name" value="rgba8888d24s8ms0"/>
                <option name="deqp-surface-type" value="window"/>
                <option name="deqp-screen-rotation" value="unspecified"/>
-               <option name="runtime-hint" value="24m"/>
+               <option name="runtime-hint" value="23m"/>
                <option name="deqp-config-required" value="true"/>
        </test>
        <test class="com.drawelements.deqp.runner.DeqpTestRunner">
@@ -33,7 +33,7 @@
                <option name="deqp-gl-config-name" value="rgba8888d24s8ms0"/>
                <option name="deqp-surface-type" value="window"/>
                <option name="deqp-screen-rotation" value="unspecified"/>
-               <option name="runtime-hint" value="40m"/>
+               <option name="runtime-hint" value="46m"/>
                <option name="deqp-config-required" value="true"/>
        </test>
        <test class="com.drawelements.deqp.runner.DeqpTestRunner">
@@ -42,7 +42,7 @@
                <option name="deqp-gl-config-name" value="rgba8888d24s8ms0"/>
                <option name="deqp-surface-type" value="window"/>
                <option name="deqp-screen-rotation" value="unspecified"/>
-               <option name="runtime-hint" value="1h15m"/>
+               <option name="runtime-hint" value="1h50m"/>
                <option name="deqp-config-required" value="true"/>
        </test>
        <test class="com.drawelements.deqp.runner.DeqpTestRunner">
@@ -51,7 +51,7 @@
                <option name="deqp-gl-config-name" value="rgba8888d24s8ms0"/>
                <option name="deqp-surface-type" value="window"/>
                <option name="deqp-screen-rotation" value="0"/>
-               <option name="runtime-hint" value="7m"/>
+               <option name="runtime-hint" value="1m"/>
        </test>
        <test class="com.drawelements.deqp.runner.DeqpTestRunner">
                <option name="deqp-package" value="dEQP-GLES3"/>
@@ -59,7 +59,7 @@
                <option name="deqp-gl-config-name" value="rgba8888d24s8ms0"/>
                <option name="deqp-surface-type" value="window"/>
                <option name="deqp-screen-rotation" value="90"/>
-               <option name="runtime-hint" value="7m"/>
+               <option name="runtime-hint" value="1m"/>
        </test>
        <test class="com.drawelements.deqp.runner.DeqpTestRunner">
                <option name="deqp-package" value="dEQP-GLES3"/>
@@ -67,7 +67,7 @@
                <option name="deqp-gl-config-name" value="rgba8888d24s8ms0"/>
                <option name="deqp-surface-type" value="window"/>
                <option name="deqp-screen-rotation" value="180"/>
-               <option name="runtime-hint" value="7m"/>
+               <option name="runtime-hint" value="1m"/>
        </test>
        <test class="com.drawelements.deqp.runner.DeqpTestRunner">
                <option name="deqp-package" value="dEQP-GLES3"/>
@@ -75,7 +75,7 @@
                <option name="deqp-gl-config-name" value="rgba8888d24s8ms0"/>
                <option name="deqp-surface-type" value="window"/>
                <option name="deqp-screen-rotation" value="270"/>
-               <option name="runtime-hint" value="7m"/>
+               <option name="runtime-hint" value="1m"/>
        </test>
        <test class="com.drawelements.deqp.runner.DeqpTestRunner">
                <option name="deqp-package" value="dEQP-GLES3"/>
@@ -83,7 +83,7 @@
                <option name="deqp-gl-config-name" value="rgba8888d24s8ms4"/>
                <option name="deqp-surface-type" value="window"/>
                <option name="deqp-screen-rotation" value="unspecified"/>
-               <option name="runtime-hint" value="10m"/>
+               <option name="runtime-hint" value="1m"/>
        </test>
        <test class="com.drawelements.deqp.runner.DeqpTestRunner">
                <option name="deqp-package" value="dEQP-GLES3"/>
@@ -91,7 +91,7 @@
                <option name="deqp-gl-config-name" value="rgb565d0s0ms0"/>
                <option name="deqp-surface-type" value="window"/>
                <option name="deqp-screen-rotation" value="unspecified"/>
-               <option name="runtime-hint" value="10m"/>
+               <option name="runtime-hint" value="1m"/>
        </test>
        <test class="com.drawelements.deqp.runner.DeqpTestRunner">
                <option name="deqp-package" value="dEQP-GLES31"/>
@@ -99,7 +99,7 @@
                <option name="deqp-gl-config-name" value="rgba8888d24s8ms0"/>
                <option name="deqp-surface-type" value="window"/>
                <option name="deqp-screen-rotation" value="unspecified"/>
-               <option name="runtime-hint" value="7h30m"/>
+               <option name="runtime-hint" value="1h40m"/>
                <option name="deqp-config-required" value="true"/>
        </test>
        <test class="com.drawelements.deqp.runner.DeqpTestRunner">
@@ -153,6 +153,6 @@
        <test class="com.drawelements.deqp.runner.DeqpTestRunner">
                <option name="deqp-package" value="dEQP-VK"/>
                <option name="deqp-caselist-file" value="vk-master.txt"/>
-               <option name="runtime-hint" value="3h45m"/>
+               <option name="runtime-hint" value="2h29m"/>
        </test>
 </configuration>
diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index 52ffd1e..162ab3a 100644 (file)
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -207,7 +207,7 @@ NYC_EGL_PKG                                         = Package(module = EGL_MODULE, configurations = [
                                          rotation              = "unspecified",
                                          surfacetype   = "window",
                                          filters               = NYC_EGL_COMMON_FILTERS,
-                                     runtime           = "24m"),
+                                     runtime           = "11m"),
        ])
 
 NYC_GLES2_COMMON_FILTERS                       = [
@@ -220,7 +220,7 @@ NYC_GLES2_PKG                                       = Package(module = GLES2_MODULE, configurations = [
                                          rotation              = "unspecified",
                                          surfacetype   = "window",
                                          filters               = NYC_GLES2_COMMON_FILTERS,
-                                         runtime               = "40m"),
+                                         runtime               = "30m"),
        ])
 
 NYC_GLES3_COMMON_FILTERS               = [
@@ -233,32 +233,32 @@ NYC_GLES3_PKG                                     = Package(module = GLES3_MODULE, configurations = [
                                          rotation              = "unspecified",
                                          surfacetype   = "window",
                                          filters               = NYC_GLES3_COMMON_FILTERS,
-                                         runtime               = "1h15m"),
+                                         runtime               = "1h50min"),
                # Rotations
                Configuration(name                      = "rotate-portrait",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "0",
                                          surfacetype   = "window",
                                          filters               = NYC_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-                                         runtime               = "7m"),
+                                         runtime               = "5m"),
                Configuration(name                      = "rotate-landscape",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "90",
                                          surfacetype   = "window",
                                          filters               = NYC_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-                                         runtime               = "7m"),
+                                         runtime               = "5m"),
                Configuration(name                      = "rotate-reverse-portrait",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "180",
                                          surfacetype   = "window",
                                          filters               = NYC_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-                                         runtime               = "7m"),
+                                         runtime               = "5m"),
                Configuration(name                      = "rotate-reverse-landscape",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "270",
                                          surfacetype   = "window",
                                          filters               = NYC_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-                                         runtime               = "7m"),
+                                         runtime               = "5m"),
 
                # MSAA
                Configuration(name                      = "multisample",
@@ -287,7 +287,7 @@ NYC_GLES31_PKG                                      = Package(module = GLES31_MODULE, configurations = [
                                          rotation              = "unspecified",
                                          surfacetype   = "window",
                                          filters               = NYC_GLES31_COMMON_FILTERS,
-                                         runtime               = "7h30m"),
+                                         runtime               = "4h40m"),
 
                # Rotations
                Configuration(name                      = "rotate-portrait",
@@ -338,7 +338,7 @@ NYC_VULKAN_FILTERS                          = [
 NYC_VULKAN_PKG                                 = Package(module = VULKAN_MODULE, configurations = [
                Configuration(name                      = "master",
                                          filters               = NYC_VULKAN_FILTERS,
-                                         runtime               = "3h45m"),
+                                         runtime               = "1h11m"),
        ])
 
 # Master
@@ -355,7 +355,7 @@ MASTER_EGL_PKG                                      = Package(module = EGL_MODULE, configurations = [
                                          surfacetype   = "window",
                                          required              = True,
                                          filters               = MASTER_EGL_COMMON_FILTERS,
-                                     runtime           = "24m"),
+                                     runtime           = "23m"),
        ])
 
 MASTER_GLES2_COMMON_FILTERS            = [
@@ -371,7 +371,7 @@ MASTER_GLES2_PKG                            = Package(module = GLES2_MODULE, configurations = [
                                          surfacetype   = "window",
                                          required              = True,
                                          filters               = MASTER_GLES2_COMMON_FILTERS,
-                                         runtime               = "40m"),
+                                         runtime               = "46m"),
        ])
 
 MASTER_GLES3_COMMON_FILTERS            = [
@@ -389,32 +389,32 @@ MASTER_GLES3_PKG                          = Package(module = GLES3_MODULE, configurations = [
                                          surfacetype   = "window",
                                          required              = True,
                                          filters               = MASTER_GLES3_COMMON_FILTERS,
-                                         runtime               = "1h15m"),
+                                         runtime               = "1h50m"),
                # Rotations
                Configuration(name                      = "rotate-portrait",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "0",
                                          surfacetype   = "window",
                                          filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-                                         runtime               = "7m"),
+                                         runtime               = "1m"),
                Configuration(name                      = "rotate-landscape",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "90",
                                          surfacetype   = "window",
                                          filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-                                         runtime               = "7m"),
+                                         runtime               = "1m"),
                Configuration(name                      = "rotate-reverse-portrait",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "180",
                                          surfacetype   = "window",
                                          filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-                                         runtime               = "7m"),
+                                         runtime               = "1m"),
                Configuration(name                      = "rotate-reverse-landscape",
                                          glconfig              = "rgba8888d24s8ms0",
                                          rotation              = "270",
                                          surfacetype   = "window",
                                          filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-                                         runtime               = "7m"),
+                                         runtime               = "1m"),
 
                # MSAA
                Configuration(name                      = "multisample",
@@ -423,7 +423,7 @@ MASTER_GLES3_PKG                            = Package(module = GLES3_MODULE, configurations = [
                                          surfacetype   = "window",
                                          filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-multisample.txt"),
                                                                                                                                         exclude("gles3-multisample-issues.txt")],
-                                         runtime               = "10m"),
+                                         runtime               = "1m"),
 
                # Pixel format
                Configuration(name                      = "565-no-depth-no-stencil",
@@ -432,7 +432,7 @@ MASTER_GLES3_PKG                            = Package(module = GLES3_MODULE, configurations = [
                                          surfacetype   = "window",
                                          filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-pixelformat.txt"),
                                                                                                                                         exclude("gles3-pixelformat-issues.txt")],
-                                         runtime               = "10m"),
+                                         runtime               = "1m"),
        ])
 
 MASTER_GLES31_COMMON_FILTERS   = [
@@ -450,7 +450,7 @@ MASTER_GLES31_PKG                           = Package(module = GLES31_MODULE, configurations = [
                                          surfacetype   = "window",
                                          required              = True,
                                          filters               = MASTER_GLES31_COMMON_FILTERS,
-                                         runtime               = "7h30m"),
+                                         runtime               = "1h40m"),
 
                # Rotations
                Configuration(name                      = "rotate-portrait",
@@ -504,7 +504,7 @@ MASTER_VULKAN_FILTERS                       = [
 MASTER_VULKAN_PKG                              = Package(module = VULKAN_MODULE, configurations = [
                Configuration(name                      = "master",
                                          filters               = MASTER_VULKAN_FILTERS,
-                                         runtime               = "3h45m"),
+                                         runtime               = "2h29m"),
        ])
 
 MUSTPASS_LISTS                         = [
Domain: Graphics System / GL;