From 508dc3a95de50de4a4d07d0a72a18e40d55b0e2e Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska 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 --- source/core/slang-rtti-util.h | 47 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) (limited to 'source/core/slang-rtti-util.h') diff --git a/source/core/slang-rtti-util.h b/source/core/slang-rtti-util.h index cf513ecad..4807c5ea2 100644 --- a/source/core/slang-rtti-util.h +++ b/source/core/slang-rtti-util.h @@ -3,8 +3,53 @@ #include "slang-rtti-info.h" -namespace Slang { +// Some macros to help generate StructRttiInfo for structs without too much +// boilerplate, use as so: +// +// struct MyStruct +// { +// int an_optional_field; +// List a_list_of_strings_field; +// } +// SLANG_MAKE_STRUCT_RTTI_INFO( +// MyStruct, +// SLANG_OPTIONAL_RTTI_FIELD(an_optional_field), +// SLANG_RTTI_FIELD(a_list_of_strings_field) +// ); +// +// This allows parsing JSON objects like +// { +// "an_optional_field": 10, +// "a_list_of_strings_field": ["hello", "world"] +// } +// +// Convert from such JSON objects using JSONToNativeConverter::convert + +#define SLANG_MAKE_STRUCT_RTTI_INFO(S, ...) \ + template<> \ + struct GetRttiInfo \ + { \ + static const RttiInfo* get() \ + { \ + using S_ = S; \ + const static StructRttiInfo::Field fs[] = {__VA_ARGS__}; \ + const auto ignoreUnknownFields = true; \ + const static auto ret = StructRttiInfo{ \ + {{RttiInfo::Kind::Struct, alignof(S), sizeof(S)}, #S}, \ + nullptr, \ + SLANG_COUNT_OF(fs), \ + fs, \ + ignoreUnknownFields \ + }; \ + return &ret; \ + } \ + }; +#define SLANG_RTTI_FIELD_IMPL(m, name, flags) \ + {name, GetRttiInfo::get(), offsetof(S_, m), flags} +#define SLANG_RTTI_FIELD(m) SLANG_RTTI_FIELD_IMPL(m, #m, 0) +#define SLANG_OPTIONAL_RTTI_FIELD(m) SLANG_RTTI_FIELD_IMPL(m, #m, StructRttiInfo::Flag::Optional) +namespace Slang { struct RttiUtil { -- cgit v1.2.3