From 0431b2116aa7d3eddcb36a8781ecb91741acafcd Mon Sep 17 00:00:00 2001
From: Sarbojit2019 <52527887+SarbojitAMD@users.noreply.github.com>
Date: Thu, 25 Nov 2021 15:13:22 +0530
Subject: [PATCH] SWDEV-306176 - Fix hipInfo sample for arch name showing junk
 values on some platform (#2404)

[ROCm/hip commit: de1e4a66c504594560e69211a840031b24ae7e56]
---
 .../hip/samples/1_Utils/hipInfo/hipInfo.cpp   | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/projects/hip/samples/1_Utils/hipInfo/hipInfo.cpp b/projects/hip/samples/1_Utils/hipInfo/hipInfo.cpp
index 53c841280b..28128b6d33 100644
--- a/projects/hip/samples/1_Utils/hipInfo/hipInfo.cpp
+++ b/projects/hip/samples/1_Utils/hipInfo/hipInfo.cpp
@@ -75,7 +75,7 @@ void printDeviceProp(int deviceId) {
          << endl;
     cout << setw(w1) << "device#" << deviceId << endl;
 
-    hipDeviceProp_t props;
+    hipDeviceProp_t props = {0};
     HIPCHECK(hipGetDeviceProperties(&props, deviceId));
 
     cout << setw(w1) << "Name: " << props.name << endl;
@@ -90,12 +90,8 @@ void printDeviceProp(int deviceId) {
     cout << setw(w1) << "memoryClockRate: " << (float)props.memoryClockRate / 1000.0 << " Mhz"
          << endl;
     cout << setw(w1) << "memoryBusWidth: " << props.memoryBusWidth << endl;
-    cout << setw(w1) << "clockInstructionRate: " << (float)props.clockInstructionRate / 1000.0
-         << " Mhz" << endl;
     cout << setw(w1) << "totalGlobalMem: " << fixed << setprecision(2)
          << bytesToGB(props.totalGlobalMem) << " GB" << endl;
-    cout << setw(w1) << "maxSharedMemoryPerMultiProcessor: " << fixed << setprecision(2)
-         << bytesToKB(props.maxSharedMemoryPerMultiProcessor) << " KB" << endl;
     cout << setw(w1) << "totalConstMem: " << props.totalConstMem << endl;
     cout << setw(w1) << "sharedMemPerBlock: " << (float)props.sharedMemPerBlock / 1024.0 << " KB"
          << endl;
@@ -116,6 +112,21 @@ void printDeviceProp(int deviceId) {
     cout << setw(w1) << "concurrentKernels: " << props.concurrentKernels << endl;
     cout << setw(w1) << "cooperativeLaunch: " << props.cooperativeLaunch << endl;
     cout << setw(w1) << "cooperativeMultiDeviceLaunch: " << props.cooperativeMultiDeviceLaunch << endl;
+    cout << setw(w1) << "isIntegrated: " << props.integrated << endl;
+    cout << setw(w1) << "maxTexture1D: " << props.maxTexture1D << endl;
+    cout << setw(w1) << "maxTexture2D.width: " << props.maxTexture2D[0] << endl;
+    cout << setw(w1) << "maxTexture2D.height: " << props.maxTexture2D[1] << endl;
+    cout << setw(w1) << "maxTexture3D.width: " << props.maxTexture3D[0] << endl;
+    cout << setw(w1) << "maxTexture3D.height: " << props.maxTexture3D[1] << endl;
+    cout << setw(w1) << "maxTexture3D.depth: " << props.maxTexture3D[2] << endl;
+
+#ifdef __HIP_PLATFORM_AMD__
+    cout << setw(w1) << "isLargeBar: " << props.isLargeBar << endl;
+    cout << setw(w1) << "asicRevision: " << props.asicRevision << endl;
+    cout << setw(w1) << "maxSharedMemoryPerMultiProcessor: " << fixed << setprecision(2)
+         << bytesToKB(props.maxSharedMemoryPerMultiProcessor) << " KB" << endl;
+    cout << setw(w1) << "clockInstructionRate: " << (float)props.clockInstructionRate / 1000.0
+         << " Mhz" << endl;
     cout << setw(w1) << "arch.hasGlobalInt32Atomics: " << props.arch.hasGlobalInt32Atomics << endl;
     cout << setw(w1) << "arch.hasGlobalFloatAtomicExch: " << props.arch.hasGlobalFloatAtomicExch
          << endl;
@@ -136,16 +147,7 @@ void printDeviceProp(int deviceId) {
     cout << setw(w1) << "arch.has3dGrid: " << props.arch.has3dGrid << endl;
     cout << setw(w1) << "arch.hasDynamicParallelism: " << props.arch.hasDynamicParallelism << endl;
     cout << setw(w1) << "gcnArchName: " << props.gcnArchName << endl;
-    cout << setw(w1) << "isIntegrated: " << props.integrated << endl;
-    cout << setw(w1) << "maxTexture1D: " << props.maxTexture1D << endl;
-    cout << setw(w1) << "maxTexture2D.width: " << props.maxTexture2D[0] << endl;
-    cout << setw(w1) << "maxTexture2D.height: " << props.maxTexture2D[1] << endl;
-    cout << setw(w1) << "maxTexture3D.width: " << props.maxTexture3D[0] << endl;
-    cout << setw(w1) << "maxTexture3D.height: " << props.maxTexture3D[1] << endl;
-    cout << setw(w1) << "maxTexture3D.depth: " << props.maxTexture3D[2] << endl;
-    cout << setw(w1) << "isLargeBar: " << props.isLargeBar << endl;
-    cout << setw(w1) << "asicRevision: " << props.asicRevision << endl;
-
+#endif
     int deviceCnt;
     hipGetDeviceCount(&deviceCnt);
     cout << setw(w1) << "peers: ";