Skip to content

Commit

Permalink
[RISCV] Update pr58511.ll to not use mul by constant that can be conv…
Browse files Browse the repository at this point in the history
…erted to shift.

Normally a mul by a power 2 will be converted to shift by InstCombine.
Hoping this will make D127115 not affect this test so much.

I've verified the change still fails with the original DAGCombiner
bug.
  • Loading branch information
topperc committed May 21, 2023
1 parent fda76c4 commit 2e6bfa8
Showing 1 changed file with 24 additions and 29 deletions.
53 changes: 24 additions & 29 deletions llvm/test/CodeGen/RISCV/pr58511.ll
@@ -1,62 +1,59 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc < %s -mtriple=riscv64 | FileCheck %s
; RUN: llc < %s -mtriple=riscv64 -mattr=+m | FileCheck %s

define i32 @f(i1 %0, i32 %1, ptr %2) {
; CHECK-LABEL: f:
; CHECK: # %bb.0: # %BB
; CHECK-NEXT: slli a3, a1, 11
; CHECK-NEXT: slli a1, a1, 12
; CHECK-NEXT: subw a1, a1, a3
; CHECK-NEXT: lui a3, 4097
; CHECK-NEXT: addiw a3, a3, -2047
; CHECK-NEXT: mul a1, a1, a3
; CHECK-NEXT: slli a0, a0, 63
; CHECK-NEXT: srai a0, a0, 63
; CHECK-NEXT: li a3, 1
; CHECK-NEXT: slli a3, a3, 11
; CHECK-NEXT: or a0, a0, a3
; CHECK-NEXT: sw a1, 0(a2)
; CHECK-NEXT: ret
BB:
%I = select i1 %0, i32 -1, i32 0
%I1 = mul i32 %1, 2048
%I2 = or i32 2048, %I
%I1 = mul i32 %1, 16779265
%I2 = or i32 16779265, %I
store i32 %I1, ptr %2
ret i32 %I2
}

define i32 @g(i1 %0, i32 %1, ptr %2) {
; CHECK-LABEL: g:
; CHECK: # %bb.0: # %BB
; CHECK-NEXT: slli a3, a1, 11
; CHECK-NEXT: slli a1, a1, 12
; CHECK-NEXT: subw a1, a1, a3
; CHECK-NEXT: lui a3, 4097
; CHECK-NEXT: addiw a3, a3, -2047
; CHECK-NEXT: mul a1, a1, a3
; CHECK-NEXT: andi a0, a0, 1
; CHECK-NEXT: addi a0, a0, -1
; CHECK-NEXT: li a3, 1
; CHECK-NEXT: slli a3, a3, 11
; CHECK-NEXT: or a0, a0, a3
; CHECK-NEXT: sw a1, 0(a2)
; CHECK-NEXT: ret
BB:
%I = select i1 %0, i32 0, i32 -1
%I1 = mul i32 %1, 2048
%I2 = or i32 2048, %I
%I1 = mul i32 %1, 16779265
%I2 = or i32 16779265, %I
store i32 %I1, ptr %2
ret i32 %I2
}

define i32 @h(i1 %0, i32 %1, ptr %2) {
; CHECK-LABEL: h:
; CHECK: # %bb.0: # %BB
; CHECK-NEXT: slli a3, a1, 11
; CHECK-NEXT: slli a1, a1, 12
; CHECK-NEXT: subw a1, a1, a3
; CHECK-NEXT: andi a0, a0, 1
; CHECK-NEXT: slli a0, a0, 11
; CHECK-NEXT: lui a3, 4097
; CHECK-NEXT: addiw a3, a3, -2047
; CHECK-NEXT: mul a1, a1, a3
; CHECK-NEXT: slli a0, a0, 63
; CHECK-NEXT: srai a0, a0, 63
; CHECK-NEXT: and a0, a0, a3
; CHECK-NEXT: sw a1, 0(a2)
; CHECK-NEXT: ret
BB:
%I = select i1 %0, i32 -1, i32 0
%I1 = mul i32 %1, 2048
%I2 = and i32 2048, %I
%I1 = mul i32 %1, 16779265
%I2 = and i32 16779265, %I
store i32 %I1, ptr %2
ret i32 %I2
}
Expand All @@ -65,19 +62,17 @@ define i32 @i(i1 %0, i32 %1, ptr %2) {
; CHECK-LABEL: i:
; CHECK: # %bb.0: # %BB
; CHECK-NEXT: andi a0, a0, 1
; CHECK-NEXT: slli a3, a1, 11
; CHECK-NEXT: slli a1, a1, 12
; CHECK-NEXT: subw a1, a1, a3
; CHECK-NEXT: lui a3, 4097
; CHECK-NEXT: addiw a3, a3, -2047
; CHECK-NEXT: mul a1, a1, a3
; CHECK-NEXT: addi a0, a0, -1
; CHECK-NEXT: li a3, 1
; CHECK-NEXT: slli a3, a3, 11
; CHECK-NEXT: and a0, a0, a3
; CHECK-NEXT: sw a1, 0(a2)
; CHECK-NEXT: ret
BB:
%I = select i1 %0, i32 0, i32 -1
%I1 = mul i32 %1, 2048
%I2 = and i32 2048, %I
%I1 = mul i32 %1, 16779265
%I2 = and i32 16779265, %I
store i32 %I1, ptr %2
ret i32 %I2
}

0 comments on commit 2e6bfa8

Please sign in to comment.