fixed header names

Change-Id: I21650d6398187d3767b28e8ac81b2642d3b89a0e [ROCm/hip commit: e0133e627d]
2017-03-31 12:18:55 -05:00
commit 7635e0a57e
@@ -1,13 +1,16 @@
 /*
-Copyright (c) 2015-2017 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - present Advanced Micro Devices, Inc. All rights reserved.
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
+
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
@@ -17,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */

-#ifndef HIP_HCC_DETAIL_DEVICE_FUNCTIONS_H
-#define HIP_HCC_DETAIL_DEVICE_FUNCTIONS_H
+#ifndef HIP_INCLUDE_HIP_HCC_DETAIL_DEVICE_FUNCTIONS_H
+#define HIP_INCLUDE_HIP_HCC_DETAIL_DEVICE_FUNCTIONS_H

 #include <hip/hip_runtime.h>
 #include <hip/hip_vector_types.h>
@@ -1,13 +1,16 @@
 /*
-Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - present Advanced Micro Devices, Inc. All rights reserved.
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
+
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
@@ -17,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */

-#ifndef HIP_HCC_DETAIL_DRIVER_TYPES_H
-#define HIP_HCC_DETAIL_DRIVER_TYPES_H
+#ifndef HIP_INCLUDE_HIP_HCC_DETAIL_DRIVER_TYPES_H
+#define HIP_INCLUDE_HIP_HCC_DETAIL_DRIVER_TYPES_H

 enum hipChannelFormatKind
 {
@@ -1,59 +0,0 @@
-/*
-Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#ifndef HCC_ACC_H
-#define HCC_ACC_H
-#include "hip/hip_runtime_api.h"
-
-#if __cplusplus
-#ifdef __HCC__
-#include <hc.hpp>
-/**
- * @brief Return hc::accelerator associated with the specified deviceId
- * @return #hipSuccess, #hipErrorInvalidDevice
- */
-hipError_t hipHccGetAccelerator(int deviceId, hc::accelerator *acc);
-
-/**
- * @brief Return hc::accelerator_view associated with the specified stream
- *
- * If stream is 0, the accelerator_view for the default stream is returned.
- * @return #hipSuccess
- */
-hipError_t hipHccGetAcceleratorView(hipStream_t stream, hc::accelerator_view **av);
-
-
-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);
-#endif
-#endif
-
-#endif
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - present Advanced Micro Devices, Inc. All rights reserved.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2017 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - present Advanced Micro Devices, Inc. All rights reserved.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */

-#ifndef INCLUDE_HIP_HCC_DETAIL_HIP_COMPLEX_H
-#define INCLUDE_HIP_HCC_DETAIL_HIP_COMPLEX_H
+#ifndef HIP_INCLUDE_HIP_HCC_DETAIL_HIP_COMPLEX_H
+#define HIP_INCLUDE_HIP_HCC_DETAIL_HIP_COMPLEX_H

 #include "./hip_fp16.h"
 #include "./hip_vector_types.h"
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2017 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - present Advanced Micro Devices, Inc. All rights reserved.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */

-#ifndef HIP_HCC_DETAIL_FP16_H
-#define HIP_HCC_DETAIL_FP16_H
+#ifndef HIP_INCLUDE_HIP_HCC_DETAIL_HIP_FP16_H
+#define HIP_INCLUDE_HIP_HCC_DETAIL_HIP_FP16_H

 #include "hip/hip_runtime.h"

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - present Advanced Micro Devices, Inc. All rights reserved.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */

-#ifndef HIP_LDG_H
-#define HIP_LDG_H
+#ifndef HIP_INCLUDE_HIP_HCC_DETAIL_HIP_LDG_H
+#define HIP_INCLUDE_HIP_HCC_DETAIL_HIP_LDG_H

 #if defined __HCC__
 #if __hcc_workweek__ >= 16164
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - present Advanced Micro Devices, Inc. All rights reserved.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -26,8 +26,8 @@ THE SOFTWARE.
 */

 //#pragma once
-#ifndef HIP_HCC_DETAIL_RUNTIME_H
-#define HIP_HCC_DETAIL_RUNTIME_H
+#ifndef HIP_INCLUDE_HIP_HCC_DETAIL_HIP_RUNTIME_H
+#define HIP_INCLUDE_HIP_HCC_DETAIL_HIP_RUNTIME_H

 //---
 // Top part of file can be compiled with any compiler
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2017 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - present Advanced Micro Devices, Inc. All rights reserved.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -21,8 +21,8 @@ THE SOFTWARE.
 */

 //#pragma once
