[llvm-branch-commits] [llvm] [CodeGen][NPM] Disable Machine verifier at the end of default pipelines (PR #176693)

[via llvm-branch-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-backend-amdgpu

Author: Vikram Hegde (vikramRH)

<details>
<summary>Changes</summary>

Legacy PM does not have it and I don't think all targets are ready to enable machine verifier at the end of pipelines by default. I guess better approach would be to fix existing verifier issues until we are confident about enabling generic verification ?

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


3 Files Affected:

- (modified) llvm/include/llvm/Passes/CodeGenPassBuilder.h (-3) 
- (modified) llvm/test/CodeGen/AMDGPU/llc-pipeline-npm.ll (+3-6) 
- (modified) llvm/test/CodeGen/X86/llc-pipeline-npm.ll (+4-8) 


``````````diff
diff --git a/llvm/include/llvm/Passes/CodeGenPassBuilder.h b/llvm/include/llvm/Passes/CodeGenPassBuilder.h
index 4a5ddb54572b6..f2e1aada33bd3 100644
--- a/llvm/include/llvm/Passes/CodeGenPassBuilder.h
+++ b/llvm/include/llvm/Passes/CodeGenPassBuilder.h
@@ -593,9 +593,6 @@ Error CodeGenPassBuilder<Derived, TargetMachineT>::buildPipeline(
   if (auto Err = derived().addMachinePasses(PMW))
     return std::move(Err);
 
-  if (!Opt.DisableVerify)
-    addMachineFunctionPass(MachineVerifierPass(), PMW);
-
   if (PrintAsm) {
     derived().addAsmPrinter(
         PMW, [this, &Out, DwoOut, FileType](MCContext &Ctx) {
diff --git a/llvm/test/CodeGen/AMDGPU/llc-pipeline-npm.ll b/llvm/test/CodeGen/AMDGPU/llc-pipeline-npm.ll
index 5a6067f9bdf39..cb4d3507ff5ef 100644
--- a/llvm/test/CodeGen/AMDGPU/llc-pipeline-npm.ll
+++ b/llvm/test/CodeGen/AMDGPU/llc-pipeline-npm.ll
@@ -90,8 +90,7 @@
 ; GCN-O0-NEXT:live-debug-values
 ; GCN-O0-NEXT:machine-sanmd
 ; GCN-O0-NEXT:amdgpu-preload-kern-arg-prolog
-; GCN-O0-NEXT:stack-frame-layout
-; GCN-O0-NEXT:verify)
+; GCN-O0-NEXT:stack-frame-layout)
 ; GCN-O0-NEXT:free-machine-function))
 
 ; GCN-O2:require<MachineModuleAnalysis>
@@ -261,8 +260,7 @@
 ; GCN-O2-NEXT:live-debug-values
 ; GCN-O2-NEXT:machine-sanmd
 ; GCN-O2-NEXT:amdgpu-preload-kern-arg-prolog
-; GCN-O2-NEXT:stack-frame-layout
-; GCN-O2-NEXT:verify)
+; GCN-O2-NEXT:stack-frame-layout)
 ; GCN-O2-NEXT:free-machine-function))
 
 ; GCN-O3:require<MachineModuleAnalysis>
@@ -432,8 +430,7 @@
 ; GCN-O3-NEXT:live-debug-values
 ; GCN-O3-NEXT:machine-sanmd
 ; GCN-O3-NEXT:amdgpu-preload-kern-arg-prolog
-; GCN-O3-NEXT:stack-frame-layout
-; GCN-O3-NEXT:verify)
+; GCN-O3-NEXT:stack-frame-layout)
 ; GCN-O3-NEXT:free-machine-function))
 
 define void @empty() {
diff --git a/llvm/test/CodeGen/X86/llc-pipeline-npm.ll b/llvm/test/CodeGen/X86/llc-pipeline-npm.ll
index 59a21a4f0ebb6..79d99eff0b497 100644
--- a/llvm/test/CodeGen/X86/llc-pipeline-npm.ll
+++ b/llvm/test/CodeGen/X86/llc-pipeline-npm.ll
@@ -62,8 +62,7 @@
 ; O0-NEXT: machine-sanmd
 ; O0-NEXT: stack-frame-layout
 ; O0-NEXT: x86-seses
-; O0-NEXT: x86-return-thunks
-; O0-NEXT: verify)
+; O0-NEXT: x86-return-thunks)
 ; O0-NEXT: free-machine-function)
 
 ; O2: require<MachineModuleAnalysis>
@@ -172,8 +171,7 @@
 ; O2-NEXT: machine-sanmd
 ; O2-NEXT: stack-frame-layout
 ; O2-NEXT: x86-seses
-; O2-NEXT: x86-return-thunks
-; O2-NEXT: verify)
+; O2-NEXT: x86-return-thunks)
 ; O2-NEXT: free-machine-function)
 
 ; O0-WINDOWS: require<MachineModuleAnalysis>
@@ -231,8 +229,7 @@
 ; O0-WINDOWS-NEXT: stack-frame-layout
 ; O0-WINDOWS-NEXT: x86-seses
 ; O0-WINDOWS-NEXT: x86-return-thunks
-; O0-WINDOWS-NEXT: x86-avoid-trailing-call
-; O0-WINDOWS-NEXT: verify)
+; O0-WINDOWS-NEXT: x86-avoid-trailing-call)
 ; O0-WINDOWS-NEXT: free-machine-function)
 
 ; O3-WINDOWS: require<MachineModuleAnalysis>
@@ -344,6 +341,5 @@
 ; O3-WINDOWS-NEXT: stack-frame-layout
 ; O3-WINDOWS-NEXT: x86-seses
 ; O3-WINDOWS-NEXT: x86-return-thunks
-; O3-WINDOWS-NEXT: x86-avoid-trailing-call
-; O3-WINDOWS-NEXT: verify)
+; O3-WINDOWS-NEXT: x86-avoid-trailing-call)
 ; O3-WINDOWS-NEXT: free-machine-function)

``````````

</details>


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