Support PVC-VG platform in VC

.

(cherry picked from commit 2ab5903)

Author: vmustya

IGC/VectorCompiler/cmake/supported_platforms_list.cmake

@@ -16,4 +16,5 @@ set(SUPPORTED_VC_PLATFORMS
     "XeHPG"
     "XeLPG"
     "XeHPC"
+    "XeHPCVG"
     )

IGC/VectorCompiler/igcdeps/src/TranslationInterface.cpp

@@ -172,8 +172,11 @@ getPlatformName(const PLATFORM &Platform) {
       return {"XeLPG", RevId};
     break;
   case IGFX_XE_HPC_CORE:
-    if (Product == IGFX_PVC)
+    if (Product == IGFX_PVC) {
+      if (GFX_IS_VG_CONFIG(DevId))
+        return {"XeHPCVG", RevId & ComputeTileMaskPVC};
       return {"XeHPC", RevId & ComputeTileMaskPVC};
+    }
     break;
   default:
     break;

IGC/VectorCompiler/lib/GenXCodeGen/GenX.td

@@ -421,6 +421,32 @@ def : Proc<"XeHPC", [
   FeatureThreadPayloadInMemory,
 ]>;
 
+def : Proc<"XeHPCVG", [
+  FeatureFP64,
+  FeatureGRFByteSize64,
+  FeatureHas8ThreadsPerEU,
+  FeatureHasAdd3,
+  FeatureHasBfn,
+  FeatureHasLSC,
+  FeatureHasLargeGRF,
+  FeatureHasMadSimd32,
+  FeatureHasNamedBarriers,
+  FeatureHasOWordSLM,
+  FeatureHasPackedFloat,
+  FeatureIEEEDivSqrt,
+  FeatureIndirectGRFCrossing,
+  FeatureInstr64BitRotate,
+  FeatureInstrAdd64,
+  FeatureInstrGlobalAtomicAddF64,
+  FeatureInstrLocalIntegerCas64,
+  FeatureLSCMaxWidth32,
+  FeatureLongLong,
+  FeaturePartialI64Emulation,
+  FeatureSLM128K,
+  FeatureSwitchjmp,
+  FeatureThreadPayloadInMemory,
+]>;
+
 def GenX : Target {
   // Nothing here (yet?)
 }

IGC/VectorCompiler/lib/GenXCodeGen/GenXSubtarget.cpp

@@ -62,6 +62,7 @@ void GenXSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
                  .Case("XeHPG", XeHPG)
                  .Case("XeLPG", XeLPG)
                  .Case("XeHPC", XeHPC)
+                 .Case("XeHPCVG", XeHPCVG)
                  .Default(Invalid);
 
   std::string CPUName(CPU);
@@ -97,8 +98,8 @@ uint32_t GenXSubtarget::getMaxThreadsNumPerSubDevice() const {
   case XeHP:
   case XeHPG:
   case XeLPG:
-    return 1 << 12;
   case XeHPC:
+  case XeHPCVG:
     return 1 << 12;
   }
   return 0;
@@ -121,7 +122,8 @@ ArrayRef<std::pair<int, int>> GenXSubtarget::getThreadIdReservedBits() const {
     static const std::pair<int, int> Bits[] = {{6, 1}, {3, 1}};
     return Bits;
   }
-  case GenXSubtarget::XeHPC: {
+  case GenXSubtarget::XeHPC:
+  case GenXSubtarget::XeHPCVG: {
     // [14:12] Slice ID.
     // [11:9] SubSlice ID
     // [8] : EUID[2]
@@ -156,7 +158,8 @@ ArrayRef<std::pair<int, int>> GenXSubtarget::getSubsliceIdBits() const {
     static const std::pair<int, int> Bits[] = {{8, 6}};
     return Bits;
   }
-  case GenXSubtarget::XeHPC: {
+  case GenXSubtarget::XeHPC:
+  case GenXSubtarget::XeHPCVG: {
     // [14:12] Slice ID.
     // [11:9] SubSlice ID
     static const std::pair<int, int> Bits[] = {{9, 6}};
@@ -178,7 +181,8 @@ ArrayRef<std::pair<int, int>> GenXSubtarget::getEUIdBits() const {
     static const std::pair<int, int> Bits[] = {{4, 2}, {7, 1}};
     return Bits;
   }
-  case GenXSubtarget::XeHPC: {
+  case GenXSubtarget::XeHPC:
+  case GenXSubtarget::XeHPCVG: {
     // [8] : EUID[2]
     // [7:6] : Reserved
     // [5:4] EUID[1:0]
@@ -220,6 +224,8 @@ TARGET_PLATFORM GenXSubtarget::getVisaPlatform() const {
   case XeHPC:
     if (!partialI64Emulation())
       return TARGET_PLATFORM::Xe_PVC;
+    LLVM_FALLTHROUGH;
+  case XeHPCVG:
     return TARGET_PLATFORM::Xe_PVCXT;
   default:
     return TARGET_PLATFORM::GENX_NONE;

IGC/VectorCompiler/lib/GenXCodeGen/GenXSubtarget.h

@@ -56,6 +56,7 @@ class GenXSubtarget final : public GenXGenSubtargetInfo {
     XeHPG,
     XeLPG,
     XeHPC,
+    XeHPCVG,
     Invalid,
   };
 

IGC/common/VCPlatformSelector.hpp

@@ -83,6 +83,8 @@ inline const char *getPlatformStr(PLATFORM Platform, unsigned &RevId) {
     return "dg2";
   case IGFX_PVC:
     RevId &= cmc::ComputeTileMaskPVC;
+    if (GFX_IS_VG_CONFIG(DeviceId))
+      return "pvc-vg";
     if (RevId <= 1)
       return "pvc-sdv";
     if (RevId == 3)

inc/common/igfxfmid.h

@@ -723,6 +723,19 @@ typedef enum __NATIVEGTTYPE
 // ARL
 #define DEV_ID_7D67                             0x7D67
 
+// PVC
+#define DEV_ID_0BD0                            0x0BD0
+#define DEV_ID_0BD4                            0x0BD4
+#define DEV_ID_0BD5                            0x0BD5
+#define DEV_ID_0BD6                            0x0BD6
+#define DEV_ID_0BD7                            0x0BD7
+#define DEV_ID_0BD8                            0x0BD8
+#define DEV_ID_0BD9                            0x0BD9
+#define DEV_ID_0BDA                            0x0BDA
+#define DEV_ID_0BDB                            0x0BDB
+#define DEV_ID_0B69                            0x0B69
+#define DEV_ID_0B6E                            0x0B6E
+
 #define GFX_IS_DG2_G11_CONFIG(d) ( ( d == DEV_ID_56A5 )             ||   \
                                  ( d == DEV_ID_56A6 )             ||   \
                                  ( d == DEV_ID_5693 )             ||   \
@@ -758,4 +771,15 @@ typedef enum __NATIVEGTTYPE
 
 #define GFX_IS_ARL_S(d)  ( ( d == DEV_ID_7D67 ) )
 
+#define GFX_IS_XT_CONFIG(d) ((d == DEV_ID_0BD5) || \
+                             (d == DEV_ID_0BD6) || \
+                             (d == DEV_ID_0BD7) || \
+                             (d == DEV_ID_0BD8) || \
+                             (d == DEV_ID_0BD9) || \
+                             (d == DEV_ID_0BDA) || \
+                             (d == DEV_ID_0BDB) || \
+                             (d == DEV_ID_0B69) || \
+                             (d == DEV_ID_0B6E))
+#define GFX_IS_VG_CONFIG(d) ((d == DEV_ID_0BD4))
+
 #endif