Skip to content

OpenCL C 3.0 patch update: allow nosvm attribute for 3.0 #223

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 2 commits into from
Dec 8, 2020
Merged

OpenCL C 3.0 patch update: allow nosvm attribute for 3.0 #223

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f73a09
OpenCL C 3.0 patch update: allow nosvm attribute for 3.0
azabazno Dec 7, 2020
c710d0c
Keep same error for 2.0
azabazno Dec 7, 2020
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
19 changes: 14 additions & 5 deletions patches/clang/0006-OpenCL-3.0-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ebfc732638fa68d1bc79fbad02011fe71ffc075a Mon Sep 17 00:00:00 2001
From 6dd990a8258c0f46b0202492624770b57c0cca12 Mon Sep 17 00:00:00 2001
From: Anton Zabaznov <anton.zabaznov@intel.com>
Date: Thu, 24 Sep 2020 00:12:24 +0300
Subject: [PATCH] OpenCL 3.0 support
Expand Down Expand Up @@ -27,7 +27,7 @@ Subject: [PATCH] OpenCL 3.0 support
lib/Sema/Sema.cpp | 47 +-
lib/Sema/SemaChecking.cpp | 38 +-
lib/Sema/SemaDecl.cpp | 9 +-
lib/Sema/SemaDeclAttr.cpp | 7 +
lib/Sema/SemaDeclAttr.cpp | 9 +-
lib/Sema/SemaDeclCXX.cpp | 10 +
lib/Sema/SemaType.cpp | 24 +-
test/CodeGenOpenCL/addr-space-struct-arg.cl | 7 +-
Expand Down Expand Up @@ -65,7 +65,7 @@ Subject: [PATCH] OpenCL 3.0 support
.../SemaOpenCL/forget-unsupported-builtins.cl | 23 +
test/SemaOpenCL/invalid-pipe-builtin-cl2.0.cl | 1 +
test/SemaOpenCL/storageclass-cl20.cl | 1 +
61 files changed, 3613 insertions(+), 722 deletions(-)
61 files changed, 3614 insertions(+), 723 deletions(-)
create mode 100644 test/CodeGenOpenCL/generic-address-space-feature.cl
create mode 100644 test/Sema/feature-extensions-simult-support.cl
create mode 100644 test/Sema/features-ignore-pragma.cl
Expand Down Expand Up @@ -6967,9 +6967,18 @@ index 7ddf2e88b7..8105b799e0 100644
<< Scope << "global or constant";
else
diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp
index c4c3598ee7..646aea2bd5 100644
index c4c3598ee7..8e56a1f4f0 100644
--- a/lib/Sema/SemaDeclAttr.cpp
+++ b/lib/Sema/SemaDeclAttr.cpp
@@ -6112,7 +6112,7 @@ static void handleInternalLinkageAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
}

static void handleOpenCLNoSVMAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
- if (S.LangOpts.OpenCLVersion != 200)
+ if (S.LangOpts.OpenCLVersion < 200)
S.Diag(AL.getLoc(), diag::err_attribute_requires_opencl_version)
<< AL << "2.0" << 0;
else
@@ -6194,6 +6194,13 @@ static void handleOpenCLAccessAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
<< AL << PDecl->getType() << DeclTy->isImageType();
D->setInvalidDecl(true);
Expand Down Expand Up @@ -7934,5 +7943,5 @@ index 581701d2a6..469c526ebc 100644
int G2 = 0;
global int G3 = 0;
--
2.17.1
2.29.2