[llvm-branch-commits] [llvm] [CodeGen][AMDGPU] Prepare rematerializer for multi-def remat support (NFC) (PR #197579)

[via llvm-branch-commits]

github-actions[bot] wrote:

<!--PREMERGE ADVISOR COMMENT: Windows-->
# :window: Windows x64 Test Results

The build failed before running any tests. Click on a failure below to see the details.

<details>
<summary>[code=1] lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/Rematerializer.cpp.obj</summary>

```
FAILED: [code=1] lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/Rematerializer.cpp.obj
sccache C:\clang\clang-msvc\bin\clang-cl.exe  /nologo -TP -DUNICODE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_GLIBCXX_ASSERTIONS -D_HAS_EXCEPTIONS=0 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -IC:\_work\llvm-project\llvm-project\build\lib\CodeGen -IC:\_work\llvm-project\llvm-project\llvm\lib\CodeGen -IC:\_work\llvm-project\llvm-project\build\include -IC:\_work\llvm-project\llvm-project\llvm\include /DWIN32 /D_WINDOWS   /Zc:inline /Zc:__cplusplus /Oi /Brepro /bigobj /permissive- -Werror=unguarded-availability-new /W4  -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wno-pass-failed -Wmisleading-indentation -Wctad-maybe-unsupported /Gw /O2 /Ob2  -std:c++17 -MD -UNDEBUG /EHs-c- /GR- /showIncludes /Folib\CodeGen\CMakeFiles\LLVMCodeGen.dir\Rematerializer.cpp.obj /Fdlib\CodeGen\CMakeFiles\LLVMCodeGen.dir\LLVMCodeGen.pdb -c -- C:\_work\llvm-project\llvm-project\llvm\lib\CodeGen\Rematerializer.cpp
C:\_work\llvm-project\llvm-project\llvm\lib\CodeGen\Rematerializer.cpp(451,34): error: use of undeclared identifier 'RematDeps'; did you mean 'RematReg'?
451 |   SmallSetVector<RegisterIdx, 2> RematDeps;
|                                  ^~~~~~~~~
|                                  RematReg
C:\_work\llvm-project\llvm-project\llvm\lib\CodeGen\Rematerializer.cpp(429,7): note: 'RematReg' declared here
429 |   Reg RematReg;
|       ^
C:\_work\llvm-project\llvm-project\llvm\lib\CodeGen\Rematerializer.cpp(451,3): error: use of undeclared identifier 'SmallSetVector'; did you mean 'SmallBitVector'?
451 |   SmallSetVector<RegisterIdx, 2> RematDeps;
|   ^~~~~~~~~~~~~~
C:\_work\llvm-project\llvm-project\llvm\include\llvm/CodeGen/MachineInstr.h(58,7): note: 'SmallBitVector' declared here
58 | class SmallBitVector;
|       ^
C:\_work\llvm-project\llvm-project\llvm\lib\CodeGen\Rematerializer.cpp(452,3): error: no template named 'SmallMapVector'; did you mean 'SmallVector'?
452 |   SmallMapVector<Register, LaneBitmask, 2> UnrematDeps;
|   ^~~~~~~~~~~~~~
|   SmallVector
C:\_work\llvm-project\llvm-project\llvm\include\llvm/ADT/SmallVector.h(1224,22): note: 'SmallVector' declared here
1224 | class LLVM_GSL_OWNER SmallVector : public SmallVectorImpl<T>,
|                      ^
C:\_work\llvm-project\llvm-project\llvm\lib\CodeGen\Rematerializer.cpp(452,28): error: template argument for non-type template parameter must be an expression
452 |   SmallMapVector<Register, LaneBitmask, 2> UnrematDeps;
|                            ^~~~~~~~~~~
C:\_work\llvm-project\llvm-project\llvm\include\llvm/ADT/SmallVector.h(1223,20): note: template parameter is declared here
1223 |           unsigned N = CalculateSmallVectorDefaultInlinedElements<T>::value>
|                    ^
C:\_work\llvm-project\llvm-project\llvm\lib\CodeGen\Rematerializer.cpp(461,7): error: use of undeclared identifier 'RematDeps'
461 |       RematDeps.insert(DepIt->second);
|       ^~~~~~~~~
C:\_work\llvm-project\llvm-project\llvm\lib\CodeGen\Rematerializer.cpp(473,27): error: use of undeclared identifier 'RematDeps'
473 |   RematReg.Dependencies = RematDeps.takeVector();
|                           ^~~~~~~~~
6 errors generated.
```
</details>

If these failures are unrelated to your changes (for example tests are broken or flaky at HEAD), please open an issue at https://github.com/llvm/llvm-project/issues and add the `infrastructure` label.

https://github.com/llvm/llvm-project/pull/197579