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

SWDEV-425248 - Fix Unit_ChannelDescriptor_Positive for long.

Browse Source 
Limit checks for long based on __LP64__ macro.
Changes are required after below PR got merged.
https://gerrit-git.amd.com/c/compute/ec/clr/+/870326

Change-Id: I51cbaf087a7ba98a441348a13091b92dbb97df21


[ROCm/hip-tests commit: e5d82f128d]
This commit is contained in:
Jaydeep Patel
2023-10-30 10:50:20 +00:00
committed by Rakesh Roy
parent b6ffd24006
commit 67ba110e4f
3 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/hip-tests/catch/hipTestMain/config/config_amd_linux
-10
View File
@@ -118,16 +118,6 @@
"Unit_hipMemcpyParam2DAsync_multiDevice-StreamOnDiffDevice",
"=== Below tests fail in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/96 ===",
"Unit_hipHostGetDevicePointer_Negative",
"=== Below tests fail in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/215 ===",
"Unit_ChannelDescriptor_Positive_Basic_1D - long",
"Unit_ChannelDescriptor_Positive_Basic_1D - unsigned long",
"Unit_ChannelDescriptor_Positive_Basic_1D - ulong1",
"Unit_ChannelDescriptor_Positive_Basic_1D - signed long",
"Unit_ChannelDescriptor_Positive_Basic_1D - long1",
"Unit_ChannelDescriptor_Positive_Basic_2D - ulong2",
"Unit_ChannelDescriptor_Positive_Basic_2D - long2",
"Unit_ChannelDescriptor_Positive_Basic_4D - ulong4",
"Unit_ChannelDescriptor_Positive_Basic_4D - long4",
"Unit_hipExtModuleLaunchKernel_NonUniformWorkGroup",
"=== Below tests fail in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/18 ===",
"Unit_hipMemcpyAsync_Negative_Parameters",
projects/hip-tests/catch/hipTestMain/config/config_amd_windows
-12
View File
@@ -207,18 +207,6 @@
"Unit_hipDeviceGetUuid_Positive",
"=== Below tests fail in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/96 ===",
"Unit_hipHostGetDevicePointer_Negative",
"=== Below tests fail in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/215 ===",
"Unit_ChannelDescriptor_Positive_Basic_1D - long",
"Unit_ChannelDescriptor_Positive_Basic_1D - unsigned long",
"Unit_ChannelDescriptor_Positive_Basic_1D - ulong1",
"Unit_ChannelDescriptor_Positive_Basic_1D - signed long",
"Unit_ChannelDescriptor_Positive_Basic_1D - long1",
"Unit_ChannelDescriptor_Positive_Basic_2D - ulong2",
"Unit_ChannelDescriptor_Positive_Basic_2D - long2",
"Unit_ChannelDescriptor_Positive_Basic_3D - ulong3",
"Unit_ChannelDescriptor_Positive_Basic_3D - long3",
"Unit_ChannelDescriptor_Positive_Basic_4D - ulong4",
"Unit_ChannelDescriptor_Positive_Basic_4D - long4",
"Unit_hipExtModuleLaunchKernel_NonUniformWorkGroup",
"=== Below tests fail in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/18 ===",
"Unit_hipMemcpyAsync_Negative_Parameters",
projects/hip-tests/catch/unit/channelDescriptor/channel_descriptor_common.hh
+16 -4
View File
@@ -88,7 +88,9 @@ template <typename T> class ChannelDescriptorTest1D : public ChannelDescriptorTe
} else if (std::is_same_v<float, T> || std::is_same_v<float1, T>) {
this->size = static_cast<int>(sizeof(float) * 8);
this->kind = hipChannelFormatKindFloat;
} else if (std::is_same_v<unsigned long, T> || std::is_same_v<ulong1, T>) {
}
#if !defined(__LP64__)
else if (std::is_same_v<unsigned long, T> || std::is_same_v<ulong1, T>) {
this->size = static_cast<int>(sizeof(unsigned long) * 8);
this->kind = hipChannelFormatKindUnsigned;
} else if (std::is_same_v<long, T> || std::is_same_v<signed long, T> ||
@@ -96,6 +98,7 @@ template <typename T> class ChannelDescriptorTest1D : public ChannelDescriptorTe
this->size = static_cast<int>(sizeof(signed long) * 8);
this->kind = hipChannelFormatKindSigned;
}
#endif
}
};
@@ -126,13 +129,16 @@ template <typename T> class ChannelDescriptorTest2D : public ChannelDescriptorTe
} else if (std::is_same_v<float2, T>) {
this->size = static_cast<int>(sizeof(float) * 8);
this->kind = hipChannelFormatKindFloat;
} else if (std::is_same_v<ulong2, T>) {
}
#if !defined(__LP64__)
else if (std::is_same_v<ulong2, T>) {
this->size = static_cast<int>(sizeof(unsigned long) * 8);
this->kind = hipChannelFormatKindUnsigned;
} else if (std::is_same_v<long2, T>) {
this->size = static_cast<int>(sizeof(signed long) * 8);
this->kind = hipChannelFormatKindSigned;
}
#endif
}
};
@@ -164,13 +170,16 @@ template <typename T> class ChannelDescriptorTest3D : public ChannelDescriptorTe
} else if (std::is_same_v<float3, T>) {
this->size = static_cast<int>(sizeof(float) * 8);
this->kind = hipChannelFormatKindFloat;
} else if (std::is_same_v<ulong3, T>) {
}
#if !defined(__LP64__)
else if (std::is_same_v<ulong3, T>) {
this->size = static_cast<int>(sizeof(unsigned long) * 8);
this->kind = hipChannelFormatKindUnsigned;
} else if (std::is_same_v<long3, T>) {
this->size = static_cast<int>(sizeof(signed long) * 8);
this->kind = hipChannelFormatKindSigned;
}
#endif
}
};
#endif
@@ -202,13 +211,16 @@ template <typename T> class ChannelDescriptorTest4D : public ChannelDescriptorTe
} else if (std::is_same_v<float4, T>) {
this->size = static_cast<int>(sizeof(float) * 8);
this->kind = hipChannelFormatKindFloat;
} else if (std::is_same_v<ulong4, T>) {
}
#if !defined(__LP64__)
else if (std::is_same_v<ulong4, T>) {
this->size = static_cast<int>(sizeof(unsigned long) * 8);
this->kind = hipChannelFormatKindUnsigned;
} else if (std::is_same_v<long4, T>) {
this->size = static_cast<int>(sizeof(signed long) * 8);
this->kind = hipChannelFormatKindSigned;
}
#endif
}
};