Skip to content

[SYCL]Allow parameter pack expansion in device_has attribute #8536

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
merged 1 commit into from
Mar 7, 2023
Merged

[SYCL]Allow parameter pack expansion in device_has attribute #8536

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
1 change: 1 addition & 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 @@ -1348,6 +1348,7 @@ def SYCLDeviceHas : InheritableAttr {
let LangOpts = [SYCLIsDevice, SilentlyIgnoreSYCLIsHost];
let Documentation = [SYCLDeviceHasDocs];
let SupportsNonconformingLambdaSyntax = 1;
let AcceptsExprPack = 1;
}

def SYCLUsesAspects : InheritableAttr {
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/Sema/SemaDeclAttr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10801,7 +10801,7 @@ void Sema::AddSYCLDeviceHasAttr(Decl *D, const AttributeCommonInfo &CI,
SYCLDeviceHasAttr TmpAttr(Context, CI, Exprs, Size);
SmallVector<Expr *, 5> Aspects;
for (auto *E : TmpAttr.aspects())
if (!isDeviceAspectType(E->getType()))
if (!isa<PackExpansionExpr>(E) && !isDeviceAspectType(E->getType()))
Diag(E->getExprLoc(), diag::err_sycl_invalid_aspect_argument) << CI;

if (const auto *ExistingAttr = D->getAttr<SYCLDeviceHasAttr>()) {
Expand Down
9 changes: 3 additions & 6 deletions clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,12 +650,9 @@ instantiateSYCLDeviceHasAttr(Sema &S,
EnterExpressionEvaluationContext Unevaluated(
S, Sema::ExpressionEvaluationContext::ConstantEvaluated);
SmallVector<Expr *, 8> Args;
for (auto I : Attr->aspects()) {
ExprResult Result = S.SubstExpr(I, TemplateArgs);
if (Result.isInvalid())
return;
Args.push_back(Result.getAs<Expr>());
}
if (S.SubstExprs(ArrayRef<Expr *>(Attr->aspects_begin(), Attr->aspects_end()),
/*IsCall=*/false, TemplateArgs, Args))
return;
S.AddSYCLDeviceHasAttr(New, *Attr, Args.data(), Args.size());
}

Expand Down
13 changes: 13 additions & 0 deletions clang/test/CodeGenSYCL/device_has.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@ constexpr sycl::aspect getAspect() { return sycl::aspect::cpu; }
// CHECK: define dso_local spir_func void @{{.*}}func6{{.*}} !sycl_declared_aspects ![[ASPECTS1]] !srcloc ![[SRCLOC7:[0-9]+]] {
[[sycl::device_has(getAspect())]] void func6() {}

// CHECK: define linkonce_odr spir_func void @{{.*}}func7{{.*}} !sycl_declared_aspects ![[ASPECTS1]]
// CHECK: define linkonce_odr spir_func void @{{.*}}func7{{.*}} !sycl_declared_aspects ![[ASPECTS5:[0-9]+]]
template <sycl::aspect... Asp>
[[sycl::device_has(Asp...)]] void func7() {}

// CHECK: define linkonce_odr spir_func void @{{.*}}func8{{.*}} !sycl_declared_aspects ![[ASPECTS5]]
template <sycl::aspect Asp, sycl::aspect... AspPack>
[[sycl::device_has(Asp, AspPack...)]] void func8() {}

class KernelFunctor {
public:
[[sycl::device_has(sycl::aspect::cpu)]] void operator()() const {
Expand All @@ -38,6 +47,9 @@ class KernelFunctor {
func4<sycl::aspect::host>();
func5();
func6();
func7<sycl::aspect::cpu>();
func7<sycl::aspect::cpu, sycl::aspect::host>();
func8<sycl::aspect::cpu, sycl::aspect::host>();
}
};

Expand All @@ -61,5 +73,6 @@ void foo() {
// CHECK: [[SRCLOC5]] = !{i32 {{[0-9]+}}}
// CHECK: [[SRCLOC6]] = !{i32 {{[0-9]+}}}
// CHECK: [[SRCLOC7]] = !{i32 {{[0-9]+}}}
// CHECK: [[ASPECTS5]] = !{i32 1, i32 0}
// CHECK: [[ASPECTS4]] = !{i32 2}
// CHECK: [[SRCLOC8]] = !{i32 {{[0-9]+}}}
13 changes: 9 additions & 4 deletions clang/test/SemaSYCL/device_has.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ enum class aspect {
template <fake_cl::sycl::aspect Aspect>
[[sycl::device_has(Aspect)]] void func4() {} // expected-error 2{{'device_has' attribute argument is invalid; argument must be device aspect of type sycl::aspect}}

void checkTemplate() {
func4<fake_cl::sycl::aspect::aspect1>(); // expected-note {{in instantiation of function template specialization 'func4<fake_cl::sycl::aspect::aspect1>' requested here}}
}

[[sycl::device_has(1)]] void func5() {} // expected-error{{'device_has' attribute argument is invalid; argument must be device aspect of type sycl::aspect}}

template <typename Ty>
Expand All @@ -36,3 +32,12 @@ template <typename Ty>
[[sycl::device_has(sycl::aspect::cpu)]] // expected-note{{previous attribute is here}}
[[sycl::device_has(sycl::aspect::gpu)]] void
func7() {} // expected-warning@-1{{attribute 'device_has' is already applied}}

template <fake_cl::sycl::aspect... Aspect>
[[sycl::device_has(Aspect...)]] void func8() {} // expected-error {{'device_has' attribute argument is invalid; argument must be device aspect of type sycl::aspect}}

void checkTemplate() {
func4<fake_cl::sycl::aspect::aspect1>(); // expected-note {{in instantiation of function template specialization 'func4<fake_cl::sycl::aspect::aspect1>' requested here}}
func8<fake_cl::sycl::aspect::aspect1>(); // expected-note {{in instantiation of function template specialization 'func8<fake_cl::sycl::aspect::aspect1>' requested here}}
}

67 changes: 66 additions & 1 deletion clang/test/SemaSYCL/device_has_ast.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,69 @@ void func5() {}
// CHECK-NOT: SYCLDeviceHasAttr
[[sycl::device_has(sycl::aspect::gpu)]] void func6() {}

// CHECK: CXXRecordDecl {{.*}} KernelFunctor
// CHECK: FunctionTemplateDecl {{.*}} func7
// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}} ... Asp
// CHECK-NEXT: FunctionDecl {{.*}} func7
// CHECK-NEXT: CompoundStmt
// CHECK-NEXT: SYCLDeviceHasAttr
// CHECK-NEXT: PackExpansionExpr
// CHECK-NEXT: DeclRefExpr {{.*}} NonTypeTemplateParm {{.*}} 'Asp' 'sycl::aspect'

// CHECK: FunctionDecl {{.*}} func7 'void ()'
// CHECK-NEXT: TemplateArgument pack
// CHECK-NEXT: TemplateArgument integral 1
// CHECK-NEXT: TemplateArgument integral 2
// CHECK-NEXT: CompoundStmt
// CHECK-NEXT: SYCLDeviceHasAttr
// CHECK-NEXT: SubstNonTypeTemplateParmExpr {{.*}} 'sycl::aspect'
// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}} ... Asp
// CHECK-NEXT: CStyleCastExpr {{.*}} 'sycl::aspect' <IntegralCast>
// CHECK-NEXT: IntegerLiteral {{.*}} 'int' 1
// CHECK-NEXT: SubstNonTypeTemplateParmExpr {{.*}} 'sycl::aspect'
// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}} ... Asp
// CHECK-NEXT: CStyleCastExpr {{.*}} 'sycl::aspect' <IntegralCast>
// CHECK-NEXT: IntegerLiteral {{.*}} 'int' 2

// CHECK: FunctionDecl {{.*}} func7 'void ()'
// CHECK-NEXT: TemplateArgument pack
// CHECK-NEXT: TemplateArgument integral 1
// CHECK-NEXT: CompoundStmt
// CHECK-NEXT: SYCLDeviceHasAttr
// CHECK-NEXT: SubstNonTypeTemplateParmExpr {{.*}} 'sycl::aspect'
// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}} ... Asp
// CHECK-NEXT: CStyleCastExpr {{.*}} 'sycl::aspect' <IntegralCast>
// CHECK-NEXT: IntegerLiteral {{.*}} 'int' 1
template <sycl::aspect... Asp>
[[sycl::device_has(Asp...)]] void func7() {}

// CHECK: FunctionTemplateDecl {{.*}} func8
// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}} Asp
// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}} ... AspPack
// CHECK-NEXT: FunctionDecl {{.*}} func8
// CHECK-NEXT: CompoundStmt
// CHECK-NEXT: SYCLDeviceHasAttr
// CHECK-NEXT: DeclRefExpr {{.*}} NonTypeTemplateParm {{.*}} 'Asp' 'sycl::aspect'
// CHECK-NEXT: PackExpansionExpr
// CHECK-NEXT: DeclRefExpr {{.*}} NonTypeTemplateParm {{.*}} 'AspPack' 'sycl::aspect'

// CHECK-NEXT: FunctionDecl {{.*}} func8
// CHECK-NEXT: TemplateArgument integral 0
// CHECK-NEXT: TemplateArgument pack
// CHECK-NEXT: TemplateArgument integral 1
// CHECK-NEXT: CompoundStmt
// CHECK-NEXT: SYCLDeviceHasAttr
// CHECK-NEXT: SubstNonTypeTemplateParmExpr {{.*}} 'sycl::aspect'
// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}} Asp
// CHECK-NEXT: CStyleCastExpr {{.*}} 'sycl::aspect' <IntegralCast>
// CHECK-NEXT: IntegerLiteral {{.*}} 'int' 0
// CHECK-NEXT: SubstNonTypeTemplateParmExpr {{.*}} 'sycl::aspect'
// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}} ... AspPack
// CHECK-NEXT: CStyleCastExpr {{.*}} 'sycl::aspect' <IntegralCast>
// CHECK-NEXT: IntegerLiteral {{.*}} 'int' 1
template <sycl::aspect Asp, sycl::aspect... AspPack>
[[sycl::device_has(Asp, AspPack...)]] void func8() {}

// CHECK: CXXRecordDecl {{.*}} KernelFunctor definition
class KernelFunctor {
public:
void operator()() const {
Expand All @@ -67,6 +129,9 @@ class KernelFunctor {
func4<sycl::aspect::host>();
func5();
func6();
func7<sycl::aspect::cpu, sycl::aspect::gpu>();
func7<sycl::aspect::cpu>();
func8<sycl::aspect::host, sycl::aspect::cpu>();
}
};

Expand Down