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

[Vikram Hegde via llvm-branch-commits]

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

>From 133105eb188d75f235fb36643c5479e6a6970002 Mon Sep 17 00:00:00 2001
From: vikhegde <vikram.hegde at amd.com>
Date: Fri, 16 Jan 2026 16:45:41 +0530
Subject: [PATCH] [CodeGen][NPM] Disable Machine verifier at the end of default
 pipelines

---
 llvm/include/llvm/Passes/CodeGenPassBuilder.h |  3 ---
 llvm/test/CodeGen/AMDGPU/llc-pipeline-npm.ll  |  9 +++------
 llvm/test/CodeGen/X86/llc-pipeline-npm.ll     | 12 ++++--------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/llvm/include/llvm/Passes/CodeGenPassBuilder.h b/llvm/include/llvm/Passes/CodeGenPassBuilder.h
index 6942fc42ca721..6ab1dc8d5a2a6 100644
--- a/llvm/include/llvm/Passes/CodeGenPassBuilder.h
+++ b/llvm/include/llvm/Passes/CodeGenPassBuilder.h
@@ -596,9 +596,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 525ab3757e6e0..a8a4e75ecb6b0 100644
--- a/llvm/test/CodeGen/AMDGPU/llc-pipeline-npm.ll
+++ b/llvm/test/CodeGen/AMDGPU/llc-pipeline-npm.ll
@@ -91,8 +91,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>
@@ -263,8 +262,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>
@@ -435,8 +433,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 8425af01b0330..6463e27fddfc4 100644
--- a/llvm/test/CodeGen/X86/llc-pipeline-npm.ll
+++ b/llvm/test/CodeGen/X86/llc-pipeline-npm.ll
@@ -63,8 +63,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>
@@ -174,8 +173,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>
@@ -234,8 +232,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>
@@ -348,6 +345,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)