Skip to content

Commit c07f709

Browse files
Revert "Recommit "[AArch64] Split bitmask immediate of bitwise AND operation""
This reverts commit 73a196a. Causes crashes as reported in https://reviews.llvm.org/D109963
1 parent 7255ce3 commit c07f709

8 files changed

+4
-498
lines changed

llvm/lib/Target/AArch64/AArch64.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ FunctionPass *createAArch64A53Fix835769();
5151
FunctionPass *createFalkorHWPFFixPass();
5252
FunctionPass *createFalkorMarkStridedAccessesPass();
5353
FunctionPass *createAArch64BranchTargetsPass();
54-
FunctionPass *createAArch64MIPeepholeOptPass();
5554

5655
FunctionPass *createAArch64CleanupLocalDynamicTLSPass();
5756

@@ -83,7 +82,6 @@ void initializeAArch64SLSHardeningPass(PassRegistry&);
8382
void initializeAArch64SpeculationHardeningPass(PassRegistry&);
8483
void initializeAArch64LoadStoreOptPass(PassRegistry&);
8584
void initializeAArch64LowerHomogeneousPrologEpilogPass(PassRegistry &);
86-
void initializeAArch64MIPeepholeOptPass(PassRegistry &);
8785
void initializeAArch64SIMDInstrOptPass(PassRegistry&);
8886
void initializeAArch64O0PreLegalizerCombinerPass(PassRegistry &);
8987
void initializeAArch64PreLegalizerCombinerPass(PassRegistry&);

llvm/lib/Target/AArch64/AArch64MIPeepholeOpt.cpp

Lines changed: 0 additions & 235 deletions
This file was deleted.

llvm/lib/Target/AArch64/AArch64TargetMachine.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeAArch64Target() {
195195
initializeAArch64DeadRegisterDefinitionsPass(*PR);
196196
initializeAArch64ExpandPseudoPass(*PR);
197197
initializeAArch64LoadStoreOptPass(*PR);
198-
initializeAArch64MIPeepholeOptPass(*PR);
199198
initializeAArch64SIMDInstrOptPass(*PR);
200199
initializeAArch64O0PreLegalizerCombinerPass(*PR);
201200
initializeAArch64PreLegalizerCombinerPass(*PR);
@@ -480,7 +479,6 @@ class AArch64PassConfig : public TargetPassConfig {
480479
bool addRegBankSelect() override;
481480
void addPreGlobalInstructionSelect() override;
482481
bool addGlobalInstructionSelect() override;
483-
void addMachineSSAOptimization() override;
484482
bool addILPOpts() override;
485483
void addPreRegAlloc() override;
486484
void addPostRegAlloc() override;
@@ -651,14 +649,6 @@ bool AArch64PassConfig::addGlobalInstructionSelect() {
651649
return false;
652650
}
653651

654-
void AArch64PassConfig::addMachineSSAOptimization() {
655-
// Run default MachineSSAOptimization first.
656-
TargetPassConfig::addMachineSSAOptimization();
657-
658-
if (TM->getOptLevel() != CodeGenOpt::None)
659-
addPass(createAArch64MIPeepholeOptPass());
660-
}
661-
662652
bool AArch64PassConfig::addILPOpts() {
663653
if (EnableCondOpt)
664654
addPass(createAArch64ConditionOptimizerPass());

llvm/lib/Target/AArch64/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ add_llvm_target(AArch64CodeGen
6666
AArch64LowerHomogeneousPrologEpilog.cpp
6767
AArch64MachineFunctionInfo.cpp
6868
AArch64MacroFusion.cpp
69-
AArch64MIPeepholeOpt.cpp
7069
AArch64MCInstLower.cpp
7170
AArch64PromoteConstant.cpp
7271
AArch64PBQPRegAlloc.cpp

llvm/lib/Target/AArch64/MCTargetDesc/AArch64AddressingModes.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#ifndef LLVM_LIB_TARGET_AARCH64_MCTARGETDESC_AARCH64ADDRESSINGMODES_H
1414
#define LLVM_LIB_TARGET_AARCH64_MCTARGETDESC_AARCH64ADDRESSINGMODES_H
1515

16-
#include "AArch64ExpandImm.h"
1716
#include "llvm/ADT/APFloat.h"
1817
#include "llvm/ADT/APInt.h"
1918
#include "llvm/ADT/bit.h"

llvm/test/CodeGen/AArch64/O3-pipeline.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
; CHECK-NEXT: Induction Variable Users
4141
; CHECK-NEXT: Loop Strength Reduction
4242
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
43-
; CHECK-NEXT: Function Alias Analysis Results
43+
; CHECK-NEXT: Function Alias Analysis Results
4444
; CHECK-NEXT: Merge contiguous icmps into a memcmp
4545
; CHECK-NEXT: Natural Loop Information
4646
; CHECK-NEXT: Lazy Branch Probability Analysis
@@ -131,7 +131,6 @@
131131
; CHECK-NEXT: Machine code sinking
132132
; CHECK-NEXT: Peephole Optimizations
133133
; CHECK-NEXT: Remove dead machine instructions
134-
; CHECK-NEXT: AArch64 MI Peephole Optimization pass
135134
; CHECK-NEXT: AArch64 Dead register definitions
136135
; CHECK-NEXT: Detect Dead Lanes
137136
; CHECK-NEXT: Process Implicit Definitions

0 commit comments

Comments
 (0)