Author: sjoerdmeijer Date: Wed Aug 14 23:24:40 2019 New Revision: 368970 URL: http://llvm.org/viewvc/llvm-project?rev=368970&view=rev Log: [Clang] Pragma vectorize_predicate implies vectorize
New pragma "vectorize_predicate(enable)" now implies "vectorize(enable)", and it is ignored when vectorization is disabled with e.g. "vectorize(disable) vectorize_predicate(enable)". Differential Revision: https://reviews.llvm.org/D65776 Modified: cfe/trunk/lib/CodeGen/CGLoopInfo.cpp cfe/trunk/test/CodeGenCXX/pragma-loop-predicate.cpp Modified: cfe/trunk/lib/CodeGen/CGLoopInfo.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGLoopInfo.cpp?rev=368970&r1=368969&r2=368970&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGLoopInfo.cpp (original) +++ cfe/trunk/lib/CodeGen/CGLoopInfo.cpp Wed Aug 14 23:24:40 2019 @@ -253,12 +253,18 @@ LoopInfo::createLoopVectorizeMetadata(co Args.append(LoopProperties.begin(), LoopProperties.end()); // Setting vectorize.predicate - if (Attrs.VectorizePredicateEnable != LoopAttributes::Unspecified) { + bool IsVectorPredicateEnabled = false; + if (Attrs.VectorizePredicateEnable != LoopAttributes::Unspecified && + Attrs.VectorizeEnable != LoopAttributes::Disable && + Attrs.VectorizeWidth < 1) { + + IsVectorPredicateEnabled = + (Attrs.VectorizePredicateEnable == LoopAttributes::Enable); + Metadata *Vals[] = { MDString::get(Ctx, "llvm.loop.vectorize.predicate.enable"), - ConstantAsMetadata::get(ConstantInt::get( - llvm::Type::getInt1Ty(Ctx), - (Attrs.VectorizePredicateEnable == LoopAttributes::Enable)))}; + ConstantAsMetadata::get(ConstantInt::get(llvm::Type::getInt1Ty(Ctx), + IsVectorPredicateEnabled))}; Args.push_back(MDNode::get(Ctx, Vals)); } @@ -281,12 +287,15 @@ LoopInfo::createLoopVectorizeMetadata(co } // Setting vectorize.enable - if (Attrs.VectorizeEnable != LoopAttributes::Unspecified) { + if (Attrs.VectorizeEnable != LoopAttributes::Unspecified || + IsVectorPredicateEnabled) { Metadata *Vals[] = { MDString::get(Ctx, "llvm.loop.vectorize.enable"), ConstantAsMetadata::get(ConstantInt::get( llvm::Type::getInt1Ty(Ctx), - (Attrs.VectorizeEnable == LoopAttributes::Enable)))}; + IsVectorPredicateEnabled + ? true + : (Attrs.VectorizeEnable == LoopAttributes::Enable)))}; Args.push_back(MDNode::get(Ctx, Vals)); } Modified: cfe/trunk/test/CodeGenCXX/pragma-loop-predicate.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/pragma-loop-predicate.cpp?rev=368970&r1=368969&r2=368970&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/pragma-loop-predicate.cpp (original) +++ cfe/trunk/test/CodeGenCXX/pragma-loop-predicate.cpp Wed Aug 14 23:24:40 2019 @@ -27,9 +27,50 @@ void test2(int *List, int Length) { List[i] = i * 2; } +// vectorize_predicate(enable) implies vectorize(enable) +void test3(int *List, int Length) { +// CHECK-LABEL: @{{.*}}test3{{.*}}( +// CHECK: br label {{.*}}, !llvm.loop ![[LOOP3:.*]] + + #pragma clang loop vectorize_predicate(enable) + for (int i = 0; i < Length; i++) + List[i] = i * 2; +} + +// Check that disabling vectorization means a vectorization width of 1, and +// also that vectorization_predicate isn't enabled. +void test4(int *List, int Length) { +// CHECK-LABEL: @{{.*}}test4{{.*}}( +// CHECK: br label {{.*}}, !llvm.loop ![[LOOP4:.*]] + + #pragma clang loop vectorize(disable) + for (int i = 0; i < Length; i++) + List[i] = i * 2; +} + +// Check that vectorize and vectorize_predicate are disabled. +void test5(int *List, int Length) { +// CHECK-LABEL: @{{.*}}test5{{.*}}( +// CHECK: br label {{.*}}, !llvm.loop ![[LOOP5:.*]] + + #pragma clang loop vectorize(disable) vectorize_predicate(enable) + for (int i = 0; i < Length; i++) + List[i] = i * 2; +} + + // CHECK: ![[LOOP0]] = distinct !{![[LOOP0]], !3} // CHECK-NEXT: !3 = !{!"llvm.loop.vectorize.enable", i1 true} + // CHECK-NEXT: ![[LOOP1]] = distinct !{![[LOOP1]], !5, !3} // CHECK-NEXT: !5 = !{!"llvm.loop.vectorize.predicate.enable", i1 true} + // CHECK-NEXT: ![[LOOP2]] = distinct !{![[LOOP2]], !7, !3} // CHECK-NEXT: !7 = !{!"llvm.loop.vectorize.predicate.enable", i1 false} + +// CHECK-NEXT: ![[LOOP3]] = distinct !{![[LOOP3]], !5, !3} + +// CHECK-NEXT: ![[LOOP4]] = distinct !{![[LOOP4]], !10} +// CHECK-NEXT: !10 = !{!"llvm.loop.vectorize.width", i32 1} + +// CHECK-NEXT: ![[LOOP5]] = distinct !{![[LOOP5]], !10} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
