From 66467144d0f824115debcbb294e4fcb500990542 Mon Sep 17 00:00:00 2001 From: Aitor Camacho Date: Fri, 10 Mar 2023 17:41:36 +0100 Subject: Avoid watchdog timeout in dEQP-Vk.api.external.*.export_multiple_times_* Mentioned tests now take longer than watchdog's time limit for the interval. Affects: dEQP-VK.api.external.*.export_multiple_times_* Components: Vulkan VK-GL-CTS issue: 4331 Change-Id: I81abe9a30945cf2cfe4feb460f66a6dcdedbafcd --- external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp index 4c0ed0bf4..2c824824e 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp @@ -1418,6 +1418,9 @@ tcu::TestStatus testSemaphoreMultipleExports (Context& context, { NativeHandle handle; + // Need to touch watchdog due to how long one iteration takes + context.getTestContext().touchWatchdog(); + if (transference == TRANSFERENCE_COPY) { submitAtomicCalculationsAndGetSemaphoreNative(context, vkd, *device, alloc, queue, queueFamilyIndex, *semaphore, config.externalType, handle); @@ -2487,6 +2490,9 @@ tcu::TestStatus testFenceMultipleExports (Context& context, { NativeHandle handle; + // Need to touch watchdog due to how long one iteration takes + context.getTestContext().touchWatchdog(); + if (transference == TRANSFERENCE_COPY) { submitAtomicCalculationsAndGetFenceNative(context, vkd, *device, alloc, queue, queueFamilyIndex, *fence, config.externalType, handle, exportNdx == 0 /* expect fence to be signaled after first pass */); -- cgit v1.2.3 From e5e42d95242dfa1e1989ba284796639824d45e04 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 10 Mar 2023 11:23:56 +0000 Subject: Fix prettySize() in dEQP-VK.info.* The units were in the wrong order, leading to MiB being picked for all values below 1 TiB and above or equal to 1 MiB, skipping GiB. Adding an assert ensures that this stays correct in the future as well, as the comment was clearly not enough. Components: Vulkan Affects: dEQP-VK.info.memory_limits Change-Id: Ie9ccc14ee8ef703e197af8e5c31387deba1dd1d4 --- external/vulkancts/modules/vulkan/vktInfoTests.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/external/vulkancts/modules/vulkan/vktInfoTests.cpp b/external/vulkancts/modules/vulkan/vktInfoTests.cpp index 63052c948..7dddfefcc 100644 --- a/external/vulkancts/modules/vulkan/vktInfoTests.cpp +++ b/external/vulkancts/modules/vulkan/vktInfoTests.cpp @@ -29,6 +29,7 @@ #include "tcuFormatUtil.hpp" #include "tcuCommandLine.hpp" #include "tcuPlatform.hpp" +#include "deDefs.h" #include "deStringUtil.hpp" #include "vktApiFeatureInfo.hpp" @@ -180,14 +181,16 @@ const SizeUnit* getBestSizeUnit (deUint64 value) { // \note Must be ordered from largest to smallest { "TiB", 1ull<<40ull }, - { "MiB", 1ull<<20ull }, { "GiB", 1ull<<30ull }, + { "MiB", 1ull<<20ull }, { "KiB", 1ull<<10ull }, }; static const SizeUnit s_defaultUnit = { "B", 1u }; for (int ndx = 0; ndx < DE_LENGTH_OF_ARRAY(s_units); ++ndx) { + DE_ASSERT(ndx == DE_LENGTH_OF_ARRAY(s_units) || + s_units[ndx].value > s_units[ndx + 1].value); if (value >= s_units[ndx].value) return &s_units[ndx]; } -- cgit v1.2.3