Move include/* to include/hip/*

Change-Id: I7a7b2839b4df59c7a4c503550f99fdc9e45c0f54

hipamd/CMakeLists.txt

@@ -166,7 +166,7 @@ if(HIP_PLATFORM STREQUAL "hcc")
     set(HIP_HCC_BUILD_FLAGS "${HIP_HCC_BUILD_FLAGS} -DHIP_VERSION_MAJOR=${HIP_VERSION_MAJOR} -DHIP_VERSION_MINOR=${HIP_VERSION_MINOR} -DHIP_VERSION_PATCH=${HIP_VERSION_PATCH}")
 
     # Add remaining flags
-    set(HIP_HCC_BUILD_FLAGS "${HIP_HCC_BUILD_FLAGS} -fPIC -hc -I${HCC_HOME}/include -I${HSA_PATH}/include -I/opt/rocm/libhsakmt/include/libhsakmt -stdlib=libc++")
+    set(HIP_HCC_BUILD_FLAGS "${HIP_HCC_BUILD_FLAGS} -fPIC -hc -I${HCC_HOME}/include -I${HSA_PATH}/include -I/opt/rocm/libhsakmt/include -stdlib=libc++")
 
     # Set compiler and compiler flags
     set(CMAKE_CXX_COMPILER "${HCC_HOME}/bin/hcc")

hipamd/include/hip

@@ -1 +0,0 @@
-../include

hipamd/include/hip/hcc.h

@@ -2,7 +2,7 @@
 #define HCC_H
 
 #if defined(__HIP_PLATFORM_HCC__) && !defined (__HIP_PLATFORM_NVCC__)
-#include <hcc_detail/hcc_acc.h>
+#include "hip/hcc_detail/hcc_acc.h"
 #endif
 
 #endif

hipamd/include/hip/hcc_detail/hip_fp16.h

@@ -20,7 +20,7 @@ THE SOFTWARE.
 #ifndef HIP_FP16_H
 #define HIP_FP16_H
 
-#include "hip_runtime.h"
+#include "hip/hip_runtime.h"
 
 typedef struct{
   unsigned x: 16;

hipamd/include/hip/hcc_detail/hip_ldg.h

@@ -21,11 +21,9 @@ THE SOFTWARE.
 #define HIP_LDG_H
 
 #if __HCC__
-#include"hip_vector_types.h"
-#include"host_defines.h"
 #if __hcc_workweek__ >= 16164
-#include"hip/hip_vector_types.h"
+#include "hip/hip_vector_types.h"
-#include"hip/hcc_detail/host_defines.h"
+#include "hip/hcc_detail/host_defines.h"
 
 
 __device__ char                 __ldg(const char* );

hipamd/src/device_util.cpp

@@ -17,11 +17,12 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include"hip_runtime.h"
+#include <hc.hpp>
-#include<hc.hpp>
+#include <grid_launch.h>
-#include<grid_launch.h>
-
 #include <hc_math.hpp>
+
+#include "hip/hip_runtime.h"
+
 // TODO: Choose whether default is precise math or fast math based on compilation flag.
 #ifdef __HCC_ACCELERATOR__
 using namespace hc::precise_math;

hipamd/src/hip_context.cpp

@@ -22,9 +22,9 @@ THE SOFTWARE.
 
 #include <stack>
 
-#include "hip_runtime.h"
+#include "hip/hip_runtime.h"
-#include "hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/hip_hcc.h"
-#include "hcc_detail/trace_helper.h"
+#include "hip/hcc_detail/trace_helper.h"
 
 // Stack of contexts
 thread_local std::stack<ihipCtx_t *>  tls_ctxStack;

hipamd/src/hip_device.cpp

@@ -17,9 +17,9 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "hip_runtime.h"
+#include "hip/hip_runtime.h"
-#include "hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/hip_hcc.h"
-#include "hcc_detail/trace_helper.h"
+#include "hip/hcc_detail/trace_helper.h"
 
 //-------------------------------------------------------------------------------------------------
 //Devices

hipamd/src/hip_error.cpp

@@ -17,9 +17,9 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "hip_runtime.h"
+#include "hip/hip_runtime.h"
-#include "hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/hip_hcc.h"
-#include "hcc_detail/trace_helper.h"
+#include "hip/hcc_detail/trace_helper.h"
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------

hipamd/src/hip_event.cpp

@@ -17,9 +17,9 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "hip_runtime.h"
+#include "hip/hip_runtime.h"
-#include "hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/hip_hcc.h"
-#include "hcc_detail/trace_helper.h"
+#include "hip/hcc_detail/trace_helper.h"
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------

hipamd/src/hip_hcc.cpp

@@ -36,15 +36,15 @@ THE SOFTWARE.
 #include <vector>
 #include <algorithm>
 #include <atomic>
+
 #include <hc.hpp>
 #include <hc_am.hpp>
+#include "hsa/hsa_ext_amd.h"
+#include "libhsakmt/hsakmt.h"
 
-#include "hip_runtime.h"
+#include "hip/hip_runtime.h"
-#include "hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/hip_hcc.h"
-#include "hsa_ext_amd.h"
+#include "hip/hcc_detail/trace_helper.h"
-#include "hsakmt.h"
-
-#include "hcc_detail/trace_helper.h"
 
 
 

hipamd/src/hip_ldg.cpp

@@ -18,7 +18,8 @@ THE SOFTWARE.
 */
 
 #include <hc.hpp>
