AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWDEV-408843 - Fix vulkan_interop failure

Browse Source 
Fix vulkan_interop build issue on CMake so that
it can be integrated into catch2 batch build.
Fix some test failures.
Update some code format.

Change-Id: I32c9bed861ddf4fe0d7bba21dce9bd720168c397
This commit is contained in:
taosang2
2023-08-02 14:58:42 -04:00
committed by Rakesh Roy
parent 0f99950ba7
commit 8cc7ed5a03
9 changed files with 80 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
catch/unit/vulkan_interop/hipExternalMemoryGetMappedBuffer.cc
+11 -7
View File
@@ -32,7 +32,9 @@ TEST_CASE("Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Positive_Read_Write") {
const auto vk_storage =
vkt.CreateMappedStorage<type>(count, VK_BUFFER_USAGE_TRANSFER_DST_BIT, true);
if (vk_storage.memory == nullptr) {
return;
}
const auto hip_ext_mem_desc = vkt.BuildMemoryDescriptor(vk_storage.memory, vk_storage.size);
hipExternalMemory_t hip_ext_memory;
HIP_CHECK(hipImportExternalMemory(&hip_ext_memory, &hip_ext_mem_desc));
@@ -62,13 +64,11 @@ TEST_CASE("Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Positive_Read_Write") {
REQUIRE(42 == vk_storage.host_ptr[1]);
REQUIRE(43 == vk_storage.host_ptr[2]);
// Defect - EXSWHTEC-181
// HIP_CHECK(hipFree(hip_dev_ptr));
HIP_CHECK(hipFree(hip_dev_ptr));
HIP_CHECK(hipDestroyExternalMemory(hip_ext_memory));
}
// Disabled on AMD due to defect - EXSWHTEC-175
#if HT_NVIDIA
TEST_CASE("Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Positive_Read_Write_With_Offset") {
VulkanTest vkt(enable_validation);
using type = uint8_t;
@@ -76,6 +76,9 @@ TEST_CASE("Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Positive_Read_Write_With
const auto vk_storage =
vkt.CreateMappedStorage<type>(count, VK_BUFFER_USAGE_TRANSFER_DST_BIT, true);
if (vk_storage.memory == nullptr) {
return;
}
const auto hip_ext_mem_desc = vkt.BuildMemoryDescriptor(vk_storage.memory, vk_storage.size);
hipExternalMemory_t hip_ext_memory;
@@ -97,15 +100,16 @@ TEST_CASE("Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Positive_Read_Write_With
REQUIRE(42 == read_val);
// Defect - EXSWHTEC-181
// HIP_CHECK(hipFree(hip_dev_ptr));
HIP_CHECK(hipFree(hip_dev_ptr));
HIP_CHECK(hipDestroyExternalMemory(hip_ext_memory));
}
#endif
TEST_CASE("Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Negative_Parameters") {
VulkanTest vkt(enable_validation);
const auto vk_storage = vkt.CreateMappedStorage<int>(1, VK_BUFFER_USAGE_TRANSFER_DST_BIT, true);
if (vk_storage.memory == nullptr) {
return;
}
const auto hip_ext_mem_desc = vkt.BuildMemoryDescriptor(vk_storage.memory, vk_storage.size);
hipExternalMemory_t hip_ext_memory;
HIP_CHECK(hipImportExternalMemory(&hip_ext_memory, &hip_ext_mem_desc));