r278972 - [OpenCL] AMDGPU: add support of cl_khr_subgroups

[Yaxun Liu via cfe-commits]

Author: yaxunl
Date: Wed Aug 17 15:39:49 2016
New Revision: 278972

URL: http://llvm.org/viewvc/llvm-project?rev=278972&view=rev
Log:
[OpenCL] AMDGPU: add support of cl_khr_subgroups

Patch by Aaron En Ye Shi.

Differential Revision: https://reviews.llvm.org/D23573

Modified:
    cfe/trunk/lib/Basic/Targets.cpp
    cfe/trunk/test/Misc/amdgcn.languageOptsOpenCL.cl
    cfe/trunk/test/SemaOpenCL/extension-version.cl

Modified: cfe/trunk/lib/Basic/Targets.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=278972&r1=278971&r2=278972&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/Targets.cpp (original)
+++ cfe/trunk/lib/Basic/Targets.cpp Wed Aug 17 15:39:49 2016
@@ -2152,6 +2152,7 @@ public:
       Opts.cl_khr_int64_base_atomics = 1;
       Opts.cl_khr_int64_extended_atomics = 1;
       Opts.cl_khr_mipmap_image = 1;
+      Opts.cl_khr_subgroups = 1;
       Opts.cl_khr_3d_image_writes = 1;
       Opts.cl_amd_media_ops = 1;
       Opts.cl_amd_media_ops2 = 1;

Modified: cfe/trunk/test/Misc/amdgcn.languageOptsOpenCL.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Misc/amdgcn.languageOptsOpenCL.cl?rev=278972&r1=278971&r2=278972&view=diff
==============================================================================
--- cfe/trunk/test/Misc/amdgcn.languageOptsOpenCL.cl (original)
+++ cfe/trunk/test/Misc/amdgcn.languageOptsOpenCL.cl Wed Aug 17 15:39:49 2016
@@ -199,11 +199,17 @@
 #pragma OPENCL EXTENSION cl_khr_srgb_image_writes: enable
 // expected-warning at -1{{unsupported OpenCL extension 'cl_khr_srgb_image_writes' - ignoring}}
 
+#if (__OPENCL_C_VERSION__ >= 200)
+#ifndef cl_khr_subgroups
+#error "Missing cl_khr_subgroups define"
+#endif
+#else
 #ifdef cl_khr_subgroups
 #error "Incorrect cl_khr_subgroups define"
 #endif
+// expected-warning at +2{{unsupported OpenCL extension 'cl_khr_subgroups' - ignoring}}
+#endif
 #pragma OPENCL EXTENSION cl_khr_subgroups: enable
-// expected-warning at -1{{unsupported OpenCL extension 'cl_khr_subgroups' - ignoring}}
 
 #ifdef cl_khr_terminate_context
 #error "Incorrect cl_khr_terminate_context define"

Modified: cfe/trunk/test/SemaOpenCL/extension-version.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/extension-version.cl?rev=278972&r1=278971&r2=278972&view=diff
==============================================================================
--- cfe/trunk/test/SemaOpenCL/extension-version.cl (original)
+++ cfe/trunk/test/SemaOpenCL/extension-version.cl Wed Aug 17 15:39:49 2016
@@ -247,6 +247,9 @@
 #error "Missing cl_khr_subgroups define"
 #endif
 #else
+#ifdef cl_khr_subgroups
+#error "Incorrect cl_khr_subgroups define"
+#endif
 // expected-warning at +2{{unsupported OpenCL extension 'cl_khr_subgroups' - ignoring}}
 #endif
 #pragma OPENCL EXTENSION cl_khr_subgroups: enable