Merge relevant changes into release 1.7.2212 #5045
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pow2clk
requested review from
cassiebeckley,
Keenuts,
tex3d,
llvm-beanz and
python3kgae
pow2clk
force-pushed
the
cp-release-1.7.2212
branch
2 times, most recently
from
ce05c9c
to
092d039
Compare
|
❌ Build DirectXShaderCompiler 1.0.2864 failed (commit fb8d167cae by @jeffnn) |
Having this enabled makes dxc depends on ncurses5. This is required by LLVM when supporting colored message output, but DXC doesn't supports it for now. Fixes microsoft#4892 (cherry picked from commit 88a2888)
…oft#4927) structurize-returns uses scope-end blocks recorded during codegen to transform the control flow. When "cleanup" blocks are generated (for example for lifetime-markers), structurize-returns as is cannot transform the control flow safely. This change disables structurize-returns and emits a warning when cleanup blocks are detected in the affected function. (cherry picked from commit 93f43ec)
…er offsets (microsoft#4952) * Ignore static members * Remove filecheck macros from test code (cherry picked from commit bef540d)
We would create the dxil runtime reflection object but never free it. Using a unique_ptr here does the job. Found by running external tests with appverifier enabled. (cherry picked from commit 661f7ce)
PDBs compiled with /D "" results in an empty define in the PDB/debug DXIL, which causes IDxcPdbUtils to crash when reading the defines. This change does not fix the empty define, just makes IDxcPdbUtils not crash when reading PDBs like this. The test consists of a compiled DXIL with embedded debug with an empty define. If we decide to fix the empty define later, this test would continue to test for regression. (cherry picked from commit ce9b3a2)
1. The StringRef in the `stringLiterals` in the `SpirvBuilder` can have a dangling reference causing undefined behaviour. 2. Two symbols can have the same name, so when we sort a vector of symbols by name, we want to use std::stable_sort to make sure we get deterministic behaviour. (cherry picked from commit 7c4927a)
When scalarize shuffle inst which has extract element as the input element, create clone before the shuffle instead of after. Because later when replace the shuffle, new vector will be inserted before the shuffle. The elt define will be after its use if inserted before the shuffle earlier. Like %[[B:.+]] = load <2 x float>, <2 x float>* %b, align 4 %[[X:.+]] = insertelement <4 x float> undef, float %[[BX0]], i32 0 %[[Y:.+]] = insertelement <4 x float> %[[X]], float %[[BY0]], i32 1 %[[Z:.+]] = insertelement <4 x float> %[[Y]], float %[[BX1]], i32 2 %[[W:.+]] = insertelement <4 x float> %[[Z]], float %[[BY1]], i32 3 %[[BX0:.+]] = extractelement <2 x float> %[[B]], i32 0 %[[BY0:.+]] = extractelement <2 x float> %[[B]], i32 1 %[[BX1:.+]] = extractelement <2 x float> %[[B]], i32 0 %[[BY1:.+]] = extractelement <2 x float> %[[B]], i32 1 (cherry picked from commit b3dedc9)
dxcapi.h and dxcisense.h had inconsistent and unhelpful for release include paths to find WinAdapter.h. By adding the necessary -I flag, the include can be found without including the paths Fixes microsoft#4918 (cherry picked from commit 00da3ab)
When present in the library search path, linux builds of libdxcompiler.so and the dxc executable should load libdxil.so and use it for validation and signing. However, the code to do that was still searching for dxil.dll even on these platforms. This change creates appropriate names for the dxcompiler and dxil libraries for each platform and uses them where appropriate. In addition, this changes some of the internal interfaces from wide chars to simple chars as the wide interface wasn't useful here. (cherry picked from commit ae51624)
This is a bit hacky. We don't want to have SO versions but we do want SO names. This makes it a bit wonky since CMake doesn't support this usage. (cherry picked from commit 46eb82e)
`dlopen` and `dlsym` do not set `errno` on failure, instead errors are provided in string format via `dlerror()`. Since we don't currently have a good way to propagate string errors we don't propagate them through our API, but this does correct code that otherwise was returning success on failing `dlopen`/`dlsym` calls. (cherry picked from commit 4d7b69c)
) (cherry picked from commit 67162b4)
(cherry picked from commit 5223e25)
pow2clk
force-pushed
the
cp-release-1.7.2212
branch
from
092d039
to
7ce4986
Compare
|
✅ Build DirectXShaderCompiler 1.0.2868 completed (commit 92cdf0164e by @hekota) |
jeffnn
approved these changes
Feb 27, 2023
hekota
approved these changes
Feb 27, 2023
tex3d
approved these changes
Feb 27, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Collects bug fix changes from main into release 1.7.2212