From 67e186f0169591c48d24bd8ff7e4e4e715e8fa45 Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Mon, 9 Oct 2023 14:03:43 -0700
Subject: Run curated spirv-opt passes through slang-glslang. (#3266)

* Run curated spirv-opt passes through slang-glslang.

* Cleanup.

* Replace spirv-dis downstream compiler with glslang.

* delete slang-spirv-opt.cpp.

---------

Co-authored-by: Yong He <yhe@nvidia.com>
---
 build/visual-studio/compiler-core/compiler-core.vcxproj         | 2 --
 build/visual-studio/compiler-core/compiler-core.vcxproj.filters | 6 ------
 build/visual-studio/slang/slang.vcxproj                         | 2 --
 build/visual-studio/slang/slang.vcxproj.filters                 | 6 ------
 4 files changed, 16 deletions(-)

(limited to 'build/visual-studio')

diff --git a/build/visual-studio/compiler-core/compiler-core.vcxproj b/build/visual-studio/compiler-core/compiler-core.vcxproj
index e5b9c5fdb..e2202aaca 100644
--- a/build/visual-studio/compiler-core/compiler-core.vcxproj
+++ b/build/visual-studio/compiler-core/compiler-core.vcxproj
@@ -312,7 +312,6 @@
     <ClInclude Include="..\..\..\source\compiler-core\slang-source-loc.h" />
     <ClInclude Include="..\..\..\source\compiler-core\slang-source-map.h" />
     <ClInclude Include="..\..\..\source\compiler-core\slang-spirv-core-grammar.h" />
-    <ClInclude Include="..\..\..\source\compiler-core\slang-spirv-dis-compiler.h" />
     <ClInclude Include="..\..\..\source\compiler-core\slang-test-server-protocol.h" />
     <ClInclude Include="..\..\..\source\compiler-core\slang-token-defs.h" />
     <ClInclude Include="..\..\..\source\compiler-core\slang-token.h" />
@@ -361,7 +360,6 @@
     <ClCompile Include="..\..\..\source\compiler-core\slang-source-loc.cpp" />
     <ClCompile Include="..\..\..\source\compiler-core\slang-source-map.cpp" />
     <ClCompile Include="..\..\..\source\compiler-core\slang-spirv-core-grammar.cpp" />
-    <ClCompile Include="..\..\..\source\compiler-core\slang-spirv-dis-compiler.cpp" />
     <ClCompile Include="..\..\..\source\compiler-core\slang-test-server-protocol.cpp" />
     <ClCompile Include="..\..\..\source\compiler-core\slang-token.cpp" />
     <ClCompile Include="..\..\..\source\compiler-core\slang-visual-studio-compiler-util.cpp" />
diff --git a/build/visual-studio/compiler-core/compiler-core.vcxproj.filters b/build/visual-studio/compiler-core/compiler-core.vcxproj.filters
index 14c7aa7da..2d4e3663d 100644
--- a/build/visual-studio/compiler-core/compiler-core.vcxproj.filters
+++ b/build/visual-studio/compiler-core/compiler-core.vcxproj.filters
@@ -150,9 +150,6 @@
     <ClInclude Include="..\..\..\source\compiler-core\slang-spirv-core-grammar.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\compiler-core\slang-spirv-dis-compiler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\compiler-core\slang-test-server-protocol.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -293,9 +290,6 @@
     <ClCompile Include="..\..\..\source\compiler-core\slang-spirv-core-grammar.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\compiler-core\slang-spirv-dis-compiler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\compiler-core\slang-test-server-protocol.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/build/visual-studio/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj
index 52db5fb4b..2e180e9ed 100644
--- a/build/visual-studio/slang/slang.vcxproj
+++ b/build/visual-studio/slang/slang.vcxproj
@@ -506,7 +506,6 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-aarch64\release\slang-glsla
     <ClInclude Include="..\..\..\source\slang\slang-serialize-types.h" />
     <ClInclude Include="..\..\..\source\slang\slang-serialize-value-type-info.h" />
     <ClInclude Include="..\..\..\source\slang\slang-serialize.h" />
-    <ClInclude Include="..\..\..\source\slang\slang-spirv-opt.h" />
     <ClInclude Include="..\..\..\source\slang\slang-spirv-val.h" />
     <ClInclude Include="..\..\..\source\slang\slang-stdlib-textures.h" />
     <ClInclude Include="..\..\..\source\slang\slang-syntax.h" />
@@ -719,7 +718,6 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-aarch64\release\slang-glsla
     <ClCompile Include="..\..\..\source\slang\slang-serialize-types.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-serialize.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-spirv-core-grammar-embed.cpp" />
-    <ClCompile Include="..\..\..\source\slang\slang-spirv-opt.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-spirv-val.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-stdlib-api.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-stdlib-textures.cpp" />
diff --git a/build/visual-studio/slang/slang.vcxproj.filters b/build/visual-studio/slang/slang.vcxproj.filters
index 67e22c3ea..10cc7c103 100644
--- a/build/visual-studio/slang/slang.vcxproj.filters
+++ b/build/visual-studio/slang/slang.vcxproj.filters
@@ -606,9 +606,6 @@
     <ClInclude Include="..\..\..\source\slang\slang-serialize.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\slang\slang-spirv-opt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\slang\slang-spirv-val.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1241,9 +1238,6 @@
     <ClCompile Include="..\..\..\source\slang\slang-spirv-core-grammar-embed.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\slang\slang-spirv-opt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\slang\slang-spirv-val.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-- 
cgit v1.2.3