Merge pull request KhronosGroup#270 from kpet/sycl

raunraun · web-flow · commit 9c3fd01c8a91 · 2022-04-06T11:23:53.000-05:00
Add a SourceLanguage for SYCL
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
@@ -9434,6 +9434,10 @@
         {
           "enumerant" : "CPP_for_OpenCL",
           "value" : 6
+        },
+        {
+          "enumerant" : "SYCL",
+          "value" : 7
         }
       ]
     },
diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs
@@ -62,6 +62,7 @@ public enum SourceLanguage
             OpenCL_CPP = 4,
             HLSL = 5,
             CPP_for_OpenCL = 6,
+            SYCL = 7,
         }
 
         public enum ExecutionModel
diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h
@@ -70,6 +70,7 @@ typedef enum SpvSourceLanguage_ {
     SpvSourceLanguageOpenCL_CPP = 4,
     SpvSourceLanguageHLSL = 5,
     SpvSourceLanguageCPP_for_OpenCL = 6,
+    SpvSourceLanguageSYCL = 7,
     SpvSourceLanguageMax = 0x7fffffff,
 } SpvSourceLanguage;
 
diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp
@@ -66,6 +66,7 @@ enum SourceLanguage {
     SourceLanguageOpenCL_CPP = 4,
     SourceLanguageHLSL = 5,
     SourceLanguageCPP_for_OpenCL = 6,
+    SourceLanguageSYCL = 7,
     SourceLanguageMax = 0x7fffffff,
 };
 
diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11
@@ -66,6 +66,7 @@ enum class SourceLanguage : unsigned {
     OpenCL_CPP = 4,
     HLSL = 5,
     CPP_for_OpenCL = 6,
+    SYCL = 7,
     Max = 0x7fffffff,
 };
 
diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json
@@ -72,7 +72,8 @@
                     "OpenCL_C": 3,
                     "OpenCL_CPP": 4,
                     "HLSL": 5,
-                    "CPP_for_OpenCL": 6
+                    "CPP_for_OpenCL": 6,
+                    "SYCL": 7
                 }
             },
             {
diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua
@@ -57,6 +57,7 @@ spv = {
         OpenCL_CPP = 4,
         HLSL = 5,
         CPP_for_OpenCL = 6,
+        SYCL = 7,
     },
 
     ExecutionModel = {
diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py
@@ -57,6 +57,7 @@
         'OpenCL_CPP' : 4,
         'HLSL' : 5,
         'CPP_for_OpenCL' : 6,
+        'SYCL' : 7,
     },
 
     'ExecutionModel' : {
diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d
@@ -65,6 +65,7 @@ enum SourceLanguage : uint
     OpenCL_CPP = 4,
     HLSL = 5,
     CPP_for_OpenCL = 6,
+    SYCL = 7,
 }
 
 enum ExecutionModel : uint

Original file line number	Diff line number	Diff line change
`@@ -9434,6 +9434,10 @@`
`9434`	`9434`	`{`
`9435`	`9435`	`"enumerant" : "CPP_for_OpenCL",`
`9436`	`9436`	`"value" : 6`
	`9437`	`+ },`
	`9438`	`+ {`
	`9439`	`+ "enumerant" : "SYCL",`
	`9440`	`+ "value" : 7`
`9437`	`9441`	`}`
`9438`	`9442`	`]`
`9439`	`9443`	`},`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ public enum SourceLanguage`
`62`	`62`	`OpenCL_CPP = 4,`
`63`	`63`	`HLSL = 5,`
`64`	`64`	`CPP_for_OpenCL = 6,`
	`65`	`+ SYCL = 7,`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`public enum ExecutionModel`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@`
`72`	`72`	`"OpenCL_C": 3,`
`73`	`73`	`"OpenCL_CPP": 4,`
`74`	`74`	`"HLSL": 5,`
`75`		`- "CPP_for_OpenCL": 6`
	`75`	`+ "CPP_for_OpenCL": 6,`
	`76`	`+ "SYCL": 7`
`76`	`77`	`}`
`77`	`78`	`},`
`78`	`79`	`{`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ enum SourceLanguage : uint`
`65`	`65`	`OpenCL_CPP = 4,`
`66`	`66`	`HLSL = 5,`
`67`	`67`	`CPP_for_OpenCL = 6,`
	`68`	`+ SYCL = 7,`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`enum ExecutionModel : uint`