diff options
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | android/cts/Android.bp | 6 | ||||
| -rw-r--r-- | android/cts/AndroidTest.xml | 13 | ||||
| -rw-r--r-- | android/cts/main/src/vk-excluded-tests.txt | 6 | ||||
| -rw-r--r-- | android/cts/main/vk-master/ray-tracing-pipeline.txt | 30 | ||||
| -rw-r--r-- | android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java | 29 | ||||
| -rw-r--r-- | external/vulkancts/modules/vulkan/wsi/vktWsiMaintenance1Tests.cpp | 8 | ||||
| -rw-r--r-- | framework/delibs/debase/deDefs.h | 3 | ||||
| -rw-r--r-- | scripts/mustpass.py | 13 |
9 files changed, 70 insertions, 41 deletions
diff --git a/Android.bp b/Android.bp index 434138745..84e19b86a 100644 --- a/Android.bp +++ b/Android.bp @@ -245,6 +245,9 @@ cc_test { ], multilib: { + lib32: { + suffix: "32", + }, lib64: { suffix: "64", }, diff --git a/android/cts/Android.bp b/android/cts/Android.bp index 5503833c4..52b795ecb 100644 --- a/android/cts/Android.bp +++ b/android/cts/Android.bp @@ -61,7 +61,13 @@ java_test_host { per_testcase_directory: true, data: [ ":com.drawelements.deqp", + ":deqp_binary_data", + ":deqp_binary_data_vulkancts", + ":deqp_binary_data_graphicsfuzz", ":deqp_main_caselists", ":deqp_angle_exclude_caselists", ], + data_device_bins_both: [ + "deqp-binary", + ], } diff --git a/android/cts/AndroidTest.xml b/android/cts/AndroidTest.xml index 14b4aa48a..d47193312 100644 --- a/android/cts/AndroidTest.xml +++ b/android/cts/AndroidTest.xml @@ -22,6 +22,19 @@ <option name="cleanup-apks" value="true"/> <option name="test-file-name" value="com.drawelements.deqp.apk"/> </target_preparer> + <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher"> + <option name="cleanup" value="true"/> + <option name="disable" value="true"/> + <option name="push" value="deqp-binary32->/data/local/tmp/deqp-binary32"/> + <option name="push" value="deqp-binary64->/data/local/tmp/deqp-binary64"/> + <option name="push" value="gles2->/data/local/tmp/gles2"/> + <option name="push" value="gles3->/data/local/tmp/gles3"/> + <option name="push" value="gles3-incremental-deqp.txt->/data/local/tmp/gles3-incremental-deqp.txt"/> + <option name="push" value="gles31->/data/local/tmp/gles31"/> + <option name="push" value="internal->/data/local/tmp/internal"/> + <option name="push" value="vk-incremental-deqp.txt->/data/local/tmp/vk-incremental-deqp.txt"/> + <option name="push" value="vulkan->/data/local/tmp/vulkan"/> + </target_preparer> <target_preparer class="com.android.compatibility.common.tradefed.targetprep.IncrementalDeqpPreparer"> <option name="disable" value="true"/> </target_preparer> diff --git a/android/cts/main/src/vk-excluded-tests.txt b/android/cts/main/src/vk-excluded-tests.txt index 15bc958b1..e968f5f50 100644 --- a/android/cts/main/src/vk-excluded-tests.txt +++ b/android/cts/main/src/vk-excluded-tests.txt @@ -65,4 +65,8 @@ dEQP-VK.texture.conversion.snorm_clamp_linear.r16g16_snorm dEQP-VK.texture.conversion.snorm_clamp_linear.r16_snorm dEQP-VK.texture.conversion.snorm_clamp_linear.r8g8b8a8_snorm dEQP-VK.texture.conversion.snorm_clamp_linear.r8g8_snorm -dEQP-VK.texture.conversion.snorm_clamp_linear.r8_snorm
\ No newline at end of file +dEQP-VK.texture.conversion.snorm_clamp_linear.r8_snorm + +# VK-GL-CTS 3005 +dEQP-VK.ray_tracing_pipeline.build.cpuht*1048576_1_1 +dEQP-VK.ray_tracing_pipeline.build.cpuht*65536_4_4
\ No newline at end of file diff --git a/android/cts/main/vk-master/ray-tracing-pipeline.txt b/android/cts/main/vk-master/ray-tracing-pipeline.txt index 9bf6ec0c9..ffc2e840a 100644 --- a/android/cts/main/vk-master/ray-tracing-pipeline.txt +++ b/android/cts/main/vk-master/ray-tracing-pipeline.txt @@ -3552,26 +3552,21 @@ dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.triangles_16_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.triangles_256_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.triangles_4096_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.triangles_65536_1_1 -dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.triangles_1048576_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.triangles_1_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.triangles_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.triangles_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.triangles_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.triangles_65536_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.aabbs_16_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.aabbs_256_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.aabbs_4096_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.aabbs_65536_1_1 -dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.aabbs_1048576_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.aabbs_1_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.aabbs_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.aabbs_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.aabbs_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.aabbs_65536_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.mixed_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.mixed_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.mixed_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_instances.mixed_65536_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_primitives.triangles_1_1_16 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_primitives.triangles_1_1_256 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_primitives.triangles_1_1_4096 @@ -3624,26 +3619,21 @@ dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.triangles_16_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.triangles_256_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.triangles_4096_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.triangles_65536_1_1 -dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.triangles_1048576_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.triangles_1_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.triangles_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.triangles_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.triangles_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.triangles_65536_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.aabbs_16_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.aabbs_256_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.aabbs_4096_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.aabbs_65536_1_1 -dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.aabbs_1048576_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.aabbs_1_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.aabbs_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.aabbs_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.aabbs_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.aabbs_65536_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.mixed_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.mixed_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.mixed_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_2.level_instances.mixed_65536_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_primitives.triangles_1_1_16 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_primitives.triangles_1_1_256 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_primitives.triangles_1_1_4096 @@ -3696,26 +3686,21 @@ dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.triangles_16_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.triangles_256_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.triangles_4096_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.triangles_65536_1_1 -dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.triangles_1048576_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.triangles_1_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.triangles_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.triangles_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.triangles_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.triangles_65536_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.aabbs_16_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.aabbs_256_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.aabbs_4096_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.aabbs_65536_1_1 -dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.aabbs_1048576_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.aabbs_1_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.aabbs_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.aabbs_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.aabbs_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.aabbs_65536_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.mixed_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.mixed_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.mixed_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_3.level_instances.mixed_65536_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_primitives.triangles_1_1_16 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_primitives.triangles_1_1_256 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_primitives.triangles_1_1_4096 @@ -3768,26 +3753,21 @@ dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.triangles_16_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.triangles_256_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.triangles_4096_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.triangles_65536_1_1 -dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.triangles_1048576_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.triangles_1_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.triangles_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.triangles_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.triangles_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.triangles_65536_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.aabbs_16_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.aabbs_256_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.aabbs_4096_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.aabbs_65536_1_1 -dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.aabbs_1048576_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.aabbs_1_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.aabbs_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.aabbs_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.aabbs_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.aabbs_65536_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.mixed_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.mixed_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.mixed_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_4.level_instances.mixed_65536_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_primitives.triangles_1_1_16 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_primitives.triangles_1_1_256 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_primitives.triangles_1_1_4096 @@ -3840,26 +3820,21 @@ dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.triangles_16_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.triangles_256_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.triangles_4096_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.triangles_65536_1_1 -dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.triangles_1048576_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.triangles_1_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.triangles_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.triangles_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.triangles_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.triangles_65536_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.aabbs_16_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.aabbs_256_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.aabbs_4096_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.aabbs_65536_1_1 -dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.aabbs_1048576_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.aabbs_1_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.aabbs_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.aabbs_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.aabbs_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.aabbs_65536_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.mixed_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.mixed_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.mixed_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_8.level_instances.mixed_65536_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_primitives.triangles_1_1_16 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_primitives.triangles_1_1_256 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_primitives.triangles_1_1_4096 @@ -3912,26 +3887,21 @@ dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.triangles_16_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.triangles_256_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.triangles_4096_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.triangles_65536_1_1 -dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.triangles_1048576_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.triangles_1_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.triangles_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.triangles_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.triangles_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.triangles_65536_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.aabbs_16_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.aabbs_256_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.aabbs_4096_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.aabbs_65536_1_1 -dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.aabbs_1048576_1_1 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.aabbs_1_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.aabbs_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.aabbs_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.aabbs_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.aabbs_65536_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.mixed_16_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.mixed_256_4_4 dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.mixed_4096_4_4 -dEQP-VK.ray_tracing_pipeline.build.cpuht_max.level_instances.mixed_65536_4_4 dEQP-VK.ray_tracing_pipeline.barycentric_coordinates.ahit dEQP-VK.ray_tracing_pipeline.barycentric_coordinates.chit dEQP-VK.ray_tracing_pipeline.barrier.ubo.memory_barrier.from_host_to_rgen diff --git a/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java b/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java index e04207854..246785a81 100644 --- a/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java +++ b/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java @@ -86,6 +86,7 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest, private static final String DEQP_ONDEVICE_APK = "com.drawelements.deqp.apk"; private static final String DEQP_ONDEVICE_PKG = "com.drawelements.deqp"; private static final String INCOMPLETE_LOG_MESSAGE = "Crash: Incomplete test log"; + private static final String TIMEOUT_LOG_MESSAGE = "Timeout: Test timeout"; private static final String SKIPPED_INSTANCE_LOG_MESSAGE = "Configuration skipped"; private static final String NOT_EXECUTABLE_LOG_MESSAGE = "Abort: Test cannot be executed"; private static final String APP_DIR = "/sdcard/"; @@ -99,7 +100,7 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest, private static final int TESTCASE_BATCH_LIMIT = 1000; private static final int TESTCASE_BATCH_LIMIT_LARGE = 10000; - private static final int UNRESPONSIVE_CMD_TIMEOUT_MS = 10 * 60 * 1000; // 10min + private static final int UNRESPONSIVE_CMD_TIMEOUT_MS_DEFAULT = 10 * 60 * 1000; // 10min private static final int R_API_LEVEL = 30; private static final int DEQP_LEVEL_R_2020 = 132383489; @@ -110,6 +111,10 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest, // !NOTE: There's a static method copyOptions() for copying options during split. // If you add state update copyOptions() as appropriate! + @Option(name="timeout", + description="Timeout for unresponsive tests in milliseconds. Default: " + UNRESPONSIVE_CMD_TIMEOUT_MS_DEFAULT, + importance=Option.Importance.NEVER) + private long mUnresponsiveCmdTimeoutMs = UNRESPONSIVE_CMD_TIMEOUT_MS_DEFAULT; @Option(name="deqp-package", description="Name of the deqp module used. Determines GLES version.", importance=Option.Importance.ALWAYS) @@ -1390,6 +1395,12 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest, } } + private static final class AdbComLinkUnresponsiveError extends Exception { + public AdbComLinkUnresponsiveError(String description, Throwable inner) { + super(description, inner); + } + } + /** * Executes a given command in adb shell * @@ -1398,10 +1409,10 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest, */ private void executeShellCommandAndReadOutput(final String command, final IShellOutputReceiver receiver) - throws AdbComLinkOpenError, AdbComLinkKilledError { + throws AdbComLinkOpenError, AdbComLinkKilledError, AdbComLinkUnresponsiveError { try { mDevice.getIDevice().executeShellCommand(command, receiver, - UNRESPONSIVE_CMD_TIMEOUT_MS, TimeUnit.MILLISECONDS); + mUnresponsiveCmdTimeoutMs, TimeUnit.MILLISECONDS); } catch (TimeoutException ex) { // Opening connection timed out throw new AdbComLinkOpenError("opening connection timed out", ex); @@ -1413,7 +1424,7 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest, throw new AdbComLinkKilledError("command link killed", ex); } catch (ShellCommandUnresponsiveException ex) { // shell command halted - throw new AdbComLinkKilledError("command link hung", ex); + throw new AdbComLinkUnresponsiveError("command link was unresponsive for longer than requested timeout", ex); } } @@ -1537,9 +1548,14 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest, mDeviceRecovery.onExecutionProgressed(); } - // interrupted, try to recover + // interrupted either because of ADB or test timeout if (interruptingError != null) { - if (interruptingError instanceof AdbComLinkOpenError) { + + // AdbComLinkUnresponsiveError means the test has timeout during execution. + // Device is likely fine, so we won't attempt to recover the device. + if (interruptingError instanceof AdbComLinkUnresponsiveError) { + mInstanceListerner.abortTest(mInstanceListerner.getCurrentTestId(), TIMEOUT_LOG_MESSAGE); + } else if (interruptingError instanceof AdbComLinkOpenError) { mDeviceRecovery.recoverConnectionRefused(); } else if (interruptingError instanceof AdbComLinkKilledError) { mDeviceRecovery.recoverComLinkKilled(); @@ -2429,6 +2445,7 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest, } private static void copyOptions(DeqpTestRunner destination, DeqpTestRunner source) { + destination.mUnresponsiveCmdTimeoutMs = source.mUnresponsiveCmdTimeoutMs; destination.mDeqpPackage = source.mDeqpPackage; destination.mConfigName = source.mConfigName; destination.mCaselistFile = source.mCaselistFile; diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiMaintenance1Tests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiMaintenance1Tests.cpp index 1788bdbdc..e256b3cfe 100644 --- a/external/vulkancts/modules/vulkan/wsi/vktWsiMaintenance1Tests.cpp +++ b/external/vulkancts/modules/vulkan/wsi/vktWsiMaintenance1Tests.cpp @@ -625,17 +625,17 @@ deUint32 getIterations(std::vector<VkPresentModeKHR> presentModes, } } - // Return an iteration count that is as high as possible while keeping the test time reasonable. + // Return an iteration count that is as high as possible while keeping the test time and memory usage reasonable. // // - If FIFO is used, limit to 120 (~2s on 60Hz) - // - Else, if immediate/mailbox is used, limit to 3000 - // - Else, if shared is used, limit to 5000 + // - Else, limit to 1000 if (hasFifo) return testResizesWindowsFrequently ? 60 : 120; (void)hasShared; - deUint32 iterations = hasNoVsync ? 3000 : 5000; + (void)hasNoVsync; + deUint32 iterations = 1000; // If the test resizes windows frequently, reduce the testing time as that's a very slow operation. if (testResizesWindowsFrequently) diff --git a/framework/delibs/debase/deDefs.h b/framework/delibs/debase/deDefs.h index 93e46cfe3..4c6b1e9c8 100644 --- a/framework/delibs/debase/deDefs.h +++ b/framework/delibs/debase/deDefs.h @@ -347,6 +347,9 @@ DE_INLINE deBool deGetTrue (void) { return DE_TRUE; } /* Floating-point environment flag. */ #if defined(DE_FENV_ACCESS_ON) /* Already defined */ +#elif (DE_COMPILER == DE_COMPILER_CLANG) && (DE_CPU == DE_CPU_ARM) +//TODO(b/298204279): FENV_ACCESS is not supported, disabling all optimizations to make tests pass +# define DE_FENV_ACCESS_ON _Pragma("clang optimize off") #elif (DE_COMPILER == DE_COMPILER_CLANG) && (DE_CPU != DE_CPU_ARM) # define DE_FENV_ACCESS_ON _Pragma("STDC FENV_ACCESS ON") #elif (DE_COMPILER == DE_COMPILER_MSC) diff --git a/scripts/mustpass.py b/scripts/mustpass.py index c27d37f91..624249430 100644 --- a/scripts/mustpass.py +++ b/scripts/mustpass.py @@ -431,6 +431,19 @@ def genAndroidTestXml (mustpass): # Target preparer for incremental dEQP preparerElement = ElementTree.SubElement(configElement, "target_preparer") + preparerElement.set("class", "com.android.compatibility.common.tradefed.targetprep.FilePusher") + addOptionElement(preparerElement, "cleanup", "true") + addOptionElement(preparerElement, "disable", "true") + addOptionElement(preparerElement, "push", "deqp-binary32->/data/local/tmp/deqp-binary32") + addOptionElement(preparerElement, "push", "deqp-binary64->/data/local/tmp/deqp-binary64") + addOptionElement(preparerElement, "push", "gles2->/data/local/tmp/gles2") + addOptionElement(preparerElement, "push", "gles3->/data/local/tmp/gles3") + addOptionElement(preparerElement, "push", "gles3-incremental-deqp.txt->/data/local/tmp/gles3-incremental-deqp.txt") + addOptionElement(preparerElement, "push", "gles31->/data/local/tmp/gles31") + addOptionElement(preparerElement, "push", "internal->/data/local/tmp/internal") + addOptionElement(preparerElement, "push", "vk-incremental-deqp.txt->/data/local/tmp/vk-incremental-deqp.txt") + addOptionElement(preparerElement, "push", "vulkan->/data/local/tmp/vulkan") + preparerElement = ElementTree.SubElement(configElement, "target_preparer") preparerElement.set("class", "com.android.compatibility.common.tradefed.targetprep.IncrementalDeqpPreparer") addOptionElement(preparerElement, "disable", "true") |