[AMDGPU][NewPM] Make the pass flow consistent with the legacy pipeline.

[cdevadas]

No description provided.

[cdevadas]

• [AMDGPU][NewPM] Make the pass flow consistent with the legacy pipeline. #136551 👈 (View in Graphite)
• main

This stack of pull requests is managed by Graphite. Learn more about stacking.

[llvmbot]

@llvm/pr-subscribers-backend-amdgpu

Author: Christudasan Devadasan (cdevadas)

Changes

---

Full diff: https://github.com/llvm/llvm-project/pull/136551.diff

1 Files Affected:

• (modified) llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp (+3-5)

diff --git a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
index 90e3489ced923..b6cc5137d711a 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
@@ -2081,13 +2081,11 @@ void AMDGPUCodeGenPassBuilder::addCodeGenPrepare(AddIRPass &addPass) const {
 
 void AMDGPUCodeGenPassBuilder::addPreISel(AddIRPass &addPass) const {
 
-  if (TM.getOptLevel() > CodeGenOptLevel::None)
+  if (TM.getOptLevel() > CodeGenOptLevel::None) {
     addPass(FlattenCFGPass());
-
-  if (TM.getOptLevel() > CodeGenOptLevel::None)
     addPass(SinkingPass());
-
-  addPass(AMDGPULateCodeGenPreparePass(TM));
+    addPass(AMDGPULateCodeGenPreparePass(TM));
+  }
 
   // Merge divergent exit nodes. StructurizeCFG won't recognize the multi-exit
   // regions formed by them.

[cdevadas]

Merge activity

• Apr 21, 6:02 AM EDT: A user started a stack merge that includes this pull request via Graphite.
• Apr 21, 6:04 AM EDT: A user merged this pull request with Graphite.

[llvm-ci]

LLVM Buildbot has detected a new failure on builder llvm-clang-x86_64-gcc-ubuntu running on sie-linux-worker3 while building llvm at step 6 "test-build-unified-tree-check-all".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/174/builds/16522

Here is the relevant piece of the build log for the reference

Step 6 (test-build-unified-tree-check-all) failure: test (failure)
******************** TEST 'AddressSanitizer-x86_64-linux :: TestCases/asan_lsan_deadlock.cpp' FAILED ********************
Exit Code: 1

Command Output (stderr):
--
/home/buildbot/buildbot-root/llvm-clang-x86_64-gcc-ubuntu/build/./bin/clang  --driver-mode=g++ -fsanitize=address -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer -fno-optimize-sibling-calls -gline-tables-only  -m64  -O0 /home/buildbot/buildbot-root/llvm-clang-x86_64-gcc-ubuntu/llvm-project/compiler-rt/test/asan/TestCases/asan_lsan_deadlock.cpp -o /home/buildbot/buildbot-root/llvm-clang-x86_64-gcc-ubuntu/build/runtimes/runtimes-bins/compiler-rt/test/asan/X86_64LinuxConfig/TestCases/Output/asan_lsan_deadlock.cpp.tmp # RUN: at line 4
+ /home/buildbot/buildbot-root/llvm-clang-x86_64-gcc-ubuntu/build/./bin/clang --driver-mode=g++ -fsanitize=address -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer -fno-optimize-sibling-calls -gline-tables-only -m64 -O0 /home/buildbot/buildbot-root/llvm-clang-x86_64-gcc-ubuntu/llvm-project/compiler-rt/test/asan/TestCases/asan_lsan_deadlock.cpp -o /home/buildbot/buildbot-root/llvm-clang-x86_64-gcc-ubuntu/build/runtimes/runtimes-bins/compiler-rt/test/asan/X86_64LinuxConfig/TestCases/Output/asan_lsan_deadlock.cpp.tmp
env ASAN_OPTIONS=detect_leaks=1 not  /home/buildbot/buildbot-root/llvm-clang-x86_64-gcc-ubuntu/build/runtimes/runtimes-bins/compiler-rt/test/asan/X86_64LinuxConfig/TestCases/Output/asan_lsan_deadlock.cpp.tmp 2>&1 | FileCheck /home/buildbot/buildbot-root/llvm-clang-x86_64-gcc-ubuntu/llvm-project/compiler-rt/test/asan/TestCases/asan_lsan_deadlock.cpp # RUN: at line 5
+ env ASAN_OPTIONS=detect_leaks=1 not /home/buildbot/buildbot-root/llvm-clang-x86_64-gcc-ubuntu/build/runtimes/runtimes-bins/compiler-rt/test/asan/X86_64LinuxConfig/TestCases/Output/asan_lsan_deadlock.cpp.tmp
+ FileCheck /home/buildbot/buildbot-root/llvm-clang-x86_64-gcc-ubuntu/llvm-project/compiler-rt/test/asan/TestCases/asan_lsan_deadlock.cpp
�[1m/home/buildbot/buildbot-root/llvm-clang-x86_64-gcc-ubuntu/llvm-project/compiler-rt/test/asan/TestCases/asan_lsan_deadlock.cpp:61:12: �[0m�[0;1;31merror: �[0m�[1mCHECK: expected string not found in input
�[0m // CHECK: SUMMARY: AddressSanitizer: stack-buffer-overflow
�[0;1;32m           ^
�[0m�[1m<stdin>:1:1: �[0m�[0;1;30mnote: �[0m�[1mscanning from here
�[0m=================================================================
�[0;1;32m^
�[0m�[1m<stdin>:2:10: �[0m�[0;1;30mnote: �[0m�[1mpossible intended match here
�[0m==1684283==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7b0707ede034 at pc 0x56506a1f9240 bp 0x7b07060fdce0 sp 0x7b07060fdcd8
�[0;1;32m         ^
�[0m
Input file: <stdin>
Check file: /home/buildbot/buildbot-root/llvm-clang-x86_64-gcc-ubuntu/llvm-project/compiler-rt/test/asan/TestCases/asan_lsan_deadlock.cpp

-dump-input=help explains the following input dump.

Input was:
<<<<<<
�[1m�[0m�[0;1;30m            1: �[0m�[1m�[0;1;46m================================================================= �[0m
�[0;1;31mcheck:61'0     X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
�[0m�[0;1;30m            2: �[0m�[1m�[0;1;46m==1684283==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7b0707ede034 at pc 0x56506a1f9240 bp 0x7b07060fdce0 sp 0x7b07060fdcd8 �[0m
�[0;1;31mcheck:61'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
�[0m�[0;1;35mcheck:61'1              ?                                                                                                                                    possible intended match
�[0m�[0;1;30m            3: �[0m�[1m�[0;1;46mWRITE of size 4 at 0x7b0707ede034 thread T2 �[0m
�[0;1;31mcheck:61'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
�[0m�[0;1;30m            4: �[0m�[1m�[0;1;46mTimeout! Deadlock detected. �[0m
�[0;1;31mcheck:61'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
�[0m>>>>>>

--

********************

[llvm-ci]

LLVM Buildbot has detected a new failure on builder premerge-monolithic-windows running on premerge-windows-1 while building llvm at step 8 "test-build-unified-tree-check-all".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/35/builds/9382

Here is the relevant piece of the build log for the reference

Step 8 (test-build-unified-tree-check-all) failure: test (failure)
...
[25/121] Linking CXX executable tools\clang\tools\extra\unittests\clang-doc\ClangDocTests.exe
[26/121] Linking CXX executable tools\clang\tools\extra\unittests\clang-query\ClangQueryTests.exe
[27/121] Linking CXX executable tools\clang\tools\extra\unittests\clang-tidy\ClangTidyTests.exe
[28/121] Linking CXX executable tools\clang\unittests\InstallAPI\InstallAPITests.exe
[29/121] Linking CXX executable tools\clang\tools\extra\unittests\clang-include-fixer\find-all-symbols\FindAllSymbolsTests.exe
[30/121] Linking CXX executable tools\polly\unittests\Isl\IslTests.exe
[31/121] Linking CXX executable tools\clang\tools\extra\unittests\clang-include-fixer\ClangIncludeFixerTests.exe
[32/121] Linking CXX executable tools\polly\unittests\Flatten\FlattenTests.exe
[33/121] Linking CXX executable tools\polly\unittests\Support\ISLToolsTests.exe
[34/121] Preparing lit tests
FAILED: utils/lit/CMakeFiles/prepare-check-lit 
cmd.exe /C "cd /D C:\ws\buildbot\premerge-monolithic-windows\build\utils\lit && C:\BuildTools\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe -E remove_directory C:/ws/buildbot/premerge-monolithic-windows/build/utils/lit/tests && C:\BuildTools\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe -E copy_directory C:/ws/buildbot/premerge-monolithic-windows/llvm-project/llvm/utils/lit/tests C:/ws/buildbot/premerge-monolithic-windows/build/utils/lit/tests && C:\BuildTools\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe -E copy C:/ws/buildbot/premerge-monolithic-windows/build/utils/lit/lit.site.cfg C:/ws/buildbot/premerge-monolithic-windows/build/utils/lit/tests"
Error removing directory "C:/ws/buildbot/premerge-monolithic-windows/build/utils/lit/tests".
[35/121] Linking CXX executable tools\polly\unittests\DeLICM\DeLICMTests.exe
[36/121] Linking CXX executable tools\polly\unittests\ScheduleOptimizer\ScheduleOptimizerTests.exe
[37/121] Linking CXX executable tools\polly\unittests\ScopPassManager\ScopPassManagerTests.exe
[38/121] Linking CXX executable tools\clang\unittests\Analysis\ClangAnalysisTests.exe
[39/121] Linking CXX executable tools\clang\unittests\Rewrite\RewriteTests.exe
[40/121] Linking CXX executable bin\mlir-capi-translation-test.exe
[41/121] Linking CXX executable tools\clang\unittests\AST\ByteCode\InterpTests.exe
[42/121] Linking CXX executable tools\clang\unittests\CrossTU\CrossTUTests.exe
[43/121] Linking CXX executable unittests\Analysis\AnalysisTests.exe
[44/121] Linking CXX executable tools\clang\unittests\Sema\SemaTests.exe
[45/121] Linking CXX executable tools\clang\unittests\Analysis\FlowSensitive\ClangAnalysisFlowSensitiveTests.exe
[46/121] Linking CXX executable tools\clang\unittests\ASTMatchers\Dynamic\DynamicASTMatchersTests.exe
[47/121] Linking CXX executable tools\clang\unittests\Support\ClangSupportTests.exe
[48/121] Linking CXX executable tools\clang\unittests\Tooling\Syntax\SyntaxTests.exe
[49/121] Linking CXX executable tools\clang\unittests\StaticAnalyzer\StaticAnalysisTests.exe
[50/121] Linking CXX executable tools\clang\unittests\Index\IndexTests.exe
[51/121] Linking CXX executable tools\clang\unittests\AST\ASTTests.exe
[52/121] Linking CXX executable tools\clang\unittests\ASTMatchers\ASTMatchersTests.exe
[53/121] Linking CXX executable tools\clang\unittests\Serialization\SerializationTests.exe
[54/121] Linking CXX executable tools\clang\tools\extra\clangd\unittests\ClangdTests.exe
[55/121] Linking CXX executable tools\clang\unittests\CodeGen\ClangCodeGenTests.exe
[56/121] Linking CXX executable tools\mlir\unittests\Target\LLVM\MLIRTargetLLVMTests.exe
[57/121] Linking CXX executable tools\clang\unittests\Frontend\FrontendTests.exe
[58/121] Linking CXX executable bin\mlir-capi-ir-test.exe
[59/121] Linking CXX executable bin\mlir-capi-pass-test.exe
[60/121] Linking CXX executable bin\mlir-capi-execution-engine-test.exe
[61/121] Linking CXX executable tools\clang\unittests\Driver\ClangDriverTests.exe
[62/121] Linking CXX executable tools\lld\unittests\AsLibELF\LLDAsLibELFTests.exe
[63/121] Linking CXX executable tools\clang\unittests\Tooling\ToolingTests.exe
[64/121] Linking CXX executable tools\lld\unittests\AsLibAll\LLDAsLibAllTests.exe
[65/121] Linking CXX executable tools\clang\unittests\Interpreter\ClangReplInterpreterTests.exe
ninja: build stopped: subcommand failed.