https://github.com/schittir updated
https://github.com/llvm/llvm-project/pull/140282
>From abdbf8905d324f9b935b34bbc97c508ede5ac028 Mon Sep 17 00:00:00 2001
From: "Chittireddy, Sindhu" <sindhu.chittire...@intel.com>
Date: Fri, 16 May 2025 08:51:06 -0700
Subject: [PATCH 1/6] Add sycl_external attribute
---
clang/include/clang/Basic/Attr.td | 20 ++++++-
clang/include/clang/Basic/AttrDocs.td | 11 ++++
.../clang/Basic/DiagnosticSemaKinds.td | 5 ++
clang/include/clang/Sema/SemaSYCL.h | 1 +
clang/lib/AST/ASTContext.cpp | 7 +++
clang/lib/Sema/SemaDeclAttr.cpp | 3 ++
clang/lib/Sema/SemaSYCL.cpp | 11 ++++
.../test/SemaSYCL/sycl-external-attribute.cpp | 52 +++++++++++++++++++
8 files changed, 109 insertions(+), 1 deletion(-)
create mode 100644 clang/test/SemaSYCL/sycl-external-attribute.cpp
diff --git a/clang/include/clang/Basic/Attr.td
b/clang/include/clang/Basic/Attr.td
index ccd13a4cca4dd..1c13d0eb23f3b 100644
--- a/clang/include/clang/Basic/Attr.td
+++ b/clang/include/clang/Basic/Attr.td
@@ -143,6 +143,7 @@ def SharedVar : SubsetSubject<Var,
def GlobalVar : SubsetSubject<Var,
[{S->hasGlobalStorage()}], "global variables">;
+
def ExternalGlobalVar : SubsetSubject<Var,
[{S->hasGlobalStorage() &&
S->getStorageClass()!=StorageClass::SC_Static &&
@@ -408,10 +409,14 @@ class SubjectList<list<AttrSubject> subjects, SubjectDiag
diag = WarnDiag,
string CustomDiag = customDiag;
}
-class LangOpt<string name, code customCode = [{}]> {
+class LangOpt<string name, code customCode = [{}], bit silentlyIgnore = 0> {
// The language option to test; ignored when custom code is supplied.
string Name = name;
+ // If set to 1, the attribute is accepted but is silently ignored. This is
+ // useful in multi-compilation situations like SYCL.
+ bit SilentlyIgnore = silentlyIgnore;
+
// A custom predicate, written as an expression evaluated in a context with
// "LangOpts" bound.
code CustomCode = customCode;
@@ -422,6 +427,7 @@ def CUDA : LangOpt<"CUDA">;
def HIP : LangOpt<"HIP">;
def SYCLHost : LangOpt<"SYCLIsHost">;
def SYCLDevice : LangOpt<"SYCLIsDevice">;
+def SilentlyIgnoreSYCLHost : LangOpt<"SYCLIsHost", "", 1>;
def COnly : LangOpt<"", "!LangOpts.CPlusPlus">;
def CPlusPlus : LangOpt<"CPlusPlus">;
def OpenCL : LangOpt<"OpenCL">;
@@ -1545,6 +1551,18 @@ def SYCLKernel : InheritableAttr {
let Documentation = [SYCLKernelDocs];
}
+def GlobalStorageNonLocalVar : SubsetSubject<Var,
+ [{S->hasGlobalStorage() &&
+ !S->isLocalVarDeclOrParm()}],
+ "global variables">;
+
+def SYCLExternal : InheritableAttr {
+ let Spellings = [GNU<"sycl_external">];
+ let Subjects = SubjectList<[Function, GlobalStorageNonLocalVar]>;
+ let LangOpts = [SYCLDevice, SilentlyIgnoreSYCLHost];
+ let Documentation = [SYCLExternalDocs];
+}
+
def SYCLKernelEntryPoint : InheritableAttr {
let Spellings = [Clang<"sycl_kernel_entry_point">];
let Args = [
diff --git a/clang/include/clang/Basic/AttrDocs.td
b/clang/include/clang/Basic/AttrDocs.td
index 5fb5f16680b41..2eef46a1348f3 100644
--- a/clang/include/clang/Basic/AttrDocs.td
+++ b/clang/include/clang/Basic/AttrDocs.td
@@ -472,6 +472,17 @@ The SYCL kernel in the previous code sample meets these
expectations.
}];
}
+def SYCLExternalDocs : Documentation {
+ let Category = DocCatFunction;
+ let Heading = "sycl_external";
+ let Content = [{
+The ``sycl_external`` attribute (or the ``SYCL_EXTERNAL`` macro) can only be
applied to
+functions, and indicates that the function must be treated as a device
function and
+must be emitted even if it has no direct uses from other device functions.
+All ``sycl_external`` function callees implicitly inherit this attribute.
+ }];
+}
+
def SYCLKernelEntryPointDocs : Documentation {
let Category = DocCatFunction;
let Content = [{
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td
b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index 3efe9593b8633..9228d388bc10b 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -12746,6 +12746,11 @@ def err_sycl_special_type_num_init_method : Error<
"types with 'sycl_special_class' attribute must have one and only one
'__init' "
"method defined">;
+//SYCL external attribute diagnostics
+def err_sycl_attribute_internal_decl
+ : Error<"%0 attribute cannot be applied to a %select{function|variable}1"
+ " without external linkage">;
+
// SYCL kernel entry point diagnostics
def err_sycl_entry_point_invalid : Error<
"'sycl_kernel_entry_point' attribute cannot be applied to a"
diff --git a/clang/include/clang/Sema/SemaSYCL.h
b/clang/include/clang/Sema/SemaSYCL.h
index b47b2f155ef93..099cc56b0ef92 100644
--- a/clang/include/clang/Sema/SemaSYCL.h
+++ b/clang/include/clang/Sema/SemaSYCL.h
@@ -62,6 +62,7 @@ class SemaSYCL : public SemaBase {
ParsedType ParsedTy);
void handleKernelAttr(Decl *D, const ParsedAttr &AL);
+ void handleSYCLExternalAttr(Decl *D, const ParsedAttr &AL);
void handleKernelEntryPointAttr(Decl *D, const ParsedAttr &AL);
void CheckSYCLEntryPointFunctionDecl(FunctionDecl *FD);
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index c58cd2c93fb60..e767b79d0b25f 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -12909,6 +12909,9 @@ bool ASTContext::DeclMustBeEmitted(const Decl *D) {
if (D->hasAttr<WeakRefAttr>())
return false;
+ if (LangOpts.SYCLIsDevice && !D->hasAttr<SYCLKernelEntryPointAttr>())
+ return false;
+
// Aliases and used decls are required.
if (D->hasAttr<AliasAttr>() || D->hasAttr<UsedAttr>())
return true;
@@ -12926,6 +12929,10 @@ bool ASTContext::DeclMustBeEmitted(const Decl *D) {
// FIXME: Functions declared with SYCL_EXTERNAL are required during
// device compilation.
+ // Functions definitions with sycl_external attribute are required during
+ // device compilation.
+ if (LangOpts.SYCLIsDevice && FD->hasAttr<SYCLExternalAttr>())
+ return true;
// Constructors and destructors are required.
if (FD->hasAttr<ConstructorAttr>() || FD->hasAttr<DestructorAttr>())
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index 377595639bef1..271cf417a12f3 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -7113,6 +7113,9 @@ ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
const ParsedAttr &AL,
case ParsedAttr::AT_SYCLKernel:
S.SYCL().handleKernelAttr(D, AL);
break;
+ case ParsedAttr::AT_SYCLExternal:
+ S.SYCL().handleSYCLExternalAttr(D, AL);
+ break;
case ParsedAttr::AT_SYCLKernelEntryPoint:
S.SYCL().handleKernelEntryPointAttr(D, AL);
break;
diff --git a/clang/lib/Sema/SemaSYCL.cpp b/clang/lib/Sema/SemaSYCL.cpp
index 1969d7b0ba837..a08e2f076fb12 100644
--- a/clang/lib/Sema/SemaSYCL.cpp
+++ b/clang/lib/Sema/SemaSYCL.cpp
@@ -202,6 +202,17 @@ void SemaSYCL::handleKernelAttr(Decl *D, const ParsedAttr
&AL) {
handleSimpleAttribute<SYCLKernelAttr>(*this, D, AL);
}
+void SemaSYCL::handleSYCLExternalAttr(Decl *D, const ParsedAttr &AL) {
+ auto *ND = cast<NamedDecl>(D);
+ if (!ND->isExternallyVisible()) {
+ Diag(AL.getLoc(), diag::err_sycl_attribute_internal_decl)
+ << AL << !isa<FunctionDecl>(ND);
+ return;
+ }
+
+ handleSimpleAttribute<SYCLExternalAttr>(*this, D, AL);
+}
+
void SemaSYCL::handleKernelEntryPointAttr(Decl *D, const ParsedAttr &AL) {
ParsedType PT = AL.getTypeArg();
TypeSourceInfo *TSI = nullptr;
diff --git a/clang/test/SemaSYCL/sycl-external-attribute.cpp
b/clang/test/SemaSYCL/sycl-external-attribute.cpp
new file mode 100644
index 0000000000000..2260dba386a73
--- /dev/null
+++ b/clang/test/SemaSYCL/sycl-external-attribute.cpp
@@ -0,0 +1,52 @@
+// RUN: %clang_cc1 -fsycl-is-device -fsyntax-only -verify -DSYCL %s
+// RUN: %clang_cc1 -fsycl-is-host -fsyntax-only -verify -DHOST %s
+// RUN: %clang_cc1 -verify %s
+
+// Semantic tests for sycl_external attribute
+
+#ifdef SYCL
+
+__attribute__((sycl_external(3))) // expected-error {{'sycl_external'
attribute takes no arguments}}
+void bar() {}
+
+__attribute__((sycl_external)) // expected-error {{'sycl_external' attribute
cannot be applied to a function without external linkage}}
+static void func1() {}
+
+namespace {
+ __attribute__((sycl_external)) // expected-error {{'sycl_external' attribute
cannot be applied to a function without external linkage}}
+ void func2() {}
+
+ struct UnnX {};
+}
+
+__attribute__((sycl_external)) // expected-error {{'sycl_external' attribute
cannot be applied to a function without external linkage}}
+ void func4(UnnX) {}
+
+class A {
+ __attribute__((sycl_external))
+ A() {}
+
+ __attribute__((sycl_external)) void func3() {}
+};
+
+class B {
+public:
+ __attribute__((sycl_external)) virtual void foo() {}
+
+ __attribute__((sycl_external)) virtual void bar() = 0;
+};
+
+__attribute__((sycl_external)) int *func0() { return nullptr; }
+
+__attribute__((sycl_external)) void func2(int *) {}
+
+#elif defined(HOST)
+
+// expected-no-diagnostics
+__attribute__((sycl_external)) void func3() {}
+
+#else
+__attribute__((sycl_external)) // expected-warning {{'sycl_external' attribute
ignored}}
+void baz() {}
+
+#endif
>From f631d7a58e5ce5e80f3562226723410af8b199d6 Mon Sep 17 00:00:00 2001
From: "Chittireddy, Sindhu" <sindhu.chittire...@intel.com>
Date: Fri, 16 May 2025 13:48:04 -0700
Subject: [PATCH 2/6] Fix test and remove space
---
clang/include/clang/Basic/Attr.td | 1 -
clang/test/CodeGenSYCL/kernel-caller-entry-point.cpp | 9 ++++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/clang/include/clang/Basic/Attr.td
b/clang/include/clang/Basic/Attr.td
index 1c13d0eb23f3b..d2fdb1a12c9fb 100644
--- a/clang/include/clang/Basic/Attr.td
+++ b/clang/include/clang/Basic/Attr.td
@@ -143,7 +143,6 @@ def SharedVar : SubsetSubject<Var,
def GlobalVar : SubsetSubject<Var,
[{S->hasGlobalStorage()}], "global variables">;
-
def ExternalGlobalVar : SubsetSubject<Var,
[{S->hasGlobalStorage() &&
S->getStorageClass()!=StorageClass::SC_Static &&
diff --git a/clang/test/CodeGenSYCL/kernel-caller-entry-point.cpp
b/clang/test/CodeGenSYCL/kernel-caller-entry-point.cpp
index b5687523aee36..e41209673c9cc 100644
--- a/clang/test/CodeGenSYCL/kernel-caller-entry-point.cpp
+++ b/clang/test/CodeGenSYCL/kernel-caller-entry-point.cpp
@@ -100,11 +100,10 @@ int main() {
// Verify that SYCL kernel caller functions are emitted for each device target.
//
-// FIXME: The following set of matches are used to skip over the declaration of
-// main(). main() shouldn't be emitted in device code, but that pruning isn't
-// performed yet.
-// CHECK-DEVICE: Function Attrs: convergent mustprogress noinline
norecurse nounwind optnone
-// CHECK-DEVICE-NEXT: define {{[a-z_ ]*}}noundef i32 @main() #0
+// main() shouldn't be emitted in device code. It is not annotated with
+// sycl_kernel_entry_point or sycl_external attributes.
+// Function Attrs: convergent mustprogress noinline norecurse nounwind optnone
+// CHECK-NOT: define {{[a-z_ ]*}}noundef i32 @main() #0
// IR for the SYCL kernel caller function generated for
// single_purpose_kernel_task with single_purpose_kernel_name as the SYCL
kernel
>From 128ab1b1e3030b30d4b157f6657ac1c543fffb4f Mon Sep 17 00:00:00 2001
From: "Chittireddy, Sindhu" <sindhu.chittire...@intel.com>
Date: Fri, 23 May 2025 10:46:29 -0700
Subject: [PATCH 3/6] Address review comments #1
---
clang/include/clang/Basic/Attr.td | 9 ++-------
clang/include/clang/Basic/DiagnosticSemaKinds.td | 5 ++---
clang/include/clang/Sema/SemaSYCL.h | 2 +-
clang/lib/AST/ASTContext.cpp | 10 +++++-----
clang/lib/Sema/SemaDeclAttr.cpp | 2 +-
clang/lib/Sema/SemaSYCL.cpp | 4 ++--
6 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/clang/include/clang/Basic/Attr.td
b/clang/include/clang/Basic/Attr.td
index d2fdb1a12c9fb..43a7de4257583 100644
--- a/clang/include/clang/Basic/Attr.td
+++ b/clang/include/clang/Basic/Attr.td
@@ -412,10 +412,6 @@ class LangOpt<string name, code customCode = [{}], bit
silentlyIgnore = 0> {
// The language option to test; ignored when custom code is supplied.
string Name = name;
- // If set to 1, the attribute is accepted but is silently ignored. This is
- // useful in multi-compilation situations like SYCL.
- bit SilentlyIgnore = silentlyIgnore;
-
// A custom predicate, written as an expression evaluated in a context with
// "LangOpts" bound.
code CustomCode = customCode;
@@ -426,7 +422,6 @@ def CUDA : LangOpt<"CUDA">;
def HIP : LangOpt<"HIP">;
def SYCLHost : LangOpt<"SYCLIsHost">;
def SYCLDevice : LangOpt<"SYCLIsDevice">;
-def SilentlyIgnoreSYCLHost : LangOpt<"SYCLIsHost", "", 1>;
def COnly : LangOpt<"", "!LangOpts.CPlusPlus">;
def CPlusPlus : LangOpt<"CPlusPlus">;
def OpenCL : LangOpt<"OpenCL">;
@@ -1556,9 +1551,9 @@ def GlobalStorageNonLocalVar : SubsetSubject<Var,
"global variables">;
def SYCLExternal : InheritableAttr {
- let Spellings = [GNU<"sycl_external">];
+ let Spellings = [Clang<"sycl_external">];
let Subjects = SubjectList<[Function, GlobalStorageNonLocalVar]>;
- let LangOpts = [SYCLDevice, SilentlyIgnoreSYCLHost];
+ let LangOpts = [SYCLDevice];
let Documentation = [SYCLExternalDocs];
}
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td
b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index 9228d388bc10b..6ca2e6d6811d1 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -12747,9 +12747,8 @@ def err_sycl_special_type_num_init_method : Error<
"method defined">;
//SYCL external attribute diagnostics
-def err_sycl_attribute_internal_decl
- : Error<"%0 attribute cannot be applied to a %select{function|variable}1"
- " without external linkage">;
+def err_sycl_attribute_invalid_linkage : Error<
+ "'sycl_external' can only be applied to functions with external linkage">;
// SYCL kernel entry point diagnostics
def err_sycl_entry_point_invalid : Error<
diff --git a/clang/include/clang/Sema/SemaSYCL.h
b/clang/include/clang/Sema/SemaSYCL.h
index 099cc56b0ef92..b1c94ee17abb2 100644
--- a/clang/include/clang/Sema/SemaSYCL.h
+++ b/clang/include/clang/Sema/SemaSYCL.h
@@ -62,7 +62,7 @@ class SemaSYCL : public SemaBase {
ParsedType ParsedTy);
void handleKernelAttr(Decl *D, const ParsedAttr &AL);
- void handleSYCLExternalAttr(Decl *D, const ParsedAttr &AL);
+ void handleExternalAttr(Decl *D, const ParsedAttr &AL);
void handleKernelEntryPointAttr(Decl *D, const ParsedAttr &AL);
void CheckSYCLEntryPointFunctionDecl(FunctionDecl *FD);
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index e767b79d0b25f..7db8a07cad603 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -12909,7 +12909,8 @@ bool ASTContext::DeclMustBeEmitted(const Decl *D) {
if (D->hasAttr<WeakRefAttr>())
return false;
- if (LangOpts.SYCLIsDevice && !D->hasAttr<SYCLKernelEntryPointAttr>())
+ if (LangOpts.SYCLIsDevice &&
+ (!D->hasAttr<SYCLKernelEntryPointAttr>() ||
!D->hasAttr<SYCLExternalAttr>()))
return false;
// Aliases and used decls are required.
@@ -12927,10 +12928,9 @@ bool ASTContext::DeclMustBeEmitted(const Decl *D) {
if (LangOpts.SYCLIsDevice && FD->hasAttr<SYCLKernelEntryPointAttr>())
return true;
- // FIXME: Functions declared with SYCL_EXTERNAL are required during
- // device compilation.
- // Functions definitions with sycl_external attribute are required during
- // device compilation.
+ // Functions definitions with the sycl_external attribute are required
+ // during device compilation regardless of whether they are reachable from
+ // a SYCL kernel.
if (LangOpts.SYCLIsDevice && FD->hasAttr<SYCLExternalAttr>())
return true;
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index 271cf417a12f3..a6996fe0ce3d1 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -7114,7 +7114,7 @@ ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
const ParsedAttr &AL,
S.SYCL().handleKernelAttr(D, AL);
break;
case ParsedAttr::AT_SYCLExternal:
- S.SYCL().handleSYCLExternalAttr(D, AL);
+ S.SYCL().handleExternalAttr(D, AL);
break;
case ParsedAttr::AT_SYCLKernelEntryPoint:
S.SYCL().handleKernelEntryPointAttr(D, AL);
diff --git a/clang/lib/Sema/SemaSYCL.cpp b/clang/lib/Sema/SemaSYCL.cpp
index a08e2f076fb12..c12ed801ccc97 100644
--- a/clang/lib/Sema/SemaSYCL.cpp
+++ b/clang/lib/Sema/SemaSYCL.cpp
@@ -202,10 +202,10 @@ void SemaSYCL::handleKernelAttr(Decl *D, const ParsedAttr
&AL) {
handleSimpleAttribute<SYCLKernelAttr>(*this, D, AL);
}
-void SemaSYCL::handleSYCLExternalAttr(Decl *D, const ParsedAttr &AL) {
+void SemaSYCL::handleExternalAttr(Decl *D, const ParsedAttr &AL) {
auto *ND = cast<NamedDecl>(D);
if (!ND->isExternallyVisible()) {
- Diag(AL.getLoc(), diag::err_sycl_attribute_internal_decl)
+ Diag(AL.getLoc(), diag::err_sycl_attribute_invalid_linkage)
<< AL << !isa<FunctionDecl>(ND);
return;
}
>From 118656c84eba4bcc608d7c19bb7a41fa0b0fabc8 Mon Sep 17 00:00:00 2001
From: "Chittireddy, Sindhu" <sindhu.chittire...@intel.com>
Date: Wed, 28 May 2025 12:40:52 -0700
Subject: [PATCH 4/6] Fix conditional and failing tests
---
clang/lib/AST/ASTContext.cpp | 2 +-
.../CodeGenSYCL/address-space-deduction.cpp | 2 +-
.../CodeGenSYCL/address-space-mangling.cpp | 2 +-
.../debug-info-kernel-variables.cpp | 2 +-
.../CodeGenSYCL/field-annotate-addr-space.cpp | 2 +-
.../CodeGenSYCL/functionptr-addrspace.cpp | 2 +-
.../test/SemaSYCL/sycl-external-attribute.cpp | 36 ++++++-------------
7 files changed, 17 insertions(+), 31 deletions(-)
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 7db8a07cad603..c02686800b890 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -12910,7 +12910,7 @@ bool ASTContext::DeclMustBeEmitted(const Decl *D) {
return false;
if (LangOpts.SYCLIsDevice &&
- (!D->hasAttr<SYCLKernelEntryPointAttr>() ||
!D->hasAttr<SYCLExternalAttr>()))
+ !D->hasAttr<SYCLKernelEntryPointAttr>() &&
!D->hasAttr<SYCLExternalAttr>())
return false;
// Aliases and used decls are required.
diff --git a/clang/test/CodeGenSYCL/address-space-deduction.cpp
b/clang/test/CodeGenSYCL/address-space-deduction.cpp
index 5910ec3bfc305..0fb5c41d630cc 100644
--- a/clang/test/CodeGenSYCL/address-space-deduction.cpp
+++ b/clang/test/CodeGenSYCL/address-space-deduction.cpp
@@ -85,7 +85,7 @@
// CHECK-NEXT: store ptr addrspace(4) addrspacecast (ptr addrspace(1)
@.str.1 to ptr addrspace(4)), ptr addrspace(4) [[SELECT_STR_TRIVIAL2_ASCAST]],
align 8
// CHECK-NEXT: ret void
//
-void test() {
+[[clang::sycl_external]] void test() {
static const int foo = 0x42;
diff --git a/clang/test/CodeGenSYCL/address-space-mangling.cpp
b/clang/test/CodeGenSYCL/address-space-mangling.cpp
index 868bf8ccbdcf8..ecc2d4b43a159 100644
--- a/clang/test/CodeGenSYCL/address-space-mangling.cpp
+++ b/clang/test/CodeGenSYCL/address-space-mangling.cpp
@@ -18,7 +18,7 @@ void foo(int *);
// X86: declare void @_Z3fooPU9SYprivatei(ptr noundef) #1
// X86: declare void @_Z3fooPi(ptr noundef) #1
-void test() {
+[[clang::sycl_external]] void test() {
__attribute__((opencl_global)) int *glob;
__attribute__((opencl_local)) int *loc;
__attribute__((opencl_private)) int *priv;
diff --git a/clang/test/CodeGenSYCL/debug-info-kernel-variables.cpp
b/clang/test/CodeGenSYCL/debug-info-kernel-variables.cpp
index 96c0dcfdb75b6..551c4e7e2b8b4 100644
--- a/clang/test/CodeGenSYCL/debug-info-kernel-variables.cpp
+++ b/clang/test/CodeGenSYCL/debug-info-kernel-variables.cpp
@@ -18,7 +18,7 @@ KERNEL void parallel_for(const KernelType &KernelFunc) {
KernelFunc();
}
-void my_kernel(int my_param) {
+[[clang::sycl_external]] void my_kernel(int my_param) {
int my_local = 0;
my_local = my_param;
}
diff --git a/clang/test/CodeGenSYCL/field-annotate-addr-space.cpp
b/clang/test/CodeGenSYCL/field-annotate-addr-space.cpp
index 26bfda8185112..fe7a160900a54 100644
--- a/clang/test/CodeGenSYCL/field-annotate-addr-space.cpp
+++ b/clang/test/CodeGenSYCL/field-annotate-addr-space.cpp
@@ -9,7 +9,7 @@ struct HasField {
int *a;
};
-void foo(int *b) {
+[[clang::sycl_external]] void foo(int *b) {
struct HasField f;
// CHECK: %[[A:.+]] = getelementptr inbounds nuw %struct.HasField, ptr
addrspace(4) %{{.+}}
// CHECK: %[[CALL:.+]] = call ptr addrspace(4)
@llvm.ptr.annotation.p4.p1(ptr addrspace(4) %[[A]], ptr addrspace(1) [[ANNOT]]
diff --git a/clang/test/CodeGenSYCL/functionptr-addrspace.cpp
b/clang/test/CodeGenSYCL/functionptr-addrspace.cpp
index a477b4c7d03ab..060104a29b60a 100644
--- a/clang/test/CodeGenSYCL/functionptr-addrspace.cpp
+++ b/clang/test/CodeGenSYCL/functionptr-addrspace.cpp
@@ -8,7 +8,7 @@ __attribute__((sycl_kernel)) void kernel_single_task(const Func
&kernelFunc) {
}
// CHECK: define dso_local spir_func{{.*}}invoke_function{{.*}}(ptr noundef
%fptr, ptr addrspace(4) noundef %ptr)
-void invoke_function(int (*fptr)(), int *ptr) {}
+[[clang::sycl_external]] void invoke_function(int (*fptr)(), int *ptr) {}
int f() { return 0; }
diff --git a/clang/test/SemaSYCL/sycl-external-attribute.cpp
b/clang/test/SemaSYCL/sycl-external-attribute.cpp
index 2260dba386a73..4bf40c37400ea 100644
--- a/clang/test/SemaSYCL/sycl-external-attribute.cpp
+++ b/clang/test/SemaSYCL/sycl-external-attribute.cpp
@@ -1,52 +1,38 @@
-// RUN: %clang_cc1 -fsycl-is-device -fsyntax-only -verify -DSYCL %s
-// RUN: %clang_cc1 -fsycl-is-host -fsyntax-only -verify -DHOST %s
-// RUN: %clang_cc1 -verify %s
+// RUN: %clang_cc1 -fsycl-is-device -fsyntax-only -verify %s
// Semantic tests for sycl_external attribute
-#ifdef SYCL
-
-__attribute__((sycl_external(3))) // expected-error {{'sycl_external'
attribute takes no arguments}}
+[[clang::sycl_external(3)]] // expected-error {{'sycl_external' attribute
takes no arguments}}
void bar() {}
-__attribute__((sycl_external)) // expected-error {{'sycl_external' attribute
cannot be applied to a function without external linkage}}
+[[clang::sycl_external]] // expected-error {{'sycl_external' can only be
applied to functions with external linkage}}
static void func1() {}
namespace {
- __attribute__((sycl_external)) // expected-error {{'sycl_external' attribute
cannot be applied to a function without external linkage}}
+ [[clang::sycl_external]] // expected-error {{'sycl_external' can only be
applied to functions with external linkage}}
void func2() {}
struct UnnX {};
}
-__attribute__((sycl_external)) // expected-error {{'sycl_external' attribute
cannot be applied to a function without external linkage}}
+[[clang::sycl_external]] // expected-error {{'sycl_external' can only be
applied to functions with external linkage}}
void func4(UnnX) {}
class A {
- __attribute__((sycl_external))
+ [[clang::sycl_external]]
A() {}
- __attribute__((sycl_external)) void func3() {}
+ [[clang::sycl_external]] void func3() {}
};
class B {
public:
- __attribute__((sycl_external)) virtual void foo() {}
+ [[clang::sycl_external]] virtual void foo() {}
- __attribute__((sycl_external)) virtual void bar() = 0;
+ [[clang::sycl_external]] virtual void bar() = 0;
};
-__attribute__((sycl_external)) int *func0() { return nullptr; }
-
-__attribute__((sycl_external)) void func2(int *) {}
-
-#elif defined(HOST)
-
-// expected-no-diagnostics
-__attribute__((sycl_external)) void func3() {}
+[[clang::sycl_external]] int *func0() { return nullptr; }
-#else
-__attribute__((sycl_external)) // expected-warning {{'sycl_external' attribute
ignored}}
-void baz() {}
+[[clang::sycl_external]] void func2(int *) {}
-#endif
>From 7c592a42b8814e17f48bac3df29a2883ac70c23f Mon Sep 17 00:00:00 2001
From: Sindhu Chittireddy <sindhu.chittire...@intel.com>
Date: Tue, 3 Jun 2025 20:48:07 -0700
Subject: [PATCH 5/6] Fix the remaining six failing tests
---
.../CodeGenSYCL/address-space-conversions.cpp | 170 +++++++++---------
.../amd-address-space-conversions.cpp | 160 ++++++++---------
.../cuda-address-space-conversions.cpp | 152 ++++++++--------
clang/test/CodeGenSYCL/function-attrs.cpp | 21 +--
clang/test/CodeGenSYCL/unique_stable_name.cpp | 126 +++++++------
.../unique_stable_name_windows_diff.cpp | 38 +++-
6 files changed, 345 insertions(+), 322 deletions(-)
diff --git a/clang/test/CodeGenSYCL/address-space-conversions.cpp
b/clang/test/CodeGenSYCL/address-space-conversions.cpp
index ee3183b74e038..fa7acb0d99433 100644
--- a/clang/test/CodeGenSYCL/address-space-conversions.cpp
+++ b/clang/test/CodeGenSYCL/address-space-conversions.cpp
@@ -1,143 +1,143 @@
// RUN: %clang_cc1 -triple spir64 -fsycl-is-device -disable-llvm-passes
-emit-llvm %s -o - | FileCheck %s
void bar(int &Data) {}
-// CHECK: define{{.*}} spir_func void @[[RAW_REF:[a-zA-Z0-9_]+]](ptr
addrspace(4) noundef align 4 dereferenceable(4) %
+// CHECK-DAG: define{{.*}} spir_func void @[[RAW_REF:[a-zA-Z0-9_]+]](ptr
addrspace(4) noundef align 4 dereferenceable(4) %
void bar2(int &Data) {}
-// CHECK: define{{.*}} spir_func void @[[RAW_REF2:[a-zA-Z0-9_]+]](ptr
addrspace(4) noundef align 4 dereferenceable(4) %
+// CHECK-DAG: define{{.*}} spir_func void @[[RAW_REF2:[a-zA-Z0-9_]+]](ptr
addrspace(4) noundef align 4 dereferenceable(4) %
void bar(__attribute__((opencl_local)) int &Data) {}
-// CHECK: define{{.*}} spir_func void [[LOC_REF:@[a-zA-Z0-9_]+]](ptr
addrspace(3) noundef align 4 dereferenceable(4) %
+// CHECK-DAG: define{{.*}} spir_func void [[LOC_REF:@[a-zA-Z0-9_]+]](ptr
addrspace(3) noundef align 4 dereferenceable(4) %
void foo(int *Data) {}
-// CHECK: define{{.*}} spir_func void @[[RAW_PTR:[a-zA-Z0-9_]+]](ptr
addrspace(4) noundef %
+// CHECK-DAG: define{{.*}} spir_func void @[[RAW_PTR:[a-zA-Z0-9_]+]](ptr
addrspace(4) noundef %
void foo2(int *Data) {}
-// CHECK: define{{.*}} spir_func void @[[RAW_PTR2:[a-zA-Z0-9_]+]](ptr
addrspace(4) noundef %
+// CHECK-DAG: define{{.*}} spir_func void @[[RAW_PTR2:[a-zA-Z0-9_]+]](ptr
addrspace(4) noundef %
void foo(__attribute__((opencl_local)) int *Data) {}
-// CHECK: define{{.*}} spir_func void [[LOC_PTR:@[a-zA-Z0-9_]+]](ptr
addrspace(3) noundef %
+// CHECK-DAG: define{{.*}} spir_func void [[LOC_PTR:@[a-zA-Z0-9_]+]](ptr
addrspace(3) noundef %
template <typename T>
void tmpl(T t) {}
// See Check Lines below.
-void usages() {
+[[clang::sycl_external]] void usages() {
int *NoAS;
- // CHECK: [[NoAS:%[a-zA-Z0-9]+]] = alloca ptr addrspace(4)
+ // CHECK-DAG: [[NoAS:%[a-zA-Z0-9]+]] = alloca ptr addrspace(4)
__attribute__((opencl_global)) int *GLOB;
- // CHECK: [[GLOB:%[a-zA-Z0-9]+]] = alloca ptr addrspace(1)
+ // CHECK-DAG: [[GLOB:%[a-zA-Z0-9]+]] = alloca ptr addrspace(1)
__attribute__((opencl_local)) int *LOC;
- // CHECK: [[LOC:%[a-zA-Z0-9]+]] = alloca ptr addrspace(3)
+ // CHECK-DAG: [[LOC:%[a-zA-Z0-9]+]] = alloca ptr addrspace(3)
__attribute__((opencl_private)) int *PRIV;
- // CHECK: [[PRIV:%[a-zA-Z0-9]+]] = alloca ptr
+ // CHECK-DAG: [[PRIV:%[a-zA-Z0-9]+]] = alloca ptr
__attribute__((opencl_global_device)) int *GLOBDEVICE;
- // CHECK: [[GLOB_DEVICE:%[a-zA-Z0-9]+]] = alloca ptr addrspace(5)
+ // CHECK-DAG: [[GLOB_DEVICE:%[a-zA-Z0-9]+]] = alloca ptr addrspace(5)
__attribute__((opencl_global_host)) int *GLOBHOST;
- // CHECK: [[GLOB_HOST:%[a-zA-Z0-9]+]] = alloca ptr addrspace(6)
+ // CHECK-DAG: [[GLOB_HOST:%[a-zA-Z0-9]+]] = alloca ptr addrspace(6)
- // CHECK: [[NoAS]].ascast = addrspacecast ptr [[NoAS]] to ptr addrspace(4)
- // CHECK: [[GLOB]].ascast = addrspacecast ptr [[GLOB]] to ptr addrspace(4)
- // CHECK: [[LOC]].ascast = addrspacecast ptr [[LOC]] to ptr addrspace(4)
- // CHECK: [[PRIV]].ascast = addrspacecast ptr [[PRIV]] to ptr addrspace(4)
+ // CHECK-DAG: [[NoAS]].ascast = addrspacecast ptr [[NoAS]] to ptr
addrspace(4)
+ // CHECK-DAG: [[GLOB]].ascast = addrspacecast ptr [[GLOB]] to ptr
addrspace(4)
+ // CHECK-DAG: [[LOC]].ascast = addrspacecast ptr [[LOC]] to ptr addrspace(4)
+ // CHECK-DAG: [[PRIV]].ascast = addrspacecast ptr [[PRIV]] to ptr
addrspace(4)
LOC = nullptr;
- // CHECK: store ptr addrspace(3) null, ptr addrspace(4) [[LOC]].ascast,
align 8
+ // CHECK-DAG: store ptr addrspace(3) null, ptr addrspace(4) [[LOC]].ascast,
align 8
GLOB = nullptr;
- // CHECK: store ptr addrspace(1) null, ptr addrspace(4) [[GLOB]].ascast,
align 8
+ // CHECK-DAG: store ptr addrspace(1) null, ptr addrspace(4) [[GLOB]].ascast,
align 8
// Explicit conversions
// From named address spaces to default address space
- // CHECK: [[GLOB_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
addrspace(4) [[GLOB]].ascast
- // CHECK: [[GLOB_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD]] to ptr addrspace(4)
- // CHECK: store ptr addrspace(4) [[GLOB_CAST]], ptr addrspace(4)
[[NoAS]].ascast
+ // CHECK-DAG: [[GLOB_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
addrspace(4) [[GLOB]].ascast
+ // CHECK-DAG: [[GLOB_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD]] to ptr addrspace(4)
+ // CHECK-DAG: store ptr addrspace(4) [[GLOB_CAST]], ptr addrspace(4)
[[NoAS]].ascast
NoAS = (int *)GLOB;
- // CHECK: [[LOC_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
addrspace(4) [[LOC]].ascast
- // CHECK: [[LOC_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD]] to ptr addrspace(4)
- // CHECK: store ptr addrspace(4) [[LOC_CAST]], ptr addrspace(4)
[[NoAS]].ascast
+ // CHECK-DAG: [[LOC_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
addrspace(4) [[LOC]].ascast
+ // CHECK-DAG: [[LOC_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD]] to ptr addrspace(4)
+ // CHECK-DAG: store ptr addrspace(4) [[LOC_CAST]], ptr addrspace(4)
[[NoAS]].ascast
NoAS = (int *)LOC;
- // CHECK: [[PRIV_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr addrspace(4)
[[PRIV]].ascast
- // CHECK: [[PRIV_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr [[PRIV_LOAD]] to
ptr addrspace(4)
- // CHECK: store ptr addrspace(4) [[PRIV_CAST]], ptr addrspace(4)
[[NoAS]].ascast
+ // CHECK-DAG: [[PRIV_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr addrspace(4)
[[PRIV]].ascast
+ // CHECK-DAG: [[PRIV_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr [[PRIV_LOAD]]
to ptr addrspace(4)
+ // CHECK-DAG: store ptr addrspace(4) [[PRIV_CAST]], ptr addrspace(4)
[[NoAS]].ascast
NoAS = (int *)PRIV;
// From default address space to named address space
- // CHECK: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(4), ptr
addrspace(4) [[NoAS]].ascast
- // CHECK: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(4)
[[NoAS_LOAD]] to ptr addrspace(1)
- // CHECK: store ptr addrspace(1) [[NoAS_CAST]], ptr addrspace(4)
[[GLOB]].ascast
+ // CHECK-DAG: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(4), ptr
addrspace(4) [[NoAS]].ascast
+ // CHECK-DAG: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(4)
[[NoAS_LOAD]] to ptr addrspace(1)
+ // CHECK-DAG: store ptr addrspace(1) [[NoAS_CAST]], ptr addrspace(4)
[[GLOB]].ascast
GLOB = (__attribute__((opencl_global)) int *)NoAS;
- // CHECK: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(4), ptr
addrspace(4) [[NoAS]].ascast
- // CHECK: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(4)
[[NoAS_LOAD]] to ptr addrspace(3)
- // CHECK: store ptr addrspace(3) [[NoAS_CAST]], ptr addrspace(4)
[[LOC]].ascast
+ // CHECK-DAG: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(4), ptr
addrspace(4) [[NoAS]].ascast
+ // CHECK-DAG: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(4)
[[NoAS_LOAD]] to ptr addrspace(3)
+ // CHECK-DAG: store ptr addrspace(3) [[NoAS_CAST]], ptr addrspace(4)
[[LOC]].ascast
LOC = (__attribute__((opencl_local)) int *)NoAS;
- // CHECK: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(4), ptr
addrspace(4) [[NoAS]].ascast
- // CHECK: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(4)
[[NoAS_LOAD]] to ptr
- // CHECK: store ptr [[NoAS_CAST]], ptr addrspace(4) [[PRIV]].ascast
+ // CHECK-DAG: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(4), ptr
addrspace(4) [[NoAS]].ascast
+ // CHECK-DAG: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(4)
[[NoAS_LOAD]] to ptr
+ // CHECK-DAG: store ptr [[NoAS_CAST]], ptr addrspace(4) [[PRIV]].ascast
PRIV = (__attribute__((opencl_private)) int *)NoAS;
// From opencl_global_[host/device] address spaces to opencl_global
- // CHECK: [[GLOBDEVICE_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(5), ptr
addrspace(4) [[GLOB_DEVICE]].ascast
- // CHECK: [[GLOBDEVICE_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(5)
[[GLOBDEVICE_LOAD]] to ptr addrspace(1)
- // CHECK: store ptr addrspace(1) [[GLOBDEVICE_CAST]], ptr addrspace(4)
[[GLOB]].ascast
+ // CHECK-DAG: [[GLOBDEVICE_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(5), ptr
addrspace(4) [[GLOB_DEVICE]].ascast
+ // CHECK-DAG: [[GLOBDEVICE_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr
addrspace(5) [[GLOBDEVICE_LOAD]] to ptr addrspace(1)
+ // CHECK-DAG: store ptr addrspace(1) [[GLOBDEVICE_CAST]], ptr addrspace(4)
[[GLOB]].ascast
GLOB = (__attribute__((opencl_global)) int *)GLOBDEVICE;
- // CHECK: [[GLOBHOST_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(6), ptr
addrspace(4) [[GLOB_HOST]].ascast
- // CHECK: [[GLOBHOST_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(6)
[[GLOBHOST_LOAD]] to ptr addrspace(1)
- // CHECK: store ptr addrspace(1) [[GLOBHOST_CAST]], ptr addrspace(4)
[[GLOB]].ascast
+ // CHECK-DAG: [[GLOBHOST_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(6), ptr
addrspace(4) [[GLOB_HOST]].ascast
+ // CHECK-DAG: [[GLOBHOST_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr
addrspace(6) [[GLOBHOST_LOAD]] to ptr addrspace(1)
+ // CHECK-DAG: store ptr addrspace(1) [[GLOBHOST_CAST]], ptr addrspace(4)
[[GLOB]].ascast
GLOB = (__attribute__((opencl_global)) int *)GLOBHOST;
bar(*GLOB);
- // CHECK: [[GLOB_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
addrspace(4) [[GLOB]].ascast
- // CHECK: [[GLOB_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD]] to ptr addrspace(4)
- // CHECK: call spir_func void @[[RAW_REF]](ptr addrspace(4) noundef align 4
dereferenceable(4) [[GLOB_CAST]])
+ // CHECK-DAG: [[GLOB_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
addrspace(4) [[GLOB]].ascast
+ // CHECK-DAG: [[GLOB_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD]] to ptr addrspace(4)
+ // CHECK-DAG: call spir_func void @[[RAW_REF]](ptr addrspace(4) noundef
align 4 dereferenceable(4) [[GLOB_CAST]])
bar2(*GLOB);
- // CHECK: [[GLOB_LOAD2:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
addrspace(4) [[GLOB]].ascast
- // CHECK: [[GLOB_CAST2:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD2]] to ptr addrspace(4)
- // CHECK: call spir_func void @[[RAW_REF2]](ptr addrspace(4) noundef align 4
dereferenceable(4) [[GLOB_CAST2]])
+ // CHECK-DAG: [[GLOB_LOAD2:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
addrspace(4) [[GLOB]].ascast
+ // CHECK-DAG: [[GLOB_CAST2:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD2]] to ptr addrspace(4)
+ // CHECK-DAG: call spir_func void @[[RAW_REF2]](ptr addrspace(4) noundef
align 4 dereferenceable(4) [[GLOB_CAST2]])
bar(*LOC);
- // CHECK: [[LOC_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
addrspace(4) [[LOC]].ascast
- // CHECK: call spir_func void [[LOC_REF]](ptr addrspace(3) noundef align 4
dereferenceable(4) [[LOC_LOAD]])
+ // CHECK-DAG: [[LOC_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
addrspace(4) [[LOC]].ascast
+ // CHECK-DAG: call spir_func void [[LOC_REF]](ptr addrspace(3) noundef align
4 dereferenceable(4) [[LOC_LOAD]])
bar2(*LOC);
- // CHECK: [[LOC_LOAD2:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
addrspace(4) [[LOC]].ascast
- // CHECK: [[LOC_CAST2:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD2]] to ptr addrspace(4)
- // CHECK: call spir_func void @[[RAW_REF2]](ptr addrspace(4) noundef align 4
dereferenceable(4) [[LOC_CAST2]])
+ // CHECK-DAG: [[LOC_LOAD2:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
addrspace(4) [[LOC]].ascast
+ // CHECK-DAG: [[LOC_CAST2:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD2]] to ptr addrspace(4)
+ // CHECK-DAG: call spir_func void @[[RAW_REF2]](ptr addrspace(4) noundef
align 4 dereferenceable(4) [[LOC_CAST2]])
bar(*NoAS);
- // CHECK: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(4), ptr
addrspace(4) [[NoAS]].ascast
- // CHECK: call spir_func void @[[RAW_REF]](ptr addrspace(4) noundef align 4
dereferenceable(4) [[NoAS_LOAD]])
+ // CHECK-DAG: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(4), ptr
addrspace(4) [[NoAS]].ascast
+ // CHECK-DAG: call spir_func void @[[RAW_REF]](ptr addrspace(4) noundef
align 4 dereferenceable(4) [[NoAS_LOAD]])
bar2(*NoAS);
- // CHECK: [[NoAS_LOAD2:%[a-zA-Z0-9]+]] = load ptr addrspace(4), ptr
addrspace(4) [[NoAS]].ascast
- // CHECK: call spir_func void @[[RAW_REF2]](ptr addrspace(4) noundef align 4
dereferenceable(4) [[NoAS_LOAD2]])
+ // CHECK-DAG: [[NoAS_LOAD2:%[a-zA-Z0-9]+]] = load ptr addrspace(4), ptr
addrspace(4) [[NoAS]].ascast
+ // CHECK-DAG: call spir_func void @[[RAW_REF2]](ptr addrspace(4) noundef
align 4 dereferenceable(4) [[NoAS_LOAD2]])
foo(GLOB);
- // CHECK: [[GLOB_LOAD3:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
addrspace(4) [[GLOB]].ascast
- // CHECK: [[GLOB_CAST3:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD3]] to ptr addrspace(4)
- // CHECK: call spir_func void @[[RAW_PTR]](ptr addrspace(4) noundef
[[GLOB_CAST3]])
+ // CHECK-DAG: [[GLOB_LOAD3:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
addrspace(4) [[GLOB]].ascast
+ // CHECK-DAG: [[GLOB_CAST3:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD3]] to ptr addrspace(4)
+ // CHECK-DAG: call spir_func void @[[RAW_PTR]](ptr addrspace(4) noundef
[[GLOB_CAST3]])
foo2(GLOB);
- // CHECK: [[GLOB_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
addrspace(4) [[GLOB]].ascast
- // CHECK: [[GLOB_CAST4:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD4]] to ptr addrspace(4)
- // CHECK: call spir_func void @[[RAW_PTR2]](ptr addrspace(4) noundef
[[GLOB_CAST4]])
+ // CHECK-DAG: [[GLOB_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
addrspace(4) [[GLOB]].ascast
+ // CHECK-DAG: [[GLOB_CAST4:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD4]] to ptr addrspace(4)
+ // CHECK-DAG: call spir_func void @[[RAW_PTR2]](ptr addrspace(4) noundef
[[GLOB_CAST4]])
foo(LOC);
- // CHECK: [[LOC_LOAD3:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
addrspace(4) [[LOC]].ascast
- // CHECK: call spir_func void [[LOC_PTR]](ptr addrspace(3) noundef
[[LOC_LOAD3]])
+ // CHECK-DAG: [[LOC_LOAD3:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
addrspace(4) [[LOC]].ascast
+ // CHECK-DAG: call spir_func void [[LOC_PTR]](ptr addrspace(3) noundef
[[LOC_LOAD3]])
foo2(LOC);
- // CHECK: [[LOC_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
addrspace(4) [[LOC]].ascast
- // CHECK: [[LOC_CAST4:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD4]] to ptr addrspace(4)
- // CHECK: call spir_func void @[[RAW_PTR2]](ptr addrspace(4) noundef
[[LOC_CAST4]])
+ // CHECK-DAG: [[LOC_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
addrspace(4) [[LOC]].ascast
+ // CHECK-DAG: [[LOC_CAST4:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD4]] to ptr addrspace(4)
+ // CHECK-DAG: call spir_func void @[[RAW_PTR2]](ptr addrspace(4) noundef
[[LOC_CAST4]])
foo(NoAS);
- // CHECK: [[NoAS_LOAD3:%[a-zA-Z0-9]+]] = load ptr addrspace(4), ptr
addrspace(4) [[NoAS]].ascast
- // CHECK: call spir_func void @[[RAW_PTR]](ptr addrspace(4) noundef
[[NoAS_LOAD3]])
+ // CHECK-DAG: [[NoAS_LOAD3:%[a-zA-Z0-9]+]] = load ptr addrspace(4), ptr
addrspace(4) [[NoAS]].ascast
+ // CHECK-DAG: call spir_func void @[[RAW_PTR]](ptr addrspace(4) noundef
[[NoAS_LOAD3]])
foo2(NoAS);
- // CHECK: [[NoAS_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(4), ptr
addrspace(4) [[NoAS]].ascast
- // CHECK: call spir_func void @[[RAW_PTR2]](ptr addrspace(4) noundef
[[NoAS_LOAD4]])
+ // CHECK-DAG: [[NoAS_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(4), ptr
addrspace(4) [[NoAS]].ascast
+ // CHECK-DAG: call spir_func void @[[RAW_PTR2]](ptr addrspace(4) noundef
[[NoAS_LOAD4]])
// Ensure that we still get 3 different template instantiations.
tmpl(GLOB);
- // CHECK: [[GLOB_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
addrspace(4) [[GLOB]].ascast
- // CHECK: call spir_func void @_Z4tmplIPU3AS1iEvT_(ptr addrspace(1) noundef
[[GLOB_LOAD4]])
+ // CHECK-DAG: [[GLOB_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
addrspace(4) [[GLOB]].ascast
+ // CHECK-DAG: call spir_func void @_Z4tmplIPU3AS1iEvT_(ptr addrspace(1)
noundef [[GLOB_LOAD4]])
tmpl(LOC);
- // CHECK: [[LOC_LOAD5:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
addrspace(4) [[LOC]].ascast
- // CHECK: call spir_func void @_Z4tmplIPU3AS3iEvT_(ptr addrspace(3) noundef
[[LOC_LOAD5]])
+ // CHECK-DAG: [[LOC_LOAD5:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
addrspace(4) [[LOC]].ascast
+ // CHECK-DAG: call spir_func void @_Z4tmplIPU3AS3iEvT_(ptr addrspace(3)
noundef [[LOC_LOAD5]])
tmpl(PRIV);
- // CHECK: [[PRIV_LOAD5:%[a-zA-Z0-9]+]] = load ptr, ptr addrspace(4)
[[PRIV]].ascast
- // CHECK: call spir_func void @_Z4tmplIPU3AS0iEvT_(ptr noundef
[[PRIV_LOAD5]])
+ // CHECK-DAG: [[PRIV_LOAD5:%[a-zA-Z0-9]+]] = load ptr, ptr addrspace(4)
[[PRIV]].ascast
+ // CHECK-DAG: call spir_func void @_Z4tmplIPU3AS0iEvT_(ptr noundef
[[PRIV_LOAD5]])
tmpl(NoAS);
- // CHECK: [[NoAS_LOAD5:%[a-zA-Z0-9]+]] = load ptr addrspace(4), ptr
addrspace(4) [[NoAS]].ascast
- // CHECK: call spir_func void @_Z4tmplIPiEvT_(ptr addrspace(4) noundef
[[NoAS_LOAD5]])
+ // CHECK-DAG: [[NoAS_LOAD5:%[a-zA-Z0-9]+]] = load ptr addrspace(4), ptr
addrspace(4) [[NoAS]].ascast
+ // CHECK-DAG: call spir_func void @_Z4tmplIPiEvT_(ptr addrspace(4) noundef
[[NoAS_LOAD5]])
}
-// CHECK: define linkonce_odr spir_func void @_Z4tmplIPU3AS1iEvT_(ptr
addrspace(1) noundef %
-// CHECK: define linkonce_odr spir_func void @_Z4tmplIPU3AS3iEvT_(ptr
addrspace(3) noundef %
-// CHECK: define linkonce_odr spir_func void @_Z4tmplIPU3AS0iEvT_(ptr noundef %
-// CHECK: define linkonce_odr spir_func void @_Z4tmplIPiEvT_(ptr addrspace(4)
noundef %
+// CHECK-DAG: define linkonce_odr spir_func void @_Z4tmplIPU3AS1iEvT_(ptr
addrspace(1) noundef %
+// CHECK-DAG: define linkonce_odr spir_func void @_Z4tmplIPU3AS3iEvT_(ptr
addrspace(3) noundef %
+// CHECK-DAG: define linkonce_odr spir_func void @_Z4tmplIPU3AS0iEvT_(ptr
noundef %
+// CHECK-DAG: define linkonce_odr spir_func void @_Z4tmplIPiEvT_(ptr
addrspace(4) noundef %
diff --git a/clang/test/CodeGenSYCL/amd-address-space-conversions.cpp
b/clang/test/CodeGenSYCL/amd-address-space-conversions.cpp
index d316f22096d3d..17a98195318ad 100644
--- a/clang/test/CodeGenSYCL/amd-address-space-conversions.cpp
+++ b/clang/test/CodeGenSYCL/amd-address-space-conversions.cpp
@@ -1,128 +1,128 @@
// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa -fsycl-is-device
-disable-llvm-passes -emit-llvm %s -o - | FileCheck %s
void bar(int &Data) {}
-// CHECK: define dso_local void @[[RAW_REF:[a-zA-Z0-9_]+]](ptr noundef nonnull
align 4 dereferenceable(4) %
+// CHECK-DAG: define {{.*}} void @[[RAW_REF:[a-zA-Z0-9_]+]](ptr noundef
nonnull align 4 dereferenceable(4) %
void bar2(int &Data) {}
-// CHECK: define dso_local void @[[RAW_REF2:[a-zA-Z0-9_]+]](ptr noundef
nonnull align 4 dereferenceable(4) %
+// CHECK-DAG: define {{.*}} void @[[RAW_REF2:[a-zA-Z0-9_]+]](ptr noundef
nonnull align 4 dereferenceable(4) %
void bar(__attribute__((opencl_local)) int &Data) {}
-// CHECK: define dso_local void @[[LOCAL_REF:[a-zA-Z0-9_]+]](ptr addrspace(3)
noundef align 4 dereferenceable(4) %
+// CHECK-DAG: define {{.*}} void @[[LOCAL_REF:[a-zA-Z0-9_]+]](ptr addrspace(3)
noundef align 4 dereferenceable(4) %
void foo(int *Data) {}
-// CHECK: define dso_local void @[[RAW_PTR:[a-zA-Z0-9_]+]](ptr noundef %
+// CHECK-DAG: define {{.*}} void @[[RAW_PTR:[a-zA-Z0-9_]+]](ptr noundef %
void foo2(int *Data) {}
-// CHECK: define dso_local void @[[RAW_PTR2:[a-zA-Z0-9_]+]](ptr noundef %
+// CHECK-DAG: define {{.*}} void @[[RAW_PTR2:[a-zA-Z0-9_]+]](ptr noundef %
void foo(__attribute__((opencl_local)) int *Data) {}
-// CHECK: define dso_local void @[[LOC_PTR:[a-zA-Z0-9_]+]](ptr addrspace(3)
noundef %
+// CHECK-DAG: define {{.*}} void @[[LOC_PTR:[a-zA-Z0-9_]+]](ptr addrspace(3)
noundef %
template <typename T>
-void tmpl(T t);
+void tmpl(T t) {}
// See Check Lines below.
-void usages() {
+[[clang::sycl_external]] void usages() {
int *NoAS;
- // CHECK: [[NoAS:%[a-zA-Z0-9]+]] = alloca ptr, align 8, addrspace(5)
+ // CHECK-DAG: [[NoAS:%[a-zA-Z0-9]+]] = alloca ptr, align 8, addrspace(5)
__attribute__((opencl_global)) int *GLOB;
- // CHECK: [[GLOB:%[a-zA-Z0-9]+]] = alloca ptr addrspace(1), align 8,
addrspace(5)
+ // CHECK-DAG: [[GLOB:%[a-zA-Z0-9]+]] = alloca ptr addrspace(1), align 8,
addrspace(5)
__attribute__((opencl_local)) int *LOC;
- // CHECK: [[LOC:%[a-zA-Z0-9]+]] = alloca ptr addrspace(3), align 4,
addrspace(5)
+ // CHECK-DAG: [[LOC:%[a-zA-Z0-9]+]] = alloca ptr addrspace(3), align 4,
addrspace(5)
__attribute__((opencl_private)) int *PRIV;
- // CHECK: [[PRIV:%[a-zA-Z0-9]+]] = alloca ptr addrspace(5), align 4,
addrspace(5)
+ // CHECK-DAG: [[PRIV:%[a-zA-Z0-9]+]] = alloca ptr addrspace(5), align 4,
addrspace(5)
__attribute__((opencl_global_device)) int *GLOBDEVICE;
- // CHECK: [[GLOB_DEVICE:%[a-zA-Z0-9]+]] = alloca ptr addrspace(1), align 8,
addrspace(5)
+ // CHECK-DAG: [[GLOB_DEVICE:%[a-zA-Z0-9]+]] = alloca ptr addrspace(1), align
8, addrspace(5)
__attribute__((opencl_global_host)) int *GLOBHOST;
- // CHECK: [[GLOB_HOST:%[a-zA-Z0-9]+]] = alloca ptr addrspace(1), align 8,
addrspace(5)
+ // CHECK-DAG: [[GLOB_HOST:%[a-zA-Z0-9]+]] = alloca ptr addrspace(1), align
8, addrspace(5)
LOC = nullptr;
- // CHECK: store ptr addrspace(3) addrspacecast (ptr null to ptr
addrspace(3)), ptr [[LOC]].ascast, align 4
+ // CHECK-DAG: store ptr addrspace(3) addrspacecast (ptr null to ptr
addrspace(3)), ptr [[LOC]].ascast, align 4
GLOB = nullptr;
- // CHECK: store ptr addrspace(1) null, ptr [[GLOB]].ascast, align 8
+ // CHECK-DAG: store ptr addrspace(1) null, ptr [[GLOB]].ascast, align 8
NoAS = (int *)GLOB;
- // CHECK: [[GLOB_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]].ascast, align 8
- // CHECK: [[GLOB_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD]] to ptr
- // CHECK: store ptr [[GLOB_CAST]], ptr [[NoAS]].ascast, align 8
+ // CHECK-DAG: [[GLOB_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]].ascast, align 8
+ // CHECK-DAG: [[GLOB_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD]] to ptr
+ // CHECK-DAG: store ptr [[GLOB_CAST]], ptr [[NoAS]].ascast, align 8
NoAS = (int *)LOC;
- // CHECK: [[LOC_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]].ascast, align 4
- // CHECK: [[LOC_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD]] to ptr
- // CHECK: store ptr [[LOC_CAST]], ptr [[NoAS]].ascast, align 8
+ // CHECK-DAG: [[LOC_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]].ascast, align 4
+ // CHECK-DAG: [[LOC_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD]] to ptr
+ // CHECK-DAG: store ptr [[LOC_CAST]], ptr [[NoAS]].ascast, align 8
NoAS = (int *)PRIV;
- // CHECK: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(5), ptr
[[PRIV]].ascast, align 4
- // CHECK: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(5)
[[NoAS_LOAD]] to ptr
- // CHECK: store ptr %5, ptr [[NoAS]].ascast, align 8
+ // CHECK-DAG: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(5), ptr
[[PRIV]].ascast, align 4
+ // CHECK-DAG: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(5)
[[NoAS_LOAD]] to ptr
+ // CHECK-DAG: store ptr %5, ptr [[NoAS]].ascast, align 8
GLOB = (__attribute__((opencl_global)) int *)NoAS;
- // CHECK: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]].ascast, align
8
- // CHECK: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr %6 to ptr
addrspace(1)
- // CHECK: store ptr addrspace(1) %7, ptr [[GLOB]].ascast, align 8
+ // CHECK-DAG: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]].ascast,
align 8
+ // CHECK-DAG: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr %6 to ptr
addrspace(1)
+ // CHECK-DAG: store ptr addrspace(1) %7, ptr [[GLOB]].ascast, align 8
LOC = (__attribute__((opencl_local)) int *)NoAS;
- // CHECK: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]].ascast, align
8
- // CHECK: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr [[NoAS_LOAD]] to
ptr addrspace(3)
- // CHECK: store ptr addrspace(3) %9, ptr [[LOC]].ascast, align 4
+ // CHECK-DAG: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]].ascast,
align 8
+ // CHECK-DAG: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr [[NoAS_LOAD]]
to ptr addrspace(3)
+ // CHECK-DAG: store ptr addrspace(3) %9, ptr [[LOC]].ascast, align 4
PRIV = (__attribute__((opencl_private)) int *)NoAS;
- // CHECK: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]].ascast, align
8
- // CHECK: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr [[NoAS_LOAD]] to
ptr addrspace(5)
- // CHECK: store ptr addrspace(5) [[NoAS_CAST]], ptr [[PRIV]].ascast, align 4
+ // CHECK-DAG: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]].ascast,
align 8
+ // CHECK-DAG: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr [[NoAS_LOAD]]
to ptr addrspace(5)
+ // CHECK-DAG: store ptr addrspace(5) [[NoAS_CAST]], ptr [[PRIV]].ascast,
align 4
GLOB = (__attribute__((opencl_global)) int *)GLOBDEVICE;
- // CHECK: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]]DEVICE.ascast, align 8
- // CHECK: store ptr addrspace(1) [[NoAS_LOAD]], ptr [[GLOB]].ascast, align 8
+ // CHECK-DAG: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]]DEVICE.ascast, align 8
+ // CHECK-DAG: store ptr addrspace(1) [[NoAS_LOAD]], ptr [[GLOB]].ascast,
align 8
GLOB = (__attribute__((opencl_global)) int *)GLOBHOST;
- // CHECK: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]]HOST.ascast, align 8
- // CHECK: tore ptr addrspace(1) [[NoAS_LOAD]], ptr [[GLOB]].ascast, align 8
+ // CHECK-DAG: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]]HOST.ascast, align 8
+ // CHECK-DAG: tore ptr addrspace(1) [[NoAS_LOAD]], ptr [[GLOB]].ascast,
align 8
bar(*GLOB);
- // CHECK: [[GLOB_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]].ascast, align 8
- // CHECK: [[GLOB_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD]] to ptr
- // CHECK: call void @[[RAW_REF]](ptr noundef nonnull align 4
dereferenceable(4) [[GLOB_CAST]])
+ // CHECK-DAG: [[GLOB_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]].ascast, align 8
+ // CHECK-DAG: [[GLOB_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD]] to ptr
+ // CHECK-DAG: call void @[[RAW_REF]](ptr noundef nonnull align 4
dereferenceable(4) [[GLOB_CAST]])
bar2(*GLOB);
- // CHECK: [[GLOB_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]].ascast, align 8
- // CHECK: [[GLOB_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD]] to ptr
- // CHECK: call void @[[RAW_REF2]](ptr noundef nonnull align 4
dereferenceable(4) [[GLOB_CAST]])
+ // CHECK-DAG: [[GLOB_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]].ascast, align 8
+ // CHECK-DAG: [[GLOB_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD]] to ptr
+ // CHECK-DAG: call void @[[RAW_REF2]](ptr noundef nonnull align 4
dereferenceable(4) [[GLOB_CAST]])
bar(*LOC);
- // CHECK: [[LOC_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]].ascast, align 4
- // CHECK: call void @_Z3barRU3AS3i(ptr addrspace(3) noundef align 4
dereferenceable(4) [[LOC_LOAD]])
+ // CHECK-DAG: [[LOC_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]].ascast, align 4
+ // CHECK-DAG: call void @_Z3barRU3AS3i(ptr addrspace(3) noundef align 4
dereferenceable(4) [[LOC_LOAD]])
bar2(*LOC);
- // CHECK: [[LOC_LOAD2:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]].ascast, align 4
- // CHECK: [[LOC_CAST2:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD2]] to ptr
- // CHECK: call void @_Z4bar2Ri(ptr noundef nonnull align 4
dereferenceable(4) [[LOC_CAST2]])
+ // CHECK-DAG: [[LOC_LOAD2:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]].ascast, align 4
+ // CHECK-DAG: [[LOC_CAST2:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD2]] to ptr
+ // CHECK-DAG: call void @_Z4bar2Ri(ptr noundef nonnull align 4
dereferenceable(4) [[LOC_CAST2]])
bar(*NoAS);
- // CHECK: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]].ascast, align
8
- // CHECK: call void @_Z3barRi(ptr noundef nonnull align 4 dereferenceable(4)
[[NoAS_LOAD]])
+ // CHECK-DAG: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]].ascast,
align 8
+ // CHECK-DAG: call void @_Z3barRi(ptr noundef nonnull align 4
dereferenceable(4) [[NoAS_LOAD]])
bar2(*NoAS);
- // CHECK: [[NoAS_LOAD2:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]].ascast,
align 8
- // CHECK: call void @_Z4bar2Ri(ptr noundef nonnull align 4
dereferenceable(4) [[NoAS_LOAD2]])
+ // CHECK-DAG: [[NoAS_LOAD2:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]].ascast,
align 8
+ // CHECK-DAG: call void @_Z4bar2Ri(ptr noundef nonnull align 4
dereferenceable(4) [[NoAS_LOAD2]])
foo(GLOB);
- // CHECK: [[GLOB_LOAD3:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]].ascast, align 8
- // CHECK: [[GLOB_CAST3:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD3]] to ptr
- // CHECK: call void @[[RAW_PTR]](ptr noundef [[GLOB_CAST3]])
+ // CHECK-DAG: [[GLOB_LOAD3:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]].ascast, align 8
+ // CHECK-DAG: [[GLOB_CAST3:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD3]] to ptr
+ // CHECK-DAG: call void @[[RAW_PTR]](ptr noundef [[GLOB_CAST3]])
foo2(GLOB);
- // CHECK: [[GLOB_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]].ascast, align 8
- // CHECK: [[GLOB_CAST4:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD4]] to ptr
- // CHECK: call void @[[RAW_PTR2]](ptr noundef [[GLOB_CAST4]])
+ // CHECK-DAG: [[GLOB_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]].ascast, align 8
+ // CHECK-DAG: [[GLOB_CAST4:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD4]] to ptr
+ // CHECK-DAG: call void @[[RAW_PTR2]](ptr noundef [[GLOB_CAST4]])
foo(LOC);
- // CHECK: [[LOC_LOAD3:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]].ascast, align 4
- // CHECK: call void @[[LOC_PTR]](ptr addrspace(3) noundef [[LOC_LOAD3]])
+ // CHECK-DAG: [[LOC_LOAD3:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]].ascast, align 4
+ // CHECK-DAG: call void @[[LOC_PTR]](ptr addrspace(3) noundef [[LOC_LOAD3]])
foo2(LOC);
- // CHECK: [[LOC_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]].ascast, align 4
- // CHECK: [[LOC_CAST4:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD4]] to ptr
- // CHECK: call void @[[RAW_PTR2]](ptr noundef [[LOC_CAST4]])
+ // CHECK-DAG: [[LOC_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]].ascast, align 4
+ // CHECK-DAG: [[LOC_CAST4:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD4]] to ptr
+ // CHECK-DAG: call void @[[RAW_PTR2]](ptr noundef [[LOC_CAST4]])
foo(NoAS);
- // CHECK: [[NoAS_LOAD3:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]].ascast,
align 8
- // CHECK: call void @[[RAW_PTR]](ptr noundef [[NoAS_LOAD3]])
+ // CHECK-DAG: [[NoAS_LOAD3:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]].ascast,
align 8
+ // CHECK-DAG: call void @[[RAW_PTR]](ptr noundef [[NoAS_LOAD3]])
foo2(NoAS);
- // CHECK: [[NoAS_LOAD4:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]].ascast,
align 8
- // CHECK: call void @[[RAW_PTR2]](ptr noundef [[NoAS_LOAD4]])
+ // CHECK-DAG: [[NoAS_LOAD4:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]].ascast,
align 8
+ // CHECK-DAG: call void @[[RAW_PTR2]](ptr noundef [[NoAS_LOAD4]])
// Ensure that we still get 3 different template instantiations.
tmpl(GLOB);
- // CHECK: [[GLOB_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]].ascast, align 8
- // CHECK: call void @_Z4tmplIPU3AS1iEvT_(ptr addrspace(1) noundef
[[GLOB_LOAD4]])
+ // CHECK-DAG: [[GLOB_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]].ascast, align 8
+ // CHECK-DAG: call void @_Z4tmplIPU3AS1iEvT_(ptr addrspace(1) noundef
[[GLOB_LOAD4]])
tmpl(LOC);
- // CHECK: [[LOC_LOAD5:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]].ascast, align 4
- // CHECK: call void @_Z4tmplIPU3AS3iEvT_(ptr addrspace(3) noundef
[[LOC_LOAD5]])
+ // CHECK-DAG: [[LOC_LOAD5:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]].ascast, align 4
+ // CHECK-DAG: call void @_Z4tmplIPU3AS3iEvT_(ptr addrspace(3) noundef
[[LOC_LOAD5]])
tmpl(PRIV);
- // CHECK: [[PRIV_LOAD5:%[a-zA-Z0-9]+]] = load ptr addrspace(5), ptr
[[PRIV]].ascast, align 4
- // CHECK: call void @_Z4tmplIPU3AS5iEvT_(ptr addrspace(5) noundef
[[PRIV_LOAD5]])
+ // CHECK-DAG: [[PRIV_LOAD5:%[a-zA-Z0-9]+]] = load ptr addrspace(5), ptr
[[PRIV]].ascast, align 4
+ // CHECK-DAG: call void @_Z4tmplIPU3AS5iEvT_(ptr addrspace(5) noundef
[[PRIV_LOAD5]])
tmpl(NoAS);
- // CHECK: [[NoAS_LOAD5:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]].ascast,
align 8
- // CHECK: call void @_Z4tmplIPiEvT_(ptr noundef [[NoAS_LOAD5]])
+ // CHECK-DAG: [[NoAS_LOAD5:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]].ascast,
align 8
+ // CHECK-DAG: call void @_Z4tmplIPiEvT_(ptr noundef [[NoAS_LOAD5]])
}
-// CHECK: declare void @_Z4tmplIPU3AS1iEvT_(ptr addrspace(1) noundef)
-// CHECK: declare void @_Z4tmplIPU3AS3iEvT_(ptr addrspace(3) noundef)
-// CHECK: declare void @_Z4tmplIPU3AS5iEvT_(ptr addrspace(5) noundef)
-// CHECK: declare void @_Z4tmplIPiEvT_(ptr noundef)
+// CHECK-DAG: define linkonce_odr void @_Z4tmplIPU3AS1iEvT_(ptr addrspace(1)
noundef %
+// CHECK-DAG: define linkonce_odr void @_Z4tmplIPU3AS3iEvT_(ptr addrspace(3)
noundef %
+// CHECK-DAG: define linkonce_odr void @_Z4tmplIPU3AS5iEvT_(ptr addrspace(5)
noundef %
+// CHECK-DAG: define linkonce_odr void @_Z4tmplIPiEvT_(ptr noundef %
diff --git a/clang/test/CodeGenSYCL/cuda-address-space-conversions.cpp
b/clang/test/CodeGenSYCL/cuda-address-space-conversions.cpp
index 1875029de0856..ffb601e62c118 100644
--- a/clang/test/CodeGenSYCL/cuda-address-space-conversions.cpp
+++ b/clang/test/CodeGenSYCL/cuda-address-space-conversions.cpp
@@ -1,122 +1,122 @@
// RUN: %clang_cc1 -triple nvptx64-nvidia-cuda -fsycl-is-device
-disable-llvm-passes -emit-llvm %s -o - | FileCheck %s
void bar(int &Data) {}
-// CHECK: define dso_local void @[[RAW_REF:[a-zA-Z0-9_]+]](ptr noundef nonnull
align 4 dereferenceable(4) %
+// CHECK-DAG: define {{.*}} void @[[RAW_REF:[a-zA-Z0-9_]+]](ptr noundef
nonnull align 4 dereferenceable(4) %
void bar2(int &Data) {}
-// CHECK: define dso_local void @[[RAW_REF2:[a-zA-Z0-9_]+]](ptr noundef
nonnull align 4 dereferenceable(4) %
+// CHECK-DAG: define {{.*}} void @[[RAW_REF2:[a-zA-Z0-9_]+]](ptr noundef
nonnull align 4 dereferenceable(4) %
void bar(__attribute__((opencl_local)) int &Data) {}
-// CHECK: define dso_local void @[[LOCAL_REF:[a-zA-Z0-9_]+]](ptr addrspace(3)
noundef align 4 dereferenceable(4) %
+// CHECK-DAG: define {{.*}} void @[[LOCAL_REF:[a-zA-Z0-9_]+]](ptr addrspace(3)
noundef align 4 dereferenceable(4) %
void foo(int *Data) {}
-// CHECK: define dso_local void @[[RAW_PTR:[a-zA-Z0-9_]+]](ptr noundef %
+// CHECK-DAG: define {{.*}} void @[[RAW_PTR:[a-zA-Z0-9_]+]](ptr noundef %
void foo2(int *Data) {}
-// CHECK: define dso_local void @[[RAW_PTR2:[a-zA-Z0-9_]+]](ptr noundef %
+// CHECK-DAG: define {{.*}} void @[[RAW_PTR2:[a-zA-Z0-9_]+]](ptr noundef %
void foo(__attribute__((opencl_local)) int *Data) {}
-// CHECK: define dso_local void @[[LOC_PTR:[a-zA-Z0-9_]+]](ptr addrspace(3)
noundef %
+// CHECK-DAG: define {{.*}} void @[[LOC_PTR:[a-zA-Z0-9_]+]](ptr addrspace(3)
noundef %
template <typename T>
void tmpl(T t);
// See Check Lines below.
-void usages() {
+[[clang::sycl_external]] void usages() {
int *NoAS;
- // CHECK: [[NoAS:%[a-zA-Z0-9]+]] = alloca ptr, align 8
+ // CHECK-DAG: [[NoAS:%[a-zA-Z0-9]+]] = alloca ptr, align 8
__attribute__((opencl_global)) int *GLOB;
- // CHECK: [[GLOB:%[a-zA-Z0-9]+]] = alloca ptr addrspace(1), align 8
+ // CHECK-DAG: [[GLOB:%[a-zA-Z0-9]+]] = alloca ptr addrspace(1), align 8
__attribute__((opencl_local)) int *LOC;
- // CHECK: [[LOC:%[a-zA-Z0-9]+]] = alloca ptr addrspace(3), align 8
+ // CHECK-DAG: [[LOC:%[a-zA-Z0-9]+]] = alloca ptr addrspace(3), align 8
__attribute__((opencl_private)) int *PRIV;
- // CHECK: [[PRIV:%[a-zA-Z0-9]+]] = alloca ptr, align 8
+ // CHECK-DAG: [[PRIV:%[a-zA-Z0-9]+]] = alloca ptr, align 8
__attribute__((opencl_global_device)) int *GLOBDEVICE;
- // CHECK: [[GLOB_DEVICE:%[a-zA-Z0-9]+]] = alloca ptr addrspace(1), align 8
+ // CHECK-DAG: [[GLOB_DEVICE:%[a-zA-Z0-9]+]] = alloca ptr addrspace(1), align
8
__attribute__((opencl_global_host)) int *GLOBHOST;
- // CHECK: [[GLOB_HOST:%[a-zA-Z0-9]+]] = alloca ptr addrspace(1), align 8
+ // CHECK-DAG: [[GLOB_HOST:%[a-zA-Z0-9]+]] = alloca ptr addrspace(1), align 8
LOC = nullptr;
- // CHECK: store ptr addrspace(3) addrspacecast (ptr null to ptr
addrspace(3)), ptr [[LOC]], align 8
+ // CHECK-DAG: store ptr addrspace(3) addrspacecast (ptr null to ptr
addrspace(3)), ptr [[LOC]], align 8
GLOB = nullptr;
- // CHECK: store ptr addrspace(1) null, ptr [[GLOB]], align 8
+ // CHECK-DAG: store ptr addrspace(1) null, ptr [[GLOB]], align 8
NoAS = (int *)GLOB;
- // CHECK: [[GLOB_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr [[GLOB]],
align 8
- // CHECK: [[GLOB_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD]] to ptr
- // CHECK: store ptr [[GLOB_CAST]], ptr [[NoAS]], align 8
+ // CHECK-DAG: [[GLOB_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]], align 8
+ // CHECK-DAG: [[GLOB_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD]] to ptr
+ // CHECK-DAG: store ptr [[GLOB_CAST]], ptr [[NoAS]], align 8
NoAS = (int *)LOC;
- // CHECK: [[LOC_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr [[LOC]],
align 8
- // CHECK: [[LOC_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD]] to ptr
- // CHECK: store ptr [[LOC_CAST]], ptr [[NoAS]], align 8
+ // CHECK-DAG: [[LOC_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]], align 8
+ // CHECK-DAG: [[LOC_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD]] to ptr
+ // CHECK-DAG: store ptr [[LOC_CAST]], ptr [[NoAS]], align 8
NoAS = (int *)PRIV;
- // CHECK: [[LOC_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[PRIV]], align 8
- // CHECK: store ptr [[LOC_LOAD]], ptr [[NoAS]], align 8
+ // CHECK-DAG: [[LOC_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[PRIV]], align 8
+ // CHECK-DAG: store ptr [[LOC_LOAD]], ptr [[NoAS]], align 8
GLOB = (__attribute__((opencl_global)) int *)NoAS;
- // CHECK: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]], align 8
- // CHECK: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr [[NoAS_LOAD]] to
ptr addrspace(1)
- // CHECK: store ptr addrspace(1) [[NoAS_CAST]], ptr [[GLOB]], align 8
+ // CHECK-DAG: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]], align 8
+ // CHECK-DAG: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr [[NoAS_LOAD]]
to ptr addrspace(1)
+ // CHECK-DAG: store ptr addrspace(1) [[NoAS_CAST]], ptr [[GLOB]], align 8
LOC = (__attribute__((opencl_local)) int *)NoAS;
- // CHECK: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]], align 8
- // CHECK: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr [[NoAS_LOAD]] to
ptr addrspace(3)
- // CHECK: store ptr addrspace(3) [[NoAS_CAST]], ptr [[LOC]], align 8
+ // CHECK-DAG: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]], align 8
+ // CHECK-DAG: [[NoAS_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr [[NoAS_LOAD]]
to ptr addrspace(3)
+ // CHECK-DAG: store ptr addrspace(3) [[NoAS_CAST]], ptr [[LOC]], align 8
PRIV = (__attribute__((opencl_private)) int *)NoAS;
- // CHECK: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]], align 8
- // CHECK: store ptr [[NoAS_LOAD]], ptr [[PRIV]], align 8
+ // CHECK-DAG: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]], align 8
+ // CHECK-DAG: store ptr [[NoAS_LOAD]], ptr [[PRIV]], align 8
GLOB = (__attribute__((opencl_global)) int *)GLOBDEVICE;
- // CHECK: [[GLOBDEVICE_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB_DEVICE]], align 8
- // CHECK: store ptr addrspace(1) [[GLOBDEVICE_LOAD]], ptr %GLOB, align 8
+ // CHECK-DAG: [[GLOBDEVICE_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB_DEVICE]], align 8
+ // CHECK-DAG: store ptr addrspace(1) [[GLOBDEVICE_LOAD]], ptr %GLOB, align 8
GLOB = (__attribute__((opencl_global)) int *)GLOBHOST;
- // CHECK: [[GLOB_HOST_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB_HOST]], align 8
- // CHECK: store ptr addrspace(1) [[GLOB_HOST_LOAD]], ptr [[GLOB]], align 8
+ // CHECK-DAG: [[GLOB_HOST_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB_HOST]], align 8
+ // CHECK-DAG: store ptr addrspace(1) [[GLOB_HOST_LOAD]], ptr [[GLOB]], align
8
bar(*GLOB);
- // CHECK: [[GLOB_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr [[GLOB]],
align 8
- // CHECK: [[GLOB_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD]] to ptr
- // CHECK: call void @[[RAW_REF]](ptr noundef nonnull align 4
dereferenceable(4) [[GLOB_CAST]])
+ // CHECK-DAG: [[GLOB_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]], align 8
+ // CHECK-DAG: [[GLOB_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD]] to ptr
+ // CHECK-DAG: call void @[[RAW_REF]](ptr noundef nonnull align 4
dereferenceable(4) [[GLOB_CAST]])
bar2(*GLOB);
- // CHECK: [[GLOB_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr [[GLOB]],
align 8
- // CHECK: [[GLOB_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD]] to ptr
- // CHECK: call void @[[RAW_REF2]](ptr noundef nonnull align 4
dereferenceable(4) [[GLOB_CAST]])
+ // CHECK-DAG: [[GLOB_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]], align 8
+ // CHECK-DAG: [[GLOB_CAST:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD]] to ptr
+ // CHECK-DAG: call void @[[RAW_REF2]](ptr noundef nonnull align 4
dereferenceable(4) [[GLOB_CAST]])
bar(*LOC);
- // CHECK: [[LOC_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr [[LOC]],
align 8
- // CHECK: call void @[[LOCAL_REF]](ptr addrspace(3) noundef align 4
dereferenceable(4) [[LOC_LOAD]])
+ // CHECK-DAG: [[LOC_LOAD:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]], align 8
+ // CHECK-DAG: call void @[[LOCAL_REF]](ptr addrspace(3) noundef align 4
dereferenceable(4) [[LOC_LOAD]])
bar2(*LOC);
- // CHECK: [[LOC_LOAD2:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr [[LOC]],
align 8
- // CHECK: [[LOC_CAST2:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD2]] to ptr
- // CHECK: call void @[[RAW_REF2]](ptr noundef nonnull align 4
dereferenceable(4) [[LOC_CAST2]])
+ // CHECK-DAG: [[LOC_LOAD2:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]], align 8
+ // CHECK-DAG: [[LOC_CAST2:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD2]] to ptr
+ // CHECK-DAG: call void @[[RAW_REF2]](ptr noundef nonnull align 4
dereferenceable(4) [[LOC_CAST2]])
bar(*NoAS);
- // CHECK: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]], align 8
- // CHECK: call void @[[RAW_REF]](ptr noundef nonnull align 4
dereferenceable(4) [[NoAS_LOAD]])
+ // CHECK-DAG: [[NoAS_LOAD:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]], align 8
+ // CHECK-DAG: call void @[[RAW_REF]](ptr noundef nonnull align 4
dereferenceable(4) [[NoAS_LOAD]])
bar2(*NoAS);
- // CHECK: [[NoAS_LOAD2:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]], align 8
- // CHECK: call void @[[RAW_REF2]](ptr noundef nonnull align 4
dereferenceable(4) [[NoAS_LOAD2]])
+ // CHECK-DAG: [[NoAS_LOAD2:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]], align 8
+ // CHECK-DAG: call void @[[RAW_REF2]](ptr noundef nonnull align 4
dereferenceable(4) [[NoAS_LOAD2]])
foo(GLOB);
- // CHECK: [[GLOB_LOAD3:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]], align 8
- // CHECK: [[GLOB_CAST3:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD3]] to ptr
- // CHECK: call void @[[RAW_PTR]](ptr noundef [[GLOB_CAST3]])
+ // CHECK-DAG: [[GLOB_LOAD3:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]], align 8
+ // CHECK-DAG: [[GLOB_CAST3:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD3]] to ptr
+ // CHECK-DAG: call void @[[RAW_PTR]](ptr noundef [[GLOB_CAST3]])
foo2(GLOB);
- // CHECK: [[GLOB_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]], align 8
- // CHECK: [[GLOB_CAST4:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD4]] to ptr
- // CHECK: call void @[[RAW_PTR2]](ptr noundef [[GLOB_CAST4]])
+ // CHECK-DAG: [[GLOB_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]], align 8
+ // CHECK-DAG: [[GLOB_CAST4:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(1)
[[GLOB_LOAD4]] to ptr
+ // CHECK-DAG: call void @[[RAW_PTR2]](ptr noundef [[GLOB_CAST4]])
foo(LOC);
- // CHECK: [[LOC_LOAD3:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr [[LOC]],
align 8
- // CHECK: call void @[[LOC_PTR]](ptr addrspace(3) noundef [[LOC_LOAD3]])
+ // CHECK-DAG: [[LOC_LOAD3:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]], align 8
+ // CHECK-DAG: call void @[[LOC_PTR]](ptr addrspace(3) noundef [[LOC_LOAD3]])
foo2(LOC);
- // CHECK: [[LOC_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr [[LOC]],
align 8
- // CHECK: [[LOC_CAST4:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD4]] to ptr
- // CHECK: call void @[[RAW_PTR2]](ptr noundef [[LOC_CAST4]])
+ // CHECK-DAG: [[LOC_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]], align 8
+ // CHECK-DAG: [[LOC_CAST4:%[a-zA-Z0-9]+]] = addrspacecast ptr addrspace(3)
[[LOC_LOAD4]] to ptr
+ // CHECK-DAG: call void @[[RAW_PTR2]](ptr noundef [[LOC_CAST4]])
foo(NoAS);
- // CHECK: [[NoAS_LOAD3:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]], align 8
- // CHECK: call void @[[RAW_PTR]](ptr noundef [[NoAS_LOAD3]])
+ // CHECK-DAG: [[NoAS_LOAD3:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]], align 8
+ // CHECK-DAG: call void @[[RAW_PTR]](ptr noundef [[NoAS_LOAD3]])
foo2(NoAS);
- // CHECK: [[NoAS_LOAD4:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]], align 8
- // CHECK: call void @[[RAW_PTR2]](ptr noundef [[NoAS_LOAD4]])
+ // CHECK-DAG: [[NoAS_LOAD4:%[a-zA-Z0-9]+]] = load ptr, ptr [[NoAS]], align 8
+ // CHECK-DAG: call void @[[RAW_PTR2]](ptr noundef [[NoAS_LOAD4]])
tmpl(GLOB);
- // CHECK: [[GLOB_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]], align 8
- // CHECK: call void @_Z4tmplIPU3AS1iEvT_(ptr addrspace(1) noundef
[[GLOB_LOAD4]])
+ // CHECK-DAG: [[GLOB_LOAD4:%[a-zA-Z0-9]+]] = load ptr addrspace(1), ptr
[[GLOB]], align 8
+ // CHECK-DAG: call void @_Z4tmplIPU3AS1iEvT_(ptr addrspace(1) noundef
[[GLOB_LOAD4]])
tmpl(LOC);
- // CHECK: [[LOC_LOAD5:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr [[LOC]],
align 8
- // CHECK: call void @_Z4tmplIPU3AS3iEvT_(ptr addrspace(3) noundef
[[LOC_LOAD5]])
+ // CHECK-DAG: [[LOC_LOAD5:%[a-zA-Z0-9]+]] = load ptr addrspace(3), ptr
[[LOC]], align 8
+ // CHECK-DAG: call void @_Z4tmplIPU3AS3iEvT_(ptr addrspace(3) noundef
[[LOC_LOAD5]])
tmpl(PRIV);
- // CHECK: [[PRIV_LOAD5:%[a-zA-Z0-9]+]] = load ptr, ptr [[PRIV]], align 8
- // CHECK: call void @_Z4tmplIPiEvT_(ptr noundef [[PRIV_LOAD5]])
+ // CHECK-DAG: [[PRIV_LOAD5:%[a-zA-Z0-9]+]] = load ptr, ptr [[PRIV]], align 8
+ // CHECK-DAG: call void @_Z4tmplIPiEvT_(ptr noundef [[PRIV_LOAD5]])
tmpl(NoAS);
-// CHECK: %33 = load ptr, ptr %NoAS, align 8
-// CHECK: call void @_Z4tmplIPiEvT_(ptr noundef %33)
+// CHECK-DAG: %33 = load ptr, ptr %NoAS, align 8
+// CHECK-DAG: call void @_Z4tmplIPiEvT_(ptr noundef %33)
}
-// CHECK: declare void @_Z4tmplIPU3AS1iEvT_(ptr addrspace(1) noundef)
-// CHECK: declare void @_Z4tmplIPU3AS3iEvT_(ptr addrspace(3) noundef)
-// CHECK: declare void @_Z4tmplIPiEvT_(ptr noundef)
+// CHECK-DAG: void @_Z4tmplIPU3AS1iEvT_(ptr addrspace(1) noundef
+// CHECK-DAG: void @_Z4tmplIPU3AS3iEvT_(ptr addrspace(3) noundef
+// CHECK-DAG: void @_Z4tmplIPiEvT_(ptr noundef
diff --git a/clang/test/CodeGenSYCL/function-attrs.cpp
b/clang/test/CodeGenSYCL/function-attrs.cpp
index 83a77a617240a..f70c918c66c7b 100644
--- a/clang/test/CodeGenSYCL/function-attrs.cpp
+++ b/clang/test/CodeGenSYCL/function-attrs.cpp
@@ -5,11 +5,11 @@
int foo();
// CHECK-LABEL: define dso_local spir_func void @_Z3barv(
-// CHECK-SAME: ) #[[ATTR0:[0-9]+]] {
+// CHECK-SAME: ) #[[ATTR2:[0-9]+]] {
// CHECK-NEXT: entry:
// CHECK-NEXT: [[A:%.*]] = alloca i32, align 4
// CHECK-NEXT: [[A_ASCAST:%.*]] = addrspacecast ptr [[A]] to ptr
addrspace(4)
-// CHECK-NEXT: [[CALL:%.*]] = call spir_func noundef i32 @_Z3foov()
#[[ATTR1:[0-9]+]]
+// CHECK-NEXT: [[CALL:%.*]] = call spir_func noundef i32 @_Z3foov()
#[[ATTR3:[0-9]+]]
// CHECK-NEXT: store i32 [[CALL]], ptr addrspace(4) [[A_ASCAST]], align 4
// CHECK-NEXT: ret void
//
@@ -18,7 +18,7 @@ void bar() {
}
// CHECK-LABEL: define dso_local spir_func noundef i32 @_Z3foov(
-// CHECK-SAME: ) #[[ATTR0]] {
+// CHECK-SAME: ) #[[ATTR2]] {
// CHECK-NEXT: entry:
// CHECK-NEXT: [[RETVAL:%.*]] = alloca i32, align 4
// CHECK-NEXT: [[RETVAL_ASCAST:%.*]] = addrspacecast ptr [[RETVAL]] to ptr
addrspace(4)
@@ -29,21 +29,10 @@ int foo() {
}
template <typename Name, typename Func>
-__attribute__((sycl_kernel)) void kernel_single_task(const Func &kernelFunc) {
+[[clang::sycl_external]] void kernel_single_task(const Func &kernelFunc) {
kernelFunc();
}
-// CHECK-LABEL: define dso_local noundef i32 @main(
-// CHECK-SAME: ) #[[ATTR0]] {
-// CHECK-NEXT: entry:
-// CHECK-NEXT: [[RETVAL:%.*]] = alloca i32, align 4
-// CHECK-NEXT: [[REF_TMP:%.*]] = alloca [[CLASS_ANON:%.*]], align 1
-// CHECK-NEXT: [[RETVAL_ASCAST:%.*]] = addrspacecast ptr [[RETVAL]] to ptr
addrspace(4)
-// CHECK-NEXT: [[REF_TMP_ASCAST:%.*]] = addrspacecast ptr [[REF_TMP]] to
ptr addrspace(4)
-// CHECK-NEXT: store i32 0, ptr addrspace(4) [[RETVAL_ASCAST]], align 4
-// CHECK-NEXT: call spir_func void
@_Z18kernel_single_taskIZ4mainE11fake_kernelZ4mainEUlvE_EvRKT0_(ptr
addrspace(4) noundef align 1 dereferenceable(1) [[REF_TMP_ASCAST]]) #[[ATTR1]]
-// CHECK-NEXT: ret i32 0
-//
int main() {
kernel_single_task<class fake_kernel>([] { bar(); });
return 0;
@@ -52,5 +41,5 @@ int main() {
// CHECK: attributes #0 = { convergent mustprogress noinline norecurse
nounwind optnone "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
// CHECK: attributes #1 = { convergent nounwind }
//.
-// CHECK: !0 = !{i32 1, !"wchar_size", i32 4}
+// CHECK: !{{[0-9]+}} = !{i32 1, !"wchar_size", i32 4}
//.
diff --git a/clang/test/CodeGenSYCL/unique_stable_name.cpp
b/clang/test/CodeGenSYCL/unique_stable_name.cpp
index cc9dd61f435d7..3ab7e3b8f2e7a 100644
--- a/clang/test/CodeGenSYCL/unique_stable_name.cpp
+++ b/clang/test/CodeGenSYCL/unique_stable_name.cpp
@@ -1,22 +1,22 @@
-// RUN: %clang_cc1 -triple spir64-unknown-unknown-sycldevice -fsycl-is-device
-disable-llvm-passes -emit-llvm %s -o - | FileCheck %s
-// CHECK: @[[LAMBDA_KERNEL3:[^\w]+]] = private unnamed_addr addrspace(1)
constant [[LAMBDA_K3_SIZE:\[[0-9]+ x i8\]]] c"_ZTSZ4mainEUlPZ4mainEUlvE_E_\00"
-// CHECK: @[[INT1:[^\w]+]] = private unnamed_addr addrspace(1) constant
[[INT_SIZE:\[[0-9]+ x i8\]]] c"_ZTSi\00"
-// CHECK: @[[STRING:[^\w]+]] = private unnamed_addr addrspace(1) constant
[[STRING_SIZE:\[[0-9]+ x i8\]]] c"_ZTSAppL_ZZ4mainE1jE_i\00",
-// CHECK: @[[INT2:[^\w]+]] = private unnamed_addr addrspace(1) constant
[[INT_SIZE]] c"_ZTSi\00"
-// CHECK: @[[LAMBDA_X:[^\w]+]] = private unnamed_addr addrspace(1) constant
[[LAMBDA_X_SIZE:\[[0-9]+ x i8\]]] c"_ZTSZZ4mainENKUlvE0_clEvEUlvE_\00"
-// CHECK: @[[MACRO_X:[^\w]+]] = private unnamed_addr addrspace(1) constant
[[MACRO_SIZE:\[[0-9]+ x i8\]]] c"_ZTSZZ4mainENKUlvE0_clEvEUlvE0_\00"
-// CHECK: @[[MACRO_Y:[^\w]+]] = private unnamed_addr addrspace(1) constant
[[MACRO_SIZE]] c"_ZTSZZ4mainENKUlvE0_clEvEUlvE1_\00"
-// CHECK: @{{.*}} = private unnamed_addr addrspace(1) constant [32 x i8]
c"_ZTSZZ4mainENKUlvE0_clEvEUlvE2_\00", align 1
-// CHECK: @{{.*}} = private unnamed_addr addrspace(1) constant [32 x i8]
c"_ZTSZZ4mainENKUlvE0_clEvEUlvE3_\00", align 1
-// CHECK: @[[MACRO_MACRO_X:[^\w]+]] = private unnamed_addr addrspace(1)
constant [[MACRO_MACRO_SIZE:\[[0-9]+ x i8\]]]
c"_ZTSZZ4mainENKUlvE0_clEvEUlvE4_\00"
-// CHECK: @[[MACRO_MACRO_Y:[^\w]+]] = private unnamed_addr addrspace(1)
constant [[MACRO_MACRO_SIZE]] c"_ZTSZZ4mainENKUlvE0_clEvEUlvE5_\00"
-// CHECK: @[[INT3:[^\w]+]] = private unnamed_addr addrspace(1) constant
[[INT_SIZE]] c"_ZTSi\00"
-// CHECK: @[[LAMBDA:[^\w]+]] = private unnamed_addr addrspace(1) constant
[[LAMBDA_SIZE:\[[0-9]+ x i8\]]] c"_ZTSZZ4mainENKUlvE0_clEvEUlvE_\00"
-// CHECK: @[[LAMBDA_IN_DEP_INT:[^\w]+]] = private unnamed_addr addrspace(1)
constant [[DEP_INT_SIZE:\[[0-9]+ x i8\]]]
c"_ZTSZ28lambda_in_dependent_functionIiEvvEUlvE_\00",
-// CHECK: @[[LAMBDA_IN_DEP_X:[^\w]+]] = private unnamed_addr addrspace(1)
constant [[DEP_LAMBDA_SIZE:\[[0-9]+ x i8\]]]
c"_ZTSZ28lambda_in_dependent_functionIZZ4mainENKUlvE0_clEvEUlvE_EvvEUlvE_\00",
-// CHECK: @[[LAMBDA_NO_DEP:[^\w]+]] = private unnamed_addr addrspace(1)
constant [[NO_DEP_LAMBDA_SIZE:\[[0-9]+ x i8\]]]
c"_ZTSZ13lambda_no_depIidEvT_T0_EUlidE_\00",
-// CHECK: @[[LAMBDA_TWO_DEP:[^\w]+]] = private unnamed_addr addrspace(1)
constant [[DEP_LAMBDA1_SIZE:\[[0-9]+ x i8\]]]
c"_ZTSZ14lambda_two_depIZZ4mainENKUlvE0_clEvEUliE_ZZ4mainENKS0_clEvEUldE_EvvEUlvE_\00",
-// CHECK: @[[LAMBDA_TWO_DEP2:[^\w]+]] = private unnamed_addr addrspace(1)
constant [[DEP_LAMBDA2_SIZE:\[[0-9]+ x i8\]]]
c"_ZTSZ14lambda_two_depIZZ4mainENKUlvE0_clEvEUldE_ZZ4mainENKS0_clEvEUliE_EvvEUlvE_\00",
+// RUN: %clang_cc1 -triple x86_64-linux-pc -fsycl-is-host -disable-llvm-passes
-emit-llvm %s -o - | FileCheck %s
+// CHECK: @[[LAMBDA_KERNEL3:[^\w]+]] = private unnamed_addr constant
[[LAMBDA_K3_SIZE:\[[0-9]+ x i8\]]] c"_ZTSZ4mainEUlPZ4mainEUlvE_E_\00"
+// CHECK: @[[INT1:[^\w]+]] = private unnamed_addr constant [[INT_SIZE:\[[0-9]+
x i8\]]] c"_ZTSi\00"
+// CHECK: @[[STRING:[^\w]+]] = private unnamed_addr constant
[[STRING_SIZE:\[[0-9]+ x i8\]]] c"_ZTSAppL_ZZ4mainE1jE_i\00",
+// CHECK: @[[INT2:[^\w]+]] = private unnamed_addr constant [[INT_SIZE]]
c"_ZTSi\00"
+// CHECK: @[[LAMBDA_X:[^\w]+]] = private unnamed_addr constant
[[LAMBDA_X_SIZE:\[[0-9]+ x i8\]]] c"_ZTSZZ4mainENKUlvE0_clEvEUlvE_\00"
+// CHECK: @[[MACRO_X:[^\w]+]] = private unnamed_addr constant
[[MACRO_SIZE:\[[0-9]+ x i8\]]] c"_ZTSZZ4mainENKUlvE0_clEvEUlvE0_\00"
+// CHECK: @[[MACRO_Y:[^\w]+]] = private unnamed_addr constant [[MACRO_SIZE]]
c"_ZTSZZ4mainENKUlvE0_clEvEUlvE1_\00"
+// CHECK: @{{.*}} = private unnamed_addr constant [32 x i8]
c"_ZTSZZ4mainENKUlvE0_clEvEUlvE2_\00", align 1
+// CHECK: @{{.*}} = private unnamed_addr constant [32 x i8]
c"_ZTSZZ4mainENKUlvE0_clEvEUlvE3_\00", align 1
+// CHECK: @[[MACRO_MACRO_X:[^\w]+]] = private unnamed_addr constant
[[MACRO_MACRO_SIZE:\[[0-9]+ x i8\]]] c"_ZTSZZ4mainENKUlvE0_clEvEUlvE4_\00"
+// CHECK: @[[MACRO_MACRO_Y:[^\w]+]] = private unnamed_addr constant
[[MACRO_MACRO_SIZE]] c"_ZTSZZ4mainENKUlvE0_clEvEUlvE5_\00"
+// CHECK: @[[INT3:[^\w]+]] = private unnamed_addr constant [[INT_SIZE]]
c"_ZTSi\00"
+// CHECK: @[[LAMBDA:[^\w]+]] = private unnamed_addr constant
[[LAMBDA_SIZE:\[[0-9]+ x i8\]]] c"_ZTSZZ4mainENKUlvE0_clEvEUlvE_\00"
+// CHECK: @[[LAMBDA_IN_DEP_INT:[^\w]+]] = private unnamed_addr constant
[[DEP_INT_SIZE:\[[0-9]+ x i8\]]]
c"_ZTSZ28lambda_in_dependent_functionIiEvvEUlvE_\00",
+// CHECK: @[[LAMBDA_IN_DEP_X:[^\w]+]] = private unnamed_addr constant
[[DEP_LAMBDA_SIZE:\[[0-9]+ x i8\]]]
c"_ZTSZ28lambda_in_dependent_functionIZZ4mainENKUlvE0_clEvEUlvE_EvvEUlvE_\00",
+// CHECK: @[[LAMBDA_NO_DEP:[^\w]+]] = private unnamed_addr constant
[[NO_DEP_LAMBDA_SIZE:\[[0-9]+ x i8\]]]
c"_ZTSZ13lambda_no_depIidEvT_T0_EUlidE_\00",
+// CHECK: @[[LAMBDA_TWO_DEP:[^\w]+]] = private unnamed_addr constant
[[DEP_LAMBDA1_SIZE:\[[0-9]+ x i8\]]]
c"_ZTSZ14lambda_two_depIZZ4mainENKUlvE0_clEvEUliE_ZZ4mainENKS0_clEvEUldE_EvvEUlvE_\00",
+// CHECK: @[[LAMBDA_TWO_DEP2:[^\w]+]] = private unnamed_addr constant
[[DEP_LAMBDA2_SIZE:\[[0-9]+ x i8\]]]
c"_ZTSZ14lambda_two_depIZZ4mainENKUlvE0_clEvEUldE_ZZ4mainENKS0_clEvEUliE_EvvEUlvE_\00",
extern "C" void puts(const char *) {}
@@ -65,95 +65,105 @@ template <typename KernelName, typename KernelType>
kernelFunc();
}
+template<typename KernelType>
+void unnamed_kernel_single_task(KernelType kernelFunc) {
+ kernel_single_task<KernelType>(kernelFunc);
+}
+
+template <typename KernelName, typename KernelType>
+void not_kernel_single_task(KernelType kernelFunc) {
+ kernelFunc();
+}
+
int main() {
- kernel_single_task<class kernel2>(func<Derp>);
- // CHECK: call spir_func void
@_Z18kernel_single_taskIZ4mainE7kernel2PFPKcvEEvT0_(ptr noundef
@_Z4funcI4DerpEDTu33__builtin_sycl_unique_stable_nameDtsrT_3strEEEv)
+ not_kernel_single_task<class kernel2>(func<Derp>);
+ // CHECK: call void
@_Z22not_kernel_single_taskIZ4mainE7kernel2PFPKcvEEvT0_(ptr noundef
@_Z4funcI4DerpEDTu33__builtin_sycl_unique_stable_nameDtsrT_3strEEEv)
auto l1 = []() { return 1; };
auto l2 = [](decltype(l1) *l = nullptr) { return 2; };
- kernel_single_task<class kernel3>(l2);
+ kernel_single_task<decltype(l2)>(l2);
puts(__builtin_sycl_unique_stable_name(decltype(l2)));
- // CHECK: call spir_func void
@_Z18kernel_single_taskIZ4mainE7kernel3Z4mainEUlPZ4mainEUlvE_E_EvT0_
- // CHECK: call spir_func void @puts(ptr addrspace(4) noundef addrspacecast
(ptr addrspace(1) @[[LAMBDA_KERNEL3]] to ptr addrspace(4)))
+ // CHECK: call void @_Z18kernel_single_taskIZ4mainEUlPZ4mainEUlvE_E_S2_EvT0_
+ // CHECK: call void @puts(ptr noundef @[[LAMBDA_KERNEL3]])
constexpr const char str[] = "lalala";
static_assert(__builtin_strcmp(__builtin_sycl_unique_stable_name(decltype(str)),
"_ZTSA7_Kc\0") == 0, "unexpected mangling");
int i = 0;
puts(__builtin_sycl_unique_stable_name(decltype(i++)));
- // CHECK: call spir_func void @puts(ptr addrspace(4) noundef addrspacecast
(ptr addrspace(1) @[[INT1]] to ptr addrspace(4)))
+ // CHECK: call void @puts(ptr noundef @[[INT1]])
// FIXME: Ensure that j is incremented because VLAs are terrible.
int j = 55;
puts(__builtin_sycl_unique_stable_name(int[++j]));
- // CHECK: call spir_func void @puts(ptr addrspace(4) noundef addrspacecast
(ptr addrspace(1) @[[STRING]] to ptr addrspace(4)))
+ // CHECK: call void @puts(ptr noundef @[[STRING]])
- // CHECK: define internal spir_func void
@_Z18kernel_single_taskIZ4mainE7kernel2PFPKcvEEvT0_
- // CHECK: declare spir_func noundef ptr addrspace(4)
@_Z4funcI4DerpEDTu33__builtin_sycl_unique_stable_nameDtsrT_3strEEEv
- // CHECK: define internal spir_func void
@_Z18kernel_single_taskIZ4mainE7kernel3Z4mainEUlPZ4mainEUlvE_E_EvT0_
- // CHECK: define internal spir_func void
@_Z18kernel_single_taskIZ4mainE6kernelZ4mainEUlvE0_EvT0_
+ // CHECK: define internal void
@_Z22not_kernel_single_taskIZ4mainE7kernel2PFPKcvEEvT0_
+ // CHECK: declare noundef ptr
@_Z4funcI4DerpEDTu33__builtin_sycl_unique_stable_nameDtsrT_3strEEEv
+ // CHECK: define internal void
@_Z18kernel_single_taskIZ4mainEUlPZ4mainEUlvE_E_S2_EvT0_
+ // CHECK: define internal void @_Z18kernel_single_taskIZ4mainEUlvE0_S0_EvT0_
- kernel_single_task<class kernel>(
+ unnamed_kernel_single_task(
[]() {
puts(__builtin_sycl_unique_stable_name(int));
- // CHECK: call spir_func void @puts(ptr addrspace(4) noundef
addrspacecast (ptr addrspace(1) @[[INT2]] to ptr addrspace(4)))
+ // CHECK: call void @puts(ptr noundef @[[INT2]])
auto x = []() {};
puts(__builtin_sycl_unique_stable_name(decltype(x)));
- // CHECK: call spir_func void @puts(ptr addrspace(4) noundef
addrspacecast (ptr addrspace(1) @[[LAMBDA_X]] to ptr addrspace(4)))
+ // CHECK: call void @puts(ptr noundef @[[LAMBDA_X]])
DEF_IN_MACRO();
- // CHECK: call spir_func void @puts(ptr addrspace(4) noundef
addrspacecast (ptr addrspace(1) @[[MACRO_X]] to ptr addrspace(4)))
- // CHECK: call spir_func void @puts(ptr addrspace(4) noundef
addrspacecast (ptr addrspace(1) @[[MACRO_Y]] to ptr addrspace(4)))
+ // CHECK: call void @puts(ptr noundef @[[MACRO_X]])
+ // CHECK: call void @puts(ptr noundef @[[MACRO_Y]])
MACRO_CALLS_MACRO();
- // CHECK: call spir_func void @puts(ptr addrspace(4) noundef
addrspacecast (ptr addrspace(1) @[[MACRO_MACRO_X]] to ptr addrspace(4)))
- // CHECK: call spir_func void @puts(ptr addrspace(4) noundef
addrspacecast (ptr addrspace(1) @[[MACRO_MACRO_Y]] to ptr addrspace(4)))
+ // CHECK: call void @puts(ptr noundef @[[MACRO_MACRO_X]])
+ // CHECK: call void @puts(ptr noundef @[[MACRO_MACRO_Y]])
template_param<int>();
- // CHECK: call spir_func void @_Z14template_paramIiEvv
+ // CHECK: call void @_Z14template_paramIiEvv
template_param<decltype(x)>();
- // CHECK: call spir_func void
@_Z14template_paramIZZ4mainENKUlvE0_clEvEUlvE_Evv
+ // CHECK: call void @_Z14template_paramIZZ4mainENKUlvE0_clEvEUlvE_Evv
lambda_in_dependent_function<int>();
- // CHECK: call spir_func void @_Z28lambda_in_dependent_functionIiEvv
+ // CHECK: call void @_Z28lambda_in_dependent_functionIiEvv
lambda_in_dependent_function<decltype(x)>();
- // CHECK: call spir_func void
@_Z28lambda_in_dependent_functionIZZ4mainENKUlvE0_clEvEUlvE_Evv
+ // CHECK: call void
@_Z28lambda_in_dependent_functionIZZ4mainENKUlvE0_clEvEUlvE_Evv
lambda_no_dep<int, double>(3, 5.5);
- // CHECK: call spir_func void @_Z13lambda_no_depIidEvT_T0_(i32 noundef
3, double noundef 5.500000e+00)
+ // CHECK: call void @_Z13lambda_no_depIidEvT_T0_(i32 noundef 3, double
noundef 5.500000e+00)
int a = 5;
double b = 10.7;
auto y = [](int a) { return a; };
auto z = [](double b) { return b; };
lambda_two_dep<decltype(y), decltype(z)>();
- // CHECK: call spir_func void
@_Z14lambda_two_depIZZ4mainENKUlvE0_clEvEUliE_ZZ4mainENKS0_clEvEUldE_Evv
+ // CHECK: call void
@_Z14lambda_two_depIZZ4mainENKUlvE0_clEvEUliE_ZZ4mainENKS0_clEvEUldE_Evv
lambda_two_dep<decltype(z), decltype(y)>();
- // CHECK: call spir_func void
@_Z14lambda_two_depIZZ4mainENKUlvE0_clEvEUldE_ZZ4mainENKS0_clEvEUliE_Evv
+ // CHECK: call void
@_Z14lambda_two_depIZZ4mainENKUlvE0_clEvEUldE_ZZ4mainENKS0_clEvEUliE_Evv
});
}
-// CHECK: define linkonce_odr spir_func void @_Z14template_paramIiEvv
-// CHECK: call spir_func void @puts(ptr addrspace(4) noundef addrspacecast
(ptr addrspace(1) @[[INT3]] to ptr addrspace(4)))
+// CHECK: define linkonce_odr void @_Z14template_paramIiEvv
+// CHECK: call void @puts(ptr noundef @[[INT3]])
-// CHECK: define internal spir_func void
@_Z14template_paramIZZ4mainENKUlvE0_clEvEUlvE_Evv
-// CHECK: call spir_func void @puts(ptr addrspace(4) noundef addrspacecast
(ptr addrspace(1) @[[LAMBDA]] to ptr addrspace(4)))
+// CHECK: define internal void
@_Z14template_paramIZZ4mainENKUlvE0_clEvEUlvE_Evv
+// CHECK: call void @puts(ptr noundef @[[LAMBDA]])
-// CHECK: define linkonce_odr spir_func void
@_Z28lambda_in_dependent_functionIiEvv
-// CHECK: call spir_func void @puts(ptr addrspace(4) noundef addrspacecast
(ptr addrspace(1) @[[LAMBDA_IN_DEP_INT]] to ptr addrspace(4)))
+// CHECK: define linkonce_odr void @_Z28lambda_in_dependent_functionIiEvv
+// CHECK: call void @puts(ptr noundef @[[LAMBDA_IN_DEP_INT]])
-// CHECK: define internal spir_func void
@_Z28lambda_in_dependent_functionIZZ4mainENKUlvE0_clEvEUlvE_Evv
-// CHECK: call spir_func void @puts(ptr addrspace(4) noundef addrspacecast
(ptr addrspace(1) @[[LAMBDA_IN_DEP_X]] to ptr addrspace(4)))
+// CHECK: define internal void
@_Z28lambda_in_dependent_functionIZZ4mainENKUlvE0_clEvEUlvE_Evv
+// CHECK: call void @puts(ptr noundef @[[LAMBDA_IN_DEP_X]])
-// CHECK: define linkonce_odr spir_func void @_Z13lambda_no_depIidEvT_T0_(i32
noundef %a, double noundef %b)
-// CHECK: call spir_func void @puts(ptr addrspace(4) noundef addrspacecast
(ptr addrspace(1) @[[LAMBDA_NO_DEP]] to ptr addrspace(4)))
+// CHECK: define linkonce_odr void @_Z13lambda_no_depIidEvT_T0_(i32 noundef
%a, double noundef %b)
+// CHECK: call void @puts(ptr noundef @[[LAMBDA_NO_DEP]])
-// CHECK: define internal spir_func void
@_Z14lambda_two_depIZZ4mainENKUlvE0_clEvEUliE_ZZ4mainENKS0_clEvEUldE_Evv
-// CHECK: call spir_func void @puts(ptr addrspace(4) noundef addrspacecast
(ptr addrspace(1) @[[LAMBDA_TWO_DEP]] to ptr addrspace(4)))
+// CHECK: define internal void
@_Z14lambda_two_depIZZ4mainENKUlvE0_clEvEUliE_ZZ4mainENKS0_clEvEUldE_Evv
+// CHECK: call void @puts(ptr noundef @[[LAMBDA_TWO_DEP]])
-// CHECK: define internal spir_func void
@_Z14lambda_two_depIZZ4mainENKUlvE0_clEvEUldE_ZZ4mainENKS0_clEvEUliE_Evv
-// CHECK: call spir_func void @puts(ptr addrspace(4) noundef addrspacecast
(ptr addrspace(1) @[[LAMBDA_TWO_DEP2]] to ptr addrspace(4)))
+// CHECK: define internal void
@_Z14lambda_two_depIZZ4mainENKUlvE0_clEvEUldE_ZZ4mainENKS0_clEvEUliE_Evv
+// CHECK: call void @puts(ptr noundef @[[LAMBDA_TWO_DEP2]])
diff --git a/clang/test/CodeGenSYCL/unique_stable_name_windows_diff.cpp
b/clang/test/CodeGenSYCL/unique_stable_name_windows_diff.cpp
index 7dd08a0c89255..4603c5e14e09f 100644
--- a/clang/test/CodeGenSYCL/unique_stable_name_windows_diff.cpp
+++ b/clang/test/CodeGenSYCL/unique_stable_name_windows_diff.cpp
@@ -1,22 +1,37 @@
-// RUN: %clang_cc1 -triple spir64-unknown-unknown-sycldevice -aux-triple
x86_64-pc-windows-msvc -fsycl-is-device -disable-llvm-passes -fsycl-is-device
-emit-llvm %s -o - | FileCheck %s '-D$ADDRSPACE=addrspace(1) '
+// RUN: %clang_cc1 -triple spir64-unknown-unknown -aux-triple
x86_64-pc-windows-msvc -fsycl-is-device -disable-llvm-passes -fsycl-is-device
-emit-llvm %s -o - | FileCheck %s '-D$ADDRSPACE=addrspace(1) '
// RUN: %clang_cc1 -triple x86_64-pc-windows-msvc -fsycl-is-device
-disable-llvm-passes -fsycl-is-device -emit-llvm %s -o - | FileCheck %s
'-D$ADDRSPACE='
template<typename KN, typename Func>
-__attribute__((sycl_kernel)) void kernel(Func F){
+[[clang::sycl_kernel_entry_point(KN)]] void kernel(Func F){
F();
}
+template<typename Func>
+void kernel_wrapper(Func F) {
+ kernel<Func>(F);
+}
+
template<typename KN, typename Func>
-__attribute__((sycl_kernel)) void kernel2(Func F){
+[[clang::sycl_kernel_entry_point(KN)]] void kernel2(Func F){
F(1);
}
+template<typename Func>
+void kernel2_wrapper(Func F) {
+ kernel2<Func>(F);
+}
+
template<typename KN, typename Func>
-__attribute__((sycl_kernel)) void kernel3(Func F){
+[[clang::sycl_kernel_entry_point(KN)]] void kernel3(Func F){
F(1.1);
}
+template<typename Func>
+void kernel3_wrapper(Func F) {
+ kernel3<Func>(F);
+}
+
int main() {
int i;
double d;
@@ -25,15 +40,17 @@ int main() {
auto lambda2 = [](int){};
auto lambda3 = [](double){};
- kernel<class K1>(lambda1);
- kernel2<class K2>(lambda2);
- kernel3<class K3>(lambda3);
+ kernel_wrapper(lambda1);
+ kernel2_wrapper(lambda2);
+ kernel3_wrapper(lambda3);
// Ensure the kernels are named the same between the device and host
// invocations.
+ kernel_wrapper([](){
(void)__builtin_sycl_unique_stable_name(decltype(lambda1));
(void)__builtin_sycl_unique_stable_name(decltype(lambda2));
(void)__builtin_sycl_unique_stable_name(decltype(lambda3));
+ });
// Make sure the following 3 are the same between the host and device
compile.
// Note that these are NOT the same value as each other, they differ by the
@@ -41,4 +58,11 @@ int main() {
// CHECK: private unnamed_addr [[$ADDRSPACE]]constant [17 x i8]
c"_ZTSZ4mainEUlvE_\00"
// CHECK: private unnamed_addr [[$ADDRSPACE]]constant [17 x i8]
c"_ZTSZ4mainEUliE_\00"
// CHECK: private unnamed_addr [[$ADDRSPACE]]constant [17 x i8]
c"_ZTSZ4mainEUldE_\00"
+
+ // On Windows, ensure that we haven't broken the 'lambda numbering' for thex
+ // lambda itself.
+ // WIN: define internal void @"??R<lambda_1
+ // WIN: define internal void @"??R<lambda_2
+ // WIN: define internal void @"??R<lambda_3
+ // WIN: define internal void @"??R<lambda_4
}
>From 90ead01d1818e3e4ebd8ee8e36edc19b246d1e6a Mon Sep 17 00:00:00 2001
From: Sindhu Chittireddy <sindhu.chittire...@intel.com>
Date: Wed, 4 Jun 2025 14:42:30 -0700
Subject: [PATCH 6/6] Fix formatting
---
clang/lib/AST/ASTContext.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index c02686800b890..865c7efe5e263 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -12909,8 +12909,8 @@ bool ASTContext::DeclMustBeEmitted(const Decl *D) {
if (D->hasAttr<WeakRefAttr>())
return false;
- if (LangOpts.SYCLIsDevice &&
- !D->hasAttr<SYCLKernelEntryPointAttr>() &&
!D->hasAttr<SYCLExternalAttr>())
+ if (LangOpts.SYCLIsDevice && !D->hasAttr<SYCLKernelEntryPointAttr>() &&
+ !D->hasAttr<SYCLExternalAttr>())
return false;
// Aliases and used decls are required.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
