diff --git a/projects/hip/include/hip/driver_types.h b/projects/hip/include/hip/driver_types.h index 1720fa3ab3..85493f1ab9 100644 --- a/projects/hip/include/hip/driver_types.h +++ b/projects/hip/include/hip/driver_types.h @@ -429,19 +429,6 @@ static inline struct hipExtent make_hipExtent(size_t w, size_t h, size_t d) { e.depth = d; return e; } -typedef enum hipFunction_attribute { - HIP_FUNC_ATTRIBUTE_MAX_THREADS_PER_BLOCK, - HIP_FUNC_ATTRIBUTE_SHARED_SIZE_BYTES, - HIP_FUNC_ATTRIBUTE_CONST_SIZE_BYTES, - HIP_FUNC_ATTRIBUTE_LOCAL_SIZE_BYTES, - HIP_FUNC_ATTRIBUTE_NUM_REGS, - HIP_FUNC_ATTRIBUTE_PTX_VERSION, - HIP_FUNC_ATTRIBUTE_BINARY_VERSION, - HIP_FUNC_ATTRIBUTE_CACHE_MODE_CA, - HIP_FUNC_ATTRIBUTE_MAX_DYNAMIC_SHARED_SIZE_BYTES, - HIP_FUNC_ATTRIBUTE_PREFERRED_SHARED_MEMORY_CARVEOUT, - HIP_FUNC_ATTRIBUTE_MAX -} hipFunction_attribute; typedef enum hipPointer_attribute { HIP_POINTER_ATTRIBUTE_CONTEXT = 1, ///< The context on which a pointer was allocated diff --git a/projects/hip/include/hip/hip_runtime_api.h b/projects/hip/include/hip/hip_runtime_api.h index 770c7a0909..598b70b243 100644 --- a/projects/hip/include/hip/hip_runtime_api.h +++ b/projects/hip/include/hip/hip_runtime_api.h @@ -915,8 +915,16 @@ typedef enum hipJitOption { * @warning On AMD devices and some Nvidia devices, these hints and controls are ignored. */ typedef enum hipFuncAttribute { - hipFuncAttributeMaxDynamicSharedMemorySize = 8, - hipFuncAttributePreferredSharedMemoryCarveout = 9, + hipFuncAttributeMaxThreadsPerBlock, + hipFuncAttributeSharedSizeBytes, + hipFuncAttributeConstSizeBytes, + hipFuncAttributeLocalSizeBytes, + hipFuncAttributeNumRegs, + hipFuncAttributePTXVersion, + hipFuncAttributeBinaryVersion, + hipFuncAttributeCacheModeCA, + hipFuncAttributeMaxDynamicSharedMemorySize, + hipFuncAttributePreferredSharedMemoryCarveout, hipFuncAttributeMax } hipFuncAttribute; /** @@ -4961,7 +4969,7 @@ hipError_t hipFuncGetAttributes(struct hipFuncAttributes* attr, const void* func * * @returns #hipSuccess, #hipErrorInvalidValue, #hipErrorInvalidDeviceFunction */ -hipError_t hipFuncGetAttribute(int* value, hipFunction_attribute attrib, hipFunction_t hfunc); +hipError_t hipFuncGetAttribute(int* value, hipFuncAttribute attrib, hipFunction_t hfunc); /** * @brief returns the handle of the texture reference with the name from the module. *