Skip to content

[GlobalISel] Handle more commutable instructions in commute_constant_to_rhs #87424

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 16 commits into from
Apr 16, 2024
Merged

[GlobalISel] Handle more commutable instructions in commute_constant_to_rhs #87424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d69f39f
[𝘀𝗽𝗿] changes to main this commit is based on
darkbuck Apr 2, 2024
c50ebfd
[𝘀𝗽𝗿] initial version
darkbuck Apr 2, 2024
a820fa2
[𝘀𝗽𝗿] changes introduced through rebase
darkbuck Apr 4, 2024
3aa326b
rebase
darkbuck Apr 4, 2024
a4e6fba
[𝘀𝗽𝗿] changes introduced through rebase
darkbuck Apr 4, 2024
7c8a81a
rebase again
darkbuck Apr 4, 2024
3f7167b
[𝘀𝗽𝗿] changes introduced through rebase
akyrtzi Apr 5, 2024
455302b
add missing tests and rebase
darkbuck Apr 5, 2024
a0dfcea
rebase to main branch
darkbuck Apr 5, 2024
06ee186
rebase
darkbuck Apr 8, 2024
f259373
rebase
darkbuck Apr 9, 2024
2823d5e
rebase
darkbuck Apr 10, 2024
fba9084
rebase
darkbuck Apr 10, 2024
3d996a0
rebase
darkbuck Apr 11, 2024
1188722
Add a few test cases with the constant fold barrier on instructions w…
darkbuck Apr 15, 2024
3bc3b1d
rebase
darkbuck Apr 16, 2024
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
10 changes: 8 additions & 2 deletions llvm/include/llvm/Target/GlobalISel/Combine.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,14 +443,20 @@ def select_constant_cmp: GICombineRule<
// TODO: handle compares (currently not marked as isCommutable)
def commute_int_constant_to_rhs : GICombineRule<
(defs root:$root),
(match (wip_match_opcode G_ADD, G_MUL, G_AND, G_OR, G_XOR):$root,
(match (wip_match_opcode G_ADD, G_MUL, G_AND, G_OR, G_XOR,
G_SMIN, G_SMAX, G_UMIN, G_UMAX, G_UADDO, G_SADDO,
G_UMULO, G_SMULO, G_UMULH, G_SMULH,
G_UADDSAT, G_SADDSAT, G_SMULFIX, G_UMULFIX,
G_SMULFIXSAT, G_UMULFIXSAT):$root,
[{ return Helper.matchCommuteConstantToRHS(*${root}); }]),
(apply [{ Helper.applyCommuteBinOpOperands(*${root}); }])
>;

def commute_fp_constant_to_rhs : GICombineRule<
(defs root:$root),
(match (wip_match_opcode G_FADD, G_FMUL):$root,
(match (wip_match_opcode G_FADD, G_FMUL, G_FMINNUM, G_FMAXNUM,
G_FMINNUM_IEEE, G_FMAXNUM_IEEE,
G_FMINIMUM, G_FMAXIMUM):$root,
[{ return Helper.matchCommuteFPConstantToRHS(*${root}); }]),
(apply [{ Helper.applyCommuteBinOpOperands(*${root}); }])
>;
Expand Down
38 changes: 32 additions & 6 deletions llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6273,8 +6273,21 @@ bool CombinerHelper::matchShiftsTooBig(MachineInstr &MI) {
}

bool CombinerHelper::matchCommuteConstantToRHS(MachineInstr &MI) {
Register LHS = MI.getOperand(1).getReg();
Register RHS = MI.getOperand(2).getReg();
unsigned LHSOpndIdx = 1;
unsigned RHSOpndIdx = 2;
switch (MI.getOpcode()) {
case TargetOpcode::G_UADDO:
case TargetOpcode::G_SADDO:
case TargetOpcode::G_UMULO:
case TargetOpcode::G_SMULO:
LHSOpndIdx = 2;
RHSOpndIdx = 3;
break;
default:
break;
}
Register LHS = MI.getOperand(LHSOpndIdx).getReg();
Register RHS = MI.getOperand(RHSOpndIdx).getReg();
if (!getIConstantVRegVal(LHS, MRI)) {
// Skip commuting if LHS is not a constant. But, LHS may be a
// G_CONSTANT_FOLD_BARRIER. If so we commute as long as we don't already
Expand All @@ -6300,10 +6313,23 @@ bool CombinerHelper::matchCommuteFPConstantToRHS(MachineInstr &MI) {

void CombinerHelper::applyCommuteBinOpOperands(MachineInstr &MI) {
Observer.changingInstr(MI);
Register LHSReg = MI.getOperand(1).getReg();
Register RHSReg = MI.getOperand(2).getReg();
MI.getOperand(1).setReg(RHSReg);
MI.getOperand(2).setReg(LHSReg);
unsigned LHSOpndIdx = 1;
unsigned RHSOpndIdx = 2;
switch (MI.getOpcode()) {
case TargetOpcode::G_UADDO:
case TargetOpcode::G_SADDO:
case TargetOpcode::G_UMULO:
case TargetOpcode::G_SMULO:
LHSOpndIdx = 2;
RHSOpndIdx = 3;
break;
default:
break;
}
Register LHSReg = MI.getOperand(LHSOpndIdx).getReg();
Register RHSReg = MI.getOperand(RHSOpndIdx).getReg();
MI.getOperand(LHSOpndIdx).setReg(RHSReg);
MI.getOperand(RHSOpndIdx).setReg(LHSReg);
Observer.changedInstr(MI);
}

Expand Down
126 changes: 126 additions & 0 deletions llvm/test/CodeGen/AArch64/GlobalISel/combine-commute-fp-const-lhs.mir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,129 @@ body: |
$q0 = COPY %mul
RET_ReallyLR
...
---
name: fminnum
tracksRegLiveness: true
body: |
bb.1:
liveins: $s0

; CHECK-LABEL: name: fminnum
; CHECK: liveins: $s0
; CHECK-NEXT: {{ $}}
; CHECK-NEXT: [[COPY:%[0-9]+]]:_(s32) = COPY $s0
; CHECK-NEXT: %cst:_(s32) = G_FCONSTANT float 2.000000e+00
; CHECK-NEXT: %min:_(s32) = G_FMINNUM [[COPY]], %cst
; CHECK-NEXT: $s0 = COPY %min(s32)
; CHECK-NEXT: RET_ReallyLR
%0:_(s32) = COPY $s0
%cst:_(s32) = G_FCONSTANT float 2.000000e+00
%min:_(s32) = G_FMINNUM %cst, %0
$s0 = COPY %min
RET_ReallyLR
...
---
name: fmaxnum
tracksRegLiveness: true
body: |
bb.1:
liveins: $s0

; CHECK-LABEL: name: fmaxnum
; CHECK: liveins: $s0
; CHECK-NEXT: {{ $}}
; CHECK-NEXT: [[COPY:%[0-9]+]]:_(s32) = COPY $s0
; CHECK-NEXT: %cst:_(s32) = G_FCONSTANT float 2.000000e+00
; CHECK-NEXT: %max:_(s32) = G_FMAXNUM [[COPY]], %cst
; CHECK-NEXT: $s0 = COPY %max(s32)
; CHECK-NEXT: RET_ReallyLR
%0:_(s32) = COPY $s0
%cst:_(s32) = G_FCONSTANT float 2.000000e+00
%max:_(s32) = G_FMAXNUM %cst, %0
$s0 = COPY %max
RET_ReallyLR
...
---
name: fminnum_ieee
tracksRegLiveness: true
body: |
bb.1:
liveins: $s0

; CHECK-LABEL: name: fminnum_ieee
; CHECK: liveins: $s0
; CHECK-NEXT: {{ $}}
; CHECK-NEXT: [[COPY:%[0-9]+]]:_(s32) = COPY $s0
; CHECK-NEXT: %cst:_(s32) = G_FCONSTANT float 2.000000e+00
; CHECK-NEXT: %min:_(s32) = G_FMINNUM_IEEE [[COPY]], %cst
; CHECK-NEXT: $s0 = COPY %min(s32)
; CHECK-NEXT: RET_ReallyLR
%0:_(s32) = COPY $s0
%cst:_(s32) = G_FCONSTANT float 2.000000e+00
%min:_(s32) = G_FMINNUM_IEEE %cst, %0
$s0 = COPY %min
RET_ReallyLR
...
---
name: fmaxnum_ieee
tracksRegLiveness: true
body: |
bb.1:
liveins: $s0

; CHECK-LABEL: name: fmaxnum_ieee
; CHECK: liveins: $s0
; CHECK-NEXT: {{ $}}
; CHECK-NEXT: [[COPY:%[0-9]+]]:_(s32) = COPY $s0
; CHECK-NEXT: %cst:_(s32) = G_FCONSTANT float 2.000000e+00
; CHECK-NEXT: %max:_(s32) = G_FMAXNUM_IEEE [[COPY]], %cst
; CHECK-NEXT: $s0 = COPY %max(s32)
; CHECK-NEXT: RET_ReallyLR
%0:_(s32) = COPY $s0
%cst:_(s32) = G_FCONSTANT float 2.000000e+00
%max:_(s32) = G_FMAXNUM_IEEE %cst, %0
$s0 = COPY %max
RET_ReallyLR
...
---
name: fminimum
tracksRegLiveness: true
body: |
bb.1:
liveins: $s0

; CHECK-LABEL: name: fminimum
; CHECK: liveins: $s0
; CHECK-NEXT: {{ $}}
; CHECK-NEXT: [[COPY:%[0-9]+]]:_(s32) = COPY $s0
; CHECK-NEXT: %cst:_(s32) = G_FCONSTANT float 2.000000e+00
; CHECK-NEXT: %min:_(s32) = G_FMINIMUM [[COPY]], %cst
; CHECK-NEXT: $s0 = COPY %min(s32)
; CHECK-NEXT: RET_ReallyLR
%0:_(s32) = COPY $s0
%cst:_(s32) = G_FCONSTANT float 2.000000e+00
%min:_(s32) = G_FMINIMUM %cst, %0
$s0 = COPY %min
RET_ReallyLR
...
---
name: fmaximum
tracksRegLiveness: true
body: |
bb.1:
liveins: $s0

; CHECK-LABEL: name: fmaximum
; CHECK: liveins: $s0
; CHECK-NEXT: {{ $}}
; CHECK-NEXT: [[COPY:%[0-9]+]]:_(s32) = COPY $s0
; CHECK-NEXT: %cst:_(s32) = G_FCONSTANT float 2.000000e+00
; CHECK-NEXT: %max:_(s32) = G_FMAXIMUM [[COPY]], %cst
; CHECK-NEXT: $s0 = COPY %max(s32)
; CHECK-NEXT: RET_ReallyLR
%0:_(s32) = COPY $s0
%cst:_(s32) = G_FCONSTANT float 2.000000e+00
%max:_(s32) = G_FMAXIMUM %cst, %0
$s0 = COPY %max
RET_ReallyLR
...
Loading