From ba775784bbe45a72ead8aab7b34df2804e599e23 Mon Sep 17 00:00:00 2001
From: Jay Kwak <82421531+jkwak-work@users.noreply.github.com>
Date: Mon, 21 Oct 2024 22:24:39 -0700
Subject: Recognize a new spirv header json grammar keyword "aliases" (#5367)

* Recognize a JSON keyword "aliases" for SPIRV-header

This commit will handle the new JSON keyword "aliases" in SPIRV-Header grammar files.

"aliases" are used in two places: one for "opname" and another for "enumerants".

This commit itself wouldn't do anything until we integrate new commits from SPIRV-Header repo.
---
 source/compiler-core/slang-spirv-core-grammar.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'source/compiler-core')

diff --git a/source/compiler-core/slang-spirv-core-grammar.cpp b/source/compiler-core/slang-spirv-core-grammar.cpp
index 9a4a7e17f..0660954fa 100644
--- a/source/compiler-core/slang-spirv-core-grammar.cpp
+++ b/source/compiler-core/slang-spirv-core-grammar.cpp
@@ -60,6 +60,7 @@ struct Enumerant
     UnownedStringSlice enumerant;
     JSONValue value;
     List<UnownedStringSlice> capabilities;
+    List<UnownedStringSlice> aliases;
     // List<Operand> parameters;
     // UnownedStringSlice version;
     // UnownedStringSlice lastVersion;
@@ -70,6 +71,7 @@ SLANG_MAKE_STRUCT_RTTI_INFO(
     SLANG_RTTI_FIELD(enumerant),
     SLANG_RTTI_FIELD(value),
     SLANG_OPTIONAL_RTTI_FIELD(capabilities),
+    SLANG_OPTIONAL_RTTI_FIELD(aliases),
     // SLANG_OPTIONAL_RTTI_FIELD(parameters),
     // SLANG_OPTIONAL_RTTI_FIELD(version),
     // SLANG_OPTIONAL_RTTI_FIELD(lastVersion),
@@ -152,6 +154,11 @@ static Dictionary<UnownedStringSlice, SpvWord> operandKindToDict(
                 );
         }
         dict.add(e.enumerant, valueInt);
+
+        for (auto alias : e.aliases)
+        {
+            dict.add(alias, valueInt);
+        }
     }
     return dict;
 }
-- 
cgit v1.2.3