Initial integration with Alex' Generic Grid Launch

Change-Id: I559afb80e9e39ec0d119bb3bf3b85ef9e448caf6


[ROCm/hip commit: 33c38de407]

projects/hip/src/hip_hcc.cpp

@@ -1556,7 +1556,6 @@ void ihipPostLaunchKernel(const char *kernelName, hipStream_t stream, grid_launc
     MARKER_END();
 }
 
-
 //=================================================================================================
 // HIP API Implementation
 //

projects/hip/src/trace_helper.h

@@ -28,7 +28,6 @@ THE SOFTWARE.
 #include <iostream>
 #include <iomanip>
 #include <string>
-
 //---
 // Helper functions to convert HIP function arguments into strings.
 // Handles POD data types as well as enumerations (ie hipMemcpyKind).
@@ -71,7 +70,7 @@ inline std::string ToString(hipEvent_t v)
     ss << v;
     return ss.str();
 };
-
+#ifndef GENERIC_GRID_LAUNCH
 //  hipStream_t
 template <>
 inline std::string ToString(hipStream_t v)
@@ -85,6 +84,7 @@ inline std::string ToString(hipStream_t v)
 
     return ss.str();
 };
+#endif //GENERIC_GRID_LAUNCH
 
 //  hipMemcpyKind specialization
 template <>