[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: Linux-->
# :penguin: Linux x64 Test Results

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

<details>
<summary>lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/Rematerializer.cpp.o</summary>

```
FAILED: lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/Rematerializer.cpp.o
sccache /opt/llvm/bin/clang++ -D_DEBUG -D_GLIBCXX_ASSERTIONS -D_GLIBCXX_USE_CXX11_ABI=1 -D_GNU_SOURCE -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/home/gha/actions-runner/_work/llvm-project/llvm-project/build/lib/CodeGen -I/home/gha/actions-runner/_work/llvm-project/llvm-project/llvm/lib/CodeGen -I/home/gha/actions-runner/_work/llvm-project/llvm-project/build/include -I/home/gha/actions-runner/_work/llvm-project/llvm-project/llvm/include -gmlt -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror -Werror=date-time -Werror=unguarded-availability-new -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -pedantic -Wno-long-long -Wc++98-compat-extra-semi -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 -fdiagnostics-color -ffunction-sections -fdata-sections -O3 -DNDEBUG -std=c++17 -UNDEBUG -fno-exceptions -funwind-tables -fno-rtti -MD -MT lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/Rematerializer.cpp.o -MF lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/Rematerializer.cpp.o.d -o lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/Rematerializer.cpp.o -c /home/gha/actions-runner/_work/llvm-project/llvm-project/llvm/lib/CodeGen/Rematerializer.cpp
/home/gha/actions-runner/_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
/home/gha/actions-runner/_work/llvm-project/llvm-project/llvm/lib/CodeGen/Rematerializer.cpp:429:7: note: 'RematReg' declared here
429 |   Reg RematReg;
|       ^
/home/gha/actions-runner/_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;
|   ^~~~~~~~~~~~~~
/home/gha/actions-runner/_work/llvm-project/llvm-project/llvm/include/llvm/CodeGen/MachineInstr.h:58:7: note: 'SmallBitVector' declared here
58 | class SmallBitVector;
|       ^
/home/gha/actions-runner/_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
/home/gha/actions-runner/_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>,
|                      ^
/home/gha/actions-runner/_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;
|                            ^~~~~~~~~~~
/home/gha/actions-runner/_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>
|                    ^
/home/gha/actions-runner/_work/llvm-project/llvm-project/llvm/lib/CodeGen/Rematerializer.cpp:461:7: error: use of undeclared identifier 'RematDeps'
461 |       RematDeps.insert(DepIt->second);
|       ^~~~~~~~~
/home/gha/actions-runner/_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