Pull upstream

.github/workflows/presubmit.yml

@@ -8,7 +8,7 @@ jobs:
   validate_json:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Validate
         run: python3 tools/check_grammar/check_grammar.py include/spirv/unified1/*.json
 
@@ -19,7 +19,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install Ubuntu packages
         if: matrix.os == 'ubuntu-latest'
         run: sudo apt install -y dos2unix
@@ -59,7 +59,7 @@ jobs:
   test_cmake_min_required:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: lukka/get-cmake@latest
         with:
           cmakeVersion: 3.14.0
@@ -71,7 +71,7 @@ jobs:
   test_cmake_latest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: lukka/get-cmake@latest
       - name: CMake build
         run: |
@@ -81,7 +81,7 @@ jobs:
   add_subdirectory:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: lukka/get-cmake@latest
         with:
           cmakeVersion: 3.15.0
@@ -93,7 +93,7 @@ jobs:
   find_package:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: lukka/get-cmake@latest
         with:
           cmakeVersion: 3.15.0
@@ -109,7 +109,7 @@ jobs:
   find_pkg_config:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: lukka/get-cmake@latest
         with:
           cmakeVersion: 3.15.0
@@ -126,7 +126,7 @@ jobs:
   find_pkg_config_absolute:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: lukka/get-cmake@latest
         with:
           cmakeVersion: 3.15.0
@@ -148,6 +148,6 @@ jobs:
     container: khronosgroup/docker-images@sha256:724f67d8562445523644abf017d5d192b369fafc122de75e9d26792c649821a0
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: REUSE license checker
         run: reuse lint

include/spirv/spir-v.xml

@@ -81,7 +81,8 @@
         <id value="46"  vendor="Nintendo" comment="Contact Steve Urquhart, steve.urquhart@ntd.nintendo.com"/>
         <id value="47"  vendor="ARM" comment="Contact Christopher Gautier, christopher.gautier@arm.com"/>
         <id value="48"  vendor="Goopax" comment="Contact Ingo Josopait, josopait@goopax.com"/>
-        <unused start="49" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
+        <id value="49"  vendor="Icyllis Milica" tool="Arc3D Shader Compiler" comment="Contact Icyllis Milica, https://github.com/BloCamLimb/Arc3D"/>
+        <unused start="50" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
     </ids>
 
     <!-- SECTION: SPIR-V Opcodes and Enumerants -->
@@ -139,13 +140,14 @@
     <ids type="opcode" start="6592" end="6655" vendor="Saarland University" comment="Contact devillers@cg.uni-saarland.de"/>
     <ids type="opcode" start="6656" end="6719" vendor="Meta" comment="Contact dunfanlu@meta.com"/>
     <ids type="opcode" start="6720" end="6783" vendor="MediaTek" comment="Contact samuel.huang@mediatek.com"/>
+    <ids type="opcode" start="6784" end="6911" vendor="Intel" comment="Contact mariusz.merecki@intel.com"/>
     <!-- Opcode enumerants to reserve for future use. To get a block, allocate
          multiples of 64 starting at the lowest available point in this
          block and add a corresponding <ids> tag immediately above. Make
          sure to fill in the vendor attribute, and preferably add a contact
          person/address in a comment attribute. -->
     <!-- Example new block: <ids type="opcode" start="XXXX" end="XXXX+64n-1" vendor="Add vendor" comment="Contact TBD"/> -->
-    <ids type="opcode" start="6784" end="65535" comment="Opcode range reservable for future use by vendors"/>
+    <ids type="opcode" start="6912" end="65535" comment="Opcode range reservable for future use by vendors"/>
     <!-- End reservations of opcodes -->
 
 
@@ -173,13 +175,14 @@
     <ids type="enumerant" start="6592" end="6655" vendor="Saarland University" comment="Contact devillers@cg.uni-saarland.de"/>
     <ids type="enumerant" start="6656" end="6719" vendor="Meta" comment="Contact dunfanlu@meta.com"/>
     <ids type="enumerant" start="6720" end="6783" vendor="MediaTek" comment="Contact samuel.huang@mediatek.com"/>
+    <ids type="enumerant" start="6784" end="6911" vendor="Intel" comment="Contact mariusz.merecki@intel.com"/>
     <!-- Enumerants to reserve for future use. To get a block, allocate
          multiples of 64 starting at the lowest available point in this
          block and add a corresponding <ids> tag immediately above. Make
          sure to fill in the vendor attribute, and preferably add a contact
          person/address in a comment attribute. -->
     <!-- Example new block: <ids type="enumerant" start="XXXX" end="XXXX+64n-1" vendor="Add vendor" comment="Contact TBD"/> -->
-    <ids type="enumerant" start="6784" end="4294967295" comment="Enumerant range reservable for future use by vendors"/>
+    <ids type="enumerant" start="6912" end="4294967295" comment="Enumerant range reservable for future use by vendors"/>
     <!-- End reservations of enumerants -->
 
 

include/spirv/unified1/TOSA.001000.1.h

@@ -9,7 +9,7 @@ extern "C" {
 #endif
 
 enum {
-    TOSAVersion = 1000000,
+    TOSAVersion = 1000001,
     TOSAVersion_BitWidthPadding = 0x7fffffff
 };
 enum {

include/spirv/unified1/extinst.debuginfo.grammar.json

@@ -432,35 +432,35 @@
       "enumerants" : [
         {
           "enumerant" : "Unspecified",
-          "value" : "0"
+          "value" : 0
         },
         {
           "enumerant" : "Address",
-          "value" : "1"
+          "value" : 1
         },
         {
           "enumerant" : "Boolean",
-          "value" : "2"
+          "value" : 2
         },
         {
           "enumerant" : "Float",
-          "value" : "4"
+          "value" : 4
         },
         {
           "enumerant" : "Signed",
-          "value" : "5"
+          "value" : 5
         },
         {
           "enumerant" : "SignedChar",
-          "value" : "6"
+          "value" : 6
         },
         {
           "enumerant" : "Unsigned",
-          "value" : "7"
+          "value" : 7
         },
         {
           "enumerant" : "UnsignedChar",
-          "value" : "8"
+          "value" : 8
         }
       ]
     },
@@ -470,15 +470,15 @@
       "enumerants" : [
         {
           "enumerant" : "Class",
-          "value" : "0"
+          "value" : 0
         },
         {
           "enumerant" : "Structure",
-          "value" : "1"
+          "value" : 1
         },
         {
           "enumerant" : "Union",
-          "value" : "2"
+          "value" : 2
         }
       ]
     },
@@ -488,15 +488,15 @@
       "enumerants" : [
         {
           "enumerant" : "ConstType",
-          "value" : "0"
+          "value" : 0
         },
         {
           "enumerant" : "VolatileType",
-          "value" : "1"
+          "value" : 1
         },
         {
           "enumerant" : "RestrictType",
-          "value" : "2"
+          "value" : 2
         }
       ]
     },
@@ -506,46 +506,46 @@
       "enumerants" : [
         {
           "enumerant" : "Deref",
-          "value" : "0"
+          "value" : 0
         },
         {
           "enumerant" : "Plus",
-          "value" : "1"
+          "value" : 1
         },
         {
           "enumerant" : "Minus",
-          "value" : "2"
+          "value" : 2
         },
         {
           "enumerant" : "PlusUconst",
-          "value" : "3",
+          "value" : 3,
           "parameters" : [
              { "kind" : "LiteralInteger" }
           ]
         },
         {
           "enumerant" : "BitPiece",
-          "value" : "4",
+          "value" : 4,
           "parameters" : [
              { "kind" : "LiteralInteger" },
              { "kind" : "LiteralInteger" }
           ]
         },
         {
           "enumerant" : "Swap",
-          "value" : "5"
+          "value" : 5
         },
         {
           "enumerant" : "Xderef",
-          "value" : "6"
+          "value" : 6
         },
         {
           "enumerant" : "StackValue",
-          "value" : "7"
+          "value" : 7
         },
         {
           "enumerant" : "Constu",
-          "value" : "8",
+          "value" : 8,
           "parameters" : [
              { "kind" : "LiteralInteger" }
           ]