Merge pull request KhronosGroup#338 from heroseh/main

johnkslang · web-flow · commit 8e2ad27488ed · 2023-05-31T11:34:32.000-06:00
Add Hero C Compiler to the vendor list &amp; add C source language
diff --git a/include/spirv/spir-v.xml b/include/spirv/spir-v.xml
@@ -87,7 +87,8 @@
         <id value="34"  vendor="Rayan Hatout" tool="SPIRVSmith" comment="Contact Rayan Hatout rayan.hatout@gmail.com, Repo https://github.com/rayanht/SPIRVSmith"/>
         <id value="35"  vendor="Saarland University" tool="Shady" comment="Contact Hugo Devillers devillers@uni-saarland.de, Repo https://github.com/Hugobros3/shady"/>
         <id value="36"  vendor="Taichi Graphics" tool="Taichi" comment="Contact Rendong Liang rendongliang@taichi.graphics, Repo https://github.com/taichi-dev/taichi"/>
-        <unused start="37" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
+        <id value="37"  vendor="heroseh" tool="Hero C Compiler" comment="https://github.com/heroseh/hcc"/>
+        <unused start="38" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
     </ids>
 
     <!-- SECTION: SPIR-V Opcodes and Enumerants -->
diff --git a/include/spirv/unified1/spirv.bf b/include/spirv/unified1/spirv.bf
@@ -66,6 +66,7 @@ namespace Spv
             HLSL = 5,
             CPP_for_OpenCL = 6,
             SYCL = 7,
+            HERO_C = 8,
         }
 
         [AllowDuplicates, CRepr] public enum ExecutionModel
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
@@ -10084,6 +10084,10 @@
         {
           "enumerant" : "SYCL",
           "value" : 7
+        },
+        {
+          "enumerant" : "HERO_C",
+          "value" : 8
         }
       ]
     },
diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs
@@ -65,6 +65,7 @@ public enum SourceLanguage
             HLSL = 5,
             CPP_for_OpenCL = 6,
             SYCL = 7,
+            HERO_C = 8,
         }
 
         public enum ExecutionModel
diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h
@@ -73,6 +73,7 @@ typedef enum SpvSourceLanguage_ {
     SpvSourceLanguageHLSL = 5,
     SpvSourceLanguageCPP_for_OpenCL = 6,
     SpvSourceLanguageSYCL = 7,
+    SpvSourceLanguageHERO_C = 8,
     SpvSourceLanguageMax = 0x7fffffff,
 } SpvSourceLanguage;
 
diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp
@@ -69,6 +69,7 @@ enum SourceLanguage {
     SourceLanguageHLSL = 5,
     SourceLanguageCPP_for_OpenCL = 6,
     SourceLanguageSYCL = 7,
+    SourceLanguageHERO_C = 8,
     SourceLanguageMax = 0x7fffffff,
 };
 
diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11
@@ -69,6 +69,7 @@ enum class SourceLanguage : unsigned {
     HLSL = 5,
     CPP_for_OpenCL = 6,
     SYCL = 7,
+    HERO_C = 8,
     Max = 0x7fffffff,
 };
 
diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json
@@ -75,7 +75,8 @@
                     "OpenCL_CPP": 4,
                     "HLSL": 5,
                     "CPP_for_OpenCL": 6,
-                    "SYCL": 7
+                    "SYCL": 7,
+                    "HERO_C": 8
                 }
             },
             {
diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua
@@ -60,6 +60,7 @@ spv = {
         HLSL = 5,
         CPP_for_OpenCL = 6,
         SYCL = 7,
+        HERO_C = 8,
     },
 
     ExecutionModel = {
diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py
@@ -60,6 +60,7 @@
         'HLSL' : 5,
         'CPP_for_OpenCL' : 6,
         'SYCL' : 7,
+        'HERO_C' : 8,
     },
 
     'ExecutionModel' : {
diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d
@@ -68,6 +68,7 @@ enum SourceLanguage : uint
     HLSL = 5,
     CPP_for_OpenCL = 6,
     SYCL = 7,
+    HERO_C = 8,
 }
 
 enum ExecutionModel : uint

-Original file line number
+Diff line change
         <id value="34"  vendor="Rayan Hatout" tool="SPIRVSmith" comment="Contact Rayan Hatout [email protected], Repo https://github.com/rayanht/SPIRVSmith"/>
         <id value="35"  vendor="Saarland University" tool="Shady" comment="Contact Hugo Devillers [email protected], Repo https://github.com/Hugobros3/shady"/>
         <id value="36"  vendor="Taichi Graphics" tool="Taichi" comment="Contact Rendong Liang [email protected], Repo https://github.com/taichi-dev/taichi"/>
 -        <unused start="37" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
 +        <id value="37"  vendor="heroseh" tool="Hero C Compiler" comment="https://github.com/heroseh/hcc"/>
 +        <unused start="38" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
     </ids>
     <!-- SECTION: SPIR-V Opcodes and Enumerants -->
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ namespace Spv`
`66`	`66`	`HLSL = 5,`
`67`	`67`	`CPP_for_OpenCL = 6,`
`68`	`68`	`SYCL = 7,`
	`69`	`+ HERO_C = 8,`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`[AllowDuplicates, CRepr] public enum ExecutionModel`
Original file line number	Diff line number	Diff line change
`@@ -10084,6 +10084,10 @@`
`10084`	`10084`	`{`
`10085`	`10085`	`"enumerant" : "SYCL",`
`10086`	`10086`	`"value" : 7`
	`10087`	`+ },`
	`10088`	`+ {`
	`10089`	`+ "enumerant" : "HERO_C",`
	`10090`	`+ "value" : 8`
`10087`	`10091`	`}`
`10088`	`10092`	`]`
`10089`	`10093`	`},`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ public enum SourceLanguage`
`65`	`65`	`HLSL = 5,`
`66`	`66`	`CPP_for_OpenCL = 6,`
`67`	`67`	`SYCL = 7,`
	`68`	`+ HERO_C = 8,`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`public enum ExecutionModel`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,8 @@`
`75`	`75`	`"OpenCL_CPP": 4,`
`76`	`76`	`"HLSL": 5,`
`77`	`77`	`"CPP_for_OpenCL": 6,`
`78`		`- "SYCL": 7`
	`78`	`+ "SYCL": 7,`
	`79`	`+ "HERO_C": 8`
`79`	`80`	`}`
`80`	`81`	`},`
`81`	`82`	`{`