mirror of
https://github.com/RPCSX/llvm.git
synced 2024-11-24 20:29:53 +00:00
[LoopVectorize] Don't consider conditional-load dereferenceability for marked parallel loops
I really thought we were doing this already, but we were not. Given this input: void Test(int *res, int *c, int *d, int *p) { for (int i = 0; i < 16; i++) res[i] = (p[i] == 0) ? res[i] : res[i] + d[i]; } we did not vectorize the loop. Even with "assume_safety" the check that we don't if-convert conditionally-executed loads (to protect against data-dependent deferenceability) was not elided. One subtlety: As implemented, it will still prefer to use a masked-load instrinsic (given target support) over the speculated load. The choice here seems architecture specific; the best option depends on how expensive the masked load is compared to a regular load. Ideally, using the masked load still reduces unnecessary memory traffic, and so should be preferred. If we'd rather do it the other way, flipping the order of the checks is easy. The LangRef is updated to make explicit that llvm.mem.parallel_loop_access also implies that if conversion is okay. Differential Revision: http://reviews.llvm.org/D19512 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@267514 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
b9d01c87d6
commit
681428ed7d
@ -4716,7 +4716,8 @@ The ``llvm.mem.parallel_loop_access`` metadata refers to a loop identifier,
|
||||
or metadata containing a list of loop identifiers for nested loops.
|
||||
The metadata is attached to memory accessing instructions and denotes that
|
||||
no loop carried memory dependence exist between it and other instructions denoted
|
||||
with the same loop identifier.
|
||||
with the same loop identifier. The metadata on memory reads also implies that
|
||||
if conversion (i.e. speculative execution within a loop iteration) is safe.
|
||||
|
||||
Precisely, given two instructions ``m1`` and ``m2`` that both have the
|
||||
``llvm.mem.parallel_loop_access`` metadata, with ``L1`` and ``L2`` being the
|
||||
|
@ -4873,6 +4873,7 @@ bool LoopVectorizationLegality::blockNeedsPredication(BasicBlock *BB) {
|
||||
|
||||
bool LoopVectorizationLegality::blockCanBePredicated(BasicBlock *BB,
|
||||
SmallPtrSetImpl<Value *> &SafePtrs) {
|
||||
const bool IsAnnotatedParallel = TheLoop->isAnnotatedParallel();
|
||||
|
||||
for (BasicBlock::iterator it = BB->begin(), e = BB->end(); it != e; ++it) {
|
||||
// Check that we don't have a constant expression that can trap as operand.
|
||||
@ -4893,6 +4894,9 @@ bool LoopVectorizationLegality::blockCanBePredicated(BasicBlock *BB,
|
||||
MaskedOp.insert(LI);
|
||||
continue;
|
||||
}
|
||||
// !llvm.mem.parallel_loop_access implies if-conversion safety.
|
||||
if (IsAnnotatedParallel)
|
||||
continue;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
41
test/Transforms/LoopVectorize/X86/force-ifcvt.ll
Normal file
41
test/Transforms/LoopVectorize/X86/force-ifcvt.ll
Normal file
@ -0,0 +1,41 @@
|
||||
; RUN: opt -loop-vectorize -S < %s | FileCheck %s
|
||||
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
|
||||
target triple = "x86_64-unknown-linux-gnu"
|
||||
|
||||
; Function Attrs: norecurse nounwind uwtable
|
||||
define void @Test(i32* nocapture %res, i32* nocapture readnone %c, i32* nocapture readonly %d, i32* nocapture readonly %p) #0 {
|
||||
entry:
|
||||
br label %for.body
|
||||
|
||||
; CHECK-LABEL: @Test
|
||||
; CHECK: <4 x i32>
|
||||
|
||||
for.body: ; preds = %cond.end, %entry
|
||||
%indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %cond.end ]
|
||||
%arrayidx = getelementptr inbounds i32, i32* %p, i64 %indvars.iv
|
||||
%0 = load i32, i32* %arrayidx, align 4, !llvm.mem.parallel_loop_access !0
|
||||
%cmp1 = icmp eq i32 %0, 0
|
||||
%arrayidx3 = getelementptr inbounds i32, i32* %res, i64 %indvars.iv
|
||||
%1 = load i32, i32* %arrayidx3, align 4, !llvm.mem.parallel_loop_access !0
|
||||
br i1 %cmp1, label %cond.end, label %cond.false
|
||||
|
||||
cond.false: ; preds = %for.body
|
||||
%arrayidx7 = getelementptr inbounds i32, i32* %d, i64 %indvars.iv
|
||||
%2 = load i32, i32* %arrayidx7, align 4, !llvm.mem.parallel_loop_access !0
|
||||
%add = add nsw i32 %2, %1
|
||||
br label %cond.end
|
||||
|
||||
cond.end: ; preds = %for.body, %cond.false
|
||||
%cond = phi i32 [ %add, %cond.false ], [ %1, %for.body ]
|
||||
store i32 %cond, i32* %arrayidx3, align 4, !llvm.mem.parallel_loop_access !0
|
||||
%indvars.iv.next = add nuw nsw i64 %indvars.iv, 1
|
||||
%exitcond = icmp eq i64 %indvars.iv.next, 16
|
||||
br i1 %exitcond, label %for.end, label %for.body, !llvm.loop !0
|
||||
|
||||
for.end: ; preds = %cond.end
|
||||
ret void
|
||||
}
|
||||
|
||||
attributes #0 = { norecurse nounwind uwtable "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" }
|
||||
|
||||
!0 = distinct !{!0}
|
Loading…
Reference in New Issue
Block a user