AI/rocm-systems
2
0
Fork 0
Code Issues Pull-Requests Actions Pakete Projekte Releases Wiki Aktivität

SWDEV-546350 - [catch2][dtest] Test cases for hipMemPrefetchAsync_v2 and hipMemAdvise_v2 (#664)

Quellcode durchsuchen 
* SWDEV-546350 - [catch2][dtest] Test cases for hipMemPrefetchAsync_v2 and hipMemAdvice_v2

* SWDEV-546350 - Enable tests for NVIDIA, Guard failing tests

* SWDEV-546350 - Add checks for Managed Memory Support

* SWDEV-546350 - Gaurded Numa related things against windows

* SWDEV-546350 - Removed some scenarios which needs fixes, gaurded for NVIDIA

* SWDEV-546350 - Incorporated review comments

* SWDEV-546350 - Corrected File name

* SWDEV-546350 - Resetted to default device, modifed initial data filling ways

---------

Co-authored-by: jainprad <92369414+jainprad@users.noreply.github.com>
Dieser Commit ist enthalten in:
swargamrambabu
2025-10-06 16:59:21 +05:30
committet von GitHub
Ursprung 98d6d268a0
Commit e7e38d87f7
3 geänderte Dateien mit 667 neuen und 1 gelöschten Zeilen
Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen
projects/hip-tests/catch/unit/memory/CMakeLists.txt
+14 -1
Datei anzeigen
@@ -106,7 +106,10 @@ if(HIP_PLATFORM MATCHES "amd")
hipMemVmm.cc
hipArray.cc
hipMemcpyDeviceToDeviceNoCU.cc
hipGetProcAddressMemoryApis.cc)
hipGetProcAddressMemoryApis.cc
# Will be enabled for NVIDIA after fix for SWDEV-551244
hipMemPrefetchAsync_v2.cc
hipMemAdvise_v2.cc)
if(UNIX)
# Should be compiled for NVIDIA as well after EXSWHTEC-346 is addressed
# For windows build error occurs undefined symbol: hipPointerSetAttribute
@@ -120,6 +123,16 @@ hip_add_exe_to_target(NAME MemoryTest1
TEST_SRC ${TEST_SRC}
TEST_TARGET_NAME build_tests COMMON_SHARED_SRC ${COMMON_SHARED_SRC})
if(UNIX)
# link libnuma for numa_available(), numa_max_node(), move_pages(), etc.
find_library(NUMA_LIB numa)
if(NUMA_LIB)
target_link_libraries(MemoryTest1 ${NUMA_LIB})
else()
message(WARNING "libnuma not found; HostNuma tests will fail to link")
endif()
endif()
if(HIP_PLATFORM MATCHES "amd")
set_source_files_properties(hipHostRegister.cc PROPERTIES COMPILE_FLAGS -std=c++17)
add_executable(hipHostRegisterPerf EXCLUDE_FROM_ALL hipHostRegister_exe.cc)
projects/hip-tests/catch/unit/memory/hipMemAdvise_v2.cc
+296
Datei anzeigen
@@ -0,0 +1,296 @@
/*
Copyright (c) 2025 Advanced Micro Devices, Inc. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include <hip_test_common.hh>
#include <utils.hh>
#if __linux__
#include <numa.h>
#include <numaif.h>
#endif
/**
* Kernel to fill value for each element in the given array
*/
static __global__ void fillDataKernel(int *arr, int value) {
arr[threadIdx.x] = value;
}
/**
* Kernel to copy data from source array to destination array
*/
static __global__ void copyDataKernel(int *dstArr, int *srcArr) {
dstArr[threadIdx.x] = srcArr[threadIdx.x];
}
/**
* Helper function to get the list of devices which supports
* Managed memory
*/
static std::vector<int> getSupportedDevices() {
const auto deviceCount = HipTest::getDeviceCount();
std::vector<int> supportedDevices;
supportedDevices.reserve(deviceCount + 1);
for (int i = 0; i < deviceCount; ++i) {
if (DeviceAttributesSupport(i, hipDeviceAttributeManagedMemory,
hipDeviceAttributeConcurrentManagedAccess)) {
supportedDevices.push_back(i);
}
}
return supportedDevices;
}
/**
* Test Description
* ------------------------
* - This test case checks the following scenarios
* - 1) With Location type Device
* - 2) With Location type Host
* Test source
* ------------------------
* - unit/memory/hipMemAdvise_v2.cc
* Test requirements
* ------------------------
* - HIP_VERSION >= 7.1
*/
TEST_CASE("Unit_hipMemAdvise_v2_Device_Host") {
auto supportedDevices = getSupportedDevices();
if (supportedDevices.empty()) {
HipTest::HIP_SKIP_TEST(
"Test need at least one device with managed memory support");
}
HIP_CHECK(hipSetDevice(supportedDevices[0]));
constexpr int N = 1024;
constexpr int Nbytes = N * sizeof(int);
constexpr int value = 10;
int *memPtr = nullptr;
HIP_CHECK(hipMallocManaged(reinterpret_cast<void **>(&memPtr), Nbytes,
hipMemAttachGlobal));
REQUIRE(memPtr != nullptr);
SECTION("With Device") {
std::fill_n(memPtr, N, value);
for (int deviceId : supportedDevices) {
HIP_CHECK(hipSetDevice(deviceId));
hipMemLocation location;
location.type = hipMemLocationTypeDevice;
location.id = deviceId;
HIP_CHECK(
hipMemAdvise_v2(memPtr, Nbytes, hipMemAdviseSetReadMostly, location));
int *devArr = nullptr;
HIP_CHECK(hipMalloc(&devArr, Nbytes));
REQUIRE(devArr != nullptr);
copyDataKernel<<<1, N>>>(devArr, memPtr);
int hostArr[N];
HIP_CHECK(hipMemcpy(hostArr, devArr, Nbytes, hipMemcpyDeviceToHost));
HIP_CHECK(hipDeviceSynchronize());
for (int i = 0; i < N; i++) {
INFO("For Device " << deviceId << " At index " << i
<< " Expected value = " << value
<< " Got value = " << hostArr[i]);
REQUIRE(hostArr[i] == value);
}
HIP_CHECK(hipFree(devArr));
}
}
SECTION("With Host") {
fillDataKernel<<<1, N>>>(memPtr, value);
HIP_CHECK(hipDeviceSynchronize());
hipMemLocation location;
location.type = hipMemLocationTypeHost;
HIP_CHECK(
hipMemAdvise_v2(memPtr, Nbytes, hipMemAdviseSetReadMostly, location));
for (int i = 0; i < N; i++) {
INFO("At index " << i << " Expected value = " << value
<< " Got value = " << memPtr[i]);
REQUIRE(memPtr[i] == value);
}
}
HIP_CHECK(hipFree(memPtr));
// Reset to default device
HIP_CHECK(hipSetDevice(0));
}
/**
* Test Description
* ------------------------
* - This test case checks the following scenarios
* - 1) With Location type Host Numa
* - 2) With Location type Host Numa Current
* Test source
* ------------------------
* - unit/memory/hipMemAdvise_v2.cc
* Test requirements
* ------------------------
* - HIP_VERSION >= 7.1
*/
#if __linux__
TEST_CASE("Unit_hipMemAdvise_v2_HostNuma_HostNumaCurrent") {
auto supportedDevices = getSupportedDevices();
if (supportedDevices.empty() || numa_available() < 0) {
HipTest::HIP_SKIP_TEST("Skipping as System does not have managed memory "
"supported devices or No Numa nodes in system");
}
HIP_CHECK(hipSetDevice(supportedDevices[0]));
int maxNode = numa_max_node();
REQUIRE(maxNode >= 0);
constexpr int N = 1024;
constexpr int Nbytes = N * sizeof(int);
constexpr int value = 10;
int *memPtr = nullptr;
HIP_CHECK(hipMallocManaged(reinterpret_cast<void **>(&memPtr), Nbytes,
hipMemAttachGlobal));
REQUIRE(memPtr != nullptr);
fillDataKernel<<<1, N>>>(memPtr, value);
HIP_CHECK(hipDeviceSynchronize());
SECTION("With Host NUMA") {
for (int node = 0; node <= maxNode; ++node) {
hipMemLocation location;
location.type = hipMemLocationTypeHostNuma;
location.id = node;
HIP_CHECK(
hipMemAdvise_v2(memPtr, Nbytes, hipMemAdviseSetReadMostly, location));
for (int i = 0; i < N; i++) {
INFO("For Node " << node << " At index " << i << " Expected value = "
<< value << " Got value = " << memPtr[i]);
REQUIRE(memPtr[i] == value);
}
}
}
SECTION("With Host Numa Current") {
hipMemLocation location;
location.type = hipMemLocationTypeHostNumaCurrent;
HIP_CHECK(
hipMemAdvise_v2(memPtr, Nbytes, hipMemAdviseSetReadMostly, location));
for (int i = 0; i < N; i++) {
INFO("At index " << i << " Expected value = " << value
<< " Got value = " << memPtr[i]);
REQUIRE(memPtr[i] == value);
}
}
HIP_CHECK(hipFree(memPtr));
// Reset to default device
HIP_CHECK(hipSetDevice(0));
}
#endif
/**
* Test Description
* ------------------------
* - This test case checks the following Negative scenarios
* - 1) With dev_ptr as nullptr
* - 2) With count 0
* - 3) With count larger than actual size
* - 4) With invalid numa node
* - 5) With Invalid Advise
* Test source
* ------------------------
* - unit/memory/hipMemAdvise_v2.cc
* Test requirements
* ------------------------
* - HIP_VERSION >= 7.1
*/
TEST_CASE("Unit_hipMemAdvise_v2_Negative") {
auto supportedDevices = getSupportedDevices();
if (supportedDevices.empty()) {
HipTest::HIP_SKIP_TEST(
"Test need at least one device with managed memory support");
}
HIP_CHECK(hipSetDevice(supportedDevices[0]));
constexpr int N = 16;
constexpr int Nbytes = N * sizeof(int);
void *memPtr = nullptr;
HIP_CHECK(hipMallocManaged(&memPtr, Nbytes, hipMemAttachGlobal));
REQUIRE(memPtr != nullptr);
hipMemLocation location;
location.type = hipMemLocationTypeDevice;
SECTION("With dev_ptr as nullptr") {
HIP_CHECK_ERROR(
hipMemAdvise_v2(nullptr, Nbytes, hipMemAdviseSetReadMostly, location),
hipErrorInvalidValue);
}
SECTION("With count 0") {
HIP_CHECK_ERROR(
hipMemAdvise_v2(memPtr, 0, hipMemAdviseSetReadMostly, location),
hipErrorInvalidValue);
}
SECTION("With count larger than actual size") {
HIP_CHECK_ERROR(hipMemAdvise_v2(memPtr, Nbytes + 10,
hipMemAdviseSetReadMostly, location),
hipErrorInvalidValue);
}
SECTION("With Invalid location -1") {
hipMemLocation location;
location.type = static_cast<hipMemLocationType>(-1);
HIP_CHECK_ERROR(
hipMemAdvise_v2(memPtr, Nbytes, hipMemAdviseSetReadMostly, location),
hipErrorInvalidValue);
}
SECTION("With Invalid Advise") {
hipMemLocation location;
location.type = hipMemLocationTypeDevice;
location.id = 0;
hipMemoryAdvise advise = static_cast<hipMemoryAdvise>(-1);
HIP_CHECK_ERROR(hipMemAdvise_v2(memPtr, Nbytes, advise, location),
hipErrorInvalidValue);
}
HIP_CHECK(hipFree(memPtr));
// Reset to default device
HIP_CHECK(hipSetDevice(0));
}
projects/hip-tests/catch/unit/memory/hipMemPrefetchAsync_v2.cc
+357
Datei anzeigen
@@ -0,0 +1,357 @@
/*
Copyright (c) 2025 Advanced Micro Devices, Inc. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include <hip_test_common.hh>
#include <utils.hh>
#if __linux__
#include <numa.h>
#include <numaif.h>
#endif
/**
* Kernel to fill value for each element in the given array
*/
static __global__ void fillDataKernel(int *arr, int value) {
arr[threadIdx.x] = value;
}
/**
* Kernel to copy data from source array to destination array
*/
static __global__ void copyDataKernel(int *dstArr, int *srcArr) {
dstArr[threadIdx.x] = srcArr[threadIdx.x];
}
/**
* Helper function to get the list of devices which supports
* Managed memory
*/
static std::vector<int> getSupportedDevices() {
const auto deviceCount = HipTest::getDeviceCount();
std::vector<int> supportedDevices;
supportedDevices.reserve(deviceCount + 1);
for (int i = 0; i < deviceCount; ++i) {
if (DeviceAttributesSupport(i, hipDeviceAttributeManagedMemory,
hipDeviceAttributeConcurrentManagedAccess)) {
supportedDevices.push_back(i);
}
}
return supportedDevices;
}
/**
* Test Description
* ------------------------
* - This test case checks the following scenarios
* - 1) With Location type Device
* - 2) With Location type Host
* Test source
* ------------------------
* - unit/memory/hipMemPrefetchAsync_v2.cc
* Test requirements
* ------------------------
* - HIP_VERSION >= 7.1
*/
TEST_CASE("Unit_hipMemPrefetchAsync_v2_Device_Host") {
auto supportedDevices = getSupportedDevices();
if (supportedDevices.empty()) {
HipTest::HIP_SKIP_TEST(
"Test need at least one device with managed memory support");
}
HIP_CHECK(hipSetDevice(supportedDevices[0]));
constexpr int N = 1024;
constexpr int Nbytes = N * sizeof(int);
constexpr int value = 10;
int *memPtr = nullptr;
hipStream_t stream;
HIP_CHECK(hipStreamCreate(&stream));
HIP_CHECK(hipMallocManaged(reinterpret_cast<void **>(&memPtr), Nbytes,
hipMemAttachGlobal));
REQUIRE(memPtr != nullptr);
SECTION("With Device") {
int currentValue = value;
std::fill_n(memPtr, N, value);
for (int deviceId : supportedDevices) {
HIP_CHECK(hipSetDevice(deviceId));
hipMemLocation location;
location.type = hipMemLocationTypeDevice;
location.id = deviceId;
HIP_CHECK(hipMemPrefetchAsync_v2(memPtr, Nbytes, location, 0, stream));
HIP_CHECK(hipStreamSynchronize(stream));
int *devArr = nullptr;
HIP_CHECK(hipMalloc(&devArr, Nbytes));
REQUIRE(devArr != nullptr);
copyDataKernel<<<1, N>>>(devArr, memPtr);
int hostArr[N];
HIP_CHECK(hipMemcpy(hostArr, devArr, Nbytes, hipMemcpyDeviceToHost));
HIP_CHECK(hipDeviceSynchronize());
for (int i = 0; i < N; i++) {
INFO("For Device " << deviceId << " At index " << i
<< " Expected value = " << currentValue
<< " Got value = " << hostArr[i]);
REQUIRE(hostArr[i] == currentValue);
}
currentValue = currentValue + 1;
fillDataKernel<<<1, N>>>(memPtr, currentValue);
HIP_CHECK(hipDeviceSynchronize());
for (int i = 0; i < N; i++) {
INFO("At index " << i << " Expected value = " << currentValue
<< " Got value = " << memPtr[i]);
REQUIRE(memPtr[i] == currentValue);
}
HIP_CHECK(hipFree(devArr));
}
}
SECTION("With Host") {
fillDataKernel<<<1, N>>>(memPtr, value);
HIP_CHECK(hipDeviceSynchronize());
hipMemLocation location;
location.type = hipMemLocationTypeHost;
HIP_CHECK(hipMemPrefetchAsync_v2(memPtr, Nbytes, location, 0, stream));
HIP_CHECK(hipStreamSynchronize(stream));
for (int i = 0; i < N; i++) {
INFO("At index " << i << " Expected value = " << value
<< " Got value = " << memPtr[i]);
REQUIRE(memPtr[i] == value);
}
constexpr int newValue = 20;
std::fill_n(memPtr, N, newValue);
for (int i = 0; i < N; i++) {
INFO("At index " << i << " Expected value = " << newValue
<< " Got value = " << memPtr[i]);
REQUIRE(memPtr[i] == newValue);
}
}
HIP_CHECK(hipStreamDestroy(stream));
HIP_CHECK(hipFree(memPtr));
// Reset to default device
HIP_CHECK(hipSetDevice(0));
}
/**
* Test Description
* ------------------------
* - This test case checks the following scenarios
* - 1) With Location type Host Numa
* - 2) With Location type Host Numa Current
* Test source
* ------------------------
* - unit/memory/hipMemPrefetchAsync_v2.cc
* Test requirements
* ------------------------
* - HIP_VERSION >= 7.1
*/
#if __linux__
TEST_CASE("Unit_hipMemPrefetchAsync_v2_HostNuma_HostNumaCurrent") {
auto supportedDevices = getSupportedDevices();
if (supportedDevices.empty() || numa_available() < 0) {
HipTest::HIP_SKIP_TEST("Skipping as System does not have managed memory "
"supported devices or No Numa nodes in system");
}
HIP_CHECK(hipSetDevice(supportedDevices[0]));
int maxNode = numa_max_node();
REQUIRE(maxNode >= 0);
constexpr int N = 1024;
constexpr int Nbytes = N * sizeof(int);
constexpr int value = 10;
int *memPtr = nullptr;
hipStream_t stream;
HIP_CHECK(hipStreamCreate(&stream));
HIP_CHECK(hipMallocManaged(reinterpret_cast<void **>(&memPtr), Nbytes,
hipMemAttachGlobal));
REQUIRE(memPtr != nullptr);
fillDataKernel<<<1, N>>>(memPtr, value);
HIP_CHECK(hipDeviceSynchronize());
SECTION("With Host NUMA") {
hipMemLocation location;
int currentValue = value;
for (int node = 0; node <= maxNode; ++node) {
location.type = hipMemLocationTypeHostNuma;
location.id = node;
HIP_CHECK(hipMemPrefetchAsync_v2(memPtr, Nbytes, location, 0, stream));
HIP_CHECK(hipStreamSynchronize(stream));
for (int i = 0; i < N; i++) {
INFO("For Node " << node << " At index " << i << " Expected value = "
<< currentValue << " Got value = " << memPtr[i]);
REQUIRE(memPtr[i] == currentValue);
}
currentValue = currentValue + 1;
std::fill_n(memPtr, N, currentValue);
for (int i = 0; i < N; i++) {
INFO("For Node " << node << " At index " << i << " Expected value = "
<< currentValue << " Got value = " << memPtr[i]);
REQUIRE(memPtr[i] == currentValue);
}
#if 0 // To work this part, fix provided in SWDEV-548802 is required
// verify placement
void* page = memPtr;
int status = -1;
int ret = move_pages(0, 1, &page, nullptr, &status, 0);
REQUIRE(ret == 0);
REQUIRE(status == node);
#endif
}
}
SECTION("With Host Numa Current") {
hipMemLocation location;
location.type = hipMemLocationTypeHostNumaCurrent;
HIP_CHECK(hipMemPrefetchAsync_v2(memPtr, Nbytes, location, 0, stream));
HIP_CHECK(hipStreamSynchronize(stream));
for (int i = 0; i < N; i++) {
INFO("At index " << i << " Expected value = " << value
<< " Got value = " << memPtr[i]);
REQUIRE(memPtr[i] == value);
}
constexpr int newValue = 20;
std::fill_n(memPtr, N, newValue);
for (int i = 0; i < N; i++) {
INFO("At index " << i << " Expected value = " << newValue
<< " Got value = " << memPtr[i]);
REQUIRE(memPtr[i] == newValue);
}
// determine current CPU’s NUMA node
int cpu = sched_getcpu();
int cur_node = numa_node_of_cpu(cpu);
REQUIRE(cur_node >= 0);
// verify that the page is on the current node
void *page = memPtr;
int status = -1;
int ret = move_pages(0, 1, &page, nullptr, &status, 0);
REQUIRE(ret == 0);
REQUIRE(status == cur_node);
}
HIP_CHECK(hipStreamDestroy(stream));
HIP_CHECK(hipFree(memPtr));
// Reset to default device
HIP_CHECK(hipSetDevice(0));
}
#endif
/**
* Test Description
* ------------------------
* - This test case checks the following Negative scenarios
* - 1) With dev_ptr as nullptr
* - 2) With count 0
* - 3) With count larger than actual size
* - 4) With invalid device
* Test source
* ------------------------
* - unit/memory/hipMemPrefetchAsync_v2.cc
* Test requirements
* ------------------------
* - HIP_VERSION >= 7.1
*/
TEST_CASE("Unit_hipMemPrefetchAsync_v2_Negative") {
auto supportedDevices = getSupportedDevices();
if (supportedDevices.empty()) {
HipTest::HIP_SKIP_TEST(
"Test need at least one device with managed memory support");
}
HIP_CHECK(hipSetDevice(supportedDevices[0]));
constexpr int N = 16;
constexpr int Nbytes = N * sizeof(int);
hipStream_t stream;
HIP_CHECK(hipStreamCreate(&stream));
void *memPtr = nullptr;
HIP_CHECK(hipMallocManaged(&memPtr, Nbytes, hipMemAttachGlobal));
hipMemLocation location;
location.type = hipMemLocationTypeDevice;
SECTION("With dev_ptr as nullptr") {
HIP_CHECK_ERROR(
hipMemPrefetchAsync_v2(nullptr, Nbytes, location, 0, stream),
hipErrorInvalidValue);
}
SECTION("With count 0") {
HIP_CHECK_ERROR(hipMemPrefetchAsync_v2(memPtr, 0, location, 0, stream),
hipErrorInvalidValue);
}
SECTION("With count larger than actual size") {
HIP_CHECK_ERROR(
hipMemPrefetchAsync_v2(memPtr, Nbytes + 10, location, 0, stream),
hipErrorInvalidValue);
}
SECTION("With invalid device") {
hipMemLocation dstLocation;
dstLocation.type = hipMemLocationTypeDevice;
int deviceCount = 0;
HIP_CHECK(hipGetDeviceCount(&deviceCount));
dstLocation.id = deviceCount;
HIP_CHECK_ERROR(
hipMemPrefetchAsync_v2(memPtr, Nbytes, dstLocation, 0, stream),
hipErrorInvalidDevice);
}
HIP_CHECK(hipStreamDestroy(stream));
HIP_CHECK(hipFree(memPtr));
// Reset to default device
HIP_CHECK(hipSetDevice(0));
}