From 508dc3a95de50de4a4d07d0a72a18e40d55b0e2e Mon Sep 17 00:00:00 2001
From: Ellie Hermaszewska <ellieh@nvidia.com>
Date: Tue, 29 Aug 2023 06:05:26 +0800
Subject: Allow bitwise or expressions and numeric literals in spirv_asm blocks
 (#3157)

* Add -spirv-core-grammar option to load alternate spirv defs

Also embed a version to use by default

* Use perfect hash for spv op lookup

* Neaten perfect hash embedding

* Refactor spirv grammar lookup in preperation for more kinds of lookups

* Load spirv capability list from spec

* Add all SPIR-V enums to lookup table

* regenerate vs projects

* appease msvc

* Use string slices for spir-v core grammar lookups

* wiggle

* comment

* Add OpInfo for spv ops

* regenerate vs projects

* Embed op names

* Add min/max operand counts and enum categories to spirv info

* neaten

* Operand kinds for spirv ops

* Store and embed all information relating to spirv enums and qualifiers

* Use SPIR-V spec to position instructions in spirv_asm blocks

* Neaten spir-v info embedding

* Neaten perfect hash embedding

* Add assignment syntax to spirv_asm snippets

* Better errors for spirv_asm parser

* Add warning for too many operands in spirv asm

* squash warnings

* neaten

* test wiggle

* Lookup enums for spirv

* Put OpCapability and OpExtension in the correct place for spirv_asm blocks

* Tests for OpCapability and OpExtension

* ci wiggle

* Add expected failure

* Allow raising immediate values to constant ids where necessary in spirv_asm blocks

* Allow bitwise or expressions and numeric literals in spirv_asm blocks

* test numeric literals

* Fix memory issues.

* fix.

---------

Co-authored-by: Yong He <yonghe@outlook.com>
---
 source/core/slang-dictionary.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'source/core/slang-dictionary.h')

diff --git a/source/core/slang-dictionary.h b/source/core/slang-dictionary.h
index c7c0c8e05..ff7e201bf 100644
--- a/source/core/slang-dictionary.h
+++ b/source/core/slang-dictionary.h
@@ -9,6 +9,7 @@
 #include "slang-math.h"
 #include "slang-hash.h"
 #include "../../external/unordered_dense/include/ankerl/unordered_dense.h"
+#include <initializer_list>
 
 namespace Slang
 {
@@ -87,6 +88,16 @@ namespace Slang
         using ThisType = Dictionary<TKey, TValue, Hash, KeyEqual>;
         InnerMap map;
     public:
+        Dictionary() = default;
+        Dictionary(const Dictionary&) = default;
+        Dictionary(Dictionary&&) = default;
+        ThisType& operator=(const ThisType&) = default;
+        ThisType& operator=(ThisType&&) = default;
+        Dictionary(std::initializer_list<typename InnerMap::value_type> inits)
+            : map(std::move(inits))
+        {
+        }
+
         //
         // Types
         //
-- 
cgit v1.2.3