Support SPIRV Capability declaration on intrinsic functions. (#3150)

* Spirv Capability lookup.

* Fix.

---------

Co-authored-by: Yong He <yhe@nvidia.com>

4 files changed, 52 insertions, 0 deletions

diff --git a/build/visual-studio/generate-lookup-tables/generate-lookup-tables.vcxproj b/build/visual-studio/generate-lookup-tables/generate-lookup-tables.vcxproj
index 3d27b3cb2..e558d3cb7 100644
--- a/build/visual-studio/generate-lookup-tables/generate-lookup-tables.vcxproj
+++ b/build/visual-studio/generate-lookup-tables/generate-lookup-tables.vcxproj
@@ -174,6 +174,23 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../external/spirv-headers/include/spirv/unified1/spirv.core.grammar.json;../../../bin/windows-x64/release/slang-lookup-generator.exe</AdditionalInputs>

       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release aarch64|ARM64'">../../../external/spirv-headers/include/spirv/unified1/spirv.core.grammar.json;../../../bin/windows-aarch64/release/slang-lookup-generator.exe</AdditionalInputs>

     </CustomBuild>

+    <CustomBuild Include="..\..\..\external\spirv\spirv-capabilities.txt">

+      <FileType>Document</FileType>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../../../bin/windows-x86/debug/slang-lookup-generator" %(FullPath) $(SolutionDir)/source/slang/slang-lookup-spvcapability.cpp SpvCapability SpvCapability spirv/unified1/spirv.h</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"../../../bin/windows-x64/debug/slang-lookup-generator" %(FullPath) $(SolutionDir)/source/slang/slang-lookup-spvcapability.cpp SpvCapability SpvCapability spirv/unified1/spirv.h</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug aarch64|ARM64'">"../../../bin/windows-aarch64/debug/slang-lookup-generator" %(FullPath) $(SolutionDir)/source/slang/slang-lookup-spvcapability.cpp SpvCapability SpvCapability spirv/unified1/spirv.h</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"../../../bin/windows-x86/release/slang-lookup-generator" %(FullPath) $(SolutionDir)/source/slang/slang-lookup-spvcapability.cpp SpvCapability SpvCapability spirv/unified1/spirv.h</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"../../../bin/windows-x64/release/slang-lookup-generator" %(FullPath) $(SolutionDir)/source/slang/slang-lookup-spvcapability.cpp SpvCapability SpvCapability spirv/unified1/spirv.h</Command>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release aarch64|ARM64'">"../../../bin/windows-aarch64/release/slang-lookup-generator" %(FullPath) $(SolutionDir)/source/slang/slang-lookup-spvcapability.cpp SpvCapability SpvCapability spirv/unified1/spirv.h</Command>

+      <Outputs>../../../source/slang/slang-lookup-spvcapability.cpp</Outputs>

+      <Message>slang-lookup-generator for slang-lookup-spvcapability.cpp</Message>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../external/spirv/spirv-capabilities.txt;../../../bin/windows-x86/debug/slang-lookup-generator.exe</AdditionalInputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../external/spirv/spirv-capabilities.txt;../../../bin/windows-x64/debug/slang-lookup-generator.exe</AdditionalInputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug aarch64|ARM64'">../../../external/spirv/spirv-capabilities.txt;../../../bin/windows-aarch64/debug/slang-lookup-generator.exe</AdditionalInputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../external/spirv/spirv-capabilities.txt;../../../bin/windows-x86/release/slang-lookup-generator.exe</AdditionalInputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../external/spirv/spirv-capabilities.txt;../../../bin/windows-x64/release/slang-lookup-generator.exe</AdditionalInputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release aarch64|ARM64'">../../../external/spirv/spirv-capabilities.txt;../../../bin/windows-aarch64/release/slang-lookup-generator.exe</AdditionalInputs>

+    </CustomBuild>

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/build/visual-studio/generate-lookup-tables/generate-lookup-tables.vcxproj.filters b/build/visual-studio/generate-lookup-tables/generate-lookup-tables.vcxproj.filters
new file mode 100644
index 000000000..8936bc45b
--- /dev/null
+++ b/build/visual-studio/generate-lookup-tables/generate-lookup-tables.vcxproj.filters
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="spirv">
+      <UniqueIdentifier>{593A5F10-C54E-87C1-8ED0-2A21FAA383F2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="spirv-headers">
+      <UniqueIdentifier>{62802470-CE40-A0A6-977B-E92303FBE482}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="spirv-headers\include">
+      <UniqueIdentifier>{D5E9D41E-4156-9019-0A4A-28777675B281}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="spirv-headers\include\spirv">
+      <UniqueIdentifier>{58E55631-C4F2-8417-4DD9-8002B9E550CE}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="spirv-headers\include\spirv\unified1">
+      <UniqueIdentifier>{3C495E56-2830-204E-D180-866BBD4699B4}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\external\spirv-headers\include\spirv\unified1\extinst.glsl.std.450.grammar.json">
+      <Filter>spirv-headers\include\spirv\unified1</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\external\spirv-headers\include\spirv\unified1\spirv.core.grammar.json">
+      <Filter>spirv-headers\include\spirv\unified1</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\external\spirv\spirv-capabilities.txt">
+      <Filter>spirv</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build/visual-studio/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj
index ebbb4f98d..573e4dff2 100644
--- a/build/visual-studio/slang/slang.vcxproj
+++ b/build/visual-studio/slang/slang.vcxproj
@@ -688,6 +688,7 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-aarch64\release\slang-glsla
     <ClCompile Include="..\..\..\source\slang\slang-language-server.cpp" />

     <ClCompile Include="..\..\..\source\slang\slang-legalize-types.cpp" />

     <ClCompile Include="..\..\..\source\slang\slang-lookup-glslstd450.cpp" />

+    <ClCompile Include="..\..\..\source\slang\slang-lookup-spvcapability.cpp" />

     <ClCompile Include="..\..\..\source\slang\slang-lookup-spvop.cpp" />

     <ClCompile Include="..\..\..\source\slang\slang-lookup.cpp" />

     <ClCompile Include="..\..\..\source\slang\slang-lower-to-ir.cpp" />

diff --git a/build/visual-studio/slang/slang.vcxproj.filters b/build/visual-studio/slang/slang.vcxproj.filters
index 0c4f8a4d3..1eca9a115 100644
--- a/build/visual-studio/slang/slang.vcxproj.filters
+++ b/build/visual-studio/slang/slang.vcxproj.filters
@@ -1148,6 +1148,9 @@
     <ClCompile Include="..\..\..\source\slang\slang-lookup-glslstd450.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="..\..\..\source\slang\slang-lookup-spvcapability.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

     <ClCompile Include="..\..\..\source\slang\slang-lookup-spvop.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>