diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2021-09-10 16:31:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-10 13:31:26 -0700 |
| commit | 27ce5eb0de9f792f3e433bcb239c07d79371cf45 (patch) | |
| tree | bb85155ceafd280a3931432141fc1cc1dae20959 /build | |
| parent | 28adf8917e53953dbfebd746410a427a55eed814 (diff) | |
First Slang LLVM integration (#1934)
* #include an absolute path didn't work - because paths were taken to always be relative.
* First integration with 'slang-llvm'.
* Fix project.
* Fix test output.
* First pass assert support.
* Add inline impls for min and max.
* Add abs inline abs impl for llvm.
* Make abs not use ternary op
* Fix typo in slang-llvm.h
* Sundary fixes to make remaining tests using llvm backend pass.
Diffstat (limited to 'build')
4 files changed, 12 insertions, 0 deletions
diff --git a/build/visual-studio/compiler-core/compiler-core.vcxproj b/build/visual-studio/compiler-core/compiler-core.vcxproj index 339bc73d1..86dec62fc 100644 --- a/build/visual-studio/compiler-core/compiler-core.vcxproj +++ b/build/visual-studio/compiler-core/compiler-core.vcxproj @@ -186,6 +186,7 @@ <ClInclude Include="..\..\..\source\compiler-core\slang-json-value.h" /> <ClInclude Include="..\..\..\source\compiler-core\slang-lexer-diagnostic-defs.h" /> <ClInclude Include="..\..\..\source\compiler-core\slang-lexer.h" /> + <ClInclude Include="..\..\..\source\compiler-core\slang-llvm-compiler.h" /> <ClInclude Include="..\..\..\source\compiler-core\slang-misc-diagnostic-defs.h" /> <ClInclude Include="..\..\..\source\compiler-core\slang-name-convention-util.h" /> <ClInclude Include="..\..\..\source\compiler-core\slang-name.h" /> @@ -211,6 +212,7 @@ <ClCompile Include="..\..\..\source\compiler-core\slang-json-parser.cpp" /> <ClCompile Include="..\..\..\source\compiler-core\slang-json-value.cpp" /> <ClCompile Include="..\..\..\source\compiler-core\slang-lexer.cpp" /> + <ClCompile Include="..\..\..\source\compiler-core\slang-llvm-compiler.cpp" /> <ClCompile Include="..\..\..\source\compiler-core\slang-name-convention-util.cpp" /> <ClCompile Include="..\..\..\source\compiler-core\slang-name.cpp" /> <ClCompile Include="..\..\..\source\compiler-core\slang-nvrtc-compiler.cpp" /> diff --git a/build/visual-studio/compiler-core/compiler-core.vcxproj.filters b/build/visual-studio/compiler-core/compiler-core.vcxproj.filters index da0ca5d63..d68b6e630 100644 --- a/build/visual-studio/compiler-core/compiler-core.vcxproj.filters +++ b/build/visual-studio/compiler-core/compiler-core.vcxproj.filters @@ -57,6 +57,9 @@ <ClInclude Include="..\..\..\source\compiler-core\slang-lexer.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\..\..\source\compiler-core\slang-llvm-compiler.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\..\..\source\compiler-core\slang-misc-diagnostic-defs.h"> <Filter>Header Files</Filter> </ClInclude> @@ -128,6 +131,9 @@ <ClCompile Include="..\..\..\source\compiler-core\slang-lexer.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\..\source\compiler-core\slang-llvm-compiler.cpp"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="..\..\..\source\compiler-core\slang-name-convention-util.cpp"> <Filter>Source Files</Filter> </ClCompile> diff --git a/build/visual-studio/run-generators/run-generators.vcxproj b/build/visual-studio/run-generators/run-generators.vcxproj index 2819cc616..98f121f9f 100644 --- a/build/visual-studio/run-generators/run-generators.vcxproj +++ b/build/visual-studio/run-generators/run-generators.vcxproj @@ -156,6 +156,7 @@ <ItemGroup> <ClInclude Include="..\..\..\prelude\slang-cpp-scalar-intrinsics.h" /> <ClInclude Include="..\..\..\prelude\slang-cpp-types.h" /> + <ClInclude Include="..\..\..\prelude\slang-llvm.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\source\core\slang-string.cpp" /> diff --git a/build/visual-studio/run-generators/run-generators.vcxproj.filters b/build/visual-studio/run-generators/run-generators.vcxproj.filters index 17a7477ed..c535b0a02 100644 --- a/build/visual-studio/run-generators/run-generators.vcxproj.filters +++ b/build/visual-studio/run-generators/run-generators.vcxproj.filters @@ -15,6 +15,9 @@ <ClInclude Include="..\..\..\prelude\slang-cpp-types.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\..\..\prelude\slang-llvm.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\source\core\slang-string.cpp"> |