Merge "Fix missed VDI names in hip-on-rocclr" into amd-master-next

[ROCm/hip commit: 73e759eab0]

projects/hip/bin/hipcc

@@ -127,7 +127,7 @@ $HIP_PLATFORM= `$HIP_PATH/bin/hipconfig --platform` // "hcc";
 $HIP_VERSION= `$HIP_PATH/bin/hipconfig --version`;
 #HIP_COMPILER controls whether to use hcc, clang or nvcc for compilation:
 $HIP_COMPILER= `$HIP_PATH/bin/hipconfig --compiler`;
-#HIP_RUNTIME controls whether to use HCC, VDI, or NVCC as the runtime:
+#HIP_RUNTIME controls whether to use HCC, ROCclr, or NVCC as the runtime:
 $HIP_RUNTIME= `$HIP_PATH/bin/hipconfig --runtime`;
 
 # If using ROCclr runtime, need to find HIP_ROCclr_HOME

projects/hip/bin/hipconfig

@@ -118,8 +118,8 @@ if ($HIP_COMPILER eq "clang") {
 
     $CPP_CONFIG = " -D__HIP_PLATFORM_HCC__=  -I$HIP_PATH/include -I$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION -I$HSA_PATH/include";
 }
-if ($HIP_RUNTIME eq "VDI") {
-    $CPP_CONFIG .= " -D__HIP_VDI__";
+if ($HIP_RUNTIME eq "ROCclr") {
+    $CPP_CONFIG .= " -D__HIP_ROCclr__";
 }
 if ($HIP_PLATFORM eq "nvcc") {
     $CPP_CONFIG = " -D__HIP_PLATFORM_NVCC__=  -I$HIP_PATH/include -I$CUDA_PATH/include";

projects/hip/rocclr/hip_internal.hpp

@@ -112,12 +112,12 @@ namespace hip {
   /// HIP Device class
   class Device {
     amd::Monitor lock_{"Device lock"};
-    /// VDI context
+    /// ROCclr context
     amd::Context* context_;
     /// Device's ID
     /// Store it here so we don't have to loop through the device list every time
     int deviceId_;
-    /// VDI host queue for default streams
+    /// ROCclr host queue for default streams
     Stream null_stream_;
     //Maintain list of user enabled peers
     std::list<int> userEnabledPeers;
@@ -168,11 +168,11 @@ namespace hip {
 
   extern void setCurrentDevice(unsigned int index);
 
-  /// Get VDI queue associated with hipStream
+  /// Get ROCclr queue associated with hipStream
   /// Note: This follows the CUDA spec to sync with default streams
   ///       and Blocking streams
   extern amd::HostQueue* getQueue(hipStream_t s);
-  /// Get default stream associated with the VDI context
+  /// Get default stream associated with the ROCclr context
   extern amd::HostQueue* getNullStream(amd::Context&);
   /// Get default stream of the thread
   extern amd::HostQueue* getNullStream();