Skip to content

[sycl] [clang] Add sycl global var attribute #3746

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

Merged
bader merged 17 commits into from
Jun 9, 2021
Merged

[sycl] [clang] Add sycl global var attribute #3746

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
682277f
[clang] Add sycl global var attribute
jtmott-intel May 13, 2021
2c6f8fa
Update clang/lib/Sema/SemaExpr.cpp
jtmott-intel May 13, 2021
4184aa4
Use SimpleHandler = 1 and revert changes to SemaDeclAttr
jtmott-intel May 13, 2021
3f7887f
Wrapped attribute in pre-defined macro
jtmott-intel May 13, 2021
63c4f17
Add tests and docs, and remove predefined macro
jtmott-intel May 15, 2021
8b721d9
Update clang/include/clang/Basic/AttrDocs.td
jtmott-intel May 17, 2021
08d0c67
Update clang/include/clang/Basic/AttrDocs.td
jtmott-intel May 17, 2021
5c0f8af
Expand documentation and tests.
jtmott-intel May 18, 2021
a1ac1c5
Update clang/include/clang/Basic/AttrDocs.td
jtmott-intel May 18, 2021
a046f39
Add anonymous union to tests
jtmott-intel May 19, 2021
6bb98b9
Disallowed local vars, and upgraded diagnostic to an error
jtmott-intel May 20, 2021
47ce16a
Restrict attribute to system headers, or it has no effect
jtmott-intel May 27, 2021
a349032
Changed to non-simple handler, added templates to test
jtmott-intel Jun 2, 2021
79d4ed7
clang format
jtmott-intel Jun 2, 2021
e9b7b2a
Simulated system include, and added macro test
jtmott-intel Jun 3, 2021
7219bff
Use SubsetSubject, return after error, no documentation, add system h…
jtmott-intel Jun 4, 2021
3373830
I guess not documented means not on the supported list
jtmott-intel Jun 4, 2021
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
8 changes: 8 additions & 0 deletions clang/include/clang/Basic/Attr.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,6 +1197,14 @@ def SYCLDevice : InheritableAttr {
let Documentation = [SYCLDeviceDocs];
}

def SYCLGlobalVar : InheritableAttr {
let Spellings = [GNU<"sycl_global_var">];
let Subjects = SubjectList<[GlobalVar]>;
let LangOpts = [SYCLIsDevice];
let Documentation = [Undocumented];
let SimpleHandler = 1;
}

def SYCLKernel : InheritableAttr {
let Spellings = [Clang<"sycl_kernel">];
let Subjects = SubjectList<[FunctionTmpl]>;
Expand Down
1 change: 1 addition & 0 deletions clang/lib/Frontend/InitPreprocessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1145,6 +1145,7 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
// SYCL device compiler which doesn't produce host binary.
if (LangOpts.SYCLIsDevice) {
Builder.defineMacro("__SYCL_DEVICE_ONLY__", "1");
Builder.defineMacro("__SYCL_GLOBAL_VAR__", "__attribute__((sycl_global_var))");
Builder.defineMacro("SYCL_EXTERNAL", "__attribute__((sycl_device))");

// Enable __SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__ macro for
Expand Down
5 changes: 3 additions & 2 deletions clang/lib/Sema/SemaExpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,10 @@ bool Sema::DiagnoseUseOfDecl(NamedDecl *D, ArrayRef<SourceLocation> Locs,
if (IsRuntimeEvaluated && !IsConst && VD->getStorageClass() == SC_Static)
SYCLDiagIfDeviceCode(*Locs.begin(), diag::err_sycl_restrict)
<< Sema::KernelNonConstStaticDataVariable;
// Non-const globals are allowed for SYCL explicit SIMD.
// Non-const globals are allowed for SYCL explicit SIMD or with the
// SYCLGlobalVar attribute.
else if (IsRuntimeEvaluated && !IsEsimdPrivateGlobal && !IsConst &&
VD->hasGlobalStorage())
VD->hasGlobalStorage() && !VD->hasAttr<SYCLGlobalVarAttr>())
SYCLDiagIfDeviceCode(*Locs.begin(), diag::err_sycl_restrict)
<< Sema::KernelGlobalVariable;
// ESIMD globals cannot be used in a SYCL context.
Expand Down
1 change: 1 addition & 0 deletions clang/test/Misc/pragma-attribute-supported-attributes-list.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@
// CHECK-NEXT: ReturnsTwice (SubjectMatchRule_function)
// CHECK-NEXT: SYCLDevice (SubjectMatchRule_function)
// CHECK-NEXT: SYCLDeviceIndirectlyCallable (SubjectMatchRule_function)
// CHECK-NEXT: SYCLGlobalVar (SubjectMatchRule_variable_is_global)
// CHECK-NEXT: SYCLIntelFPGADisableLoopPipelining (SubjectMatchRule_function)
// CHECK-NEXT: SYCLIntelFPGAInitiationInterval (SubjectMatchRule_function)
// CHECK-NEXT: SYCLIntelFPGAMaxConcurrency (SubjectMatchRule_function)
Expand Down
7 changes: 7 additions & 0 deletions clang/test/SemaSYCL/invalid-kernel-arguments.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ class H {
int A;
};

int GlobalNoAttribute;
__attribute__((sycl_global_var)) int GlobalWithAttribute;
__SYCL_GLOBAL_VAR__ int GlobalWithAttributeViaMacro;

int main() {
A Obj{};
D Obj1{};
Expand All @@ -65,6 +69,9 @@ int main() {
(void)Obj4;
(void)Obj5;
(void)Obj6;
(void)GlobalNoAttribute; // expected-error {{SYCL kernel cannot use a non-const global variable}} expected-note@Inputs/sycl.hpp:* {{called by}}
(void)GlobalWithAttribute;
(void)GlobalWithAttributeViaMacro;
});
return 0;
}