Skip to content

OpenCL C 3.0 patch update: incorrect preprocessor directives in header #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2020
Merged

OpenCL C 3.0 patch update: incorrect preprocessor directives in header #203

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 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,4 +1,4 @@
From 0116b61334e967d152f8b81708c93e57312c0955 Mon Sep 17 00:00:00 2001
From 21ffb389c1f308394006751c543d048c673a2545 Mon Sep 17 00:00:00 2001
From: Anton Zabaznov <anton.zabaznov@intel.com>
Date: Tue, 22 Sep 2020 19:03:50 +0300
Subject: [PATCH] OpenCL 3.0 support
Expand Down Expand Up @@ -930,7 +930,7 @@ index 430e07d36f6..afa900ab24d 100644

#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
diff --git a/clang/lib/Headers/opencl-c.h b/clang/lib/Headers/opencl-c.h
index 66e18bdd47b..e3b94149fc0 100644
index 66e18bdd47b..67d900eb1c3 100644
--- a/clang/lib/Headers/opencl-c.h
+++ b/clang/lib/Headers/opencl-c.h
@@ -35,7 +35,6 @@
Expand Down Expand Up @@ -3522,7 +3522,7 @@ index 66e18bdd47b..e3b94149fc0 100644

// atomic_fetch()
-
+#ifdef defined(__opencl_c_atomic_scope_device) && \
+#if defined(__opencl_c_atomic_scope_device) && \
+ defined(__opencl_c_atomic_order_seq_cst)
+#ifdef __opencl_c_generic_address_space
int __ovld atomic_fetch_add(volatile atomic_int *object, int operand);
Expand Down Expand Up @@ -3686,7 +3686,7 @@ index 66e18bdd47b..e3b94149fc0 100644
+ // defined(cl_khr_int64_extended_atomics)
+#endif // __opencl_c_generic_address_space
+
+#ifdef(__OPENCL_C_VERSION__ >= CL_VERSION_3_0)
+#if(__OPENCL_C_VERSION__ >= CL_VERSION_3_0)
+int __ovld atomic_fetch_add(volatile atomic_int __global *object, int operand);
+uint __ovld atomic_fetch_add(volatile atomic_uint __local *object,
+ uint operand);
Expand Down