[llvm] [NVPTX] Default to NewPM (PR #218756)

[via llvm-commits]

llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-backend-nvptx

Author: Alex MacLean (AlexMaclean)

<details>
<summary>Changes</summary>

tweak a couple tests that explicitly test the Legacy PM.

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


3 Files Affected:

- (modified) llvm/lib/Target/NVPTX/NVPTXTargetMachine.h (+2) 
- (modified) llvm/test/CodeGen/NVPTX/NVPTXAA_before_BasicAA.ll (+3-2) 
- (modified) llvm/test/CodeGen/NVPTX/pass-name.ll (+2-2) 


``````````diff
diff --git a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.h b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.h
index 5fab5d970b7ef..2282419cda39b 100644
--- a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.h
+++ b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.h
@@ -72,6 +72,8 @@ class NVPTXTargetMachine : public CodeGenTargetMachineImpl {
                              const CGPassBuilderOption &Opt, MCContext &Ctx,
                              PassInstrumentationCallbacks *PIC) override;
 
+  bool shouldDefaultToNewPM() const override { return true; }
+
   TargetTransformInfo getTargetTransformInfo(const Function &F) const override;
 
   bool isMachineVerifierClean() const override { return false; }
diff --git a/llvm/test/CodeGen/NVPTX/NVPTXAA_before_BasicAA.ll b/llvm/test/CodeGen/NVPTX/NVPTXAA_before_BasicAA.ll
index 0d16b344e9f66..d8895e44e232a 100644
--- a/llvm/test/CodeGen/NVPTX/NVPTXAA_before_BasicAA.ll
+++ b/llvm/test/CodeGen/NVPTX/NVPTXAA_before_BasicAA.ll
@@ -1,6 +1,7 @@
 ; REQUIRES: asserts
-; RUN: opt -aa-pipeline=default -passes='require<aa>' -debug-pass-manager -disable-output -S < %s 2>&1 | FileCheck %s
-; RUN: llc --debug-only='aa' -o /dev/null %s 2>&1 | FileCheck %s -check-prefix=LEGACY
+; RUN: opt -aa-pipeline=default -debug-pass-manager -passes='require<aa>' -disable-output -S < %s 2>&1 | FileCheck %s
+; RUN: llc -enable-new-pm=true -debug-pass-manager -filetype=null %s 2>&1 | FileCheck %s
+; RUN: llc -enable-new-pm=false --debug-only='aa' -filetype=null %s 2>&1 | FileCheck %s -check-prefix=LEGACY
 
 ; In default AA pipeline, NVPTXAA should run before BasicAA to reduce compile time for NVPTX backend
 target triple = "nvptx64-nvidia-cuda"
diff --git a/llvm/test/CodeGen/NVPTX/pass-name.ll b/llvm/test/CodeGen/NVPTX/pass-name.ll
index 9151ff0f814bf..8cc09a2902431 100644
--- a/llvm/test/CodeGen/NVPTX/pass-name.ll
+++ b/llvm/test/CodeGen/NVPTX/pass-name.ll
@@ -1,3 +1,3 @@
-; Check that all passes have names
-; RUN: llc %s -mtriple=nvptx64 -O3 --debug-pass=Structure -o /dev/null 2>&1 | FileCheck %s
+; Check that all legacy PM passes have names
+; RUN: llc %s -mtriple=nvptx64 -O3 -enable-new-pm=false --debug-pass=Structure -o /dev/null 2>&1 | FileCheck %s
 ; CHECK-NOT: Unnamed pass

``````````

</details>


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