This is an archive of the discontinued LLVM Phabricator instance.

Differential D5202

[OPENMP] Codegen for 'omp critical' directive.
ClosedPublic

Authored by ABataev on Sep 4 2014, 8:27 PM.

Details

Reviewers
rjmccall
• fraggamuffin
• ejstotzer
hfinkel
rsmith
doug.gregor
Commits
rG3a3bf0bbe35f: [OPENMP] Codegen for 'omp critical' directive. This patch adds codegen for…
rC218239: [OPENMP] Codegen for 'omp critical' directive.
rL218239: [OPENMP] Codegen for 'omp critical' directive.
Summary

This patch adds codegen for constructs:
#pragma omp critical [name]
<body>

It generates global variable ".gomp_critical_user_[name].var" of type int32[8]. Then it generates library call "kmpc_critical(loc, gtid, .gomp_critical_user_[name].var)", code for <body> statement and final call "kmpc_end_critical(loc, gtid, .gomp_critical_user_[name].var)".

Diff Detail

Event Timeline

ABataev updated this revision to Diff 13298.Sep 4 2014, 8:27 PM
ABataev retitled this revision from to [OPENMP] Codegen for 'omp critical' directive..
ABataev updated this object.
ABataev edited the test plan for this revision. (Show Details)
ABataev added reviewers: doug.gregor, hfinkel, rjmccall, rsmith, • fraggamuffin, • ejstotzer.
ABataev added a subscriber: Unknown Object (MLST).
ABataev added a comment.Sep 21 2014, 8:34 PM

Ping

hfinkel accepted this revision.Sep 22 2014, 12:38 AM
hfinkel edited edge metadata.

LGTM.

lib/CodeGen/CGOpenMPRuntime.cpp
231

Instead of calling find here, when you call GetOrCreateValue below, return Elem.getValue() if it is non-null.

test/OpenMP/critical_codegen.cpp
6

We don't need the inclusion guards here.

This revision is now accepted and ready to land.Sep 22 2014, 12:38 AM
ABataev added a comment.Sep 22 2014, 1:25 AM

Hal, Thanks!

lib/CodeGen/CGOpenMPRuntime.cpp
231

Ok, done.

test/OpenMP/critical_codegen.cpp
6

No, we need it, because of "-include-pch %t" in the third RUN command. Without inclusion guard there are errors because of duplicated symbols.

ABataev closed this revision.Sep 22 2014, 3:12 AM
ABataev updated this revision to Diff 13923.

Closed by commit rL218239 (authored by @ABataev).

Revision Contents

PathSize
lib/
CodeGen/
22 lines
43 lines
26 lines
test/
OpenMP/
38 lines

Diff 13298

lib/CodeGen/CGOpenMPRuntime.h

