Merge branch 'release_0.84.00' of https://github.com/AMDComputeLibraries/HIP-privatestaging into release_0.84.00

[ROCm/hip commit: 2ddade96d7]

projects/hip/include/hcc_detail/hcc_acc.h

@@ -1,6 +1,6 @@
 #ifndef HCC_ACC_H
 #define HCC_ACC_H
-#include "hip_runtime_api.h"
+#include "hip/hip_runtime_api.h"
 
 #if __cplusplus
 #ifdef __HCC__

projects/hip/include/hcc_detail/hip_hcc.h

@@ -21,8 +21,8 @@ THE SOFTWARE.
 #define HIP_HCC_H
 
 #include <hc.hpp>
-#include "hcc_detail/hip_util.h"
-#include "hcc_detail/staging_buffer.h"
+#include "hip/hcc_detail/hip_util.h"
+#include "hip/hcc_detail/staging_buffer.h"
 
 #define HIP_HCC
 
@@ -531,6 +531,9 @@ public:
     bool removePeer(ihipDevice_t *peer);
     void resetPeers(ihipDevice_t *thisDevice);
 
+
+    void addStream(ihipStream_t *stream);
+
     uint32_t peerCnt() const { return _peerCnt; };
     hsa_agent_t *peerAgents() const { return _peerAgents; };
 

projects/hip/include/hcc_detail/hip_runtime.h

@@ -40,8 +40,8 @@ THE SOFTWARE.
 
 #define CUDA_SUCCESS hipSuccess
 
-#include <hip_runtime_api.h>
-//#include "hcc_detail/hip_hcc.h"
+#include <hip/hip_runtime_api.h>
+//#include "hip/hcc_detail/hip_hcc.h"
 //---
 // Remainder of this file only compiles with HCC
 #ifdef __HCC__
@@ -55,9 +55,9 @@ extern int HIP_TRACE_API;
 //typedef grid_launch_parm hipLaunchParm ;
 #define hipLaunchParm grid_launch_parm
 #ifdef __cplusplus
-#include <hcc_detail/hip_texture.h>
+#include <hip/hcc_detail/hip_texture.h>
 #endif
-#include <hcc_detail/host_defines.h>
+#include <hip/hcc_detail/host_defines.h>
 // TODO-HCC remove old definitions ; ~1602 hcc supports __HCC_ACCELERATOR__ define.
 #if defined (__KALMAR_ACCELERATOR__) && !defined (__HCC_ACCELERATOR__)
 #define __HCC_ACCELERATOR__  __KALMAR_ACCELERATOR__

projects/hip/include/hcc_detail/hip_runtime_api.h

@@ -30,9 +30,9 @@ THE SOFTWARE.
 #include <stdint.h>
 #include <stddef.h>
 
-#include <hcc_detail/host_defines.h>
-#include <hip_runtime_api.h>
-//#include "hip_hcc.h"
+#include <hip/hcc_detail/host_defines.h>
+#include <hip/hip_runtime_api.h>
+//#include "hip/hip_hcc.h"
 
 #if defined (__HCC__) &&  (__hcc_workweek__ < 16155)
 #error("This version of HIP requires a newer version of HCC.");

projects/hip/include/hcc_detail/hip_texture.h

@@ -32,7 +32,7 @@ THE SOFTWARE.
 
 #include <limits.h>
 
-#include <hip_runtime.h>
+#include <hip/hip_runtime.h>
 
 //----
 //Texture - TODO - likely need to move this to a separate file only included with kernel compilation.