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

SWDEV-425129 - Revert "SWDEV-420822 - [ABI Break] Merge hipFunction_attribute into hipFuncAttribute"

Browse Source 
This reverts commit c469f18e91.

Change-Id: I02d6e77f0874fc37f22de267435917edd4fdede3
This commit is contained in:
Ioannis Assiouras
2023-10-03 11:22:29 +01:00
parent 596b496c16
commit bf31109241
4 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hipamd/include/hip/amd_detail/hip_prof_str.h
+4 -4
View File
@@ -1578,7 +1578,7 @@ typedef struct hip_api_data_s {
struct {
int* value;
int value__val;
hipFuncAttribute attrib;
hipFunction_attribute attrib;
hipFunction_t hfunc;
} hipFuncGetAttribute;
struct {
@@ -3713,10 +3713,10 @@ typedef struct hip_api_data_s {
#define INIT_hipFreeMipmappedArray_CB_ARGS_DATA(cb_data) { \
cb_data.args.hipFreeMipmappedArray.mipmappedArray = (hipMipmappedArray_t)mipmappedArray; \
};
// hipFuncGetAttribute[('int*', 'value'), ('hipFuncAttribute ', 'attrib'), ('hipFunction_t', 'hfunc')]
// hipFuncGetAttribute[('int*', 'value'), ('hipFunction_attribute', 'attrib'), ('hipFunction_t', 'hfunc')]
#define INIT_hipFuncGetAttribute_CB_ARGS_DATA(cb_data) { \
cb_data.args.hipFuncGetAttribute.value = (int*)value; \
cb_data.args.hipFuncGetAttribute.attrib = (hipFuncAttribute )attrib; \
cb_data.args.hipFuncGetAttribute.attrib = (hipFunction_attribute)attrib; \
cb_data.args.hipFuncGetAttribute.hfunc = (hipFunction_t)hfunc; \
};
// hipFuncGetAttributes[('hipFuncAttributes*', 'attr'), ('const void*', 'func')]
@@ -5851,7 +5851,7 @@ static inline void hipApiArgsInit(hip_api_id_t id, hip_api_data_t* data) {
// hipFreeMipmappedArray[('hipMipmappedArray_t', 'mipmappedArray')]
case HIP_API_ID_hipFreeMipmappedArray:
break;
// hipFuncGetAttribute[('int*', 'value'), ('hipFuncAttribute ', 'attrib'), ('hipFunction_t', 'hfunc')]
// hipFuncGetAttribute[('int*', 'value'), ('hipFunction_attribute', 'attrib'), ('hipFunction_t', 'hfunc')]
case HIP_API_ID_hipFuncGetAttribute:
if (data->args.hipFuncGetAttribute.value) data->args.hipFuncGetAttribute.value__val = *(data->args.hipFuncGetAttribute.value);
break;
hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h
+2 -2
View File
@@ -444,7 +444,7 @@ typedef struct cudaArray* hipArray_const_t;
typedef struct cudaFuncAttributes hipFuncAttributes;
typedef struct cudaLaunchParams hipLaunchParams;
typedef CUDA_LAUNCH_PARAMS hipFunctionLaunchParams;
#define hipFuncAttribute CUfunction_attribute
#define hipFunction_attribute CUfunction_attribute
#define hipPointer_attribute CUpointer_attribute
#define hip_Memcpy2D CUDA_MEMCPY2D
#define HIP_MEMCPY3D CUDA_MEMCPY3D
@@ -2764,7 +2764,7 @@ inline static hipError_t hipFuncGetAttributes(hipFuncAttributes* attr, const voi
return hipCUDAErrorTohipError(cudaFuncGetAttributes(attr, func));
}
inline static hipError_t hipFuncGetAttribute (int* value, hipFuncAttribute attrib, hipFunction_t hfunc) {
inline static hipError_t hipFuncGetAttribute (int* value, hipFunction_attribute attrib, hipFunction_t hfunc) {
return hipCUResultTohipError(cuFuncGetAttribute(value, attrib, hfunc));
}