Skip to content

Commit

Permalink
[nomp] Parse jit clause
Browse files Browse the repository at this point in the history 
Also, rename `diag::err_nomp_function_arg_invalid` to
`diag::err_nomp_invalid_function_arg`.
  • Loading branch information
@thilinarmtb
thilinarmtb committed Dec 8, 2023
1 parent 99ee490 commit bb34c4e
Show file tree
Hide file tree
Showing 3 changed files with 106 additions and 60 deletions.
4 changes: 3 additions & 1 deletion clang/include/clang/Basic/DiagnosticParseKinds.td
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1527,7 +1527,7 @@ def err_nomp_eod_expected: Error<
"Expected the end of directive '%0' at line %1, column %2">;
def err_nomp_identifier_expected: Error<
"Expected a variable name at line %0, column %1">;
def err_nomp_function_arg_invalid: Error<
def err_nomp_invalid_function_arg: Error<
"Invalid argument type at line %0, column %1: %2">;
def err_nomp_pointer_type_expected: Error<
"Expected a pointer in the nomp directive '%0' at line %1, column %2">;
Expand All @@ -1552,6 +1552,8 @@ def err_nomp_func_decl_in_kernel: Error<
"Function declaration inside kernel is not allowed at line %0 column %1">;
def err_nomp_func_call_in_kernel: Error<
"Function call inside kernel is not allowed at line %0 column %1">;
def err_nomp_invalid_arg_property: Error<
"Invalid argument property at line %0, column %1: %2">;

