Remove the tests with too large device AS build workload
This removes the tests that submit accelleration structure
builds with 1048576 instances * geometries * 'squares'.
The accelleation structure builds performed by these tests
were too long and may hit the device timeout imposed by
the operating system.
Components: Vulkan
VK-GL-CTS Issue: 2849
Removed Tests:
dEQP-VK.ray_tracing_pipeline.build.gpu*_1_1_1048576
dEQP-VK.ray_tracing_pipeline.build.gpu*_1_1048576_1
dEQP-VK.ray_tracing_pipeline.build.gpu*_1_1048576_1
dEQP-VK.ray_tracing_pipeline.build.gpu*_4_4_65536
dEQP-VK.ray_tracing_pipeline.build.gpu*_4_65536_4
dEQP-VK.ray_tracing_pipeline.build.gpu*_65536_4_4
Change-Id: Ief53cc01da4f749fd8a030bd8e2ebb5652208ce4
diff --git a/android/cts/master/vk-master-2021-03-01.txt b/android/cts/master/vk-master-2021-03-01.txt
index 14f4fef..138289e 100644
--- a/android/cts/master/vk-master-2021-03-01.txt
+++ b/android/cts/master/vk-master-2021-03-01.txt
@@ -234877,74 +234877,59 @@
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.triangles_1_1_256
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.triangles_1_1_4096
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.triangles_1_1_65536
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.triangles_1_1_1048576
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.triangles_4_4_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.triangles_4_4_16
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.triangles_4_4_256
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.triangles_4_4_4096
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.triangles_4_4_65536
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.aabbs_1_1_16
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.aabbs_1_1_256
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.aabbs_1_1_4096
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.aabbs_1_1_65536
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.aabbs_1_1_1048576
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.aabbs_4_4_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.aabbs_4_4_16
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.aabbs_4_4_256
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.aabbs_4_4_4096
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.aabbs_4_4_65536
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.mixed_4_4_16
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.mixed_4_4_256
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.mixed_4_4_4096
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_primitives.mixed_4_4_65536
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.triangles_1_16_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.triangles_1_256_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.triangles_1_4096_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.triangles_1_65536_1
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.triangles_1_1048576_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.triangles_4_1_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.triangles_4_16_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.triangles_4_256_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.triangles_4_4096_4
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.triangles_4_65536_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.aabbs_1_16_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.aabbs_1_256_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.aabbs_1_4096_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.aabbs_1_65536_1
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.aabbs_1_1048576_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.aabbs_4_1_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.aabbs_4_16_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.aabbs_4_256_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.aabbs_4_4096_4
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.aabbs_4_65536_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.mixed_4_16_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.mixed_4_256_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.mixed_4_4096_4
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_geometries.mixed_4_65536_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.triangles_16_1_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.triangles_256_1_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.triangles_4096_1_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.triangles_65536_1_1
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.triangles_1048576_1_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.triangles_1_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.triangles_16_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.triangles_256_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.triangles_4096_4_4
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.triangles_65536_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.aabbs_16_1_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.aabbs_256_1_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.aabbs_4096_1_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.aabbs_65536_1_1
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.aabbs_1048576_1_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.aabbs_1_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.aabbs_16_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.aabbs_256_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.aabbs_4096_4_4
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.aabbs_65536_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.mixed_16_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.mixed_256_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.mixed_4096_4_4
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpuht.level_instances.mixed_65536_4_4
dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_primitives.triangles_1_1_16
dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_primitives.triangles_1_1_256
dEQP-VK.ray_tracing_pipeline.build.cpuht_1.level_primitives.triangles_1_1_4096
@@ -235381,74 +235366,59 @@
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.triangles_1_1_256
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.triangles_1_1_4096
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.triangles_1_1_65536
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.triangles_1_1_1048576
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.triangles_4_4_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.triangles_4_4_16
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.triangles_4_4_256
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.triangles_4_4_4096
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.triangles_4_4_65536
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.aabbs_1_1_16
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.aabbs_1_1_256
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.aabbs_1_1_4096
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.aabbs_1_1_65536
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.aabbs_1_1_1048576
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.aabbs_4_4_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.aabbs_4_4_16
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.aabbs_4_4_256
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.aabbs_4_4_4096
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.aabbs_4_4_65536
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.mixed_4_4_16
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.mixed_4_4_256
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.mixed_4_4_4096
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_primitives.mixed_4_4_65536
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.triangles_1_16_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.triangles_1_256_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.triangles_1_4096_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.triangles_1_65536_1
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.triangles_1_1048576_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.triangles_4_1_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.triangles_4_16_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.triangles_4_256_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.triangles_4_4096_4
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.triangles_4_65536_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.aabbs_1_16_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.aabbs_1_256_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.aabbs_1_4096_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.aabbs_1_65536_1
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.aabbs_1_1048576_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.aabbs_4_1_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.aabbs_4_16_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.aabbs_4_256_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.aabbs_4_4096_4
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.aabbs_4_65536_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.mixed_4_16_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.mixed_4_256_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.mixed_4_4096_4
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_geometries.mixed_4_65536_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.triangles_16_1_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.triangles_256_1_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.triangles_4096_1_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.triangles_65536_1_1
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.triangles_1048576_1_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.triangles_1_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.triangles_16_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.triangles_256_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.triangles_4096_4_4
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.triangles_65536_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.aabbs_16_1_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.aabbs_256_1_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.aabbs_4096_1_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.aabbs_65536_1_1
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.aabbs_1048576_1_1
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.aabbs_1_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.aabbs_16_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.aabbs_256_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.aabbs_4096_4_4
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.aabbs_65536_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.mixed_16_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.mixed_256_4_4
dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.mixed_4096_4_4
-dEQP-VK.ray_tracing_pipeline.build.gpu_cpu.level_instances.mixed_65536_4_4
dEQP-VK.ray_tracing_pipeline.callable_shader.rgen_call
dEQP-VK.ray_tracing_pipeline.callable_shader.rgen_call_call
dEQP-VK.ray_tracing_pipeline.callable_shader.hit_call
diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index e7cb0dd..9582cb6 100644
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
Binary files differ
diff --git a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildTests.cpp b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildTests.cpp
index e9dee95..26613b7 100644
--- a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildTests.cpp
+++ b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildTests.cpp
@@ -615,6 +615,9 @@
const string groupDesc = !defferedOperation ? "Compare results of run with acceleration structures build on GPU and CPU"
: threadsCount > 0 ? "Compare results of run with acceleration structures build on GPU and using host threading"
: "Run acceleration structures build using host threading";
+
+ const bool deviceBuild = !defferedOperation || threadsCount == 0;
+
de::MovePtr<tcu::TestCaseGroup> groupGpuCpuHt (new tcu::TestCaseGroup(testCtx, groupName.c_str(), groupDesc.c_str()));
for (size_t testsNdx = 0; testsNdx < DE_LENGTH_OF_ARRAY(tests); ++testsNdx)
@@ -624,6 +627,9 @@
for (size_t factorNdx = 0; factorNdx < DE_LENGTH_OF_ARRAY(factors); ++factorNdx)
for (size_t sizesNdx = 0; sizesNdx < DE_LENGTH_OF_ARRAY(sizes); ++sizesNdx)
{
+ if (deviceBuild && sizes[sizesNdx] > 256)
+ continue;
+
const deUint32 factor = factors[factorNdx];
const deUint32 largestGroup = sizes[sizesNdx] * sizes[sizesNdx] / factor / factor;
const deUint32 squaresGroupCount = testsNdx == 0 ? largestGroup : factor;
@@ -652,6 +658,9 @@
for (size_t factorNdx = 0; factorNdx < DE_LENGTH_OF_ARRAY(factors); ++factorNdx)
for (size_t sizesNdx = 0; sizesNdx < DE_LENGTH_OF_ARRAY(sizes); ++sizesNdx)
{
+ if (deviceBuild && sizes[sizesNdx] > 256)
+ continue;
+
const deUint32 factor = factors[factorNdx];
const deUint32 largestGroup = sizes[sizesNdx] * sizes[sizesNdx] / factor / factor;
const deUint32 squaresGroupCount = testsNdx == 0 ? largestGroup : factor;
@@ -680,6 +689,9 @@
for (size_t factorNdx = 0; factorNdx < DE_LENGTH_OF_ARRAY(factors); ++factorNdx)
for (size_t sizesNdx = 0; sizesNdx < DE_LENGTH_OF_ARRAY(sizes); ++sizesNdx)
{
+ if (deviceBuild && sizes[sizesNdx] > 256)
+ continue;
+
const deUint32 factor = factors[factorNdx];
const deUint32 largestGroup = sizes[sizesNdx] * sizes[sizesNdx] / factor / factor;
const deUint32 squaresGroupCount = testsNdx == 0 ? largestGroup : factor;
diff --git a/external/vulkancts/mustpass/master/vk-default.txt b/external/vulkancts/mustpass/master/vk-default.txt
index 58b1df5..57094a2 100644
--- a/external/vulkancts/mustpass/master/vk-default.txt
+++ b/external/vulkancts/mustpass/master/vk-default.txt
Binary files differ