Show All 10 Lines
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef LLVM_CLANG_LIB_CODEGEN_CGOPENMPRUNTIME_H #ifndef LLVM_CLANG_LIB_CODEGEN_CGOPENMPRUNTIME_H
#define LLVM_CLANG_LIB_CODEGEN_CGOPENMPRUNTIME_H #define LLVM_CLANG_LIB_CODEGEN_CGOPENMPRUNTIME_H
#include "clang/AST/Type.h" #include "clang/AST/Type.h"
#include "llvm/ADT/DenseMap.h" #include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/IR/Type.h" #include "llvm/IR/Type.h"
#include "llvm/IR/Value.h" #include "llvm/IR/Value.h"
namespace llvm { namespace llvm {
class AllocaInst; class AllocaInst;
class CallInst; class CallInst;
class GlobalVariable; class GlobalVariable;
class Constant; class Constant;
class Function; class Function;
class Module; class Module;
class StructLayout; class StructLayout;
class ArrayType;
class FunctionType; class FunctionType;
class StructType; class StructType;
class Type; class Type;
class Value; class Value;
} // namespace llvm } // namespace llvm
namespace clang { namespace clang {
Show All 24 Lines enum OpenMPLocationFlags {
OMP_IDENT_BARRIER_IMPL_SECTIONS = 0xC0, OMP_IDENT_BARRIER_IMPL_SECTIONS = 0xC0,
/// \brief Implicit barrier in 'single' directive. /// \brief Implicit barrier in 'single' directive.
OMP_IDENT_BARRIER_IMPL_SINGLE = 0x140 OMP_IDENT_BARRIER_IMPL_SINGLE = 0x140
}; };
enum OpenMPRTLFunction { enum OpenMPRTLFunction {
// Call to void __kmpc_fork_call(ident_t *loc, kmp_int32 argc, kmpc_micro // Call to void __kmpc_fork_call(ident_t *loc, kmp_int32 argc, kmpc_micro
// microtask, ...); // microtask, ...);
OMPRTL__kmpc_fork_call, OMPRTL__kmpc_fork_call,
// Call to kmp_int32 kmpc_global_thread_num(ident_t *loc); // Call to __kmpc_int32 kmpc_global_thread_num(ident_t *loc);
OMPRTL__kmpc_global_thread_num OMPRTL__kmpc_global_thread_num,
// Call to void __kmpc_critical(ident_t ∗loc, kmp_int32 global_tid,
// kmp_critical_name ∗crit);
OMPRTL__kmpc_critical,
// Call to void __kmpc_end_critical(ident_t ∗loc, kmp_int32 global_tid,
// kmp_critical_name ∗crit);
OMPRTL__kmpc_end_critical
}; };
private: private:
CodeGenModule &CGM; CodeGenModule &CGM;
/// \brief Default const ident_t object used for initialization of all other /// \brief Default const ident_t object used for initialization of all other
/// ident_t objects. /// ident_t objects.
llvm::Constant *DefaultOpenMPPSource; llvm::Constant *DefaultOpenMPPSource;
/// \brief Map of flags and corrsponding default locations. /// \brief Map of flags and corrsponding default locations.
▲ Show 20 Lines • Show All 49 Lines • ▼ Show 20 Linesprivate:
/// typedef void (kmpc_micro)(kmp_int32 global_tid, kmp_int32 bound_tid,...); /// typedef void (kmpc_micro)(kmp_int32 global_tid, kmp_int32 bound_tid,...);
llvm::FunctionType *Kmpc_MicroTy; llvm::FunctionType *Kmpc_MicroTy;
/// \brief Map of local debug location and functions. /// \brief Map of local debug location and functions.
typedef llvm::DenseMap<llvm::Function *, llvm::Value *> OpenMPLocMapTy; typedef llvm::DenseMap<llvm::Function *, llvm::Value *> OpenMPLocMapTy;
OpenMPLocMapTy OpenMPLocMap; OpenMPLocMapTy OpenMPLocMap;
/// \brief Map of local gtid and functions. /// \brief Map of local gtid and functions.
typedef llvm::DenseMap<llvm::Function *, llvm::Value *> OpenMPGtidMapTy; typedef llvm::DenseMap<llvm::Function *, llvm::Value *> OpenMPGtidMapTy;
OpenMPGtidMapTy OpenMPGtidMap; OpenMPGtidMapTy OpenMPGtidMap;
/// \brief Type kmp_critical_name, originally defined as typedef kmp_int32
/// kmp_critical_name[8];
llvm::ArrayType *KmpCriticalNameTy;
/// \brief Map of critical regions names and the corresponding lock objects.
llvm::StringMap<llvm::Value *, llvm::BumpPtrAllocator> CriticalRegionVarNames;
public: public:
explicit CGOpenMPRuntime(CodeGenModule &CGM); explicit CGOpenMPRuntime(CodeGenModule &CGM);
~CGOpenMPRuntime() {} ~CGOpenMPRuntime() {}
/// \brief Cleans up references to the objects in finished function. /// \brief Cleans up references to the objects in finished function.
/// \param CGF Reference to finished CodeGenFunction. /// \param CGF Reference to finished CodeGenFunction.
/// ///
Show All 20 Linespublic:
/// \brief Returns pointer to kmpc_micro type; /// \brief Returns pointer to kmpc_micro type;
llvm::Type *getKmpc_MicroPointerTy(); llvm::Type *getKmpc_MicroPointerTy();
/// \brief Returns specified OpenMP runtime function. /// \brief Returns specified OpenMP runtime function.
/// \param Function OpenMP runtime function. /// \param Function OpenMP runtime function.
/// \return Specified function. /// \return Specified function.
llvm::Constant *CreateRuntimeFunction(OpenMPRTLFunction Function); llvm::Constant *CreateRuntimeFunction(OpenMPRTLFunction Function);
/// \brief Returns corresponding lock object for the specified critical region
/// name. If the lock object does not exist it is created, otherwise the
/// reference to the existing copy is returned.
llvm::Value *GetCriticalRegionLock(StringRef CriticalName);
}; };
} // namespace CodeGen } // namespace CodeGen
} // namespace clang } // namespace clang
#endif #endif

