Skip to content

Commit e6b0be3

Browse files
committed
[SLP]Correctly calculate number of copyable operands
The compiler shall not check for overflow of the number of copyable operands counter, otherwise non-copyable operand can be counted as copyable and lead to a compiler crash. Fixes #164164
1 parent b9ce765 commit e6b0be3

File tree

2 files changed

+31
-1
lines changed

2 files changed

+31
-1
lines changed

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5343,7 +5343,7 @@ class BoUpSLP {
53435343
unsigned &OpCnt =
53445344
OrderedEntriesCount.try_emplace(TE, 0).first->getSecond();
53455345
EdgeInfo EI(TE, U.getOperandNo());
5346-
if (!getScheduleCopyableData(EI, Op) && OpCnt < NumOps)
5346+
if (!getScheduleCopyableData(EI, Op))
53475347
continue;
53485348
// Found copyable operand - continue.
53495349
++OpCnt;
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 6
2+
; RUN: opt -S --passes=slp-vectorizer -mtriple=x86_64-apple-macosx15.0.0 -mcpu=skylake-avx512 -S < %s | FileCheck %s
3+
4+
define void @test(ptr %output) {
5+
; CHECK-LABEL: define void @test(
6+
; CHECK-SAME: ptr [[OUTPUT:%.*]]) #[[ATTR0:[0-9]+]] {
7+
; CHECK-NEXT: [[ENTRY:.*:]]
8+
; CHECK-NEXT: [[ARRAYIDX_2_I:%.*]] = getelementptr i8, ptr [[OUTPUT]], i64 8
9+
; CHECK-NEXT: [[TMP0:%.*]] = call <4 x i32> @llvm.masked.load.v4i32.p0(ptr [[OUTPUT]], i32 4, <4 x i1> <i1 true, i1 false, i1 false, i1 true>, <4 x i32> poison)
10+
; CHECK-NEXT: [[TMP1:%.*]] = shufflevector <4 x i32> [[TMP0]], <4 x i32> poison, <2 x i32> <i32 0, i32 3>
11+
; CHECK-NEXT: [[TMP2:%.*]] = xor <2 x i32> <i32 -1, i32 0>, [[TMP1]]
12+
; CHECK-NEXT: [[TMP3:%.*]] = shufflevector <2 x i32> [[TMP1]], <2 x i32> <i32 0, i32 poison>, <2 x i32> <i32 2, i32 1>
13+
; CHECK-NEXT: [[TMP4:%.*]] = call <2 x i32> @llvm.fshl.v2i32(<2 x i32> [[TMP2]], <2 x i32> [[TMP3]], <2 x i32> splat (i32 2))
14+
; CHECK-NEXT: store <2 x i32> [[TMP4]], ptr [[ARRAYIDX_2_I]], align 4
15+
; CHECK-NEXT: ret void
16+
;
17+
entry:
18+
%arrayidx.2.i = getelementptr i8, ptr %output, i64 8
19+
%0 = load i32, ptr %output, align 4
20+
%arrayidx.3.i = getelementptr i8, ptr %output, i64 12
21+
%1 = load i32, ptr %arrayidx.3.i, align 4
22+
%xor7 = xor i32 -1, %0
23+
%or.i = tail call i32 @llvm.fshl.i32(i32 %xor7, i32 0, i32 2)
24+
%or.i11 = tail call i32 @llvm.fshl.i32(i32 %1, i32 %1, i32 2)
25+
store i32 %or.i, ptr %arrayidx.2.i, align 4
26+
store i32 %or.i11, ptr %arrayidx.3.i, align 4
27+
ret void
28+
}
29+
30+
declare i32 @llvm.fshl.i32(i32, i32, i32)

0 commit comments

Comments
 (0)