Author: Xun Li Date: 2021-03-25T13:52:36-07:00 New Revision: f490a5969bd52c8a48586f134ff8f02ccbb295b3
URL: https://github.com/llvm/llvm-project/commit/f490a5969bd52c8a48586f134ff8f02ccbb295b3 DIFF: https://github.com/llvm/llvm-project/commit/f490a5969bd52c8a48586f134ff8f02ccbb295b3.diff LOG: [OpenMP][InstrProfiling] Fix a missing instr profiling counter When emitting a function body there needs to be a instr profiling counter emitted. Otherwise instr profiling won't work for this function. Reviewed By: MaskRay Differential Revision: https://reviews.llvm.org/D98135 Added: clang/test/OpenMP/omp_with_loop_pragma_instr_profile.c Modified: clang/lib/CodeGen/CGOpenMPRuntime.cpp Removed: ################################################################################ diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp index a8f21548d3e0..466ff096b585 100644 --- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp +++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp @@ -1034,7 +1034,7 @@ LValue CGOpenMPRegionInfo::getThreadIDVariableLValue(CodeGenFunction &CGF) { getThreadIDVariable()->getType()->castAs<PointerType>()); } -void CGOpenMPRegionInfo::EmitBody(CodeGenFunction &CGF, const Stmt * /*S*/) { +void CGOpenMPRegionInfo::EmitBody(CodeGenFunction &CGF, const Stmt *S) { if (!CGF.HaveInsertPoint()) return; // 1.2.2 OpenMP Language Terminology @@ -1043,6 +1043,8 @@ void CGOpenMPRegionInfo::EmitBody(CodeGenFunction &CGF, const Stmt * /*S*/) { // The point of exit cannot be a branch out of the structured block. // longjmp() and throw() must not violate the entry/exit criteria. CGF.EHStack.pushTerminate(); + if (S) + CGF.incrementProfileCounter(S); CodeGen(CGF); CGF.EHStack.popTerminate(); } diff --git a/clang/test/OpenMP/omp_with_loop_pragma_instr_profile.c b/clang/test/OpenMP/omp_with_loop_pragma_instr_profile.c new file mode 100644 index 000000000000..9667f9cc549d --- /dev/null +++ b/clang/test/OpenMP/omp_with_loop_pragma_instr_profile.c @@ -0,0 +1,22 @@ +// RUN: %clang_cc1 -verify -fopenmp -x c -emit-llvm %s -triple x86_64-unknown-linux -o - -femit-all-decls -disable-llvm-passes -fprofile-instrument=clang | FileCheck %s +// expected-no-diagnostics + +void sub(double *restrict a, double *restrict b, int n) { + int i; + +#pragma omp parallel for +#pragma clang loop vectorize(disable) + for (i = 0; i < n; i++) { + a[i] = a[i] + b[i]; + } +} + +// CHECK-LABEL: @.omp_outlined.( +// CHECK-NEXT: entry: +// CHECK: call void @llvm.instrprof.increment( +// CHECK: omp.precond.then: +// CHECK-NEXT: call void @llvm.instrprof.increment( +// CHECK: cond.true: +// CEHCK-NEXT: call void @llvm.instrprof.increment( +// CHECK: omp.inner.for.body: +// CHECK-NEXT: call void @llvm.instrprof.increment( _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
