Skip to content

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

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 #221

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73e01d1
OpenCL C 3.0 patch update: allow nosvm attribute for 3.0
azabazno Dec 7, 2020
d0583e2
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
21 changes: 15 additions & 6 deletions patches/clang/0001-OpenCL-3.0-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 911aba1f4a95f914994957a769c938eac04555ca Mon Sep 17 00:00:00 2001
From 01c068c2f8e4e7103b36bc2a5093dd9003b2ef27 Mon Sep 17 00:00:00 2001
From: Anton Zabaznov <[email protected]>
Date: Tue, 22 Sep 2020 19:03:50 +0300
Subject: [PATCH 1/2] OpenCL 3.0 support
Subject: [PATCH] OpenCL 3.0 support

---
clang/include/clang/Basic/Builtins.def | 65 +-
Expand Down Expand Up @@ -29,7 +29,7 @@ Subject: [PATCH 1/2] OpenCL 3.0 support
clang/lib/Sema/Sema.cpp | 47 +-
clang/lib/Sema/SemaChecking.cpp | 38 +-
clang/lib/Sema/SemaDecl.cpp | 15 +-
clang/lib/Sema/SemaDeclAttr.cpp | 7 +
clang/lib/Sema/SemaDeclAttr.cpp | 9 +-
clang/lib/Sema/SemaDeclCXX.cpp | 10 +
clang/lib/Sema/SemaLookup.cpp | 19 +-
clang/lib/Sema/SemaType.cpp | 14 +-
Expand Down Expand Up @@ -71,7 +71,7 @@ Subject: [PATCH 1/2] OpenCL 3.0 support
.../SemaOpenCL/invalid-pipe-builtin-cl2.0.cl | 1 +
clang/test/SemaOpenCL/storageclass-cl20.cl | 1 +
.../TableGen/ClangOpenCLBuiltinEmitter.cpp | 35 +-
67 files changed, 3661 insertions(+), 722 deletions(-)
67 files changed, 3662 insertions(+), 723 deletions(-)
create mode 100644 clang/test/CodeGenOpenCL/generic-address-space-feature.cl
create mode 100644 clang/test/Sema/feature-extensions-simult-support.cl
create mode 100644 clang/test/Sema/features-ignore-pragma.cl
Expand Down Expand Up @@ -7142,9 +7142,18 @@ index 64146f4a912..c1e629b5dc7 100644
<< Scope << "global or constant";
else
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index 849bc09063b..d891526ccb9 100644
index 849bc09063b..c963b95b131 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -6362,7 +6362,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
@@ -6446,6 +6446,13 @@ static void handleOpenCLAccessAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
<< AL << PDecl->getType() << DeclTy->isImageType();
D->setInvalidDecl(true);
Expand Down Expand Up @@ -8249,5 +8258,5 @@ index 41d33b55068..f50652493e5 100644
BuiltinNameEmitter NameChecker(Records, OS);
NameChecker.Emit();
--
2.17.1
2.29.2