[llvm] 0f8a3b2 - [NewPM][AArch64][GlobalISel] Port AArch64PostLegalizerCombiner to NewPM (#194156)
via llvm-commits
llvm-commits at lists.llvm.org
Tue Jun 9 04:09:20 PDT 2026
Author: Anshul Nigham
Date: 2026-06-09T04:09:15-07:00
New Revision: 0f8a3b23f1e1ffe69d6d49576347ea967ec611be
URL: https://github.com/llvm/llvm-project/commit/0f8a3b23f1e1ffe69d6d49576347ea967ec611be
DIFF: https://github.com/llvm/llvm-project/commit/0f8a3b23f1e1ffe69d6d49576347ea967ec611be.diff
LOG: [NewPM][AArch64][GlobalISel] Port AArch64PostLegalizerCombiner to NewPM (#194156)
Adds a standard porting.
Updates some (but not all) tests to verify the NewPM path is working.
Added:
Modified:
llvm/lib/Target/AArch64/AArch64.h
llvm/lib/Target/AArch64/AArch64PassRegistry.def
llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerCombiner.cpp
llvm/test/CodeGen/AArch64/GlobalISel/combine-cast.mir
llvm/test/CodeGen/AArch64/GlobalISel/combine-trunc.mir
llvm/test/CodeGen/AArch64/GlobalISel/form-bitfield-extract-from-and.mir
llvm/test/CodeGen/AArch64/GlobalISel/opt-overlapping-and-postlegalize.mir
llvm/test/CodeGen/AArch64/GlobalISel/postlegalizer-combine-ptr-add-chain.mir
llvm/test/CodeGen/AArch64/GlobalISel/prelegalizercombiner-hoist-same-hands.mir
Removed:
################################################################################
diff --git a/llvm/lib/Target/AArch64/AArch64.h b/llvm/lib/Target/AArch64/AArch64.h
index 3ef6e693a4076..9074e4e2eb672 100644
--- a/llvm/lib/Target/AArch64/AArch64.h
+++ b/llvm/lib/Target/AArch64/AArch64.h
@@ -28,6 +28,7 @@
struct AArch64O0PreLegalizerCombinerImplRuleConfig;
struct AArch64PreLegalizerCombinerImplRuleConfig;
+struct AArch64PostLegalizerCombinerImplRuleConfig;
struct AArch64PostLegalizerLoweringImplRuleConfig;
namespace llvm {
@@ -105,6 +106,24 @@ class AArch64PreLegalizerCombinerPass
MachineFunctionAnalysisManager &MFAM);
};
+class AArch64PostLegalizerCombinerPass
+ : public PassInfoMixin<AArch64PostLegalizerCombinerPass> {
+ std::unique_ptr<AArch64PostLegalizerCombinerImplRuleConfig> RuleConfig;
+ const AArch64TargetMachine *TM;
+
+public:
+ AArch64PostLegalizerCombinerPass(const AArch64TargetMachine *TM);
+ AArch64PostLegalizerCombinerPass(AArch64PostLegalizerCombinerPass &&);
+ ~AArch64PostLegalizerCombinerPass();
+
+ PreservedAnalyses run(MachineFunction &MF,
+ MachineFunctionAnalysisManager &MFAM);
+ MachineFunctionProperties getRequiredProperties() const {
+ return MachineFunctionProperties().set(
+ MachineFunctionProperties::Property::Legalized);
+ }
+};
+
class AArch64PostSelectOptimizePass
: public OptionalPassInfoMixin<AArch64PostSelectOptimizePass> {
public:
@@ -132,7 +151,7 @@ class AArch64PostLegalizerLoweringPass
FunctionPass *createAArch64O0PreLegalizerCombiner();
FunctionPass *createAArch64PreLegalizerCombiner();
-FunctionPass *createAArch64PostLegalizerCombiner(bool IsOptNone);
+FunctionPass *createAArch64PostLegalizerCombinerLegacy(bool IsOptNone);
FunctionPass *createAArch64PostLegalizerLowering();
FunctionPass *createAArch64PostSelectOptimize();
FunctionPass *createAArch64StackTaggingPass(bool IsOptNone);
@@ -160,7 +179,7 @@ void initializeAArch64CodeLayoutOptPass(PassRegistry &);
void initializeAArch64MIPeepholeOptLegacyPass(PassRegistry &);
void initializeAArch64O0PreLegalizerCombinerLegacyPass(PassRegistry &);
void initializeAArch64PostCoalescerLegacyPass(PassRegistry &);
-void initializeAArch64PostLegalizerCombinerPass(PassRegistry &);
+void initializeAArch64PostLegalizerCombinerLegacyPass(PassRegistry &);
void initializeAArch64PostSelectOptimizeLegacyPass(PassRegistry &);
void initializeAArch64PostLegalizerLoweringLegacyPass(PassRegistry &);
void initializeAArch64PreLegalizerCombinerLegacyPass(PassRegistry &);
diff --git a/llvm/lib/Target/AArch64/AArch64PassRegistry.def b/llvm/lib/Target/AArch64/AArch64PassRegistry.def
index e3e47b12a9ec3..45eece036310e 100644
--- a/llvm/lib/Target/AArch64/AArch64PassRegistry.def
+++ b/llvm/lib/Target/AArch64/AArch64PassRegistry.def
@@ -44,6 +44,8 @@ MACHINE_FUNCTION_PASS("aarch64-post-select-optimize",
AArch64PostSelectOptimizePass())
MACHINE_FUNCTION_PASS("aarch64-postlegalizer-lowering",
AArch64PostLegalizerLoweringPass())
+MACHINE_FUNCTION_PASS("aarch64-postlegalizer-combiner",
+ AArch64PostLegalizerCombinerPass(this))
MACHINE_FUNCTION_PASS("aarch64-prelegalizer-combiner",
AArch64PreLegalizerCombinerPass())
MACHINE_FUNCTION_PASS("aarch64-ptrauth", AArch64PointerAuthPass())
diff --git a/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp b/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
index f65bdb0737fef..24224a5b194ee 100644
--- a/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
+++ b/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
@@ -258,7 +258,7 @@ LLVMInitializeAArch64Target() {
initializeAArch64PreLegalizerCombinerLegacyPass(PR);
initializeAArch64PointerAuthLegacyPass(PR);
initializeAArch64PostCoalescerLegacyPass(PR);
- initializeAArch64PostLegalizerCombinerPass(PR);
+ initializeAArch64PostLegalizerCombinerLegacyPass(PR);
initializeAArch64PostSelectOptimizeLegacyPass(PR);
initializeAArch64PostLegalizerLoweringLegacyPass(PR);
initializeAArch64PromoteConstantPass(PR);
@@ -772,7 +772,7 @@ void AArch64PassConfig::addPreRegBankSelect() {
const bool IsGlobalISelOptNone =
getAArch64TargetMachine().isGlobalISelOptNone();
if (!IsGlobalISelOptNone) {
- addPass(createAArch64PostLegalizerCombiner(IsGlobalISelOptNone));
+ addPass(createAArch64PostLegalizerCombinerLegacy(IsGlobalISelOptNone));
if (EnableGISelLoadStoreOptPostLegal)
addPass(new LoadStoreOpt());
}
diff --git a/llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerCombiner.cpp b/llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerCombiner.cpp
index cd57d4dab9c8d..f9c2256728dc9 100644
--- a/llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerCombiner.cpp
+++ b/llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerCombiner.cpp
@@ -19,6 +19,7 @@
///
//===----------------------------------------------------------------------===//
+#include "AArch64.h"
#include "AArch64TargetMachine.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/CodeGen/GlobalISel/CSEInfo.h"
@@ -34,7 +35,9 @@
#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
#include "llvm/CodeGen/GlobalISel/Utils.h"
#include "llvm/CodeGen/MachineDominators.h"
+#include "llvm/CodeGen/MachineFunctionAnalysisManager.h"
#include "llvm/CodeGen/MachineFunctionPass.h"
+#include "llvm/CodeGen/MachinePassManager.h"
#include "llvm/CodeGen/MachineRegisterInfo.h"
#include "llvm/CodeGen/TargetOpcodes.h"
#include "llvm/Support/Debug.h"
@@ -48,12 +51,12 @@
using namespace llvm;
using namespace MIPatternMatch;
-namespace {
-
#define GET_GICOMBINER_TYPES
#include "AArch64GenPostLegalizeGICombiner.inc"
#undef GET_GICOMBINER_TYPES
+namespace {
+
/// This combine tries do what performExtractVectorEltCombine does in SDAG.
/// Rewrite for pairwise fadd pattern
/// (s32 (g_extract_vector_elt
@@ -631,102 +634,18 @@ AArch64PostLegalizerCombinerImpl::AArch64PostLegalizerCombinerImpl(
{
}
-class AArch64PostLegalizerCombiner : public MachineFunctionPass {
-public:
- static char ID;
-
- AArch64PostLegalizerCombiner(bool IsOptNone = false);
-
- StringRef getPassName() const override {
- return "AArch64PostLegalizerCombiner";
- }
-
- bool runOnMachineFunction(MachineFunction &MF) override;
- void getAnalysisUsage(AnalysisUsage &AU) const override;
-
-private:
- bool IsOptNone;
- AArch64PostLegalizerCombinerImplRuleConfig RuleConfig;
-
-
- struct StoreInfo {
- GStore *St = nullptr;
- // The G_PTR_ADD that's used by the store. We keep this to cache the
- // MachineInstr def.
- GPtrAdd *Ptr = nullptr;
- // The signed offset to the Ptr instruction.
- int64_t Offset = 0;
- LLT StoredType;
- };
- bool tryOptimizeConsecStores(SmallVectorImpl<StoreInfo> &Stores,
- CSEMIRBuilder &MIB);
-
- bool optimizeConsecutiveMemOpAddressing(MachineFunction &MF,
- CSEMIRBuilder &MIB);
+struct StoreInfo {
+ GStore *St = nullptr;
+ // The G_PTR_ADD that's used by the store. We keep this to cache the
+ // MachineInstr def.
+ GPtrAdd *Ptr = nullptr;
+ // The signed offset to the Ptr instruction.
+ int64_t Offset = 0;
+ LLT StoredType;
};
-} // end anonymous namespace
-
-void AArch64PostLegalizerCombiner::getAnalysisUsage(AnalysisUsage &AU) const {
- AU.setPreservesCFG();
- getSelectionDAGFallbackAnalysisUsage(AU);
- AU.addRequired<GISelValueTrackingAnalysisLegacy>();
- AU.addPreserved<GISelValueTrackingAnalysisLegacy>();
- if (!IsOptNone) {
- AU.addRequired<MachineDominatorTreeWrapperPass>();
- AU.addPreserved<MachineDominatorTreeWrapperPass>();
- AU.addRequired<GISelCSEAnalysisWrapperPass>();
- AU.addPreserved<GISelCSEAnalysisWrapperPass>();
- }
- MachineFunctionPass::getAnalysisUsage(AU);
-}
-
-AArch64PostLegalizerCombiner::AArch64PostLegalizerCombiner(bool IsOptNone)
- : MachineFunctionPass(ID), IsOptNone(IsOptNone) {
- if (!RuleConfig.parseCommandLineOption())
- report_fatal_error("Invalid rule identifier");
-}
-
-bool AArch64PostLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
- if (MF.getProperties().hasFailedISel())
- return false;
- assert(MF.getProperties().hasLegalized() && "Expected a legalized function?");
- const Function &F = MF.getFunction();
- bool EnableOpt =
- MF.getTarget().getOptLevel() != CodeGenOptLevel::None && !skipFunction(F);
-
- const AArch64Subtarget &ST = MF.getSubtarget<AArch64Subtarget>();
- const auto *LI = ST.getLegalizerInfo();
-
- GISelValueTracking *VT =
- &getAnalysis<GISelValueTrackingAnalysisLegacy>().get(MF);
- MachineDominatorTree *MDT =
- IsOptNone ? nullptr
- : &getAnalysis<MachineDominatorTreeWrapperPass>().getDomTree();
- GISelCSEAnalysisWrapper &Wrapper =
- getAnalysis<GISelCSEAnalysisWrapperPass>().getCSEWrapper();
- auto *CSEInfo =
- &Wrapper.get(getStandardCSEConfigForOpt(MF.getTarget().getOptLevel()));
- CombinerInfo CInfo(/*AllowIllegalOps*/ true, /*ShouldLegalizeIllegal*/ false,
- /*LegalizerInfo*/ nullptr, EnableOpt, F.hasOptSize(),
- F.hasMinSize());
- // Disable fixed-point iteration to reduce compile-time
- CInfo.MaxIterations = 1;
- CInfo.ObserverLvl = CombinerInfo::ObserverLevel::SinglePass;
- // Legalizer performs DCE, so a full DCE pass is unnecessary.
- CInfo.EnableFullDCE = false;
- AArch64PostLegalizerCombinerImpl Impl(MF, CInfo, *VT, CSEInfo, RuleConfig, ST,
- MDT, LI);
- bool Changed = Impl.combineMachineInstrs();
-
- auto MIB = CSEMIRBuilder(MF);
- MIB.setCSEInfo(CSEInfo);
- Changed |= optimizeConsecutiveMemOpAddressing(MF, MIB);
- return Changed;
-}
-
-bool AArch64PostLegalizerCombiner::tryOptimizeConsecStores(
- SmallVectorImpl<StoreInfo> &Stores, CSEMIRBuilder &MIB) {
+static bool tryOptimizeConsecStores(SmallVectorImpl<StoreInfo> &Stores,
+ CSEMIRBuilder &MIB) {
if (Stores.size() <= 2)
return false;
@@ -772,8 +691,8 @@ static cl::opt<bool>
cl::desc("Enable consecutive memop optimization "
"in AArch64PostLegalizerCombiner"));
-bool AArch64PostLegalizerCombiner::optimizeConsecutiveMemOpAddressing(
- MachineFunction &MF, CSEMIRBuilder &MIB) {
+static bool optimizeConsecutiveMemOpAddressing(MachineFunction &MF,
+ CSEMIRBuilder &MIB) {
// This combine needs to run after all reassociations/folds on pointer
// addressing have been done, specifically those that combine two G_PTR_ADDs
// with constant offsets into a single G_PTR_ADD with a combined offset.
@@ -910,17 +829,151 @@ bool AArch64PostLegalizerCombiner::optimizeConsecutiveMemOpAddressing(
return Changed;
}
-char AArch64PostLegalizerCombiner::ID = 0;
-INITIALIZE_PASS_BEGIN(AArch64PostLegalizerCombiner, DEBUG_TYPE,
+bool runCombiner(MachineFunction &MF, GISelCSEInfo *CSEInfo,
+ GISelValueTracking *VT, MachineDominatorTree *MDT,
+ const AArch64PostLegalizerCombinerImplRuleConfig &RuleConfig,
+ bool EnableOpt, bool IsOptNone) {
+ if (MF.getProperties().hasFailedISel())
+ return false;
+ const Function &F = MF.getFunction();
+
+ const AArch64Subtarget &ST = MF.getSubtarget<AArch64Subtarget>();
+ const LegalizerInfo *LI = ST.getLegalizerInfo();
+
+ CombinerInfo CInfo(/*AllowIllegalOps=*/false, /*ShouldLegalizeIllegal=*/false,
+ /*LegalizerInfo=*/LI, EnableOpt, F.hasOptSize(),
+ F.hasMinSize());
+ // Disable fixed-point iteration to reduce compile-time
+ CInfo.MaxIterations = 1;
+ CInfo.ObserverLvl = CombinerInfo::ObserverLevel::SinglePass;
+ // Legalizer performs DCE, so a full DCE pass is unnecessary.
+ CInfo.EnableFullDCE = false;
+ AArch64PostLegalizerCombinerImpl Impl(MF, CInfo, *VT, CSEInfo, RuleConfig, ST,
+ MDT, LI);
+ bool Changed = Impl.combineMachineInstrs();
+
+ CSEMIRBuilder MIB(MF);
+ MIB.setCSEInfo(CSEInfo);
+ Changed |= optimizeConsecutiveMemOpAddressing(MF, MIB);
+ return Changed;
+}
+
+class AArch64PostLegalizerCombinerLegacy : public MachineFunctionPass {
+public:
+ static char ID;
+
+ AArch64PostLegalizerCombinerLegacy(bool IsOptNone = false);
+
+ StringRef getPassName() const override {
+ return "AArch64PostLegalizerCombiner";
+ }
+
+ bool runOnMachineFunction(MachineFunction &MF) override;
+ void getAnalysisUsage(AnalysisUsage &AU) const override;
+
+ MachineFunctionProperties getRequiredProperties() const override {
+ return MachineFunctionProperties().set(
+ MachineFunctionProperties::Property::Legalized);
+ }
+
+private:
+ bool IsOptNone;
+ AArch64PostLegalizerCombinerImplRuleConfig RuleConfig;
+};
+} // end anonymous namespace
+
+void AArch64PostLegalizerCombinerLegacy::getAnalysisUsage(
+ AnalysisUsage &AU) const {
+ AU.setPreservesCFG();
+ getSelectionDAGFallbackAnalysisUsage(AU);
+ AU.addRequired<GISelValueTrackingAnalysisLegacy>();
+ AU.addPreserved<GISelValueTrackingAnalysisLegacy>();
+ if (!IsOptNone) {
+ AU.addRequired<MachineDominatorTreeWrapperPass>();
+ AU.addPreserved<MachineDominatorTreeWrapperPass>();
+ AU.addRequired<GISelCSEAnalysisWrapperPass>();
+ AU.addPreserved<GISelCSEAnalysisWrapperPass>();
+ }
+ MachineFunctionPass::getAnalysisUsage(AU);
+}
+
+AArch64PostLegalizerCombinerLegacy::AArch64PostLegalizerCombinerLegacy(
+ bool IsOptNone)
+ : MachineFunctionPass(ID), IsOptNone(IsOptNone) {
+ if (!RuleConfig.parseCommandLineOption())
+ reportFatalUsageError("Invalid rule identifier");
+}
+
+bool AArch64PostLegalizerCombinerLegacy::runOnMachineFunction(
+ MachineFunction &MF) {
+ if (MF.getProperties().hasFailedISel())
+ return false;
+
+ GISelValueTracking *VT =
+ &getAnalysis<GISelValueTrackingAnalysisLegacy>().get(MF);
+ MachineDominatorTree *MDT =
+ IsOptNone ? nullptr
+ : &getAnalysis<MachineDominatorTreeWrapperPass>().getDomTree();
+ GISelCSEAnalysisWrapper &Wrapper =
+ getAnalysis<GISelCSEAnalysisWrapperPass>().getCSEWrapper();
+ auto *CSEInfo =
+ &Wrapper.get(getStandardCSEConfigForOpt(MF.getTarget().getOptLevel()));
+
+ bool EnableOpt = MF.getTarget().getOptLevel() != CodeGenOptLevel::None &&
+ !skipFunction(MF.getFunction());
+
+ return runCombiner(MF, CSEInfo, VT, MDT, RuleConfig, EnableOpt, IsOptNone);
+}
+
+char AArch64PostLegalizerCombinerLegacy::ID = 0;
+INITIALIZE_PASS_BEGIN(AArch64PostLegalizerCombinerLegacy, DEBUG_TYPE,
"Combine AArch64 MachineInstrs after legalization", false,
false)
INITIALIZE_PASS_DEPENDENCY(GISelValueTrackingAnalysisLegacy)
-INITIALIZE_PASS_END(AArch64PostLegalizerCombiner, DEBUG_TYPE,
+INITIALIZE_PASS_END(AArch64PostLegalizerCombinerLegacy, DEBUG_TYPE,
"Combine AArch64 MachineInstrs after legalization", false,
false)
+AArch64PostLegalizerCombinerPass::AArch64PostLegalizerCombinerPass(
+ const AArch64TargetMachine *TM)
+ : RuleConfig(
+ std::make_unique<AArch64PostLegalizerCombinerImplRuleConfig>()),
+ TM(TM) {
+ if (!RuleConfig->parseCommandLineOption())
+ reportFatalUsageError("invalid rule identifier");
+}
+
+AArch64PostLegalizerCombinerPass::AArch64PostLegalizerCombinerPass(
+ AArch64PostLegalizerCombinerPass &&) = default;
+
+AArch64PostLegalizerCombinerPass::~AArch64PostLegalizerCombinerPass() = default;
+
+PreservedAnalyses
+AArch64PostLegalizerCombinerPass::run(MachineFunction &MF,
+ MachineFunctionAnalysisManager &MFAM) {
+ if (MF.getProperties().hasFailedISel())
+ return PreservedAnalyses::all();
+
+ const bool IsOptNone = TM->isGlobalISelOptNone();
+ bool EnableOpt = !IsOptNone;
+
+ GISelValueTracking *VT = &MFAM.getResult<GISelValueTrackingAnalysis>(MF);
+ MachineDominatorTree *MDT =
+ IsOptNone ? nullptr : &MFAM.getResult<MachineDominatorTreeAnalysis>(MF);
+ GISelCSEInfo *CSEInfo = MFAM.getResult<GISelCSEAnalysis>(MF).get();
+
+ if (!runCombiner(MF, CSEInfo, VT, MDT, *RuleConfig, EnableOpt, IsOptNone))
+ return PreservedAnalyses::all();
+
+ PreservedAnalyses PA = getMachineFunctionPassPreservedAnalyses();
+ PA.preserveSet<CFGAnalyses>();
+ PA.preserve<GISelValueTrackingAnalysis>();
+ PA.preserve<GISelCSEAnalysis>();
+ return PA;
+}
+
namespace llvm {
-FunctionPass *createAArch64PostLegalizerCombiner(bool IsOptNone) {
- return new AArch64PostLegalizerCombiner(IsOptNone);
+FunctionPass *createAArch64PostLegalizerCombinerLegacy(bool IsOptNone) {
+ return new AArch64PostLegalizerCombinerLegacy(IsOptNone);
}
} // end namespace llvm
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/combine-cast.mir b/llvm/test/CodeGen/AArch64/GlobalISel/combine-cast.mir
index 8eab47171e0d1..5724f36d60183 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/combine-cast.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/combine-cast.mir
@@ -1,6 +1,7 @@
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
# RUN: llc -o - -mtriple=aarch64-unknown-unknown -run-pass=aarch64-prelegalizer-combiner -verify-machineinstrs %s | FileCheck %s --check-prefixes=CHECK,CHECK-PRE
# RUN: llc -o - -mtriple=aarch64-unknown-unknown -run-pass=aarch64-postlegalizer-combiner -verify-machineinstrs %s | FileCheck %s --check-prefixes=CHECK,CHECK-POST
+# RUN: llc -o - -mtriple=aarch64-unknown-unknown -passes=aarch64-postlegalizer-combiner %s | FileCheck %s --check-prefixes=CHECK,CHECK-POST
---
name: test_combine_trunc_select
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/combine-trunc.mir b/llvm/test/CodeGen/AArch64/GlobalISel/combine-trunc.mir
index 9a2b9dd4b2b60..655e1ddaaa704 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/combine-trunc.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/combine-trunc.mir
@@ -1,6 +1,7 @@
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
# RUN: llc -o - -mtriple=aarch64-unknown-unknown -run-pass=aarch64-prelegalizer-combiner -verify-machineinstrs %s | FileCheck %s --check-prefixes=CHECK,CHECK-PRE
# RUN: llc -o - -mtriple=aarch64-unknown-unknown -run-pass=aarch64-postlegalizer-combiner -verify-machineinstrs %s | FileCheck %s --check-prefixes=CHECK,CHECK-POST
+# RUN: llc -o - -mtriple=aarch64-unknown-unknown -passes=aarch64-postlegalizer-combiner %s | FileCheck %s --check-prefixes=CHECK,CHECK-POST
---
name: test_combine_trunc_undef
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/form-bitfield-extract-from-and.mir b/llvm/test/CodeGen/AArch64/GlobalISel/form-bitfield-extract-from-and.mir
index 16e84a6c1af80..49ffdf4f3ddaf 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/form-bitfield-extract-from-and.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/form-bitfield-extract-from-and.mir
@@ -1,5 +1,6 @@
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
# RUN: llc -mtriple aarch64 -run-pass=aarch64-postlegalizer-combiner --aarch64postlegalizercombiner-only-enable-rule="bitfield_extract_from_and" -verify-machineinstrs %s -o - | FileCheck %s
+# RUN: llc -mtriple aarch64 -passes=aarch64-postlegalizer-combiner --aarch64postlegalizercombiner-only-enable-rule="bitfield_extract_from_and" %s -o - | FileCheck %s
# REQUIRES: asserts
# Check that we can combine
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/opt-overlapping-and-postlegalize.mir b/llvm/test/CodeGen/AArch64/GlobalISel/opt-overlapping-and-postlegalize.mir
index 831212d6cb014..eb2dfd10b89f1 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/opt-overlapping-and-postlegalize.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/opt-overlapping-and-postlegalize.mir
@@ -1,5 +1,6 @@
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
# RUN: llc -debugify-and-strip-all-safe -mtriple arm64-apple-ios -O0 -run-pass=aarch64-postlegalizer-combiner --aarch64postlegalizercombiner-only-enable-rule="overlapping_and" -global-isel -verify-machineinstrs %s -o - | FileCheck %s
+# RUN: llc -debugify-and-strip-all-safe -mtriple arm64-apple-ios -O0 -passes=aarch64-postlegalizer-combiner --aarch64postlegalizercombiner-only-enable-rule="overlapping_and" -global-isel %s -o - | FileCheck %s
# REQUIRES: asserts
# Test running the overlapping_and combine post-legalization.
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/postlegalizer-combine-ptr-add-chain.mir b/llvm/test/CodeGen/AArch64/GlobalISel/postlegalizer-combine-ptr-add-chain.mir
index cfce267f40096..ec64c9e02791d 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/postlegalizer-combine-ptr-add-chain.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/postlegalizer-combine-ptr-add-chain.mir
@@ -1,5 +1,6 @@
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
# RUN: llc -mtriple aarch64-apple-ios -run-pass=aarch64-postlegalizer-combiner --aarch64postlegalizercombiner-only-enable-rule="ptr_add_immed_chain" %s -o - -verify-machineinstrs | FileCheck %s
+# RUN: llc -mtriple aarch64-apple-ios -passes=aarch64-postlegalizer-combiner --aarch64postlegalizercombiner-only-enable-rule="ptr_add_immed_chain" %s -o - | FileCheck %s
# REQUIRES: asserts
# Check that we fold two adds of constant offsets with G_PTR_ADD into a single G_PTR_ADD.
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/prelegalizercombiner-hoist-same-hands.mir b/llvm/test/CodeGen/AArch64/GlobalISel/prelegalizercombiner-hoist-same-hands.mir
index 1b85cec49226c..7f51b69c1e20e 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/prelegalizercombiner-hoist-same-hands.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/prelegalizercombiner-hoist-same-hands.mir
@@ -1,6 +1,7 @@
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
# RUN: llc -mtriple aarch64 -run-pass=aarch64-prelegalizer-combiner -verify-machineinstrs %s -o - | FileCheck %s --check-prefixes=CHECK,CHECK-PRE
# RUN: llc -mtriple aarch64 -run-pass=aarch64-postlegalizer-combiner -verify-machineinstrs %s -o - | FileCheck %s --check-prefixes=CHECK,CHECK-POST
+# RUN: llc -mtriple aarch64 -passes=aarch64-postlegalizer-combiner %s -o - | FileCheck %s --check-prefixes=CHECK,CHECK-POST
---
name: or_combine_sext
More information about the llvm-commits
mailing list