Skip to content

Commit 53b3855

Browse files
JonPssonmemfrob
authored andcommitted
[SystemZ] Bugfix in adjustSubwordCmp()
adjustSubwordCmp() should not optimize a load of an i1 value. This is achieved by checking that the size and store-size of the MemoryVT are the same. Fixes https://bugs.llvm.org/show_bug.cgi?id=45511. Review: Ulrich Weigand Differential Revision: https://reviews.llvm.org/D78187
1 parent 9016cbe commit 53b3855

File tree

2 files changed

+31
-2
lines changed

2 files changed

+31
-2
lines changed

llvm/lib/Target/SystemZ/SystemZISelLowering.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2051,8 +2051,9 @@ static void adjustSubwordCmp(SelectionDAG &DAG, const SDLoc &DL,
20512051

20522052
// We must have an 8- or 16-bit load.
20532053
auto *Load = cast<LoadSDNode>(C.Op0);
2054-
unsigned NumBits = Load->getMemoryVT().getStoreSizeInBits();
2055-
if (NumBits != 8 && NumBits != 16)
2054+
unsigned NumBits = Load->getMemoryVT().getSizeInBits();
2055+
if ((NumBits != 8 && NumBits != 16) ||
2056+
NumBits != Load->getMemoryVT().getStoreSizeInBits())
20562057
return;
20572058

20582059
// The load must be an extending one and the constant must be within the
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
; RUN: llc < %s -mtriple=s390x-linux-gnu -mcpu=z14 -O3 -stop-before=finalize-isel \
2+
; RUN: | FileCheck %s
3+
;
4+
; Check that an i1 in memory used in a comparison is loaded correctly.
5+
6+
@bPtr = external dso_local local_unnamed_addr global i32*, align 8
7+
@c = external hidden unnamed_addr global i1, align 4
8+
9+
define i64 @main() {
10+
; CHECK-LABEL: bb.0.entry:
11+
; CHECK: %1:addr64bit = LARL @c
12+
; CHECK: %2:gr64bit = LLGC %1, 0, $noreg :: (dereferenceable load 1 from @c, align 4)
13+
; CHECK-NEXT: %4:gr64bit = IMPLICIT_DEF
14+
; CHECK-NEXT: %3:gr64bit = RISBGN %4, killed %2, 63, 191, 0
15+
; CHECK-NEXT: %5:gr64bit = LCGR killed %3, implicit-def dead $cc
16+
; CHECK-NEXT: CGHI killed %5, 1, implicit-def $cc
17+
entry:
18+
%0 = load i32*, i32** @bPtr
19+
store i1 true, i1* @c
20+
store i32 8, i32* %0
21+
%.b = load i1, i1* @c
22+
%conv.i = select i1 %.b, i64 1, i64 3
23+
%div.i = sdiv i64 -1, %conv.i
24+
%cmp.i = icmp eq i64 %div.i, 1
25+
%conv2.i = zext i1 %cmp.i to i64
26+
ret i64 %conv2.i
27+
}
28+

0 commit comments

Comments
 (0)