Merge branch 'amd-develop' into amd-master

Change-Id: Ie8a75943a315838a4e8e74ccf5d8da2c5ad735a8

CMakeLists.txt

@@ -193,6 +193,9 @@ if(HIP_PLATFORM STREQUAL "hcc")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${HCC_LD_FLAGS} -Wl,-Bsymbolic")
     #find_package(LLVM HINTS ${HCC_HOME}/compiler/lib/cmake)
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --amdgpu-target=gfx701 --amdgpu-target=gfx801 --amdgpu-target=gfx802 --amdgpu-target=gfx803 --amdgpu-target=gfx900")
+    if(COMPILE_HIP_ATP_MARKER)
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -L/opt/rocm/profiler/CXLActivityLogger/bin/x86_64 -lCXLActivityLogger")
+    endif()
     add_library(hip_hcc SHARED ${SOURCE_FILES_RUNTIME})
     target_link_libraries(hip_hcc PRIVATE hc_am)
     #target_link_libraries(hip_hcc PUBLIC LLVMAMDGPUUtils)

RELEASE.md

@@ -8,12 +8,15 @@ We have attempted to document known bugs and limitations - in particular the [HI
 ## Revision History:
 
 ===================================================================================================
+Release: 1.2
+Date: 2017.06.29
 - new APIs: hipMemcpy2DAsync, hipMallocPitch, hipHostMallocCoherent, hipHostMallocNonCoherent
 - added support for building hipify-clang using clang 3.9
 - hipify-clang updates for CUDA 8.0 runtime+driver support
 - renamed hipify to hipify-perl
 - initial implementation of hipify-cmakefile
 - several documentation updates & bug fixes
+- support for abort() function in device code
 
 
 ===================================================================================================

docs/markdown/hip_bugs.md

@@ -1,7 +1,9 @@
-# HIP Bugs 
+# HIP Bugs
+
 <!-- toc -->
 
 - [Errors related to undefined reference to `__hcLaunchKernel__***__grid_launch_parm**`](#errors-related-to-undefined-reference-to-__hclaunchkernel____grid_launch_parm)
+- [Can't find kernels inside dynamic linked library](#cant-find-kernels-inside-dynamic-linked-library)
 - [What is the current limitation of HIP Generic Grid Launch method?](#what-is-the-current-limitation-of-hip-generic-grid-launch-method)
 - [Errors related to `no matching constructor`](#errors-related-to-no-matching-constructor)
 - [HIP is more restrictive in enforcing restrictions](#hip-is-more-restrictive-in-enforcing-restrictions)

docs/markdown/hip_kernel_language.md

@@ -40,6 +40,10 @@
 - [Printf](#printf)
 - [Device-Side Dynamic Global Memory Allocation](#device-side-dynamic-global-memory-allocation)
 - [`__launch_bounds__`](#__launch_bounds__)
+  * [Compiler Impact](#compiler-impact)
+  * [CU and EU Definitions](#cu-and-eu-definitions)
+  * [Porting from CUDA __launch_bounds](#porting-from-cuda-__launch_bounds)
+  * [maxregcount](#maxregcount)
 - [Register Keyword](#register-keyword)
 - [Pragma Unroll](#pragma-unroll)
 - [In-Line Assembly](#in-line-assembly)

docs/markdown/hip_profiling.md

@@ -23,11 +23,6 @@ This document starts with some of the general capabilities of CodeXL and then de
 - [Tracing and Debug](#tracing-and-debug)
   * [Tracing HIP APIs](#tracing-hip-apis)
     + [Color](#color)
-  * [Using HIP_DB](#using-hip_db)
-  * [Using ltrace](#using-ltrace)
-  * [Chicken bits](#chicken-bits)
-  * [Debugging HIP Applications](#debugging-hip-applications)
-  * [General Debugging Tips](#general-debugging-tips)
 
 <!-- tocstop -->
 

hipify-clang/README.md

@@ -5,7 +5,7 @@
 - [Using hipify-clang](#using-hipify-clang)
   * [Build and install](#build-and-install)
   * [Running and using hipify-clang](#running-and-using-hipify-clang)
-    + [Disclaimer](#disclaimer)
+- [Disclaimer](#disclaimer)
 
 <!-- tocstop -->