// Pragma loop support.
def err_pragma_loop_missing_argument : Error<
Expand Down
1 change: 1 addition & 0 deletions clang/include/clang/Parse/Parser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3452,6 +3452,7 @@ class Parser : public CodeCompletionHandler {
StmtResult ParseNompUpdate(const SourceLocation &sLoc);
int ParseNompForClauses(std::vector<std::string> &clauses,
std::vector<std::string> &reductionVariables,
std::vector<std::string> &jitVariables,
std::string &kernelName);
StmtResult ParseNompFor(const SourceLocation &sLoc);
StmtResult ParseNompSync(const SourceLocation &sLoc);
Expand Down
161 changes: 102 additions & 59 deletions clang/lib/Parse/ParseNomp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ enum ArgType {
TypePointer = 16384
};

// FIXME: Following enum ArgProperties should be based on `nomp.h` and
// shouldn't be hard-coded here.
enum ArgProperties { PropertyJit = 1 };

//==============================================================================
// Helper functions to generate C types.
//
Expand Down Expand Up @@ -245,7 +249,7 @@ void Parser::ParseNompExprListUntilRParen(llvm::SmallVector<Expr *, 16> &EL,
static Expr *ExprToArgc(Expr *E, ASTContext &AST) {
const Type *T = E->getType().getTypePtr();
if (!T->isIntegerType() && !T->isFloatingType()) {
NompHandleError(diag::err_nomp_function_arg_invalid, E->getExprLoc(), AST,
NompHandleError(diag::err_nomp_invalid_function_arg, E->getExprLoc(), AST,
"Parameter `argc` of nomp_init() must be an Integer type.");
return nullptr;
}
Expand Down Expand Up @@ -274,7 +278,7 @@ static Expr *ExprToArgv(Expr *E, ASTContext &AST) {
#define check_cond(cond) \
{ \
if (!cond) { \
NompHandleError(diag::err_nomp_function_arg_invalid, E->getExprLoc(), \
NompHandleError(diag::err_nomp_invalid_function_arg, E->getExprLoc(), \
AST, \
"Parameter `argv` of nomp_init() must be an variable " \
"which reference an array of C-strings or " \
Expand Down Expand Up @@ -617,7 +621,8 @@ static void
CreateNompJitCall(llvm::SmallVector<Stmt *, 16> &Stmts, ASTContext &AST,
VarDecl *ID, VarDecl *VKNL, VarDecl *VCLS,
std::set<VarDecl *> &EV,
const std::vector<std::string> &reductionVariables) {
const std::vector<std::string> &reductionVariables,
const std::vector<std::string> &jitVariables) {
llvm::SmallVector<Expr *, 16> FuncArgs;
SourceLocation SL = SourceLocation();

Expand Down Expand Up @@ -659,50 +664,79 @@ CreateNompJitCall(llvm::SmallVector<Stmt *, 16> &Stmts, ASTContext &AST,
for (auto V : EV) {
QualType QT = V->getType();
const Type *T = QT.getTypePtrOrNull();
if (T) {
// Name of the variable as a string.
std::string name = V->getNameAsString();
QualType NameStrTy = getConstantArrayType(
AST, AST.CharTy, name.size() + 1, ArrayType::Normal);
StringLiteral *SL =
StringLiteral::Create(AST, name, StringLiteral::Ordinary, false,
NameStrTy, SourceLocation());
ImplicitCastExpr *ICE =
ImplicitCastExpr::Create(AST, StrTy, CK_ArrayToPointerDecay, SL,
nullptr, VK_PRValue, FPOptionsOverride());
FuncArgs.push_back(ICE);

if (T->isArrayType())
QT = AST.getBaseElementType(dyn_cast<ArrayType>(T));
else if (T->isPointerType())
QT = dyn_cast<PointerType>(T)->getPointeeType();
TypeSourceInfo *TSI = AST.getTrivialTypeSourceInfo(QT);

// sizeof(variable)
FuncArgs.push_back(new (AST) UnaryExprOrTypeTraitExpr(
UETT_SizeOf, TSI, AST.getSizeType(), SourceLocation(),
SourceLocation()));

// Check if the variable is part of a reduction since we need to pass the
// pointee type or base element type in that case.
Type *T1 = const_cast<Type *>(T);
if (std::find(reductionVariables.begin(), reductionVariables.end(),
name) != reductionVariables.end())
T1 = const_cast<Type *>(QT.getTypePtrOrNull());

// Find the nomp type.
int type = TypeInt * T1->isSignedIntegerType() +
TypeFloat * T1->isFloatingType() +
TypeUInt * T1->isUnsignedIntegerType() +
TypePointer * (T1->isPointerType() || T1->isArrayType());

if (type == 0) {
NompHandleError(diag::err_nomp_function_arg_invalid, V->getLocation(),
AST);
if (!T) {
NompHandleError(diag::err_nomp_invalid_function_arg, V->getLocation(),
AST,
"Unsupported type for argument: " + V->getNameAsString());
}

// We first pass the name of the argument as a string:
const std::string name = V->getNameAsString();
const QualType NameStrTy = getConstantArrayType(
AST, AST.CharTy, name.size() + 1, ArrayType::Normal);
StringLiteral *SL = StringLiteral::Create(
AST, name, StringLiteral::Ordinary, false, NameStrTy, SourceLocation());
ImplicitCastExpr *ICE =
ImplicitCastExpr::Create(AST, StrTy, CK_ArrayToPointerDecay, SL,
nullptr, VK_PRValue, FPOptionsOverride());
FuncArgs.push_back(ICE);

if (T->isArrayType())
QT = AST.getBaseElementType(dyn_cast<ArrayType>(T));
if (T->isPointerType())
QT = dyn_cast<PointerType>(T)->getPointeeType();
TypeSourceInfo *TSI = AST.getTrivialTypeSourceInfo(QT);

// Then: sizeof(argument)
FuncArgs.push_back(
new (AST) UnaryExprOrTypeTraitExpr(UETT_SizeOf, TSI, AST.getSizeType(),
SourceLocation(), SourceLocation()));

// Third, we pass the nomp type of the argument. We embed various argument
// properties in the type itself. For example, if the argument is a jit
// argument, we embed the property `jit` in the type.
//
// Also, Check if the variable is part of a reduction since we need to pass
// the pointee type or base element type in that case.
Type *T1 = const_cast<Type *>(T);
if (std::find(reductionVariables.begin(), reductionVariables.end(), name) !=
reductionVariables.end())
T1 = const_cast<Type *>(QT.getTypePtrOrNull());

int type = TypeInt * T1->isSignedIntegerType() +
TypeFloat * T1->isFloatingType() +
TypeUInt * T1->isUnsignedIntegerType() +
TypePointer * (T1->isPointerType() || T1->isArrayType());

if (type == 0) {
NompHandleError(diag::err_nomp_invalid_function_arg, V->getLocation(),
AST, "Unsupported type for argument: " + name);
}

if (std::find(jitVariables.begin(), jitVariables.end(), name) !=
jitVariables.end()) {
if (type == TypePointer) {
NompHandleError(diag::err_nomp_invalid_arg_property, V->getLocation(),
AST,
"Argument: " + name +
" cannot have the property `jit` in nomp_jit() "
"since it is a pointer.");
}
type = type | PropertyJit;
}

FuncArgs.push_back(IntegerLiteral::Create(AST, llvm::APInt(32, type), IntTy,
SourceLocation()));

FuncArgs.push_back(IntegerLiteral::Create(AST, llvm::APInt(32, type),
IntTy, SourceLocation()));
// Fourth, If the argument has the property `jit`, we need to pass the
// pointer to the argument.
if (type & PropertyJit) {
DeclRefExpr *DRE =
DeclRefExpr::Create(AST, NestedNameSpecifierLoc(), SourceLocation(),
V, false, SourceLocation(), QT, VK_LValue);
FuncArgs.push_back(UnaryOperator::Create(
AST, DRE, UO_AddrOf, AST.getPointerType(QT), VK_PRValue, OK_Ordinary,
SourceLocation(), false, FPOptionsOverride()));
}
}

Expand All @@ -713,7 +747,8 @@ CreateNompJitCall(llvm::SmallVector<Stmt *, 16> &Stmts, ASTContext &AST,

static void CreateNompRunCall(llvm::SmallVector<Stmt *, 16> &Stmts,
ASTContext &AST, VarDecl *ID,
std::set<VarDecl *> &EV) {
std::set<VarDecl *> &EV,
const std::vector<std::string> &jitVariables) {
llvm::SmallVector<Expr *, 16> FuncArgs;

// First argument to nomp_run() is 'id' -- input argument which passes an
Expand Down Expand Up @@ -752,9 +787,10 @@ static void CreateNompRunCall(llvm::SmallVector<Stmt *, 16> &Stmts,

int Parser::ParseNompForClauses(std::vector<std::string> &clauses,
std::vector<std::string> &reductionVariables,
std::vector<std::string> &jitVariables,
std::string &kernelName) {
// Process auxiliary pragmas (i.e., clauses) supported after `#pragma nomp
// for`. Mainly we want to support `annotate`, `transform` and `jit` for the
// Process auxiliary clauses supported after `#pragma nomp for`. Mainly
// we want to support `annotate`, `transform` and `jit` for the
// time being. All of the above should be parsed as an identifier token.
bool transformDetected = 0;
bool reductionDetected = 0;
Expand Down Expand Up @@ -817,8 +853,8 @@ int Parser::ParseNompForClauses(std::vector<std::string> &clauses,
}

// `name` and `jit` takes a single string argument. `transform`, `annotate`
// and `reduce should be followed by two arguments. In any case, we should
// get a string literal next.
// and `reduce` should be followed by two arguments. In any case, we
// should get a string literal next.
// FIXME: This can be a string variable as well. Need to support that.
if (Tok.isNot(tok::string_literal)) {
NompHandleError(diag::err_nomp_string_literal_expected, Tok, *this);
Expand All @@ -839,16 +875,21 @@ int Parser::ParseNompForClauses(std::vector<std::string> &clauses,
goto consume_r_paren;
}

// If the clause is not `name`, store the clause, and the string literal.
// If the clause is `jit`, store the string literal in the jitVariables
// so we can easily check if a variable should be passed to the kernel or
// not later and consume the ")".
if (clause == ForClauseJit) {
jitVariables.push_back(arg0);
goto consume_r_paren;
}

// If the clause is not `name` or `jit`, store the clause, and the
// string literal.
{
clauses.push_back(ForClauses[clause]);
clauses.push_back(arg0);
}

// We are done if the clause is `jit`.
if (clause == ForClauseJit)
goto consume_r_paren;

// If the clause is `reduce`, store the string literal in the
// reductionVariables so we can easily check if a variable is part of a
// reduction or not later.
Expand Down Expand Up @@ -895,9 +936,10 @@ StmtResult Parser::ParseNompFor(const SourceLocation &SL) {
Sema &S = getActions();
ASTContext &AST = S.getASTContext();

std::vector<std::string> clauses, reductionVariables;
std::vector<std::string> clauses, reductionVariables, jitVariables;
std::string kernelName;
if (ParseNompForClauses(clauses, reductionVariables, kernelName))
if (ParseNompForClauses(clauses, reductionVariables, jitVariables,
kernelName))
return StmtEmpty();

// Check if the next token is tok::kw_for. If not, exit.
Expand Down Expand Up @@ -1000,10 +1042,11 @@ StmtResult Parser::ParseNompFor(const SourceLocation &SL) {

// Next we create the AST node for the function call nomp_jit(). To do that
// we create the function arguments to nomp_jit().
CreateNompJitCall(Stmts, AST, ID, VKnl, CLS, EV, reductionVariables);
CreateNompJitCall(Stmts, AST, ID, VKnl, CLS, EV, reductionVariables,
jitVariables);

// Next we create AST node for nomp_run().
CreateNompRunCall(Stmts, AST, ID, EV);
CreateNompRunCall(Stmts, AST, ID, EV, jitVariables);

return CompoundStmt::Create(AST, ArrayRef<Stmt *>(Stmts), FPOptionsOverride(),
SL, SL);
Expand Down

0 comments on commit bb34c4e

Please sign in to comment.