Merge pull request #289 from kpet/spv-arm-core-builtins

Add definitions for SPV_ARM_core_builtins

10 files changed, 84 insertions, 0 deletions

diff --git a/include/spirv/unified1/spirv.bf b/include/spirv/unified1/spirv.bf
index fb9ec89..f83434a 100644
--- a/include/spirv/unified1/spirv.bf
+++ b/include/spirv/unified1/spirv.bf
@@ -612,6 +612,11 @@ namespace Spv
             SubgroupLocalInvocationId = 41,
             VertexIndex = 42,
             InstanceIndex = 43,
+            CoreIDARM = 4160,
+            CoreCountARM = 4161,
+            CoreMaxIDARM = 4162,
+            WarpIDARM = 4163,
+            WarpMaxIDARM = 4164,
             SubgroupEqMask = 4416,
             SubgroupEqMaskKHR = 4416,
             SubgroupGeMask = 4417,
@@ -961,6 +966,7 @@ namespace Spv
             ShaderLayer = 69,
             ShaderViewportIndex = 70,
             UniformDecoration = 71,
+            CoreBuiltinsARM = 4165,
             FragmentShadingRateKHR = 4422,
             SubgroupBallotKHR = 4423,
             DrawParameters = 4427,
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
index bd1289e..5cedfb0 100644
--- a/include/spirv/unified1/spirv.core.grammar.json
+++ b/include/spirv/unified1/spirv.core.grammar.json
@@ -12193,6 +12193,31 @@
           "capabilities" : [ "Shader" ]
         },
         {
+          "enumerant" : "CoreIDARM",
+          "value" : 4160,
+          "capabilities" : [ "CoreBuiltinsARM" ]
+        },
+        {
+          "enumerant" : "CoreCountARM",
+          "value" : 4161,
+          "capabilities" : [ "CoreBuiltinsARM" ]
+        },
+        {
+          "enumerant" : "CoreMaxIDARM",
+          "value" : 4162,
+          "capabilities" : [ "CoreBuiltinsARM" ]
+        },
+        {
+          "enumerant" : "WarpIDARM",
+          "value" : 4163,
+          "capabilities" : [ "CoreBuiltinsARM" ]
+        },
+        {
+          "enumerant" : "WarpMaxIDARM",
+          "value" : 4164,
+          "capabilities" : [ "CoreBuiltinsARM" ]
+        },
+        {
           "enumerant" : "SubgroupEqMask",
           "value" : 4416,
           "capabilities" : [ "SubgroupBallotKHR", "GroupNonUniformBallot" ],
@@ -13244,6 +13269,11 @@
           "version" : "1.6"
         },
         {
+          "enumerant" : "CoreBuiltinsARM",
+          "value" : 4165,
+          "extensions" : [ "SPV_ARM_core_builtins" ]
+        },
+        {
           "enumerant" : "FragmentShadingRateKHR",
           "value" : 4422,
           "capabilities" : [ "Shader" ],
diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs
index 14d36ae..9a0b14f 100644
--- a/include/spirv/unified1/spirv.cs
+++ b/include/spirv/unified1/spirv.cs
@@ -611,6 +611,11 @@ namespace Spv
             SubgroupLocalInvocationId = 41,
             VertexIndex = 42,
             InstanceIndex = 43,
+            CoreIDARM = 4160,
+            CoreCountARM = 4161,
+            CoreMaxIDARM = 4162,
+            WarpIDARM = 4163,
+            WarpMaxIDARM = 4164,
             SubgroupEqMask = 4416,
             SubgroupEqMaskKHR = 4416,
             SubgroupGeMask = 4417,
@@ -960,6 +965,7 @@ namespace Spv
             ShaderLayer = 69,
             ShaderViewportIndex = 70,
             UniformDecoration = 71,
+            CoreBuiltinsARM = 4165,
             FragmentShadingRateKHR = 4422,
             SubgroupBallotKHR = 4423,
             DrawParameters = 4427,
diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h
index 5b6e8aa..c3b1b3b 100644
--- a/include/spirv/unified1/spirv.h
+++ b/include/spirv/unified1/spirv.h
@@ -617,6 +617,11 @@ typedef enum SpvBuiltIn_ {
     SpvBuiltInSubgroupLocalInvocationId = 41,
     SpvBuiltInVertexIndex = 42,
     SpvBuiltInInstanceIndex = 43,
+    SpvBuiltInCoreIDARM = 4160,
+    SpvBuiltInCoreCountARM = 4161,
+    SpvBuiltInCoreMaxIDARM = 4162,
+    SpvBuiltInWarpIDARM = 4163,
+    SpvBuiltInWarpMaxIDARM = 4164,
     SpvBuiltInSubgroupEqMask = 4416,
     SpvBuiltInSubgroupEqMaskKHR = 4416,
     SpvBuiltInSubgroupGeMask = 4417,
@@ -960,6 +965,7 @@ typedef enum SpvCapability_ {
     SpvCapabilityShaderLayer = 69,
     SpvCapabilityShaderViewportIndex = 70,
     SpvCapabilityUniformDecoration = 71,
+    SpvCapabilityCoreBuiltinsARM = 4165,
     SpvCapabilityFragmentShadingRateKHR = 4422,
     SpvCapabilitySubgroupBallotKHR = 4423,
     SpvCapabilityDrawParameters = 4427,
diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp
index e25264a..38813cc 100644
--- a/include/spirv/unified1/spirv.hpp
+++ b/include/spirv/unified1/spirv.hpp
@@ -613,6 +613,11 @@ enum BuiltIn {
     BuiltInSubgroupLocalInvocationId = 41,
     BuiltInVertexIndex = 42,
     BuiltInInstanceIndex = 43,
+    BuiltInCoreIDARM = 4160,
+    BuiltInCoreCountARM = 4161,
+    BuiltInCoreMaxIDARM = 4162,
+    BuiltInWarpIDARM = 4163,
+    BuiltInWarpMaxIDARM = 4164,
     BuiltInSubgroupEqMask = 4416,
     BuiltInSubgroupEqMaskKHR = 4416,
     BuiltInSubgroupGeMask = 4417,
@@ -956,6 +961,7 @@ enum Capability {
     CapabilityShaderLayer = 69,
     CapabilityShaderViewportIndex = 70,
     CapabilityUniformDecoration = 71,
+    CapabilityCoreBuiltinsARM = 4165,
     CapabilityFragmentShadingRateKHR = 4422,
     CapabilitySubgroupBallotKHR = 4423,
     CapabilityDrawParameters = 4427,
diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11
index 555f57b..10309fe 100644
--- a/include/spirv/unified1/spirv.hpp11
+++ b/include/spirv/unified1/spirv.hpp11
@@ -613,6 +613,11 @@ enum class BuiltIn : unsigned {
     SubgroupLocalInvocationId = 41,
     VertexIndex = 42,
     InstanceIndex = 43,
+    CoreIDARM = 4160,
+    CoreCountARM = 4161,
+    CoreMaxIDARM = 4162,
+    WarpIDARM = 4163,
+    WarpMaxIDARM = 4164,
     SubgroupEqMask = 4416,
     SubgroupEqMaskKHR = 4416,
     SubgroupGeMask = 4417,
@@ -956,6 +961,7 @@ enum class Capability : unsigned {
     ShaderLayer = 69,
     ShaderViewportIndex = 70,
     UniformDecoration = 71,
+    CoreBuiltinsARM = 4165,
     FragmentShadingRateKHR = 4422,
     SubgroupBallotKHR = 4423,
     DrawParameters = 4427,
diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json
index 4ad3bcb..ebd09ee 100644
--- a/include/spirv/unified1/spirv.json
+++ b/include/spirv/unified1/spirv.json
@@ -642,6 +642,11 @@
                     "SubgroupLocalInvocationId": 41,
                     "VertexIndex": 42,
                     "InstanceIndex": 43,
+                    "CoreIDARM": 4160,
+                    "CoreCountARM": 4161,
+                    "CoreMaxIDARM": 4162,
+                    "WarpIDARM": 4163,
+                    "WarpMaxIDARM": 4164,
                     "SubgroupEqMask": 4416,
                     "SubgroupEqMaskKHR": 4416,
                     "SubgroupGeMask": 4417,
@@ -938,6 +943,7 @@
                     "ShaderLayer": 69,
                     "ShaderViewportIndex": 70,
                     "UniformDecoration": 71,
+                    "CoreBuiltinsARM": 4165,
                     "FragmentShadingRateKHR": 4422,
                     "SubgroupBallotKHR": 4423,
                     "DrawParameters": 4427,
diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua
index a3d47e9..1d784f7 100644
--- a/include/spirv/unified1/spirv.lua
+++ b/include/spirv/unified1/spirv.lua
@@ -585,6 +585,11 @@ spv = {
         SubgroupLocalInvocationId = 41,
         VertexIndex = 42,
         InstanceIndex = 43,
+        CoreIDARM = 4160,
+        CoreCountARM = 4161,
+        CoreMaxIDARM = 4162,
+        WarpIDARM = 4163,
+        WarpMaxIDARM = 4164,
         SubgroupEqMask = 4416,
         SubgroupEqMaskKHR = 4416,
         SubgroupGeMask = 4417,
@@ -918,6 +923,7 @@ spv = {
         ShaderLayer = 69,
         ShaderViewportIndex = 70,
         UniformDecoration = 71,
+        CoreBuiltinsARM = 4165,
         FragmentShadingRateKHR = 4422,
         SubgroupBallotKHR = 4423,
         DrawParameters = 4427,
diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py
index 5e8a0ef..970649f 100644
--- a/include/spirv/unified1/spirv.py
+++ b/include/spirv/unified1/spirv.py
@@ -585,6 +585,11 @@ spv = {
         'SubgroupLocalInvocationId' : 41,
         'VertexIndex' : 42,
         'InstanceIndex' : 43,
+        'CoreIDARM' : 4160,
+        'CoreCountARM' : 4161,
+        'CoreMaxIDARM' : 4162,
+        'WarpIDARM' : 4163,
+        'WarpMaxIDARM' : 4164,
         'SubgroupEqMask' : 4416,
         'SubgroupEqMaskKHR' : 4416,
         'SubgroupGeMask' : 4417,
@@ -918,6 +923,7 @@ spv = {
         'ShaderLayer' : 69,
         'ShaderViewportIndex' : 70,
         'UniformDecoration' : 71,
+        'CoreBuiltinsARM' : 4165,
         'FragmentShadingRateKHR' : 4422,
         'SubgroupBallotKHR' : 4423,
         'DrawParameters' : 4427,
diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d
index 0ef3768..a8c03ff 100644
--- a/include/spirv/unified1/spv.d
+++ b/include/spirv/unified1/spv.d
@@ -614,6 +614,11 @@ enum BuiltIn : uint
     SubgroupLocalInvocationId = 41,
     VertexIndex = 42,
     InstanceIndex = 43,
+    CoreIDARM = 4160,
+    CoreCountARM = 4161,
+    CoreMaxIDARM = 4162,
+    WarpIDARM = 4163,
+    WarpMaxIDARM = 4164,
     SubgroupEqMask = 4416,
     SubgroupEqMaskKHR = 4416,
     SubgroupGeMask = 4417,
@@ -963,6 +968,7 @@ enum Capability : uint
     ShaderLayer = 69,
     ShaderViewportIndex = 70,
     UniformDecoration = 71,
+    CoreBuiltinsARM = 4165,
     FragmentShadingRateKHR = 4422,
     SubgroupBallotKHR = 4423,
     DrawParameters = 4427,