SWDEV-268864 - Remove duplicatation of isa related information

Remove targetId_, gfxipMajor_, gfxipMinor_ and gfxipStepping_ from
device::Info as they are now available in device::Isa.

Change-Id: I381b1d4798ebf50655740e004a01ac7f86dbf668


[ROCm/clr commit: c2308216dd]

projects/clr/rocclr/device/device.hpp

@@ -411,9 +411,6 @@ struct Info : public amd::EmbeddedObject {
   //! Device name string
   char name_[0x40];
 
-  //! Target triple plus target ID string
-  char targetId_[0x40];
-
   //! Vendor name string
   char vendor_[0x20];
 
@@ -499,10 +496,6 @@ struct Info : public amd::EmbeddedObject {
   uint32_t localMemSizePerCU_;
   //! Number of banks of local memory
   uint32_t localMemBanks_;
-  //! The core engine major/minor/stepping
-  uint32_t gfxipMajor_;
-  uint32_t gfxipMinor_;
-  uint32_t gfxipStepping_;
   //! Number of available async queues
   uint32_t numAsyncQueues_;
   //! Number of available real time queues

projects/clr/rocclr/device/gpu/gpudevice.cpp

@@ -558,7 +558,6 @@ void NullDevice::fillDeviceInfo(const CALdeviceattribs& calAttr, const gslMemInf
   info_.platform_ = AMD_PLATFORM;
 
   ::strncpy(info_.name_, calName_, sizeof(info_.name_) - 1);
-  ::strncpy(info_.targetId_, isa().isaName().c_str(), sizeof(info_.targetId_) - 1);
   ::strncpy(info_.vendor_, "Advanced Micro Devices, Inc.", sizeof(info_.vendor_) - 1);
   ::snprintf(info_.driverVersion_, sizeof(info_.driverVersion_) - 1, AMD_BUILD_STRING " (GSL)%s",
              isOnline() ? "" : " [Offline]");
@@ -654,9 +653,6 @@ void NullDevice::fillDeviceInfo(const CALdeviceattribs& calAttr, const gslMemInf
     info_.globalMemChannelBankWidth_ = isa().memChannelBankWidth();
     info_.localMemSizePerCU_ = isa().localMemSizePerCU();
     info_.localMemBanks_ = isa().localMemBanks();
-    info_.gfxipMajor_ = isa().versionMajor();
-    info_.gfxipMinor_ = isa().versionMinor();
-    info_.gfxipStepping_ = isa().versionStepping();
 
     info_.numAsyncQueues_ = numComputeRings;
 

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

@@ -487,7 +487,6 @@ void NullDevice::fillDeviceInfo(const Pal::DeviceProperties& palProp,
 
   ::strncpy(info_.name_, settings().useLightning_ ? isa().targetId() : palName_,
             sizeof(info_.name_));
-  ::strncpy(info_.targetId_, isa().isaName().c_str(), sizeof(info_.targetId_) - 1);
   ::strncpy(info_.vendor_, "Advanced Micro Devices, Inc.", sizeof(info_.vendor_) - 1);
   ::snprintf(info_.driverVersion_, sizeof(info_.driverVersion_) - 1, AMD_BUILD_STRING " (PAL%s)%s",
              settings().useLightning_ ? ",LC" : ",HSAIL", isOnline() ? "" : " [Offline]");
@@ -588,10 +587,6 @@ void NullDevice::fillDeviceInfo(const Pal::DeviceProperties& palProp,
     info_.localMemSizePerCU_ = palProp.gfxipProperties.shaderCore.ldsSizePerCu;
     info_.localMemBanks_ = isa().localMemBanks();
 
-    info_.gfxipMajor_ = isa().versionMajor();
-    info_.gfxipMinor_ = isa().versionMinor();
-    info_.gfxipStepping_ = isa().versionStepping();
-
     info_.timeStampFrequency_ = 1000000;
     info_.numAsyncQueues_ = numComputeRings;
 

projects/clr/rocclr/device/rocm/rocdevice.cpp

@@ -133,10 +133,6 @@ bool NullDevice::create(const amd::Isa &isa) {
 
   // Report the device name
   ::strncpy(info_.name_, isa.targetId(), sizeof(info_.name_) - 1);
-  info_.gfxipMajor_ = isa.versionMajor();
-  info_.gfxipMinor_ = isa.versionMinor();
-  info_.gfxipStepping_ = isa.versionStepping();
-  ::strncpy(info_.targetId_, isa.isaName().c_str(), sizeof(info_.targetId_) - 1);
   info_.extensions_ = getExtensionString();
   info_.maxWorkGroupSize_ = hsaSettings->maxWorkGroupSize_;
   ::strncpy(info_.vendor_, "Advanced Micro Devices, Inc.", sizeof(info_.vendor_) - 1);
@@ -1057,10 +1053,6 @@ bool Device::populateOCLDeviceConstants() {
   info_.available_ = true;
 
   ::strncpy(info_.name_, isa().targetId(), sizeof(info_.name_) - 1);
-  info_.gfxipMajor_ = isa().versionMajor();
-  info_.gfxipMinor_ = isa().versionMinor();
-  info_.gfxipStepping_ = isa().versionStepping();
-  ::strncpy(info_.targetId_, isa().isaName().c_str(), sizeof(info_.targetId_) - 1);
   char device_name[64] = {0};
   if (HSA_STATUS_SUCCESS == hsa_agent_get_info(_bkendDevice,
                                                (hsa_agent_info_t)HSA_AMD_AGENT_INFO_PRODUCT_NAME,