diff --git a/samples/1_Utils/hipInfo/hipInfo.cpp b/samples/1_Utils/hipInfo/hipInfo.cpp
index cf4660eae7..0401745efd 100644
--- a/samples/1_Utils/hipInfo/hipInfo.cpp
+++ b/samples/1_Utils/hipInfo/hipInfo.cpp
@@ -129,6 +129,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;
 
     int deviceCnt;
     hipGetDeviceCount(&deviceCnt);
diff --git a/src/hip_hcc.cpp b/src/hip_hcc.cpp
index f7f617615b..9c54c8917f 100644
--- a/src/hip_hcc.cpp
+++ b/src/hip_hcc.cpp
@@ -737,21 +737,7 @@ hipError_t ihipDevice_t::initProperties(hipDeviceProp_t* prop)
     char archName[256];
     err = hsa_agent_get_info(_hsaAgent, HSA_AGENT_INFO_NAME, &archName);
 
-    if(strcmp(archName,"gfx701")==0){
-      prop->gcnArch = 701;
-    }
-    if(strcmp(archName,"gfx801")==0){
-      prop->gcnArch = 801;
-    }
-    if(strcmp(archName,"gfx802")==0){
-      prop->gcnArch = 802;
-    }
-    if(strcmp(archName,"gfx803")==0){
-      prop->gcnArch = 803;
-    }
-    if(strcmp(archName,"gfx900")==0){
-      prop->gcnArch = 900;
-    }
+    prop->gcnArch = atoi(archName+3);
 
     DeviceErrorCheck(err);