lib/CodeGen/CGOpenMPRuntime.cpp

Show All 28 LinesCGOpenMPRuntime::CGOpenMPRuntime(CodeGenModule &CGM)
IdentTy = llvm::StructType::create( IdentTy = llvm::StructType::create(
"ident_t", CGM.Int32Ty /* reserved_1 */, CGM.Int32Ty /* flags */, "ident_t", CGM.Int32Ty /* reserved_1 */, CGM.Int32Ty /* flags */,
CGM.Int32Ty /* reserved_2 */, CGM.Int32Ty /* reserved_3 */, CGM.Int32Ty /* reserved_2 */, CGM.Int32Ty /* reserved_3 */,
CGM.Int8PtrTy /* psource */, NULL); CGM.Int8PtrTy /* psource */, NULL);
// Build void (*kmpc_micro)(kmp_int32 *global_tid, kmp_int32 *bound_tid,...) // Build void (*kmpc_micro)(kmp_int32 *global_tid, kmp_int32 *bound_tid,...)
llvm::Type *MicroParams[] = {llvm::PointerType::getUnqual(CGM.Int32Ty), llvm::Type *MicroParams[] = {llvm::PointerType::getUnqual(CGM.Int32Ty),
llvm::PointerType::getUnqual(CGM.Int32Ty)}; llvm::PointerType::getUnqual(CGM.Int32Ty)};
Kmpc_MicroTy = llvm::FunctionType::get(CGM.VoidTy, MicroParams, true); Kmpc_MicroTy = llvm::FunctionType::get(CGM.VoidTy, MicroParams, true);
KmpCriticalNameTy = llvm::ArrayType::get(CGM.Int32Ty, /*NumElements*/ 8);
} }
llvm::Value * llvm::Value *
CGOpenMPRuntime::GetOrCreateDefaultOpenMPLocation(OpenMPLocationFlags Flags) { CGOpenMPRuntime::GetOrCreateDefaultOpenMPLocation(OpenMPLocationFlags Flags) {
llvm::Value *Entry = OpenMPDefaultLocMap.lookup(Flags); llvm::Value *Entry = OpenMPDefaultLocMap.lookup(Flags);
if (!Entry) { if (!Entry) {
if (!DefaultOpenMPPSource) { if (!DefaultOpenMPPSource) {
// Initialize default location for psource field of ident_t structure of // Initialize default location for psource field of ident_t structure of
▲ Show 20 Lines • Show All 146 Lines • ▼ Show 20 LinesCGOpenMPRuntime::CreateRuntimeFunction(OpenMPRTLFunction Function) {
case OMPRTL__kmpc_global_thread_num: { case OMPRTL__kmpc_global_thread_num: {
// Build kmp_int32 __kmpc_global_thread_num(ident_t *loc); // Build kmp_int32 __kmpc_global_thread_num(ident_t *loc);
llvm::Type *TypeParams[] = {getIdentTyPointerTy()}; llvm::Type *TypeParams[] = {getIdentTyPointerTy()};
llvm::FunctionType *FnTy = llvm::FunctionType *FnTy =
llvm::FunctionType::get(CGM.Int32Ty, TypeParams, false); llvm::FunctionType::get(CGM.Int32Ty, TypeParams, false);
RTLFn = CGM.CreateRuntimeFunction(FnTy, "__kmpc_global_thread_num"); RTLFn = CGM.CreateRuntimeFunction(FnTy, "__kmpc_global_thread_num");
break; break;
} }
case OMPRTL__kmpc_critical: {
// Build void __kmpc_critical(ident_t ∗loc, kmp_int32 global_tid,
// kmp_critical_name ∗crit);
llvm::Type *TypeParams[] = {
getIdentTyPointerTy(), CGM.Int32Ty,
llvm::PointerType::getUnqual(KmpCriticalNameTy)};
llvm::FunctionType *FnTy =
llvm::FunctionType::get(CGM.VoidTy, TypeParams, /*isVarArg*/ false);
RTLFn = CGM.CreateRuntimeFunction(FnTy, "__kmpc_critical");
break;
}
case OMPRTL__kmpc_end_critical: {
// Build void __kmpc_end_critical(ident_t ∗loc, kmp_int32 global_tid,
// kmp_critical_name ∗crit);
llvm::Type *TypeParams[] = {
getIdentTyPointerTy(), CGM.Int32Ty,
llvm::PointerType::getUnqual(KmpCriticalNameTy)};
llvm::FunctionType *FnTy =
llvm::FunctionType::get(CGM.VoidTy, TypeParams, /*isVarArg*/ false);
RTLFn = CGM.CreateRuntimeFunction(FnTy, "__kmpc_end_critical");
break;
}
} }
return RTLFn; return RTLFn;
} }
llvm::Value *CGOpenMPRuntime::GetCriticalRegionLock(StringRef CriticalName) {
SmallString<256> Buffer;
llvm::raw_svector_ostream Out(Buffer);
Out << ".gomp_critical_user_" << CriticalName << ".var";
auto RuntimeCriticalName = Out.str();
auto LockIter = CriticalRegionVarNames.find(RuntimeCriticalName);
hfinkelUnsubmitted
Not Done
ReplyInline Actions

Instead of calling find here, when you call GetOrCreateValue below, return Elem.getValue() if it is non-null.

hfinkel: Instead of calling find here, when you call GetOrCreateValue below, return Elem.getValue() if…
ABataevAuthorUnsubmitted
Not Done
ReplyInline Actions

Ok, done.

ABataev: Ok, done.
if (LockIter != CriticalRegionVarNames.end())
return LockIter->getValue();
auto &Elem =
CriticalRegionVarNames.GetOrCreateValue(RuntimeCriticalName, nullptr);
auto Lock = new llvm::GlobalVariable(
CGM.getModule(), KmpCriticalNameTy, /*IsConstant*/ false,
llvm::GlobalValue::CommonLinkage,
llvm::Constant::getNullValue(KmpCriticalNameTy), Elem.getKey());
Elem.setValue(Lock);
return Lock;
}

lib/CodeGen/CGStmtOpenMP.cpp

Show First 20 Lines • Show All 88 Lines • ▼ Show 20 Lines
void CodeGenFunction::EmitOMPSingleDirective(const OMPSingleDirective &) { void CodeGenFunction::EmitOMPSingleDirective(const OMPSingleDirective &) {
llvm_unreachable("CodeGen for 'omp single' is not supported yet."); llvm_unreachable("CodeGen for 'omp single' is not supported yet.");
} }
void CodeGenFunction::EmitOMPMasterDirective(const OMPMasterDirective &) { void CodeGenFunction::EmitOMPMasterDirective(const OMPMasterDirective &) {
llvm_unreachable("CodeGen for 'omp master' is not supported yet."); llvm_unreachable("CodeGen for 'omp master' is not supported yet.");
} }
void CodeGenFunction::EmitOMPCriticalDirective(const OMPCriticalDirective &) { void CodeGenFunction::EmitOMPCriticalDirective(const OMPCriticalDirective &S) {
llvm_unreachable("CodeGen for 'omp critical' is not supported yet."); // __kmpc_critical();
// <captured_body>
// __kmpc_end_critical();
//
auto Lock = CGM.getOpenMPRuntime().GetCriticalRegionLock(
S.getDirectiveName().getAsString());
// Prepare other arguments and build a call to __kmpc_critical
llvm::Value *Args[] = {
CGM.getOpenMPRuntime().EmitOpenMPUpdateLocation(*this, S.getLocStart()),
CGM.getOpenMPRuntime().GetOpenMPGlobalThreadNum(*this, S.getLocStart()),
Lock};
auto RTLFn = CGM.getOpenMPRuntime().CreateRuntimeFunction(
CGOpenMPRuntime::OMPRTL__kmpc_critical);
EmitRuntimeCall(RTLFn, Args);
{
RunCleanupsScope Scope(*this);
EmitStmt(cast<CapturedStmt>(S.getAssociatedStmt())->getCapturedStmt());
EnsureInsertPoint();
}
RTLFn = CGM.getOpenMPRuntime().CreateRuntimeFunction(
CGOpenMPRuntime::OMPRTL__kmpc_end_critical);
EmitRuntimeCall(RTLFn, Args);
} }
void void
CodeGenFunction::EmitOMPParallelForDirective(const OMPParallelForDirective &) { CodeGenFunction::EmitOMPParallelForDirective(const OMPParallelForDirective &) {
llvm_unreachable("CodeGen for 'omp parallel for' is not supported yet."); llvm_unreachable("CodeGen for 'omp parallel for' is not supported yet.");
} }
void CodeGenFunction::EmitOMPParallelSectionsDirective( void CodeGenFunction::EmitOMPParallelSectionsDirective(
Show All 32 Lines

test/OpenMP/critical_codegen.cpp

PropertyOld ValueNew Value
svn:eol-stylenullnative
\ No newline at end of property
svn:keywordsnullAuthor Date Id Rev URL
\ No newline at end of property
svn:mime-typenulltext/plain
\ No newline at end of property
// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -emit-llvm %s -fexceptions -fcxx-exceptions -o - | FileCheck %s
// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -triple x86_64-unknown-unknown -fexceptions -fcxx-exceptions -emit-pch -o %t %s
// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -triple x86_64-unknown-unknown -fexceptions -fcxx-exceptions -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
// expected-no-diagnostics
#ifndef HEADER
hfinkelUnsubmitted
Not Done
ReplyInline Actions

We don't need the inclusion guards here.

hfinkel: We don't need the inclusion guards here.
ABataevAuthorUnsubmitted
Not Done
ReplyInline Actions

No, we need it, because of "-include-pch %t" in the third RUN command. Without inclusion guard there are errors because of duplicated symbols.

ABataev: No, we need it, because of "-include-pch %t" in the third RUN command. Without inclusion guard…
#define HEADER
// CHECK: [[IDENT_T_TY:%.+]] = type { i32, i32, i32, i32, i8* }
// CHECK: [[UNNAMED_LOCK:@.+]] = common global [8 x i32] zeroinitializer
// CHECK: [[THE_NAME_LOCK:@.+]] = common global [8 x i32] zeroinitializer
// CHECK: define void [[FOO:@.+]]()
void foo() {}
// CHECK-LABEL: @main
int main() {
// CHECK: [[A_ADDR:%.+]] = alloca i8
char a;
// CHECK: [[GTID:%.+]] = call i32 @__kmpc_global_thread_num([[IDENT_T_TY]]* [[DEFAULT_LOC:@.+]])
// CHECK: call void @__kmpc_critical([[IDENT_T_TY]]* [[DEFAULT_LOC]], i32 [[GTID]], [8 x i32]* [[UNNAMED_LOCK]])
// CHECK-NEXT: store i8 2, i8* [[A_ADDR]]
// CHECK-NEXT: call void @__kmpc_end_critical([[IDENT_T_TY]]* [[DEFAULT_LOC]], i32 [[GTID]], [8 x i32]* [[UNNAMED_LOCK]])
#pragma omp critical
a = 2;
// CHECK: call void @__kmpc_critical([[IDENT_T_TY]]* [[DEFAULT_LOC]], i32 [[GTID]], [8 x i32]* [[THE_NAME_LOCK]])
// CHECK-NEXT: call void [[FOO]]()
// CHECK-NEXT: call void @__kmpc_end_critical([[IDENT_T_TY]]* [[DEFAULT_LOC]], i32 [[GTID]], [8 x i32]* [[THE_NAME_LOCK]])
#pragma omp critical(the_name)
foo();
// CHECK-NOT: call void @__kmpc_critical
// CHECK-NOT: call void @__kmpc_end_critical
return a;
}
#endif