Support recent devices

Author: chesik-amd

Scripts/UpdateCommonMap.py

@@ -17,7 +17,7 @@
     "common-src-AMDTMutex"                   : ["../Common/Src/AMDTMutex", "fb68811ed3a475cc9ab1c5d5e0482658ec679716"],
     "common-src-AmdDxExt"                    : ["../Common/Src/AmdDxExt", "1e16621535a70dc4e088aaa7975ac4b84949f9e3"],
     "common-src-AmdVkExt"                    : ["../Common/Src/AmdVkExt", "1fc64cdf8da2bd5c1e1b87a6d2ee58c6334e686b"],
-    "common-src-DeviceInfo"                  : ["../Common/Src/DeviceInfo", "1d750f29ebf52ff1a70f521b31c16ad6df65e8b9"],
+    "common-src-DeviceInfo"                  : ["../Common/Src/DeviceInfo", "e5e83b573fb49a16e8e1045d4cb39cbb17326270"],
     "common-src-DynamicLibraryModule"        : ["../Common/Src/DynamicLibraryModule", "4b1587a50119c0a59ce3472facbaa2af7c243fdf"],
     "common-src-GPUPerfAPIUtils"             : ["../Common/Src/GPUPerfAPIUtils", "d10457ebd4846a84820f83a7dd3e2e11ec1be081"],
     "common-src-TSingleton"                  : ["../Common/Src/TSingleton", "2a338d5b7e649ffba0225772c521726c18b13fff"],

Src/GPUPerfAPIGL/ASICInfo.cpp

@@ -318,7 +318,9 @@ bool GetASICInfo(ASICInfo& rASICInfo)
              nAsicType == ATIASIC_ID_TONGA_P ||
              nAsicType == ATIASIC_ID_FIJI_P ||
              nAsicType == ATIASIC_ID_ELLESMERE ||
-             nAsicType == ATIASIC_ID_BAFFIN)
+             nAsicType == ATIASIC_ID_BAFFIN ||
+             nAsicType == ATIASIC_ID_LEXA ||
+             nAsicType == ATIASIC_ID_VEGAM)
     {
         GPA_LogMessage("Recognized a GFX8 card.");
         rASICInfo.eAsicType = ASIC_Gfx8;
@@ -329,6 +331,16 @@ bool GetASICInfo(ASICInfo& rASICInfo)
         GPA_LogMessage("Recognized an APU with GFX8 graphics.");
         rASICInfo.eAsicType = ASIC_Gfx8;
     }
+    else if (nAsicType == ATIASIC_ID_VEGA)
+    {
+        GPA_LogMessage("Recognized a GFX9 card.");
+        rASICInfo.eAsicType = ASIC_Gfx9;
+    }
+    else if (nAsicType == ATIASIC_ID_VEGA_APU)
+    {
+        GPA_LogMessage("Recognized an APU with GFX9 graphics.");
+        rASICInfo.eAsicType = ASIC_Gfx9;
+    }
     else
     {
         std::stringstream errorMessage;

Src/GPUPerfAPIGL/ASICInfo.h

@@ -23,7 +23,7 @@ typedef enum
     ASIC_UNKNOWN   ///< unknown asic family
 } ASICType;
 
-/// !!! From maswp4p1.amd.com:1666/stg/ugl/drivers/ugl/src/gl/gs/include/atiasics.h !!!
+/// !!! From /stg/ugl/drivers/ugl/src/gl/gs/include/atiasics.h !!!
 ///   NOTE: THIS MUST BE UPDATED FOR NEW ASICS
 /// Asic identifier enumerant
 typedef enum ATIAsicIDEnum
@@ -43,13 +43,15 @@ typedef enum ATIAsicIDEnum
     ATIASIC_ID_GODAVARI,                    ///< ATIASICID for MULLINS (GFX8 Fusion (Mullins))
     ATIASIC_ID_CARRIZO,                     ///< ATIASICID for Carrizo (GFX8 Fusion)
     ATIASIC_ID_NOLAN,                       ///< ATIASICID for Nolan (GFX8.1 APU)
-    ATIASIC_ID_STONEY,                      ///< ATIASICID for Stoney (GFX8.1 APU, almost the same as Nolan) this was added in 15.20 (GL version 13393)
+    ATIASIC_ID_STONEY,                      ///< ATIASICID for Stoney (GFX8.1 APU, almost the same as Nolan)
     ATIASIC_ID_AMUR,                        ///< ATIASICID for Amur (GFX8.1 APU)
     ATIASIC_ID_FIJI_P,                      ///< ATIASICID for Fiji (GFX8)
     ATIASIC_ID_ELLESMERE,                   ///< ATIASICID for Ellesmere (GFX8)
     ATIASIC_ID_BAFFIN,                      ///< ATIASICID for Baffin (GFX8)
     ATIASIC_ID_LEXA,                        ///< ATIASICID for Lexa (GFX8)
-    ATIASIC_ID_GREENLAND,                   ///< ATIASICID for Greenland (GFX9)
+    ATIASIC_ID_VEGAM,                       ///< ATIASICID for VegaM (GFX8)
+    ATIASIC_ID_VEGA,                        ///< ATIASICID for Vega GFX9)
+    ATIASIC_ID_VEGA_APU,                    ///< ATIASICID for Vega-based APU (GFX9)
     ATIASIC_ID_UNKNOWN,                     ///< Unknown Asic
     ATIAsicId_First = ATIASIC_ID_TAHITI_P,  ///< First place holder
     ATIAsicId_LAST = ATIASIC_ID_UNKNOWN     ///< Last place holder