diff --git a/GenXIntrinsics/include/llvm/GenXIntrinsics/Intrinsic_definitions.py b/GenXIntrinsics/include/llvm/GenXIntrinsics/Intrinsic_definitions.py
index 2e4548a7..9d840f61 100644
--- a/GenXIntrinsics/include/llvm/GenXIntrinsics/Intrinsic_definitions.py
+++ b/GenXIntrinsics/include/llvm/GenXIntrinsics/Intrinsic_definitions.py
@@ -1584,7 +1584,8 @@
 ###
     "dpas" : { "result" : "anyvector",
                "arguments" : [0,"anyvector","anyvector","int"],
-               "attributes" : "NoMem"
+               "attributes" : "NoMem",
+               "platforms" : [ "XeHP+", "~XeLPG", "~XeHPCVG" ],
              },
 
 ### ``llvm.genx.dpas2.<return type>.<vector type>.<vector type>.<vector type>`` : dpas instruction (Dot Product Accumulate Systolic)
@@ -1604,7 +1605,8 @@
 ###
     "dpas2" : { "result" : "anyvector",
                 "arguments" : ["anyvector","anyvector","anyvector","int","int", "int", "int", "int", "int"],
-                "attributes" : "NoMem"
+                "attributes" : "NoMem",
+                "platforms" : [ "XeHP+", "~XeLPG", "~XeHPCVG" ],
               },
 
 ### ``llvm.genx.dpas.nosrc0.<return type>.<vector type>.<vector type>`` : dpas instruction (Dot Product Accumulate Systolic) with no src0
@@ -1618,7 +1620,8 @@
 ###
     "dpas_nosrc0" : { "result" : "anyvector",
                       "arguments" : ["anyvector","anyvector","int"],
-                      "attributes" : "NoMem"
+                      "attributes" : "NoMem",
+                      "platforms" : [ "XeHP+", "~XeLPG", "~XeHPCVG" ],
                     },
 
 ### ``llvm.genx.dpasw.<return type>.<vector type>.<vector type>`` : dpasw instruction (Dot Product Accumulate Systolic)
@@ -1633,7 +1636,9 @@
 ###
     "dpasw" : { "result" : "anyvector",
                 "arguments" : [0,"anyvector","anyvector","int"],
-                "attributes" : "NoMem"
+                "attributes" : "NoMem",
+                "platforms" : [
+                    "XeHP", "XeHPG", "XeLPGPlus" ],
               },
 
 ### ``llvm.genx.dpasw.nosrc0.<return type>.<vector type>.<vector type>`` : dpasw instruction (Dot Product Accumulate Systolic) with no src0
@@ -1647,7 +1652,9 @@
 ###
     "dpasw_nosrc0" : { "result" : "anyvector",
                        "arguments" : ["anyvector","anyvector","int"],
-                       "attributes" : "NoMem"
+                       "attributes" : "NoMem",
+                       "platforms" : [
+                           "XeHP", "XeHPG", "XeLPGPlus" ],
                      },
 
 ### ``llvm.genx.*dp4a*.<return type>.<vector type>.<vector type>.<vector type>`` : dp4a instruction (Dot Product 4 Accumulate)
diff --git a/GenXIntrinsics/include/llvm/GenXIntrinsics/Intrinsics.py b/GenXIntrinsics/include/llvm/GenXIntrinsics/Intrinsics.py
index 646165bf..a099dfbc 100755
--- a/GenXIntrinsics/include/llvm/GenXIntrinsics/Intrinsics.py
+++ b/GenXIntrinsics/include/llvm/GenXIntrinsics/Intrinsics.py
@@ -89,6 +89,7 @@
     "XeLPG",
     "XeLPGPlus",
     "XeHPC",
+    "XeHPCVG",
     "Xe2",
 ]
 
@@ -572,7 +573,7 @@ def platformExprProcess(curr_line,platf_expr,platforms):
         platf_id = platforms.get(platf_expr[1:])
         if platf_id is None:
             raise NameError("Error in platf in " + str(Intrinsics[ID_array[i]]))
-        curr_line[j] = 0;
+        curr_line[platf_id] = 0;
     elif platf_expr == "ALL":
         curr_line = [1]*len(platforms)
     else: