Skip to content

Adding support for declare target 'initializer expressions' #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
RitanyaB wants to merge 1 commit into from
Closed

Adding support for declare target 'initializer expressions' #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions clang/lib/Parse/ParseDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2071,6 +2071,29 @@ void Parser::SkipMalformedDecl() {
}
}

void ParseImplicitDeclareTargetAttr(Decl *TargetDecl) {
if (TargetDecl && TargetDecl->hasAttr<OMPDeclareTargetDeclAttr>() && isa<VarDecl>(TargetDecl)) {
VarDecl *VarFirstDecl = cast<VarDecl>(TargetDecl);
Expr *Ex = VarFirstDecl->getInit()->IgnoreCasts();
const DeclRefExpr *DeclRef = nullptr;
if (Ex && isa<UnaryOperator>(Ex)) {
if (auto *unary = cast<UnaryOperator>(Ex)) {
if (unary->getOpcode() == UnaryOperator::Opcode::UO_AddrOf) {
Copy link

@dreachem dreachem Mar 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this would only handle initializers that have the address-of operator. Were you going to also handle the following:

int y;
#pragma omp begin declare target
int x = y;
#pragma omp end declare target

for (auto child : unary->children()) {
if (isa<DeclRefExpr>(child)) {
DeclRef = dyn_cast<DeclRefExpr>(child);
Decl *DeclVar = (Decl*)DeclRef->getDecl();
DeclVar->addAttr(TargetDecl->getAttr<OMPDeclareTargetDeclAttr>());
ParseImplicitDeclareTargetAttr(DeclVar);
}
}
}
}
}
}
return;
}

