[llvm] r352555 - Check bool attribute value in getOptionalBoolLoopAttribute.

Hans Wennborg via llvm-commits llvm-commits at lists.llvm.org
Tue Feb 5 04:55:29 PST 2019


Merged to 8.0 in r353167.

On Tue, Jan 29, 2019 at 11:33 PM Alina Sbirlea via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
>
> Author: asbirlea
> Date: Tue Jan 29 14:33:20 2019
> New Revision: 352555
>
> URL: http://llvm.org/viewvc/llvm-project?rev=352555&view=rev
> Log:
> Check bool attribute value in getOptionalBoolLoopAttribute.
>
> Summary:
> Check the bool value of the attribute in getOptionalBoolLoopAttribute
> not just its existance.
> Eliminates the warning noise generated when vectorization is explicitly disabled.
>
> Reviewers: Meinersbur, hfinkel, dmgreen
>
> Subscribers: jlebar, sanjoy, llvm-commits
>
> Differential Revision: https://reviews.llvm.org/D57260
>
> Added:
>     llvm/trunk/test/Transforms/LoopVectorize/no_switch_disable_vectorization.ll
> Modified:
>     llvm/trunk/lib/Transforms/Utils/LoopUtils.cpp
>
> Modified: llvm/trunk/lib/Transforms/Utils/LoopUtils.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/LoopUtils.cpp?rev=352555&r1=352554&r2=352555&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Utils/LoopUtils.cpp (original)
> +++ llvm/trunk/lib/Transforms/Utils/LoopUtils.cpp Tue Jan 29 14:33:20 2019
> @@ -216,7 +216,10 @@ static Optional<bool> getOptionalBoolLoo
>      // When the value is absent it is interpreted as 'attribute set'.
>      return true;
>    case 2:
> -    return mdconst::extract_or_null<ConstantInt>(MD->getOperand(1).get());
> +    if (ConstantInt *IntMD =
> +            mdconst::extract_or_null<ConstantInt>(MD->getOperand(1).get()))
> +      return IntMD->getZExtValue();
> +    return true;
>    }
>    llvm_unreachable("unexpected number of options");
>  }
>
> Added: llvm/trunk/test/Transforms/LoopVectorize/no_switch_disable_vectorization.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/no_switch_disable_vectorization.ll?rev=352555&view=auto
> ==============================================================================
> --- llvm/trunk/test/Transforms/LoopVectorize/no_switch_disable_vectorization.ll (added)
> +++ llvm/trunk/test/Transforms/LoopVectorize/no_switch_disable_vectorization.ll Tue Jan 29 14:33:20 2019
> @@ -0,0 +1,95 @@
> +; RUN: opt < %s -loop-vectorize -force-vector-width=4 -transform-warning -S 2>&1 | FileCheck %s
> +; RUN: opt < %s -loop-vectorize -force-vector-width=1 -transform-warning -S 2>&1 | FileCheck %s -check-prefix=NOANALYSIS
> +; RUN: opt < %s -loop-vectorize -force-vector-width=4 -transform-warning -pass-remarks-missed='loop-vectorize' -S 2>&1 | FileCheck %s -check-prefix=MOREINFO
> +
> +; This test is a copy of no_switch.ll, with the "llvm.loop.vectorize.enable" metadata set to false.
> +; It tests that vectorization is explicitly disabled and no warnings are emitted.
> +
> +; CHECK-NOT: remark: source.cpp:4:5: loop not vectorized: loop contains a switch statement
> +; CHECK-NOT: warning: source.cpp:4:5: loop not vectorized: the optimizer was unable to perform the requested transformation; the transformation might be disabled or specified as part of an unsupported transformation ordering
> +
> +; NOANALYSIS-NOT: remark: {{.*}}
> +; NOANALYSIS-NOT: warning: source.cpp:4:5: loop not vectorized: the optimizer was unable to perform the requested transformation; the transformation might be disabled or specified as part of an unsupported transformation ordering
> +
> +; MOREINFO: remark: source.cpp:4:5: loop not vectorized: vectorization is explicitly disabled
> +; MOREINFO-NOT: warning: source.cpp:4:5: loop not vectorized: the optimizer was unable to perform the requested transformation; the transformation might be disabled or specified as part of an unsupported transformation ordering
> +
> +; CHECK: _Z11test_switchPii
> +; CHECK-NOT: x i32>
> +; CHECK: ret
> +
> +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
> +
> +; Function Attrs: nounwind optsize ssp uwtable
> +define void @_Z11test_switchPii(i32* nocapture %A, i32 %Length) #0 !dbg !4 {
> +entry:
> +  %cmp18 = icmp sgt i32 %Length, 0, !dbg !10
> +  br i1 %cmp18, label %for.body.preheader, label %for.end, !dbg !10, !llvm.loop !12
> +
> +for.body.preheader:                               ; preds = %entry
> +  br label %for.body, !dbg !14
> +
> +for.body:                                         ; preds = %for.body.preheader, %for.inc
> +  %indvars.iv = phi i64 [ %indvars.iv.next, %for.inc ], [ 0, %for.body.preheader ]
> +  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %indvars.iv, !dbg !14
> +  %0 = load i32, i32* %arrayidx, align 4, !dbg !14, !tbaa !16
> +  switch i32 %0, label %for.inc [
> +    i32 0, label %sw.bb
> +    i32 1, label %sw.bb3
> +  ], !dbg !14
> +
> +sw.bb:                                            ; preds = %for.body
> +  %1 = trunc i64 %indvars.iv to i32, !dbg !20
> +  %mul = shl nsw i32 %1, 1, !dbg !20
> +  br label %for.inc, !dbg !22
> +
> +sw.bb3:                                           ; preds = %for.body
> +  %2 = trunc i64 %indvars.iv to i32, !dbg !23
> +  store i32 %2, i32* %arrayidx, align 4, !dbg !23, !tbaa !16
> +  br label %for.inc, !dbg !23
> +
> +for.inc:                                          ; preds = %sw.bb3, %for.body, %sw.bb
> +  %storemerge = phi i32 [ %mul, %sw.bb ], [ 0, %for.body ], [ 0, %sw.bb3 ]
> +  store i32 %storemerge, i32* %arrayidx, align 4, !dbg !20, !tbaa !16
> +  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1, !dbg !10
> +  %lftr.wideiv = trunc i64 %indvars.iv.next to i32, !dbg !10
> +  %exitcond = icmp eq i32 %lftr.wideiv, %Length, !dbg !10
> +  br i1 %exitcond, label %for.end.loopexit, label %for.body, !dbg !10, !llvm.loop !12
> +
> +for.end.loopexit:                                 ; preds = %for.inc
> +  br label %for.end
> +
> +for.end:                                          ; preds = %for.end.loopexit, %entry
> +  ret void, !dbg !24
> +}
> +
> +attributes #0 = { nounwind }
> +
> +!llvm.dbg.cu = !{!0}
> +!llvm.module.flags = !{!7, !8}
> +!llvm.ident = !{!9}
> +
> +!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, producer: "clang version 3.5.0", isOptimized: true, runtimeVersion: 6, emissionKind: LineTablesOnly, file: !1, enums: !2, retainedTypes: !2, globals: !2, imports: !2)
> +!1 = !DIFile(filename: "source.cpp", directory: ".")
> +!2 = !{}
> +!4 = distinct !DISubprogram(name: "test_switch", line: 1, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, unit: !0, scopeLine: 1, file: !1, scope: !5, type: !6, retainedNodes: !2)
> +!5 = !DIFile(filename: "source.cpp", directory: ".")
> +!6 = !DISubroutineType(types: !2)
> +!7 = !{i32 2, !"Dwarf Version", i32 2}
> +!8 = !{i32 2, !"Debug Info Version", i32 3}
> +!9 = !{!"clang version 3.5.0"}
> +!10 = !DILocation(line: 3, column: 8, scope: !11)
> +!11 = distinct !DILexicalBlock(line: 3, column: 3, file: !1, scope: !4)
> +!12 = !{!12, !13, !13}
> +!13 = !{!"llvm.loop.vectorize.enable", i1 false}
> +!14 = !DILocation(line: 4, column: 5, scope: !15)
> +!15 = distinct !DILexicalBlock(line: 3, column: 36, file: !1, scope: !11)
> +!16 = !{!17, !17, i64 0}
> +!17 = !{!"int", !18, i64 0}
> +!18 = !{!"omnipotent char", !19, i64 0}
> +!19 = !{!"Simple C/C++ TBAA"}
> +!20 = !DILocation(line: 6, column: 7, scope: !21)
> +!21 = distinct !DILexicalBlock(line: 4, column: 18, file: !1, scope: !15)
> +!22 = !DILocation(line: 7, column: 5, scope: !21)
> +!23 = !DILocation(line: 9, column: 7, scope: !21)
> +!24 = !DILocation(line: 14, column: 1, scope: !4)
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits


More information about the llvm-commits mailing list