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

SWDEV-415029 - [ABI Break] Remove hcc symbols

Browse Source 
This reverts commit 81a120a5c5.

Reason for revert: Bring back original change.

Change-Id: I15c5f288bc50107831a494a81d1f16df4c2ade27


[ROCm/hip-tests commit: cf3df12106]
This commit is contained in:
Rahul Garg
2023-10-13 20:10:23 -04:00
committed by Rakesh Roy
parent 4b171d9fe7
commit 422d70ffb0
13 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/hip-tests/catch/unit/memory/hipMemcpy3DAsync_old.cc
+17 -17
View File
@@ -148,7 +148,7 @@ void Memcpy3DAsync<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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;
projects/hip-tests/catch/unit/memory/hipMemcpy3D_old.cc
+14 -14
View File
@@ -143,7 +143,7 @@ void Memcpy3D<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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<T>::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;
projects/hip-tests/catch/unit/memory/hipMemcpyWithStream_old.cc
+1 -1
View File
@@ -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();
}