hip apr stream porting to hip vdi; hip_api_string off by default

Change-Id: I2a9b55b8bdc372743b175797c0d4827fe8931033

cmake_modules/env.cmake

@@ -36,7 +36,6 @@ add_definitions ( -DLITTLEENDIAN_CPU=1 )
 add_definitions ( -DHSA_LARGE_MODEL= )
 add_definitions ( -DHSA_DEPRECATED= )
 add_definitions ( -D__HIP_PLATFORM_HCC__ )
-add_definitions ( -DHIP_PROF_HIP_API_STRING=1 )
 
 ## Linux Compiler options
 set ( CMAKE_CXX_FLAGS "-std=c++11")
@@ -66,12 +65,21 @@ if ( DEFINED ENV{CMAKE_DEBUG_TRACE} )
   add_definitions ( -DDEBUG_TRACE=1 )
 endif()
 
+if ( NOT DEFINED HIP_API_STRING )
+  set ( HIP_API_STRING 0 )
+endif()
+add_definitions ( -DHIP_PROF_HIP_API_STRING=${HIP_API_STRING} )
+
 ## Enable HIP_VDI mode
-if ( DEFINED HIP_VDI )
-  add_definitions ( -DHIP_VDI=${HIP_VDI} )
-else()
+if ( NOT DEFINED HIP_VDI )
   set ( HIP_VDI 0 )
 endif()
+add_definitions ( -DHIP_VDI=${HIP_VDI} )
+if ( "${HIP_VDI}" STREQUAL "1" )
+  set ( HIP_DEFINES "-D__HIP_ROCclr__=1" )
+else()
+  set ( HIP_DEFINES "-D__HIP_PLATFORM_HCC__=1")
+endif()
 
 ## Enable HIP/HCC local build
 if ( DEFINED LOCAL_BUILD )