P4 to Git Change 1906676 by gandryey@gera-win10 on 2019/06/26 18:29:26

SWDEV-79445 - OCL generic changes and code clean-up
	- Rename targetName_ to machineTarget_

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#55 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#145 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#95 edit


[ROCm/clr commit: a1235f5e94]

projects/clr/rocclr/runtime/device/pal/paldefs.hpp

@@ -116,7 +116,7 @@ const static uint HsaSamplerObjectAlignment = 16;
 const static uint DeviceQueueMaskSize = 32;
 
 struct AMDDeviceInfo {
-  const char* targetName_;       //!< Target name
+  const char* machineTarget_;    //!< Machine target
   const char* machineTargetLC_;  //!< Machine target for LC
   uint simdWidth_;               //!< Number of workitems processed per SIMD
   uint memChannelBankWidth_;     //!< Memory channel bank width

projects/clr/rocclr/runtime/device/pal/paldevice.cpp

@@ -79,7 +79,7 @@ bool NullDevice::init() {
     bool foundActive = false;
     Pal::AsicRevision revision = static_cast<Pal::AsicRevision>(id);
 
-    if (pal::DeviceInfo[id].targetName_[0] == '\0') {
+    if (pal::DeviceInfo[id].machineTarget_[0] == '\0') {
       continue;
     }
 
@@ -117,7 +117,7 @@ bool NullDevice::init() {
     uint gfxipVersion = IS_LIGHTNING ? pal::Gfx9PlusSubDeviceInfo[id].gfxipVersionLC_
                                      : pal::Gfx9PlusSubDeviceInfo[id].gfxipVersion_;
 
-    if (pal::Gfx9PlusSubDeviceInfo[id].targetName_[0] == '\0') {
+    if (pal::Gfx9PlusSubDeviceInfo[id].machineTarget_[0] == '\0') {
       continue;
     }
 
@@ -148,11 +148,11 @@ bool NullDevice::init() {
     // was listed previously in the Gfx9PlusSubDeviceInfo, if so, then it
     // means the current entry already has been added in the offline device list
     for (uint j = 0; j < id; ++j) {
-      if (pal::Gfx9PlusSubDeviceInfo[j].targetName_[0] == '\0') {
+      if (pal::Gfx9PlusSubDeviceInfo[j].machineTarget_[0] == '\0') {
         continue;
       }
-      if (strcmp(pal::Gfx9PlusSubDeviceInfo[j].targetName_,
-                 pal::Gfx9PlusSubDeviceInfo[id].targetName_) == 0) {
+      if (strcmp(pal::Gfx9PlusSubDeviceInfo[j].machineTarget_,
+                 pal::Gfx9PlusSubDeviceInfo[id].machineTarget_) == 0) {
         foundDuplicate = true;
         break;
       }
@@ -554,7 +554,7 @@ void NullDevice::fillDeviceInfo(const Pal::DeviceProperties& palProp,
         ::strcat(info_.name_, "+sram-ecc");
       }
     } else {
-      ::strcpy(info_.name_, hwInfo()->targetName_);
+      ::strcpy(info_.name_, hwInfo()->machineTarget_);
     }
   }
 

projects/clr/rocclr/runtime/device/pal/palprogram.cpp

@@ -176,7 +176,7 @@ HSAILProgram::HSAILProgram(Device& device)
   if (dev().asicRevision() == Pal::AsicRevision::Bristol) {
     machineTarget_ = Carrizo;
   } else {
-    machineTarget_ = dev().hwInfo()->targetName_;
+    machineTarget_ = dev().hwInfo()->machineTarget_;
   }
   loader_ = amd::hsa::loader::Loader::Create(&loaderContext_);
 }
@@ -196,7 +196,7 @@ HSAILProgram::HSAILProgram(NullDevice& device)
   if (dev().asicRevision() == Pal::AsicRevision::Bristol) {
     machineTarget_ = Carrizo;
   } else {
-    machineTarget_ = dev().hwInfo()->targetName_;
+    machineTarget_ = dev().hwInfo()->machineTarget_;
   }
   loader_ = amd::hsa::loader::Loader::Create(&loaderContext_);
 }
@@ -348,7 +348,7 @@ const aclTargetInfo& HSAILProgram::info(const char* str) {
     arch = "hsail64";
   }
   info_ = aclGetTargetInfo(arch.c_str(),
-                           (str && str[0] == '\0' ? dev().hwInfo()->targetName_ : str), &err);
+                           (str && str[0] == '\0' ? dev().hwInfo()->machineTarget_ : str), &err);
   if (err != ACL_SUCCESS) {
     LogWarning("aclGetTargetInfo failed");
   }