/// ParseDeclGroup - Having concluded that this is either a function
/// definition or a group of object declarations, actually parse the
/// result.
Expand Down Expand Up @@ -2226,6 +2249,8 @@ Parser::DeclGroupPtrTy Parser::ParseDeclGroup(ParsingDeclSpec &DS,
SmallVector<Decl *, 8> DeclsInGroup;
Decl *FirstDecl = ParseDeclarationAfterDeclaratorAndAttributes(
D, ParsedTemplateInfo(), FRI);
if (FirstDecl && FirstDecl->hasAttr<OMPDeclareTargetDeclAttr>() && isa<VarDecl>(FirstDecl))
ParseImplicitDeclareTargetAttr(FirstDecl);
if (LateParsedAttrs.size() > 0)
ParseLexedAttributeList(LateParsedAttrs, FirstDecl, true, false);
D.complete(FirstDecl);
Expand Down
30 changes: 30 additions & 0 deletions clang/test/OpenMP/declare_target_messages.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,36 @@ int MultiDevTy;
#pragma omp declare target to(MultiDevTy) device_type(host) // omp45-error {{unexpected 'device_type' clause, only 'to' or 'link' clauses expected}} omp5-error {{'device_type(host)' does not match previously specified 'device_type(any)' for the same declaration}} omp51-error {{'device_type(host)' does not match previously specified 'device_type(any)' for the same declaration}} omp52-error {{unexpected 'to' clause, use 'enter' instead}} omp52-error {{expected at least one 'enter', 'link' or 'indirect' clause}}
#pragma omp declare target to(MultiDevTy) device_type(nohost) // omp45-error {{unexpected 'device_type' clause, only 'to' or 'link' clauses expected}} omp5-error {{'device_type(nohost)' does not match previously specified 'device_type(any)' for the same declaration}} // omp51-error {{'device_type(nohost)' does not match previously specified 'device_type(any)' for the same declaration}} omp52-error {{unexpected 'to' clause, use 'enter' instead}} omp52-error {{expected at least one 'enter', 'link' or 'indirect' clause}}

static int var = 1; //expected-warning {{declaration is not declared in any declare target region}}

static int var1 = 10;
static int *var2 = &var1;
static int **ptr1 = &var2; //expected-warning {{declaration is not declared in any declare target region}}

int arr[2] = {1,2};
int (*arrptr)[2] = &arr; //expected-warning {{declaration is not declared in any declare target region}}

class declare{
public: int x;
void print();
};
declare obj1;
declare *obj2 = &obj1; //expected-warning {{declaration is not declared in any declare target region}}

struct target{
int x;
void print();
};
static target S; //expected-warning {{declaration is not declared in any declare target region}}

#pragma omp declare target
int *ptr = &var; //expected-note {{used here}}
int ***ptr2 = &ptr1; //expected-note {{used here}}
int (**ptr3)[2] = &arrptr; //expected-note {{used here}}
declare **obj3 = &obj2; //expected-note {{used here}}
target *S1 = &S; //expected-note {{used here}}
#pragma omp end declare target

#if TESTENDINC
#include "unterminated_declare_target_include.h"
#elif TESTEND
Expand Down
88 changes: 88 additions & 0 deletions clang/test/OpenMP/declare_target_variables_ast_print.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
// RUN: %clang_cc1 -w -verify -fopenmp -I %S/Inputs -ast-print %s | FileCheck %s --check-prefix=CHECK
// expected-no-diagnostics

static int var = 1;

static int var1 = 10;
static int *var2 = &var1;
static int **ptr1 = &var2;

int arr[2] = {1,2};
int (*arrptr)[2] = &arr;

class declare{
public: int x;
void print();
};
declare obj1;
declare *obj2 = &obj1;

struct target{
int x;
void print();
};
static target S;

#pragma omp declare target
int *ptr = &var;
int ***ptr2 = &ptr1;
int (**ptr3)[2] = &arrptr;
declare **obj3 = &obj2;
target *S1 = &S;
#pragma omp end declare target
// CHECK: #pragma omp declare target
// CHECK-NEXT: static int var = 1;
// CHECK-NEXT: #pragma omp end declare target

// CHECK-NEXT: #pragma omp declare target
// CHECK-NEXT: static int var1 = 10;
// CHECK-NEXT: #pragma omp end declare target
// CHECK-NEXT: #pragma omp declare target
// CHECK-NEXT: static int *var2 = &var1;
// CHECK-NEXT: #pragma omp end declare target
// CHECK-NEXT: #pragma omp declare target
// CHECK-NEXT: static int **ptr1 = &var2;
// CHECK-NEXT: #pragma omp end declare target

// CHECK-NEXT: #pragma omp declare target
// CHECK-NEXT: int arr[2] = {1, 2};
// CHECK-NEXT: #pragma omp end declare target
// CHECK-NEXT: #pragma omp declare target
// CHECK-NEXT: int (*arrptr)[2] = &arr;
// CHECK-NEXT: #pragma omp end declare target

// CHECK-NEXT: class declare {
// CHECK-NEXT: public:
// CHECK-NEXT: int x;
// CHECK-NEXT: void print();
// CHECK-NEXT: };
// CHECK-NEXT: #pragma omp declare target
// CHECK-NEXT: declare obj1;
// CHECK-NEXT: #pragma omp end declare target
// CHECK-NEXT: #pragma omp declare target
// CHECK-NEXT: declare *obj2 = &obj1;
// CHECK-NEXT: #pragma omp end declare target

// CHECK-NEXT: struct target {
// CHECK-NEXT: int x;
// CHECK-NEXT: void print();
// CHECK-NEXT: };
// CHECK-NEXT: #pragma omp declare target
// CHECK-NEXT: static target S;
// CHECK-NEXT: #pragma omp end declare target

// CHECK-NEXT: #pragma omp declare target
// CHECK-NEXT: int *ptr = &var;
// CHECK-NEXT: #pragma omp end declare target
// CHECK-NEXT: #pragma omp declare target
// CHECK-NEXT: int ***ptr2 = &ptr1;
// CHECK-NEXT: #pragma omp end declare target
// CHECK-NEXT: #pragma omp declare target
// CHECK-NEXT: int (**ptr3)[2] = &arrptr;
// CHECK-NEXT: #pragma omp end declare target
// CHECK-NEXT: #pragma omp declare target
// CHECK-NEXT: declare **obj3 = &obj2;
// CHECK-NEXT: #pragma omp end declare target
// CHECK-NEXT: #pragma omp declare target
// CHECK-NEXT: target *S1 = &S;
// CHECK-NEXT: #pragma omp end declare target