Merge 'master' into 'amd-master'

Change-Id: I3e1ce565f4faaeb5b53d6f8c7a4023c498fbf621


[ROCm/hip commit: fb312c701d]

projects/hip/bin/hipconfig

@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
-$HIP_BASE_VERSION_MAJOR = "2";
-$HIP_BASE_VERSION_MINOR = "10";
+$HIP_BASE_VERSION_MAJOR = "3";
+$HIP_BASE_VERSION_MINOR = "0";
 
 # Need perl > 5.10 to use logic-defined or
 use 5.006; use v5.10.1;

projects/hip/include/hip/hcc_detail/hip_runtime.h

@@ -518,25 +518,6 @@ hc_get_workitem_absolute_id(int dim)
 #pragma pop_macro("__CUDA__")
 #endif // ndef _OPENMP
 
-#if __HIP_VDI__
-hipError_t hipExtModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX,
-                                    uint32_t globalWorkSizeY, uint32_t globalWorkSizeZ,
-                                    uint32_t localWorkSizeX, uint32_t localWorkSizeY,
-                                    uint32_t localWorkSizeZ, size_t sharedMemBytes,
-                                    hipStream_t hStream, void** kernelParams, void** extra,
-                                    hipEvent_t startEvent = nullptr,
-                                    hipEvent_t stopEvent = nullptr,
-                                    uint32_t flags = 0);
-
-hipError_t hipHccModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX,
-                                    uint32_t globalWorkSizeY, uint32_t globalWorkSizeZ,
-                                    uint32_t localWorkSizeX, uint32_t localWorkSizeY,
-                                    uint32_t localWorkSizeZ, size_t sharedMemBytes,
-                                    hipStream_t hStream, void** kernelParams, void** extra,
-                                    hipEvent_t startEvent = nullptr,
-                                    hipEvent_t stopEvent = nullptr)
-                                    __attribute__((deprecated("use hipExtModuleLaunchKernel instead")));
-#endif // __HIP_VDI__
 #endif // defined(__clang__) && defined(__HIP__)
 
 #include <hip/hcc_detail/hip_memory.h>