diff --git a/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp b/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp
index 3926c7eb41..16db78aa32 100644
--- a/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp
+++ b/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp
@@ -1091,10 +1091,26 @@ bool Device::populateOCLDeviceConstants() {
 #endif  // !defined(WITH_LIGHTNING_COMPILER)
   }
 
-  if (HSA_STATUS_SUCCESS !=
-      hsa_agent_get_info(_bkendDevice, HSA_AGENT_INFO_WAVEFRONT_SIZE, &info_.wavefrontWidth_)) {
-    return false;
-  }
+  //if (settings().checkExtension(ClAmdDeviceAttributeQuery)) {
+    //info_.simdPerCU_ = deviceInfo_.simdPerCU_;
+    //info_.simdWidth_ = deviceInfo_.simdWidth_;
+    //info_.simdInstructionWidth_ = deviceInfo_.simdInstructionWidth_;
+    if (HSA_STATUS_SUCCESS !=
+        hsa_agent_get_info(_bkendDevice, HSA_AGENT_INFO_WAVEFRONT_SIZE, &info_.wavefrontWidth_)) {
+      return false;
+    }
+    //info_.globalMemChannels_ = palProp.gpuMemoryProperties.performance.vramBusBitWidth / 32;
+    //info_.globalMemChannelBanks_ = 4;
+    //info_.globalMemChannelBankWidth_ = deviceInfo_.memChannelBankWidth_;
+    //info_.localMemSizePerCU_ = deviceInfo_.localMemSizePerCU_;
+    //info_.localMemBanks_ = deviceInfo_.localMemBanks_;
+    info_.gfxipVersion_ = deviceInfo_.gfxipVersion_;
+    //info_.numAsyncQueues_ = numComputeRings;
+    //info_.numRTQueues_ = numExclusiveComputeRings;
+    //info_.numRTCUs_ = palProp.engineProperties[Pal::EngineTypeExclusiveCompute].maxNumDedicatedCu;
+    //info_.threadTraceEnable_ = settings().threadTraceEnable_;
+  //}
+
 
   return true;
 }