Merge branch 'master' of https://github.com/ROCm-Developer-Tools/HIP into feature_purge_genco

include/hip/hcc_detail/math_functions.h

@@ -67,7 +67,7 @@ __device__ float fminf(float x, float y);
 __device__ float fmodf(float x, float y);
 __device__ float frexpf(float x, int* nptr);
 __device__ float hypotf(float x, float y);
-__device__ float ilogbf(float x);
+__device__ int ilogbf(float x);
 __device__ int isfinite(float a);
 __device__ unsigned isinf(float a);
 __device__ unsigned isnan(float a);
@@ -153,7 +153,7 @@ __device__ double fmin(double x, double y);
 __device__ double fmod(double x, double y);
 __device__ double frexp(double x, int *nptr);
 __device__ double hypot(double x, double y);
-__device__ double ilogb(double x);
+__device__ int ilogb(double x);
 __device__ int isfinite(double x);
 __device__ unsigned isinf(double x);
 __device__ unsigned isnan(double x);

include/hip/nvcc_detail/hip_runtime_api.h

@@ -597,6 +597,10 @@ inline static hipError_t hipGetDeviceProperties(hipDeviceProp_t *p_prop, int dev
     p_prop->arch.hasDynamicParallelism       =  (ccVers >= 350);
 
     p_prop->concurrentKernels = cdprop.concurrentKernels;
+    p_prop->pciBusID = cdprop.pciBusID;
+    p_prop->pciDeviceID = cdprop.pciDeviceID;
+    p_prop->maxSharedMemoryPerMultiProcessor = cdprop.sharedMemPerMultiprocessor;
+    p_prop->isMultiGpuBoard = cdprop.isMultiGpuBoard;
 
     return hipCUDAErrorTohipError(cerror);
 }