From 0356446654a6466b786114b78d2bedbb3bcc921a Mon Sep 17 00:00:00 2001 From: itrowbri Date: Mon, 11 Nov 2024 11:47:31 -0600 Subject: [PATCH] SWDEV-496634: Revert deprecation of hipHostMalloc and hipHostFree functions (#1186) --- samples/common/defines.hpp | 4 ++-- tests/common/defines.hpp | 4 ++-- tests/rocprofv3/aborted-app/validate.py | 6 +----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/samples/common/defines.hpp b/samples/common/defines.hpp index 37b3558909..61fcf7a8af 100644 --- a/samples/common/defines.hpp +++ b/samples/common/defines.hpp @@ -70,8 +70,8 @@ } #if HIP_VERSION >= 60300000 -# define HIP_HOST_ALLOC_FUNC hipExtHostAlloc -# define HIP_HOST_FREE_FUNC hipFreeHost +# define HIP_HOST_ALLOC_FUNC hipHostMalloc +# define HIP_HOST_FREE_FUNC hipHostFree #else # define HIP_HOST_ALLOC_FUNC hipHostMalloc # define HIP_HOST_FREE_FUNC hipHostFree diff --git a/tests/common/defines.hpp b/tests/common/defines.hpp index 1b4622a740..d3770f2e96 100644 --- a/tests/common/defines.hpp +++ b/tests/common/defines.hpp @@ -40,8 +40,8 @@ } #if HIP_VERSION >= 60300000 -# define HIP_HOST_ALLOC_FUNC hipExtHostAlloc -# define HIP_HOST_FREE_FUNC hipFreeHost +# define HIP_HOST_ALLOC_FUNC hipHostMalloc +# define HIP_HOST_FREE_FUNC hipHostFree #else # define HIP_HOST_ALLOC_FUNC hipHostMalloc # define HIP_HOST_FREE_FUNC hipHostFree diff --git a/tests/rocprofv3/aborted-app/validate.py b/tests/rocprofv3/aborted-app/validate.py index 013e98f53f..05502b4e57 100644 --- a/tests/rocprofv3/aborted-app/validate.py +++ b/tests/rocprofv3/aborted-app/validate.py @@ -99,11 +99,7 @@ def test_hip_api_trace_json(json_data): "hipGetLastError", ] ) - updated_expected_functions = [ - func if func != "hipHostMalloc" else "hipExtHostAlloc" - for func in expected_functions - ] - assert functions == expected_functions or functions == updated_expected_functions + assert functions == expected_functions if __name__ == "__main__":