diff --git a/projects/hip/include/hip/hip_runtime_api.h b/projects/hip/include/hip/hip_runtime_api.h
index 4dbaaf8d18..6b67843d37 100644
--- a/projects/hip/include/hip/hip_runtime_api.h
+++ b/projects/hip/include/hip/hip_runtime_api.h
@@ -114,6 +114,7 @@ typedef struct hipDeviceProp_t {
     int isMultiGpuBoard;                      ///< 1 if device is on a multi-GPU board, 0 if not.
     int canMapHostMemory;                     ///< Check whether HIP can map host memory
     int gcnArch;                              ///< AMD GCN Arch Value. Eg: 803, 701
+    char gcnArchName[256];                    ///< AMD GCN Arch Name.
     int integrated;            ///< APU vs dGPU
     int cooperativeLaunch;            ///< HIP device supports cooperative launch
     int cooperativeMultiDeviceLaunch; ///< HIP device supports cooperative launch on multiple devices
diff --git a/projects/hip/rocclr/hip_device.cpp b/projects/hip/rocclr/hip_device.cpp
index b8a5e65d29..9491ee800f 100644
--- a/projects/hip/rocclr/hip_device.cpp
+++ b/projects/hip/rocclr/hip_device.cpp
@@ -209,6 +209,7 @@ hipError_t hipGetDeviceProperties ( hipDeviceProp_t* props, hipDevice_t device )
   //deviceProps.isMultiGpuBoard = info.;
   deviceProps.canMapHostMemory = 1;
   deviceProps.gcnArch = info.gfxipVersion_;
+  sprintf(deviceProps.gcnArchName, "gfx%d%d%x", info.gfxipMajor_, info.gfxipMinor_, info.gfxipStepping_);
   deviceProps.cooperativeLaunch = info.cooperativeGroups_;
   deviceProps.cooperativeMultiDeviceLaunch = info.cooperativeMultiDeviceGroups_;
 
diff --git a/projects/hip/samples/0_Intro/square/square.hipref.cpp b/projects/hip/samples/0_Intro/square/square.hipref.cpp
index 6911b9f6c3..a2b21f17e4 100644
--- a/projects/hip/samples/0_Intro/square/square.hipref.cpp
+++ b/projects/hip/samples/0_Intro/square/square.hipref.cpp
@@ -58,7 +58,7 @@ int main(int argc, char* argv[]) {
     CHECK(hipGetDeviceProperties(&props, device /*deviceID*/));
     printf("info: running on device %s\n", props.name);
 #ifdef __HIP_PLATFORM_HCC__
-    printf("info: architecture on AMD GPU device is: %d\n", props.gcnArch);
+    printf("info: architecture on AMD GPU device is: %s\n", props.gcnArchName);
 #endif
     printf("info: allocate host mem (%6.2f MB)\n", 2 * Nbytes / 1024.0 / 1024.0);
     A_h = (float*)malloc(Nbytes);
diff --git a/projects/hip/samples/1_Utils/hipInfo/hipInfo.cpp b/projects/hip/samples/1_Utils/hipInfo/hipInfo.cpp
index 31a5430486..5c6cdeabb5 100644
--- a/projects/hip/samples/1_Utils/hipInfo/hipInfo.cpp
+++ b/projects/hip/samples/1_Utils/hipInfo/hipInfo.cpp
@@ -138,7 +138,7 @@ void printDeviceProp(int deviceId) {
     cout << setw(w1) << "arch.hasSurfaceFuncs: " << props.arch.hasSurfaceFuncs << endl;
     cout << setw(w1) << "arch.has3dGrid: " << props.arch.has3dGrid << endl;
     cout << setw(w1) << "arch.hasDynamicParallelism: " << props.arch.hasDynamicParallelism << endl;
-    cout << setw(w1) << "gcnArch: " << props.gcnArch << 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;
diff --git a/projects/hip/tests/src/hiprtc/hiprtcGetLoweredName.cpp b/projects/hip/tests/src/hiprtc/hiprtcGetLoweredName.cpp
index 407533fd19..11c4ab1dba 100644
--- a/projects/hip/tests/src/hiprtc/hiprtcGetLoweredName.cpp
+++ b/projects/hip/tests/src/hiprtc/hiprtcGetLoweredName.cpp
@@ -83,8 +83,7 @@ int main()
     hipDeviceProp_t props;
     int device = 0;
     hipGetDeviceProperties(&props, device);
-    std::string gfxName = "gfx" + std::to_string(props.gcnArch);
-    std::string sarg = "--gpu-architecture=" + gfxName;
+    std::string sarg = "--gpu-architecture=" + props.gcnArchName;
     const char* options[] = {
             sarg.c_str()
     };
diff --git a/projects/hip/tests/src/hiprtc/saxpy.cpp b/projects/hip/tests/src/hiprtc/saxpy.cpp
index cb7e7cdb5f..f6489c761e 100755
--- a/projects/hip/tests/src/hiprtc/saxpy.cpp
+++ b/projects/hip/tests/src/hiprtc/saxpy.cpp
@@ -70,8 +70,7 @@ int main()
     hipDeviceProp_t props;
     int device = 0;
     hipGetDeviceProperties(&props, device);
-    std::string gfxName = "gfx" + std::to_string(props.gcnArch);
-    std::string sarg = "--gpu-architecture=" + gfxName;
+    std::string sarg = "--gpu-architecture=" + props.gcnArchName;
     const char* options[] = {
         sarg.c_str()
     };