-#ifndef HIP_HCC_DETAIL_HIP_RUNTIME_API_H
-#define HIP_HCC_DETAIL_HIP_RUNTIME_API_H
+#ifndef HIP_INCLUDE_HIP_HCC_DETAIL_HIP_RUNTIME_API_H
+#define HIP_INCLUDE_HIP_HCC_DETAIL_HIP_RUNTIME_API_H
 /**
 *  @file  hcc_detail/hip_runtime_api.h
 *  @brief Contains C function APIs for HIP runtime. This file does not use any HCC builtin or special language extensions (-hc mode) ; those functions in hip_runtime.h.
@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include <iostream>

 #ifndef GENERIC_GRID_LAUNCH
-#define GENERIC_GRID_LAUNCH 1 
+#define GENERIC_GRID_LAUNCH 1
 #endif

 #include <hip/hcc_detail/host_defines.h>
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2017 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - present Advanced Micro Devices, Inc. All rights reserved.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22,8 +22,8 @@ THE SOFTWARE.

 //#pragma once

-#ifndef HIP_HCC_DETAIL_TEXTURE_H
-#define HIP_HCC_DETAIL_TEXTURE_H
+#ifndef HIP_INCLUDE_HIP_HCC_DETAIL_HIP_TEXTURE_H
+#define HIP_INCLUDE_HIP_HCC_DETAIL_HIP_TEXTURE_H

 /**
 *  @file  hcc_detail/hip_texture.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - present Advanced Micro Devices, Inc. All rights reserved.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -25,8 +25,8 @@ THE SOFTWARE.
 *  @brief Defines the different newt vector types for HIP runtime.
 */

-#ifndef HIP_VECTOR_TYPES_H
-#define HIP_VECTOR_TYPES_H
+#ifndef HIP_INCLUDE_HIP_HCC_DETAIL_HIP_VECTOR_TYPES_H
+#define HIP_INCLUDE_HIP_HCC_DETAIL_HIP_VECTOR_TYPES_H

 #if defined (__HCC__) &&  (__hcc_workweek__ < 16032)
 #error("This version of HIP requires a newer version of HCC.");
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - present Advanced Micro Devices, Inc. All rights reserved.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -25,14 +25,14 @@ THE SOFTWARE.
 *  @brief TODO-doc
 */

-#ifndef HOST_DEFINES_H
-#define HOST_DEFINES_H
+#ifndef HIP_INCLUDE_HIP_HCC_DETAIL_HOST_DEFINES_H
+#define HIP_INCLUDE_HIP_HCC_DETAIL_HOST_DEFINES_H

 #define USE_PROMOTE_FREE_HCC 0

 // Add guard to Generic Grid Launch method
 #ifndef GENERIC_GRID_LAUNCH
-#define GENERIC_GRID_LAUNCH 1 
+#define GENERIC_GRID_LAUNCH 1
 #endif

 #ifdef __HCC__
@@ -1,13 +1,16 @@
 /*
-Copyright (c) 2015-2017 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - present Advanced Micro Devices, Inc. All rights reserved.
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
+
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
@@ -17,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */

-#ifndef HIP_HCC_DETAIL_MATH_FUNCTIONS_H
-#define HIP_HCC_DETAIL_MATH_FUNCTIONS_H
+#ifndef HIP_INCLUDE_HIP_HCC_DETAIL_MATH_FUNCTIONS_H
+#define HIP_INCLUDE_HIP_HCC_DETAIL_MATH_FUNCTIONS_H

 #include <hip/hip_runtime.h>
 #include <hip/hip_vector_types.h>
@@ -1,13 +1,16 @@
 /*
-Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - present Advanced Micro Devices, Inc. All rights reserved.
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
+
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
@@ -18,8 +21,8 @@ THE SOFTWARE.
 */


-#ifndef HIP_HCC_DETAIL_TEXTURE_TYPES_H
-#define HIP_HCC_DETAIL_TEXTURE_TYPES_H
+#ifndef HIP_INCLUDE_HIP_HCC_DETAIL_TEXTURE_TYPES_H
+#define HIP_INCLUDE_HIP_HCC_DETAIL_TEXTURE_TYPES_H

 #include<hip/hcc_detail/driver_types.h>