-#include"hcc_detail/hip_ldg.h"
+
+#include "hip/hcc_detail/hip_ldg.h"
 
 __device__ char                 __ldg(const char* ptr)
 {

hipamd/src/hip_memory.cpp

@@ -17,12 +17,14 @@
    THE SOFTWARE.
    */
 
-#include "hip_runtime.h"
-#include "hcc_detail/hip_hcc.h"
-#include "hcc_detail/trace_helper.h"
-#include <hsa.h>
 #include <hc_am.hpp>
-#include <hsa_ext_amd.h>
+#include "hsa/hsa.h"
+#include "hsa/hsa_ext_amd.h"
+
+#include "hip/hip_runtime.h"
+#include "hip/hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/trace_helper.h"
+
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 // Memory

hipamd/src/hip_module.cpp

@@ -17,17 +17,19 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "hip_runtime.h"
-#include "hsa/hsa.h"
-#include "hsa/hsa_ext_amd.h"
-#include "hsa/amd_hsa_kernel_code.h"
-#include "hcc_detail/hip_hcc.h"
-#include "hcc_detail/trace_helper.h"
 #include <fstream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <elf.h>
 
+#include "hsa/hsa.h"
+#include "hsa/hsa_ext_amd.h"
+#include "hsa/amd_hsa_kernel_code.h"
+
+#include "hip/hip_runtime.h"
+#include "hip/hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/trace_helper.h"
+
 //TODO Use Pool APIs from HCC to get memory regions.
 
 namespace hipdrv {

hipamd/src/hip_peer.cpp

@@ -19,9 +19,9 @@ THE SOFTWARE.
 
 #include <hc_am.hpp>
 
-#include "hip_runtime.h"
+#include "hip/hip_runtime.h"
-#include "hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/hip_hcc.h"
-#include "hcc_detail/trace_helper.h"
+#include "hip/hcc_detail/trace_helper.h"
 
 
 // Peer access functions.

hipamd/src/hip_stream.cpp

@@ -17,9 +17,9 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "hip_runtime.h"
+#include "hip/hip_runtime.h"
-#include "hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/hip_hcc.h"
-#include "hcc_detail/trace_helper.h"
+#include "hip/hcc_detail/trace_helper.h"
 
 
 //-------------------------------------------------------------------------------------------------