From 6436ec7a1e1c202e5fefe5b55721c27ce780c243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Jastrz=C4=99bski?=
Date: Fri, 23 Jun 2023 13:29:13 +0200
Subject: [PATCH] Fix review comments for synchoronisation simplification for
remaining tests.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Paweł Jastrzębski
---
.../vulkan/test_vulkan_interop_buffer.cpp | 102 +++++++-----------
1 file changed, 36 insertions(+), 66 deletions(-)
diff --git a/test_conformance/vulkan/test_vulkan_interop_buffer.cpp b/test_conformance/vulkan/test_vulkan_interop_buffer.cpp
index b1eff5002..c141bbaee 100644
--- a/test_conformance/vulkan/test_vulkan_interop_buffer.cpp
+++ b/test_conformance/vulkan/test_vulkan_interop_buffer.cpp
@@ -901,24 +901,17 @@ int run_test_with_multi_import_same_ctx(
for (uint32_t iter = 0; iter < maxIter; iter++)
{
- if (iter == 0)
+ if (use_fence)
{
- if (use_fence)
- {
- fence->reset();
- vkQueue.submit(vkCommandBuffer, fence);
- }
- else
- {
- vkQueue.submit(vkCommandBuffer, vkVk2CLSemaphore);
- }
+ fence->reset();
+ vkQueue.submit(vkCommandBuffer, fence);
+ fence->wait();
}
else
{
- if (use_fence)
+ if (iter == 0)
{
- fence->reset();
- vkQueue.submit(vkCommandBuffer, fence);
+ vkQueue.submit(vkCommandBuffer, vkVk2CLSemaphore);
}
else
{
@@ -968,16 +961,13 @@ int run_test_with_multi_import_same_ctx(
goto CLEANUP;
}
}
- if (iter != (maxIter - 1))
+ if (use_fence)
{
- if (use_fence)
- {
- clFinish(cmd_queue1);
- }
- else
- {
- clCl2VkExternalSemaphore->signal(cmd_queue1);
- }
+ clFinish(cmd_queue1);
+ }
+ else if (!!use_fence && iter != (maxIter - 1))
+ {
+ clCl2VkExternalSemaphore->signal(cmd_queue1);
}
}
error_2 = (uint8_t *)malloc(sizeof(uint8_t));
@@ -1309,24 +1299,17 @@ int run_test_with_multi_import_diff_ctx(
for (uint32_t iter = 0; iter < maxIter; iter++)
{
- if (iter == 0)
+ if (use_fence)
{
- if (use_fence)
- {
- fence->reset();
- vkQueue.submit(vkCommandBuffer, fence);
- }
- else
- {
- vkQueue.submit(vkCommandBuffer, vkVk2CLSemaphore);
- }
+ fence->reset();
+ vkQueue.submit(vkCommandBuffer, fence);
+ fence->wait();
}
else
{
- if (use_fence)
+ if (iter == 0)
{
- fence->reset();
- vkQueue.submit(vkCommandBuffer, fence);
+ vkQueue.submit(vkCommandBuffer, vkVk2CLSemaphore);
}
else
{
@@ -1376,39 +1359,29 @@ int run_test_with_multi_import_diff_ctx(
goto CLEANUP;
}
}
- if (iter != (maxIter - 1))
+ if (use_fence)
{
- if (use_fence)
- {
- clFinish(cmd_queue1);
- }
- else
- {
- clCl2VkExternalSemaphore->signal(cmd_queue1);
- }
+ clFinish(cmd_queue1);
+ }
+ else if (!use_fence && iter != (maxIter - 1))
+ {
+ clCl2VkExternalSemaphore->signal(cmd_queue1);
}
}
clFinish(cmd_queue1);
for (uint32_t iter = 0; iter < maxIter; iter++)
{
- if (iter == 0)
+ if (use_fence)
{
- if (use_fence)
- {
- fence->reset();
- vkQueue.submit(vkCommandBuffer, fence);
- }
- else
- {
- vkQueue.submit(vkCommandBuffer, vkVk2CLSemaphore);
- }
+ fence->reset();
+ vkQueue.submit(vkCommandBuffer, fence);
+ fence->wait();
}
else
{
- if (use_fence)
+ if (iter == 0)
{
- fence->reset();
- vkQueue.submit(vkCommandBuffer, fence);
+ vkQueue.submit(vkCommandBuffer, vkVk2CLSemaphore);
}
else
{
@@ -1458,16 +1431,13 @@ int run_test_with_multi_import_diff_ctx(
goto CLEANUP;
}
}
- if (iter != (maxIter - 1))
+ if (use_fence)
{
- if (use_fence)
- {
- clFinish(cmd_queue2);
- }
- else
- {
- clCl2VkExternalSemaphore2->signal(cmd_queue2);
- }
+ clFinish(cmd_queue2);
+ }
+ else if (!use_fence && iter != (maxIter - 1))
+ {
+ clCl2VkExternalSemaphore2->signal(cmd_queue2);
}
}
clFinish(cmd_queue2);