From 403afae98ff7a1ea6f54064b8fb35734cf2f1f41 Mon Sep 17 00:00:00 2001 From: taosang2 Date: Wed, 2 Aug 2023 17:46:34 -0400 Subject: [PATCH] SWDEV-415029 - [ABI Break] Remove hcc symbols Change-Id: Ic0082d3960aadbb7bc559141b6e84bd29a75b5cf --- catch/DoxyfileTests | 2 +- catch/include/hip_test_context.hh | 4 +-- .../hipDeviceComputeCapabilityMproc.cc | 4 +-- catch/multiproc/hipDeviceGetPCIBusIdMproc.cc | 4 +-- catch/multiproc/hipDeviceTotalMemMproc.cc | 4 +-- catch/multiproc/hipGetDeviceAttributeMproc.cc | 4 +-- catch/multiproc/hipGetDeviceCountMproc.cc | 2 +- .../multiproc/hipGetDevicePropertiesMproc.cc | 4 +-- catch/multiproc/hipSetGetDeviceMproc.cc | 14 ++++---- catch/unit/device/getDeviceCount_exe.cc | 4 +-- catch/unit/memory/hipMemcpy3DAsync_old.cc | 34 +++++++++---------- catch/unit/memory/hipMemcpy3D_old.cc | 28 +++++++-------- catch/unit/memory/hipMemcpyParam2D.cc | 24 ++++++------- catch/unit/memory/hipMemcpyParam2DAsync.cc | 28 +++++++-------- catch/unit/memory/hipMemcpyWithStream_old.cc | 2 +- catch/unit/memory/hipPtrGetAttribute.cc | 4 +-- 16 files changed, 83 insertions(+), 83 deletions(-) diff --git a/catch/DoxyfileTests b/catch/DoxyfileTests index b731fc0c13..6fe1167e42 100644 --- a/catch/DoxyfileTests +++ b/catch/DoxyfileTests @@ -2160,7 +2160,7 @@ PREDEFINED = TEMPLATE_TEST_CASE(x)=x() \ __linux__ \ HT_AMD \ HT_NVIDIA \ - __HIP_PLATFORM_NVCC__ \ + __HIP_PLATFORM_NVIDIA__ \ __GNUC__ # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this diff --git a/catch/include/hip_test_context.hh b/catch/include/hip_test_context.hh index 34be4becb0..874a3e7c81 100644 --- a/catch/include/hip_test_context.hh +++ b/catch/include/hip_test_context.hh @@ -44,10 +44,10 @@ THE SOFTWARE. #endif // Platform check -#if defined(__HIP_PLATFORM_HCC__) || defined(__HIP_PLATFORM_AMD__) +#if defined(__HIP_PLATFORM_AMD__) #define HT_AMD 1 #define HT_NVIDIA 0 -#elif defined(__HIP_PLATFORM_NVCC__) || defined(__HIP_PLATFORM_NVIDIA__) +#elif defined(__HIP_PLATFORM_NVIDIA__) #define HT_AMD 0 #define HT_NVIDIA 1 #else diff --git a/catch/multiproc/hipDeviceComputeCapabilityMproc.cc b/catch/multiproc/hipDeviceComputeCapabilityMproc.cc index 19be9dcf58..ac47e0a9c9 100644 --- a/catch/multiproc/hipDeviceComputeCapabilityMproc.cc +++ b/catch/multiproc/hipDeviceComputeCapabilityMproc.cc @@ -42,7 +42,7 @@ static void getDeviceCount(int *pdevCnt) { pipe(fd); // disable visible_devices env from shell -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ unsetenv("CUDA_VISIBLE_DEVICES"); #else unsetenv("ROCR_VISIBLE_DEVICES"); @@ -96,7 +96,7 @@ bool runMaskedDeviceTest(int actualNumGPUs) { snprintf(visibleDeviceString, MAX_SIZE, "%d", VISIBLE_DEVICE); // disable visible_devices env from shell -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ unsetenv("CUDA_VISIBLE_DEVICES"); setenv("CUDA_VISIBLE_DEVICES", visibleDeviceString, 1); HIP_CHECK(hipInit(0)); diff --git a/catch/multiproc/hipDeviceGetPCIBusIdMproc.cc b/catch/multiproc/hipDeviceGetPCIBusIdMproc.cc index 86e8e95578..55c939c80c 100644 --- a/catch/multiproc/hipDeviceGetPCIBusIdMproc.cc +++ b/catch/multiproc/hipDeviceGetPCIBusIdMproc.cc @@ -46,7 +46,7 @@ void getDeviceCount(int *pdevCnt) { pipe(fd); // disable visible_devices env from shell -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ unsetenv("CUDA_VISIBLE_DEVICES"); #else unsetenv("ROCR_VISIBLE_DEVICES"); @@ -101,7 +101,7 @@ bool testWithMaskedDevices(int actualNumGPUs) { snprintf(visibleDeviceString, MAX_SIZE, "%d", VISIBLE_DEVICE); // disable visible_devices env from shell -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ unsetenv("CUDA_VISIBLE_DEVICES"); setenv("CUDA_VISIBLE_DEVICES", visibleDeviceString, 1); HIP_CHECK(hipInit(0)); diff --git a/catch/multiproc/hipDeviceTotalMemMproc.cc b/catch/multiproc/hipDeviceTotalMemMproc.cc index 11ce921e1a..94b2045b6f 100644 --- a/catch/multiproc/hipDeviceTotalMemMproc.cc +++ b/catch/multiproc/hipDeviceTotalMemMproc.cc @@ -42,7 +42,7 @@ static void getDeviceCount(int *pdevCnt) { pipe(fd); // disable visible_devices env from shell -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ unsetenv("CUDA_VISIBLE_DEVICES"); #else unsetenv("ROCR_VISIBLE_DEVICES"); @@ -98,7 +98,7 @@ static bool getTotalMemoryOfMaskedDevices(int actualNumGPUs) { snprintf(visibleDeviceString, MAX_SIZE, "%d", VISIBLE_DEVICE); // disable visible_devices env from shell -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ unsetenv("CUDA_VISIBLE_DEVICES"); setenv("CUDA_VISIBLE_DEVICES", visibleDeviceString, 1); HIP_CHECK(hipInit(0)); diff --git a/catch/multiproc/hipGetDeviceAttributeMproc.cc b/catch/multiproc/hipGetDeviceAttributeMproc.cc index 357deaedc1..42b059b863 100644 --- a/catch/multiproc/hipGetDeviceAttributeMproc.cc +++ b/catch/multiproc/hipGetDeviceAttributeMproc.cc @@ -45,7 +45,7 @@ static void getDeviceCount(int *pdevCnt) { pipe(fd); // disable visible_devices env from shell -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ unsetenv("CUDA_VISIBLE_DEVICES"); #else unsetenv("ROCR_VISIBLE_DEVICES"); @@ -101,7 +101,7 @@ static bool validateGetAttributeOfMaskedDevices(int actualNumGPUs) { snprintf(visibleDeviceString, MAX_SIZE, "%d", VISIBLE_DEVICE); // disable visible_devices env from shell -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ unsetenv("CUDA_VISIBLE_DEVICES"); setenv("CUDA_VISIBLE_DEVICES", visibleDeviceString, 1); HIP_CHECK(hipInit(0)); diff --git a/catch/multiproc/hipGetDeviceCountMproc.cc b/catch/multiproc/hipGetDeviceCountMproc.cc index c1613bd944..3d2830f592 100644 --- a/catch/multiproc/hipGetDeviceCountMproc.cc +++ b/catch/multiproc/hipGetDeviceCountMproc.cc @@ -38,7 +38,7 @@ TEST_CASE("Unit_hipGetDeviceCount_MaskedDevices") { char visibleDeviceString[MAX_SIZE] = {}; snprintf(visibleDeviceString, MAX_SIZE, "%d", VISIBLE_DEVICE); -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ unsetenv("CUDA_VISIBLE_DEVICES"); setenv("CUDA_VISIBLE_DEVICES", visibleDeviceString, 1); #else diff --git a/catch/multiproc/hipGetDevicePropertiesMproc.cc b/catch/multiproc/hipGetDevicePropertiesMproc.cc index 2587ec65e1..89cf75bc59 100644 --- a/catch/multiproc/hipGetDevicePropertiesMproc.cc +++ b/catch/multiproc/hipGetDevicePropertiesMproc.cc @@ -44,7 +44,7 @@ static void getDeviceCount(int *pdevCnt) { pipe(fd); // disable visible_devices env from shell -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ unsetenv("CUDA_VISIBLE_DEVICES"); #else unsetenv("ROCR_VISIBLE_DEVICES"); @@ -101,7 +101,7 @@ static bool validateGetPropsOfMaskedDevices(int actualNumGPUs) { snprintf(visibleDeviceString, MAX_SIZE, "%d", VISIBLE_DEVICE); // disable visible_devices env from shell -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ unsetenv("CUDA_VISIBLE_DEVICES"); setenv("CUDA_VISIBLE_DEVICES", visibleDeviceString, 1); HIP_CHECK(hipInit(0)); diff --git a/catch/multiproc/hipSetGetDeviceMproc.cc b/catch/multiproc/hipSetGetDeviceMproc.cc index 6885d37749..213677300b 100644 --- a/catch/multiproc/hipSetGetDeviceMproc.cc +++ b/catch/multiproc/hipSetGetDeviceMproc.cc @@ -101,7 +101,7 @@ static void testInvalidDevice(int numDevices, bool useRocrEnv, if (cPid == 0) { // child hipError_t err; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ setenv("CUDA_VISIBLE_DEVICES", visibleDeviceString, 1); #else if (true == useRocrEnv) { @@ -190,7 +190,7 @@ static void testValidDevices(int numDevices, bool useRocrEnv, int *deviceList, cPid = fork(); if (cPid == 0) { -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ unsetenv("CUDA_VISIBLE_DEVICES"); setenv("CUDA_VISIBLE_DEVICES", visibleDeviceString, 1); #else @@ -420,7 +420,7 @@ TEST_CASE("Unit_hipSetDevice_InvalidVisibleDeviceList") { SECTION("Test setting invalid device to HIP_VISIBLE_DEVICES") { testInvalidDevice(numDevices, false, numDevices); } -#ifndef __HIP_PLATFORM_NVCC__ +#ifndef __HIP_PLATFORM_NVIDIA__ SECTION("Test setting -1 to ROCR_VISIBLE_DEVICES") { testInvalidDevice(numDevices, true, -1); } @@ -449,7 +449,7 @@ TEST_CASE("Unit_hipSetDevice_ValidVisibleDeviceList") { SECTION("Test setting valid hip visible device list") { testValidDevices(numDevices, false, deviceList, numDevices); } -#ifndef __HIP_PLATFORM_NVCC__ +#ifndef __HIP_PLATFORM_NVIDIA__ SECTION("Test setting valid rocr visible device list") { testValidDevices(numDevices, true, deviceList, numDevices); } @@ -472,7 +472,7 @@ TEST_CASE("Unit_hipSetDevice_SubsetOfAvailableDevices") { deviceList[i] = deviceListLength-1-i; } -#ifndef __HIP_PLATFORM_NVCC__ +#ifndef __HIP_PLATFORM_NVIDIA__ testValidDevices(numDevices, true, deviceList, deviceListLength); #endif @@ -480,7 +480,7 @@ TEST_CASE("Unit_hipSetDevice_SubsetOfAvailableDevices") { deviceListLength); } -#ifndef __HIP_PLATFORM_NVCC__ +#ifndef __HIP_PLATFORM_NVIDIA__ /* Following tests apply only for AMD Platforms */ /** @@ -565,6 +565,6 @@ TEST_CASE("Unit_hipSetDevice_RvdCvdDevicesList") { testRvdCvd(numDevices, deviceList, count); } -#endif // __HIP_PLATFORM_NVCC__ +#endif // __HIP_PLATFORM_NVIDIA__ #endif // __linux__ diff --git a/catch/unit/device/getDeviceCount_exe.cc b/catch/unit/device/getDeviceCount_exe.cc index 851c0e257d..ffca12cdb7 100644 --- a/catch/unit/device/getDeviceCount_exe.cc +++ b/catch/unit/device/getDeviceCount_exe.cc @@ -57,7 +57,7 @@ int main(int argc, char** argv) { } // disable visible_devices env from shell -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ UNSETENV("CUDA_VISIBLE_DEVICES"); SETENV("CUDA_VISIBLE_DEVICES", argv[1]); auto init_res = hipInit(0); @@ -79,7 +79,7 @@ int main(int argc, char** argv) { return -1; } -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ UNSETENV("CUDA_VISIBLE_DEVICES"); #else UNSETENV("ROCR_VISIBLE_DEVICES"); diff --git a/catch/unit/memory/hipMemcpy3DAsync_old.cc b/catch/unit/memory/hipMemcpy3DAsync_old.cc index cccbc3fc3f..4b436865c0 100644 --- a/catch/unit/memory/hipMemcpy3DAsync_old.cc +++ b/catch/unit/memory/hipMemcpy3DAsync_old.cc @@ -148,7 +148,7 @@ void Memcpy3DAsync::D2H_H2D_DeviceMem_OnDiffDevice() { myparms.srcPtr = make_hipPitchedPtr(hData, width * sizeof(T), width, height); myparms.dstArray = arr; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyHostToDevice; #else myparms.kind = hipMemcpyHostToDevice; @@ -166,7 +166,7 @@ void Memcpy3DAsync::D2H_H2D_DeviceMem_OnDiffDevice() { width * sizeof(T), width, height); myparms.srcArray = arr; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToHost; #else myparms.kind = hipMemcpyDeviceToHost; @@ -218,7 +218,7 @@ void Memcpy3DAsync::D2D_DeviceMem_OnDiffDevice() { width * sizeof(T), width, height); myparms.dstArray = arr; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyHostToDevice; #else myparms.kind = hipMemcpyHostToDevice; @@ -241,7 +241,7 @@ void Memcpy3DAsync::D2D_DeviceMem_OnDiffDevice() { // Device to Device myparms.srcArray = arr; myparms.dstArray = arr2; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToDevice; #else myparms.kind = hipMemcpyDeviceToDevice; @@ -261,7 +261,7 @@ void Memcpy3DAsync::D2D_DeviceMem_OnDiffDevice() { width * sizeof(T), width, height); myparms.srcArray = arr2; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToHost; #else myparms.kind = hipMemcpyDeviceToHost; @@ -294,7 +294,7 @@ void Memcpy3DAsync::NegativeTests() { myparms.srcPos = make_hipPos(0, 0, 0); myparms.dstPos = make_hipPos(0, 0, 0); myparms.extent = make_hipExtent(width , height, depth); -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyHostToDevice; #else myparms.kind = hipMemcpyHostToDevice; @@ -406,7 +406,7 @@ void Memcpy3DAsync::NegativeTests() { myparms.srcPos = make_hipPos(width+1, 0, 0); myparms.srcArray = arr; myparms.dstArray = arr1; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToDevice; #else myparms.kind = hipMemcpyDeviceToDevice; @@ -418,7 +418,7 @@ void Memcpy3DAsync::NegativeTests() { myparms.srcPos = make_hipPos(0, height+1, 0); myparms.srcArray = arr; myparms.dstArray = arr1; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToDevice; #else myparms.kind = hipMemcpyDeviceToDevice; @@ -430,7 +430,7 @@ void Memcpy3DAsync::NegativeTests() { myparms.srcPos = make_hipPos(0, 0, depth+1); myparms.srcArray = arr; myparms.dstArray = arr1; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToDevice; #else myparms.kind = hipMemcpyDeviceToDevice; @@ -447,7 +447,7 @@ void Memcpy3DAsync::NegativeTests() { , 3), hipArrayDefault)); myparms.srcArray = arr; myparms.dstArray = arr2; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToDevice; #else myparms.kind = hipMemcpyDeviceToDevice; @@ -493,7 +493,7 @@ void Memcpy3DAsync::D2D_SameDeviceMem_StreamDiffDevice() { // Host to Device myparms.srcPtr = make_hipPitchedPtr(hData, width * sizeof(T), width, height); myparms.dstArray = arr; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyHostToDevice; #else myparms.kind = hipMemcpyHostToDevice; @@ -506,7 +506,7 @@ void Memcpy3DAsync::D2D_SameDeviceMem_StreamDiffDevice() { SetDefaultData(); myparms.srcArray = arr; myparms.dstArray = arr1; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToDevice; #else myparms.kind = hipMemcpyDeviceToDevice; @@ -522,7 +522,7 @@ void Memcpy3DAsync::D2D_SameDeviceMem_StreamDiffDevice() { myparms.dstPtr = make_hipPitchedPtr(hOutputData, width * sizeof(T), width, height); myparms.srcArray = arr1; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToHost; #else myparms.kind = hipMemcpyDeviceToHost; @@ -555,7 +555,7 @@ void Memcpy3DAsync::Extent_Validation() { myparms.dstPos = make_hipPos(0, 0, 0); myparms.srcPtr = make_hipPitchedPtr(hData, width * sizeof(T), width, height); myparms.dstArray = arr; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyHostToDevice; #else myparms.kind = hipMemcpyHostToDevice; @@ -603,7 +603,7 @@ void Memcpy3DAsync::simple_Memcpy3DAsync() { // Host to Device myparms.srcPtr = make_hipPitchedPtr(hData, width * sizeof(T), width, height); myparms.dstArray = arr; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyHostToDevice; #else myparms.kind = hipMemcpyHostToDevice; @@ -622,7 +622,7 @@ void Memcpy3DAsync::simple_Memcpy3DAsync() { SetDefaultData(); myparms.srcArray = arr; myparms.dstArray = arr1; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToDevice; #else myparms.kind = hipMemcpyDeviceToDevice; @@ -638,7 +638,7 @@ void Memcpy3DAsync::simple_Memcpy3DAsync() { myparms.dstPtr = make_hipPitchedPtr(hOutputData, width * sizeof(T), width, height); myparms.srcArray = arr1; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToHost; #else myparms.kind = hipMemcpyDeviceToHost; diff --git a/catch/unit/memory/hipMemcpy3D_old.cc b/catch/unit/memory/hipMemcpy3D_old.cc index 2a640a774f..27614c63d4 100644 --- a/catch/unit/memory/hipMemcpy3D_old.cc +++ b/catch/unit/memory/hipMemcpy3D_old.cc @@ -143,7 +143,7 @@ void Memcpy3D::D2H_H2D_DeviceMem_OnDiffDevice() { myparms.srcPtr = make_hipPitchedPtr(hData, width * sizeof(T), width, height); myparms.dstArray = arr; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyHostToDevice; #else myparms.kind = hipMemcpyHostToDevice; @@ -160,7 +160,7 @@ void Memcpy3D::D2H_H2D_DeviceMem_OnDiffDevice() { width * sizeof(T), width, height); myparms.srcArray = arr; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToHost; #else myparms.kind = hipMemcpyDeviceToHost; @@ -206,7 +206,7 @@ void Memcpy3D::D2D_DeviceMem_OnDiffDevice() { width * sizeof(T), width, height); myparms.dstArray = arr; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyHostToDevice; #else myparms.kind = hipMemcpyHostToDevice; @@ -227,7 +227,7 @@ void Memcpy3D::D2D_DeviceMem_OnDiffDevice() { SetDefaultData(); myparms.srcArray = arr; myparms.dstArray = arr2; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToDevice; #else myparms.kind = hipMemcpyDeviceToDevice; @@ -247,7 +247,7 @@ void Memcpy3D::D2D_DeviceMem_OnDiffDevice() { width * sizeof(T), width, height); myparms.srcArray = arr2; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToHost; #else myparms.kind = hipMemcpyDeviceToHost; @@ -276,7 +276,7 @@ void Memcpy3D::NegativeTests() { myparms.srcPos = make_hipPos(0, 0, 0); myparms.dstPos = make_hipPos(0, 0, 0); myparms.extent = make_hipExtent(width , height, depth); -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyHostToDevice; #else myparms.kind = hipMemcpyHostToDevice; @@ -388,7 +388,7 @@ void Memcpy3D::NegativeTests() { myparms.srcPos = make_hipPos(width+1, 0, 0); myparms.srcArray = arr; myparms.dstArray = arr1; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToDevice; #else myparms.kind = hipMemcpyDeviceToDevice; @@ -400,7 +400,7 @@ void Memcpy3D::NegativeTests() { myparms.srcPos = make_hipPos(0, height+1, 0); myparms.srcArray = arr; myparms.dstArray = arr1; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToDevice; #else myparms.kind = hipMemcpyDeviceToDevice; @@ -412,7 +412,7 @@ void Memcpy3D::NegativeTests() { myparms.srcPos = make_hipPos(0, 0, depth+1); myparms.srcArray = arr; myparms.dstArray = arr1; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToDevice; #else myparms.kind = hipMemcpyDeviceToDevice; @@ -430,7 +430,7 @@ void Memcpy3D::NegativeTests() { , 3), hipArrayDefault)); myparms.srcArray = arr; myparms.dstArray = arr2; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToDevice; #else myparms.kind = hipMemcpyDeviceToDevice; @@ -455,7 +455,7 @@ void Memcpy3D::Extent_Validation() { myparms.srcPtr = make_hipPitchedPtr(hData, width * sizeof(T), width, height); myparms.dstArray = arr; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyHostToDevice; #else myparms.kind = hipMemcpyHostToDevice; @@ -505,7 +505,7 @@ void Memcpy3D::simple_Memcpy3D() { myparms.srcPtr = make_hipPitchedPtr(hData, width * sizeof(T), width, height); myparms.dstArray = arr; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyHostToDevice; #else myparms.kind = hipMemcpyHostToDevice; @@ -517,7 +517,7 @@ void Memcpy3D::simple_Memcpy3D() { SetDefaultData(); myparms.srcArray = arr; myparms.dstArray = arr1; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToDevice; #else myparms.kind = hipMemcpyDeviceToDevice; @@ -532,7 +532,7 @@ void Memcpy3D::simple_Memcpy3D() { myparms.dstPtr = make_hipPitchedPtr(hOutputData, width * sizeof(T), width, height); myparms.srcArray = arr1; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ myparms.kind = cudaMemcpyDeviceToHost; #else myparms.kind = hipMemcpyDeviceToHost; diff --git a/catch/unit/memory/hipMemcpyParam2D.cc b/catch/unit/memory/hipMemcpyParam2D.cc index 06d1654f93..497580eb6a 100644 --- a/catch/unit/memory/hipMemcpyParam2D.cc +++ b/catch/unit/memory/hipMemcpyParam2D.cc @@ -75,7 +75,7 @@ TEMPLATE_TEST_CASE("Unit_hipMemcpyParam2D_multiDevice-D2D", "[hipMemcpyParam2D]" // Device to Device hip_Memcpy2D desc = {}; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.srcMemoryType = CU_MEMORYTYPE_DEVICE; #else desc.srcMemoryType = hipMemoryTypeDevice; @@ -83,7 +83,7 @@ TEMPLATE_TEST_CASE("Unit_hipMemcpyParam2D_multiDevice-D2D", "[hipMemcpyParam2D]" desc.srcHost = A_d; desc.srcDevice = hipDeviceptr_t(A_d); desc.srcPitch = pitch_A; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.dstMemoryType = CU_MEMORYTYPE_DEVICE; #else desc.dstMemoryType = hipMemoryTypeDevice; @@ -164,7 +164,7 @@ TEMPLATE_TEST_CASE("Unit_hipMemcpyParam2D_multiDevice-H2D-D2H", "[hipMemcpyParam } else { // Host to Device hip_Memcpy2D desc = {}; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.srcMemoryType = CU_MEMORYTYPE_HOST; #else desc.srcMemoryType = hipMemoryTypeHost; @@ -172,7 +172,7 @@ TEMPLATE_TEST_CASE("Unit_hipMemcpyParam2D_multiDevice-H2D-D2H", "[hipMemcpyParam desc.srcHost = C_h; desc.srcDevice = hipDeviceptr_t(C_h); desc.srcPitch = width; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.dstMemoryType = CU_MEMORYTYPE_DEVICE; #else desc.dstMemoryType = hipMemoryTypeDevice; @@ -186,7 +186,7 @@ TEMPLATE_TEST_CASE("Unit_hipMemcpyParam2D_multiDevice-H2D-D2H", "[hipMemcpyParam // Device to Host memset(&desc, 0x0, sizeof(hip_Memcpy2D)); -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.srcMemoryType = CU_MEMORYTYPE_DEVICE; #else desc.srcMemoryType = hipMemoryTypeDevice; @@ -194,7 +194,7 @@ TEMPLATE_TEST_CASE("Unit_hipMemcpyParam2D_multiDevice-H2D-D2H", "[hipMemcpyParam desc.srcHost = A_d; desc.srcDevice = hipDeviceptr_t(A_d); desc.srcPitch = pitch_A; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.dstMemoryType = CU_MEMORYTYPE_HOST; #else desc.dstMemoryType = hipMemoryTypeHost; @@ -250,7 +250,7 @@ TEST_CASE("Unit_hipMemcpyParam2D_ExtentValidation") { // Device to Host hip_Memcpy2D desc = {}; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.srcMemoryType = CU_MEMORYTYPE_DEVICE; #else desc.srcMemoryType = hipMemoryTypeDevice; @@ -258,7 +258,7 @@ TEST_CASE("Unit_hipMemcpyParam2D_ExtentValidation") { desc.srcHost = A_d; desc.srcDevice = hipDeviceptr_t(A_d); desc.srcPitch = pitch_A; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.dstMemoryType = CU_MEMORYTYPE_HOST; #else desc.dstMemoryType = hipMemoryTypeHost; @@ -320,7 +320,7 @@ TEST_CASE("Unit_hipMemcpyParam2D_Negative") { HIP_CHECK(hipMemset2D(A_d, pitch_A, memsetval, NUM_W, NUM_H)); hip_Memcpy2D desc = {}; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.srcMemoryType = CU_MEMORYTYPE_DEVICE; #else desc.srcMemoryType = hipMemoryTypeDevice; @@ -328,7 +328,7 @@ TEST_CASE("Unit_hipMemcpyParam2D_Negative") { desc.srcHost = A_d; desc.srcDevice = hipDeviceptr_t(A_d); desc.srcPitch = pitch_A; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.dstMemoryType = CU_MEMORYTYPE_HOST; #else desc.dstMemoryType = hipMemoryTypeHost; @@ -346,7 +346,7 @@ TEST_CASE("Unit_hipMemcpyParam2D_Negative") { SECTION("Null Pointer to Destination Device Pointer") { memset(&desc, 0x0, sizeof(hip_Memcpy2D)); -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.srcMemoryType = CU_MEMORYTYPE_HOST; #else desc.srcMemoryType = hipMemoryTypeHost; @@ -354,7 +354,7 @@ TEST_CASE("Unit_hipMemcpyParam2D_Negative") { desc.srcHost = A_h; desc.srcDevice = hipDeviceptr_t(A_h); desc.srcPitch = width; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.dstMemoryType = CU_MEMORYTYPE_DEVICE; #else desc.dstMemoryType = hipMemoryTypeDevice; diff --git a/catch/unit/memory/hipMemcpyParam2DAsync.cc b/catch/unit/memory/hipMemcpyParam2DAsync.cc index 1ad5767620..c4a8cddda5 100644 --- a/catch/unit/memory/hipMemcpyParam2DAsync.cc +++ b/catch/unit/memory/hipMemcpyParam2DAsync.cc @@ -82,7 +82,7 @@ TEMPLATE_TEST_CASE("Unit_hipMemcpyParam2DAsync_multiDevice-StreamOnDiffDevice", HIP_CHECK(hipStreamSynchronize(stream)); // Device to Device hip_Memcpy2D desc = {}; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.srcMemoryType = CU_MEMORYTYPE_DEVICE; #else desc.srcMemoryType = hipMemoryTypeDevice; @@ -90,7 +90,7 @@ TEMPLATE_TEST_CASE("Unit_hipMemcpyParam2DAsync_multiDevice-StreamOnDiffDevice", desc.srcHost = A_d; desc.srcDevice = hipDeviceptr_t(A_d); desc.srcPitch = pitch_A; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.dstMemoryType = CU_MEMORYTYPE_DEVICE; #else desc.dstMemoryType = hipMemoryTypeDevice; @@ -170,7 +170,7 @@ TEMPLATE_TEST_CASE("Unit_hipMemcpyParam2DAsync_multiDevice-D2D", "[hipMemcpyPara // Device to Device hip_Memcpy2D desc = {}; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.srcMemoryType = CU_MEMORYTYPE_DEVICE; #else desc.srcMemoryType = hipMemoryTypeDevice; @@ -178,7 +178,7 @@ TEMPLATE_TEST_CASE("Unit_hipMemcpyParam2DAsync_multiDevice-D2D", "[hipMemcpyPara desc.srcHost = A_d; desc.srcDevice = hipDeviceptr_t(A_d); desc.srcPitch = pitch_A; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.dstMemoryType = CU_MEMORYTYPE_DEVICE; #else desc.dstMemoryType = hipMemoryTypeDevice; @@ -261,7 +261,7 @@ TEMPLATE_TEST_CASE("Unit_hipMemcpyParam2DAsync_multiDevice-H2D-D2H", "[hipMemcpy // Host to Device hip_Memcpy2D desc = {}; HIP_CHECK(hipStreamCreate(&stream)); -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.srcMemoryType = CU_MEMORYTYPE_HOST; #else desc.srcMemoryType = hipMemoryTypeHost; @@ -269,7 +269,7 @@ TEMPLATE_TEST_CASE("Unit_hipMemcpyParam2DAsync_multiDevice-H2D-D2H", "[hipMemcpy desc.srcHost = C_h; desc.srcDevice = hipDeviceptr_t(C_h); desc.srcPitch = width; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.dstMemoryType = CU_MEMORYTYPE_DEVICE; #else desc.dstMemoryType = hipMemoryTypeDevice; @@ -284,7 +284,7 @@ TEMPLATE_TEST_CASE("Unit_hipMemcpyParam2DAsync_multiDevice-H2D-D2H", "[hipMemcpy // Device to Host memset(&desc, 0x0, sizeof(hip_Memcpy2D)); -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.srcMemoryType = CU_MEMORYTYPE_DEVICE; #else desc.srcMemoryType = hipMemoryTypeDevice; @@ -292,7 +292,7 @@ TEMPLATE_TEST_CASE("Unit_hipMemcpyParam2DAsync_multiDevice-H2D-D2H", "[hipMemcpy desc.srcHost = A_d; desc.srcDevice = hipDeviceptr_t(A_d); desc.srcPitch = pitch_A; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.dstMemoryType = CU_MEMORYTYPE_HOST; #else desc.dstMemoryType = hipMemoryTypeHost; @@ -353,7 +353,7 @@ TEST_CASE("Unit_hipMemcpyParam2DAsync_ExtentValidation") { // Device to Host hip_Memcpy2D desc = {}; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.srcMemoryType = CU_MEMORYTYPE_DEVICE; #else desc.srcMemoryType = hipMemoryTypeDevice; @@ -361,7 +361,7 @@ TEST_CASE("Unit_hipMemcpyParam2DAsync_ExtentValidation") { desc.srcHost = A_d; desc.srcDevice = hipDeviceptr_t(A_d); desc.srcPitch = pitch_A; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.dstMemoryType = CU_MEMORYTYPE_HOST; #else desc.dstMemoryType = hipMemoryTypeHost; @@ -429,7 +429,7 @@ TEST_CASE("Unit_hipMemcpyParam2DAsync_Negative") { // Device to Host hip_Memcpy2D desc = {}; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.srcMemoryType = CU_MEMORYTYPE_DEVICE; #else desc.srcMemoryType = hipMemoryTypeDevice; @@ -437,7 +437,7 @@ TEST_CASE("Unit_hipMemcpyParam2DAsync_Negative") { desc.srcHost = A_d; desc.srcDevice = hipDeviceptr_t(A_d); desc.srcPitch = pitch_A; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.dstMemoryType = CU_MEMORYTYPE_HOST; #else desc.dstMemoryType = hipMemoryTypeHost; @@ -455,7 +455,7 @@ TEST_CASE("Unit_hipMemcpyParam2DAsync_Negative") { SECTION("Null Pointer to Destination Device Pointer") { memset(&desc, 0x0, sizeof(hip_Memcpy2D)); -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.srcMemoryType = CU_MEMORYTYPE_HOST; #else desc.srcMemoryType = hipMemoryTypeHost; @@ -463,7 +463,7 @@ TEST_CASE("Unit_hipMemcpyParam2DAsync_Negative") { desc.srcHost = A_h; desc.srcDevice = hipDeviceptr_t(A_h); desc.srcPitch = width; -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ desc.dstMemoryType = CU_MEMORYTYPE_DEVICE; #else desc.dstMemoryType = hipMemoryTypeDevice; diff --git a/catch/unit/memory/hipMemcpyWithStream_old.cc b/catch/unit/memory/hipMemcpyWithStream_old.cc index 5efc690b8d..2b9bba9660 100644 --- a/catch/unit/memory/hipMemcpyWithStream_old.cc +++ b/catch/unit/memory/hipMemcpyWithStream_old.cc @@ -575,7 +575,7 @@ TEST_CASE("Unit_hipMemcpyWithStream_TestOnMultiGPUwithOneStream") { TEST_CASE("Unit_hipMemcpyWithStream_TestkindDefault") { TestkindDefault(); } -#ifndef __HIP_PLATFORM_NVCC__ +#ifndef __HIP_PLATFORM_NVIDIA__ TEST_CASE("Unit_hipMemcpyWithStream_TestkindDefaultForDtoD") { TestkindDefaultForDtoD(); } diff --git a/catch/unit/memory/hipPtrGetAttribute.cc b/catch/unit/memory/hipPtrGetAttribute.cc index c87ea5a5f7..2204fa7c75 100644 --- a/catch/unit/memory/hipPtrGetAttribute.cc +++ b/catch/unit/memory/hipPtrGetAttribute.cc @@ -96,7 +96,7 @@ TEST_CASE("Unit_hipPtrGetAttribute_Simple") { unsigned int datatype; HIP_CHECK(hipPointerGetAttribute(&datatype, HIP_POINTER_ATTRIBUTE_MEMORY_TYPE, reinterpret_cast(A_d))); -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ REQUIRE(datatype == CU_MEMORYTYPE_DEVICE); #else REQUIRE(datatype == hipMemoryTypeDevice); @@ -104,7 +104,7 @@ TEST_CASE("Unit_hipPtrGetAttribute_Simple") { HIP_CHECK(hipPointerGetAttribute(&datatype, HIP_POINTER_ATTRIBUTE_MEMORY_TYPE, reinterpret_cast(A_Pinned_h))); -#ifdef __HIP_PLATFORM_NVCC__ +#ifdef __HIP_PLATFORM_NVIDIA__ REQUIRE(datatype == CU_MEMORYTYPE_HOST); #else REQUIRE(datatype == hipMemoryTypeHost);