Skip to content

MIPS: Set EnableLoopTermFold #133378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 28, 2025
+63 −32
Merged

MIPS: Set EnableLoopTermFold #133378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
186825b
MIPS: Set EnableLoopTermFold
wzssyqa Mar 28, 2025
7d0c5ae
fix brdelayslot.ll
wzssyqa Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions llvm/lib/Target/Mips/MipsTargetMachine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ class MipsPassConfig : public TargetPassConfig {
// can break this requirement, so disable it when long branch pass is
// enabled.
EnableTailMerge = !getMipsSubtarget().enableLongBranchPass();
EnableLoopTermFold = true;
}

MipsTargetMachine &getMipsTargetMachine() const {
Expand Down
9 changes: 6 additions & 3 deletions llvm/test/CodeGen/Mips/brdelayslot.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,12 @@ declare void @foo11()
;
; SUCCBB-LABEL: succbbs_loop1:
; SUCCBB: blez $5, $BB
; SUCCBB-NEXT: addiu
; SUCCBB: bnez ${{[0-9]+}}, $BB
; SUCCBB-NEXT: addiu
; SUCCBB-NEXT: sll
; SUCCBB-NEXT: # %bb
; SUCCBB-NEXT: addu
; SUCCBB: addiu ${{[0-9]+}}, ${{[0-9]+}}, 4
; SUCCBB-NEXT: bne ${{[0-9]+}}, ${{[0-9]+}}, $BB
; SUCCBB-NEXT: nop

define i32 @succbbs_loop1(ptr nocapture %a, i32 %n) {
entry:
Expand Down
85 changes: 56 additions & 29 deletions llvm/test/Transforms/LoopStrengthReduce/Mips/long-array-initialize.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
; RUN: opt < %s -passes=loop-reduce -S | FileCheck %s
; RUN: opt < %s -passes=loop-reduce,loop-term-fold -S | FileCheck %s --check-prefix=CHECK-OPT
; RUN: llc < %s -o - | FileCheck %s --check-prefix=CHECK-LLC

target datalayout = "E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64"
target triple = "mips-unknown-linux-gnu"
Expand All @@ -8,20 +9,34 @@ target triple = "mips-unknown-linux-gnu"

; Function Attrs: nofree norecurse nosync nounwind memory(write, argmem: none, inaccessiblemem: none)
define dso_local void @in128000(i32 noundef signext %k, i32 noundef signext %n) local_unnamed_addr #0 {
; CHECK-LABEL: define dso_local void @in128000(
; CHECK-SAME: i32 noundef signext [[K:%.*]], i32 noundef signext [[N:%.*]]) local_unnamed_addr {
; CHECK-NEXT: [[ENTRY:.*]]:
; CHECK-NEXT: br label %[[FOR_BODY:.*]]
; CHECK: [[FOR_COND_CLEANUP:.*]]:
; CHECK-NEXT: ret void
; CHECK: [[FOR_BODY]]:
; CHECK-NEXT: [[LSR_IV1:%.*]] = phi ptr [ [[SCEVGEP:%.*]], %[[FOR_BODY]] ], [ @x, %[[ENTRY]] ]
; CHECK-NEXT: [[LSR_IV:%.*]] = phi i32 [ [[LSR_IV_NEXT:%.*]], %[[FOR_BODY]] ], [ 128000, %[[ENTRY]] ]
; CHECK-NEXT: store i32 [[K]], ptr [[LSR_IV1]], align 4
; CHECK-NEXT: [[LSR_IV_NEXT]] = add nsw i32 [[LSR_IV]], -1
; CHECK-NEXT: [[SCEVGEP]] = getelementptr i8, ptr [[LSR_IV1]], i32 4
; CHECK-NEXT: [[EXITCOND_NOT:%.*]] = icmp eq i32 [[LSR_IV_NEXT]], 0
; CHECK-NEXT: br i1 [[EXITCOND_NOT]], label %[[FOR_COND_CLEANUP]], label %[[FOR_BODY]]
; CHECK-LLC-LABEL: in128000:
; CHECK-LLC: # %bb.0: # %entry
; CHECK-LLC-NEXT: lui $1, %hi(x)
; CHECK-LLC-NEXT: addiu $2, $1, %lo(x)
; CHECK-LLC-NEXT: lui $1, 7
; CHECK-LLC-NEXT: ori $1, $1, 53248
; CHECK-LLC-NEXT: addu $3, $2, $1
; CHECK-LLC-NEXT: $BB0_1: # %for.body
; CHECK-LLC-NEXT: # =>This Inner Loop Header: Depth=1
; CHECK-LLC-NEXT: sw $4, 0($2)
; CHECK-LLC-NEXT: addiu $2, $2, 4
; CHECK-LLC-NEXT: bne $2, $3, $BB0_1
; CHECK-LLC-NEXT: nop
; CHECK-LLC-NEXT: # %bb.2: # %for.cond.cleanup
; CHECK-LLC-NEXT: jr $ra
; CHECK-LLC-NEXT: nop
; CHECK-OPT-LABEL: define dso_local void @in128000(
; CHECK-OPT-SAME: i32 noundef signext [[K:%.*]], i32 noundef signext [[N:%.*]]) local_unnamed_addr {
; CHECK-OPT-NEXT: [[ENTRY:.*]]:
; CHECK-OPT-NEXT: br label %[[FOR_BODY:.*]]
; CHECK-OPT: [[FOR_COND_CLEANUP:.*]]:
; CHECK-OPT-NEXT: ret void
; CHECK-OPT: [[FOR_BODY]]:
; CHECK-OPT-NEXT: [[LSR_IV1:%.*]] = phi ptr [ [[SCEVGEP:%.*]], %[[FOR_BODY]] ], [ @x, %[[ENTRY]] ]
; CHECK-OPT-NEXT: store i32 [[K]], ptr [[LSR_IV1]], align 4
; CHECK-OPT-NEXT: [[SCEVGEP]] = getelementptr i8, ptr [[LSR_IV1]], i32 4
; CHECK-OPT-NEXT: [[LSR_FOLD_TERM_COND_REPLACED_TERM_COND:%.*]] = icmp eq ptr [[SCEVGEP]], getelementptr inbounds nuw (i8, ptr @x, i32 512000)
; CHECK-OPT-NEXT: br i1 [[LSR_FOLD_TERM_COND_REPLACED_TERM_COND]], label %[[FOR_COND_CLEANUP]], label %[[FOR_BODY]]
;
entry:
br label %for.body
Expand All @@ -40,20 +55,32 @@ for.body: ; preds = %entry, %for.body

; Function Attrs: nofree norecurse nosync nounwind memory(write, argmem: none, inaccessiblemem: none)
define dso_local void @in1000(i32 noundef signext %k, i32 noundef signext %n) local_unnamed_addr #0 {
; CHECK-LABEL: define dso_local void @in1000(
; CHECK-SAME: i32 noundef signext [[K:%.*]], i32 noundef signext [[N:%.*]]) local_unnamed_addr {
; CHECK-NEXT: [[ENTRY:.*]]:
; CHECK-NEXT: br label %[[FOR_BODY:.*]]
; CHECK: [[FOR_COND_CLEANUP:.*]]:
; CHECK-NEXT: ret void
; CHECK: [[FOR_BODY]]:
; CHECK-NEXT: [[LSR_IV1:%.*]] = phi ptr [ [[SCEVGEP:%.*]], %[[FOR_BODY]] ], [ @x, %[[ENTRY]] ]
; CHECK-NEXT: [[LSR_IV:%.*]] = phi i32 [ [[LSR_IV_NEXT:%.*]], %[[FOR_BODY]] ], [ 1000, %[[ENTRY]] ]
; CHECK-NEXT: store i32 [[K]], ptr [[LSR_IV1]], align 4
; CHECK-NEXT: [[LSR_IV_NEXT]] = add nsw i32 [[LSR_IV]], -1
; CHECK-NEXT: [[SCEVGEP]] = getelementptr i8, ptr [[LSR_IV1]], i32 4
; CHECK-NEXT: [[EXITCOND_NOT:%.*]] = icmp eq i32 [[LSR_IV_NEXT]], 0
; CHECK-NEXT: br i1 [[EXITCOND_NOT]], label %[[FOR_COND_CLEANUP]], label %[[FOR_BODY]]
; CHECK-LLC-LABEL: in1000:
; CHECK-LLC: # %bb.0: # %entry
; CHECK-LLC-NEXT: lui $1, %hi(x)
; CHECK-LLC-NEXT: addiu $2, $1, %lo(x)
; CHECK-LLC-NEXT: addiu $3, $2, 4000
; CHECK-LLC-NEXT: $BB1_1: # %for.body
; CHECK-LLC-NEXT: # =>This Inner Loop Header: Depth=1
; CHECK-LLC-NEXT: sw $4, 0($2)
; CHECK-LLC-NEXT: addiu $2, $2, 4
; CHECK-LLC-NEXT: bne $2, $3, $BB1_1
; CHECK-LLC-NEXT: nop
; CHECK-LLC-NEXT: # %bb.2: # %for.cond.cleanup
; CHECK-LLC-NEXT: jr $ra
; CHECK-LLC-NEXT: nop
; CHECK-OPT-LABEL: define dso_local void @in1000(
; CHECK-OPT-SAME: i32 noundef signext [[K:%.*]], i32 noundef signext [[N:%.*]]) local_unnamed_addr {
; CHECK-OPT-NEXT: [[ENTRY:.*]]:
; CHECK-OPT-NEXT: br label %[[FOR_BODY:.*]]
; CHECK-OPT: [[FOR_COND_CLEANUP:.*]]:
; CHECK-OPT-NEXT: ret void
; CHECK-OPT: [[FOR_BODY]]:
; CHECK-OPT-NEXT: [[LSR_IV1:%.*]] = phi ptr [ [[SCEVGEP:%.*]], %[[FOR_BODY]] ], [ @x, %[[ENTRY]] ]
; CHECK-OPT-NEXT: store i32 [[K]], ptr [[LSR_IV1]], align 4
; CHECK-OPT-NEXT: [[SCEVGEP]] = getelementptr i8, ptr [[LSR_IV1]], i32 4
; CHECK-OPT-NEXT: [[LSR_FOLD_TERM_COND_REPLACED_TERM_COND:%.*]] = icmp eq ptr [[SCEVGEP]], getelementptr inbounds nuw (i8, ptr @x, i32 4000)
; CHECK-OPT-NEXT: br i1 [[LSR_FOLD_TERM_COND_REPLACED_TERM_COND]], label %[[FOR_COND_CLEANUP]], label %[[FOR_BODY]]
;
entry:
br label %for.body
Expand Down