Merge 'master' into 'amd-master'

Change-Id: Ie37ee84b9c4f2808bd0dc2986e20feeb4449cea3

src/grid_launch.cpp

@@ -92,5 +92,8 @@ namespace hip_impl
 
         delete static_cast<L*>(locked_stream);
         locked_stream = nullptr;
+        if(HIP_PROFILE_API) {
+            MARKER_END();
+        }
     }
 }

src/hip_context.cpp

@@ -269,7 +269,7 @@ hipError_t hipCtxGetSharedMemConfig ( hipSharedMemConfig * pConfig )
 hipError_t hipCtxSynchronize ( void )
 {
     HIP_INIT_API(1);
-    return ihipSynchronize(); //TODP Shall check validity of ctx?
+    return ihipLogStatus(ihipSynchronize()); //TODP Shall check validity of ctx?
 }
 
 hipError_t hipCtxGetFlags ( unsigned int* flags )

src/hip_hcc.cpp

@@ -1592,7 +1592,9 @@ void ihipPostLaunchKernel(const char *kernelName, hipStream_t stream, grid_launc
     tprintf(DB_SYNC, "ihipPostLaunchKernel, unlocking stream\n");
 
     stream->lockclose_postKernelCommand(kernelName, lp.av);
-    MARKER_END();
+    if(HIP_PROFILE_API) {
+        MARKER_END();
+    }
 }
 
 //=================================================================================================