[llvm-branch-commits] [cfe-branch] r367300 - Merging r367008:
Hans Wennborg via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Tue Jul 30 01:44:49 PDT 2019
Author: hans
Date: Tue Jul 30 01:44:48 2019
New Revision: 367300
URL: http://llvm.org/viewvc/llvm-project?rev=367300&view=rev
Log:
Merging r367008:
------------------------------------------------------------------------
r367008 | stulova | 2019-07-25 13:04:29 +0200 (Thu, 25 Jul 2019) | 12 lines
[OpenCL] Rename lang mode flag for C++ mode
Rename lang mode flag to -cl-std=clc++/-cl-std=CLC++
or -std=clc++/-std=CLC++.
This aligns with OpenCL C conversion and removes ambiguity
with OpenCL C++.
Differential Revision: https://reviews.llvm.org/D65102
------------------------------------------------------------------------
Modified:
cfe/branches/release_90/ (props changed)
cfe/branches/release_90/docs/LanguageExtensions.rst
cfe/branches/release_90/docs/UsersManual.rst
cfe/branches/release_90/include/clang/Driver/Options.td
cfe/branches/release_90/include/clang/Frontend/LangStandards.def
cfe/branches/release_90/lib/Frontend/CompilerInvocation.cpp
cfe/branches/release_90/test/CodeGenCXX/mangle-address-space.cpp
cfe/branches/release_90/test/CodeGenOpenCL/builtins.cl
cfe/branches/release_90/test/CodeGenOpenCL/images.cl
cfe/branches/release_90/test/CodeGenOpenCL/logical-ops.cl
cfe/branches/release_90/test/CodeGenOpenCL/pipe_builtin.cl
cfe/branches/release_90/test/CodeGenOpenCL/sampler.cl
cfe/branches/release_90/test/CodeGenOpenCL/spir_version.cl
cfe/branches/release_90/test/CodeGenOpenCL/to_addr_builtin.cl
cfe/branches/release_90/test/CodeGenOpenCLCXX/address-space-castoperators.cpp
cfe/branches/release_90/test/CodeGenOpenCLCXX/address-space-deduction.cl
cfe/branches/release_90/test/CodeGenOpenCLCXX/address-space-deduction2.cl
cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-conversion.cl
cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-derived-base.cl
cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-of-this.cl
cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-operators.cl
cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-references.cl
cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-with-class.cl
cfe/branches/release_90/test/CodeGenOpenCLCXX/atexit.cl
cfe/branches/release_90/test/CodeGenOpenCLCXX/global_init.cl
cfe/branches/release_90/test/CodeGenOpenCLCXX/local_addrspace_init.cl
cfe/branches/release_90/test/CodeGenOpenCLCXX/method-overload-address-space.cl
cfe/branches/release_90/test/CodeGenOpenCLCXX/template-address-spaces.cl
cfe/branches/release_90/test/Driver/autocomplete.c
cfe/branches/release_90/test/Driver/opencl.cl
cfe/branches/release_90/test/Frontend/opencl.cl
cfe/branches/release_90/test/Frontend/stdlang.c
cfe/branches/release_90/test/Headers/opencl-c-header.cl
cfe/branches/release_90/test/Parser/opencl-cxx-keywords.cl
cfe/branches/release_90/test/Parser/opencl-cxx-virtual.cl
cfe/branches/release_90/test/Preprocessor/predefined-macros.c
cfe/branches/release_90/test/SemaOpenCL/address-spaces-conversions-cl2.0.cl
cfe/branches/release_90/test/SemaOpenCL/address-spaces.cl
cfe/branches/release_90/test/SemaOpenCL/builtin.cl
cfe/branches/release_90/test/SemaOpenCL/clk_event_t.cl
cfe/branches/release_90/test/SemaOpenCL/extension-version.cl
cfe/branches/release_90/test/SemaOpenCL/extensions.cl
cfe/branches/release_90/test/SemaOpenCL/invalid-image.cl
cfe/branches/release_90/test/SemaOpenCL/invalid-pipes-cl2.0.cl
cfe/branches/release_90/test/SemaOpenCLCXX/address-space-deduction.cl
cfe/branches/release_90/test/SemaOpenCLCXX/address-space-of-this-class-scope.cl
cfe/branches/release_90/test/SemaOpenCLCXX/address-space-of-this.cl
cfe/branches/release_90/test/SemaOpenCLCXX/address-space-references.cl
cfe/branches/release_90/test/SemaOpenCLCXX/address-space-templates.cl
cfe/branches/release_90/test/SemaOpenCLCXX/address_space_overloading.cl
cfe/branches/release_90/test/SemaOpenCLCXX/kernel_invalid.cl
cfe/branches/release_90/test/SemaOpenCLCXX/method-overload-address-space.cl
cfe/branches/release_90/test/SemaOpenCLCXX/newdelete.cl
cfe/branches/release_90/test/SemaOpenCLCXX/restricted.cl
Propchange: cfe/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
/cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:366429,366448,366457,366474,366480,366483,366511,366670,366694,366699,367039,367055,367103,367134
+/cfe/trunk:366429,366448,366457,366474,366480,366483,366511,366670,366694,366699,367008,367039,367055,367103,367134
/cfe/trunk/test:170344
/cfe/trunk/test/SemaTemplate:126920
Modified: cfe/branches/release_90/docs/LanguageExtensions.rst
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/docs/LanguageExtensions.rst?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/docs/LanguageExtensions.rst (original)
+++ cfe/branches/release_90/docs/LanguageExtensions.rst Tue Jul 30 01:44:48 2019
@@ -1779,7 +1779,7 @@ invoked.
.. code-block:: console
- clang -cl-std=c++ test.cl
+ clang -cl-std=clc++ test.cl
If there are any global objects to be initialized the final binary will
contain ``@_GLOBAL__sub_I_test.cl`` kernel to be enqueued.
Modified: cfe/branches/release_90/docs/UsersManual.rst
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/docs/UsersManual.rst?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/docs/UsersManual.rst (original)
+++ cfe/branches/release_90/docs/UsersManual.rst Tue Jul 30 01:44:48 2019
@@ -2776,7 +2776,7 @@ restrictions from OpenCL C v2.0 will inh
and function libraries are supported and can be used in the new mode.
To enable the new mode pass the following command line option when compiling ``.cl``
-file ``-cl-std=c++`` or ``-std=c++``.
+file ``-cl-std=clc++``, ``-cl-std=CLC++``, ``-std=clc++`` or ``-std=CLC++``.
.. code-block:: c++
@@ -2794,7 +2794,7 @@ file ``-cl-std=c++`` or ``-std=c++``.
.. code-block:: console
- clang -cl-std=c++ test.cl
+ clang -cl-std=clc++ test.cl
.. _target_features:
Modified: cfe/branches/release_90/include/clang/Driver/Options.td
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/include/clang/Driver/Options.td?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/include/clang/Driver/Options.td (original)
+++ cfe/branches/release_90/include/clang/Driver/Options.td Tue Jul 30 01:44:48 2019
@@ -518,7 +518,7 @@ def cl_mad_enable : Flag<["-"], "cl-mad-
def cl_no_signed_zeros : Flag<["-"], "cl-no-signed-zeros">, Group<opencl_Group>, Flags<[CC1Option]>,
HelpText<"OpenCL only. Allow use of less precise no signed zeros computations in the generated binary.">;
def cl_std_EQ : Joined<["-"], "cl-std=">, Group<opencl_Group>, Flags<[CC1Option]>,
- HelpText<"OpenCL language standard to compile for.">, Values<"cl,CL,cl1.1,CL1.1,cl1.2,CL1.2,cl2.0,CL2.0,c++">;
+ HelpText<"OpenCL language standard to compile for.">, Values<"cl,CL,cl1.1,CL1.1,cl1.2,CL1.2,cl2.0,CL2.0,clc++,CLC++">;
def cl_denorms_are_zero : Flag<["-"], "cl-denorms-are-zero">, Group<opencl_Group>, Flags<[CC1Option]>,
HelpText<"OpenCL only. Allow denormals to be flushed to zero.">;
def cl_fp32_correctly_rounded_divide_sqrt : Flag<["-"], "cl-fp32-correctly-rounded-divide-sqrt">, Group<opencl_Group>, Flags<[CC1Option]>,
Modified: cfe/branches/release_90/include/clang/Frontend/LangStandards.def
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/include/clang/Frontend/LangStandards.def?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/include/clang/Frontend/LangStandards.def (original)
+++ cfe/branches/release_90/include/clang/Frontend/LangStandards.def Tue Jul 30 01:44:48 2019
@@ -174,6 +174,7 @@ LANGSTANDARD_ALIAS_DEPR(opencl10, "CL")
LANGSTANDARD_ALIAS_DEPR(opencl11, "CL1.1")
LANGSTANDARD_ALIAS_DEPR(opencl12, "CL1.2")
LANGSTANDARD_ALIAS_DEPR(opencl20, "CL2.0")
+LANGSTANDARD_ALIAS_DEPR(openclcpp, "CLC++")
// CUDA
LANGSTANDARD(cuda, "cuda", CUDA, "NVIDIA CUDA(tm)",
Modified: cfe/branches/release_90/lib/Frontend/CompilerInvocation.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/lib/Frontend/CompilerInvocation.cpp?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/lib/Frontend/CompilerInvocation.cpp (original)
+++ cfe/branches/release_90/lib/Frontend/CompilerInvocation.cpp Tue Jul 30 01:44:48 2019
@@ -2408,7 +2408,7 @@ static void ParseLangArgs(LangOptions &O
.Cases("cl1.1", "CL1.1", LangStandard::lang_opencl11)
.Cases("cl1.2", "CL1.2", LangStandard::lang_opencl12)
.Cases("cl2.0", "CL2.0", LangStandard::lang_opencl20)
- .Case("c++", LangStandard::lang_openclcpp)
+ .Cases("clc++", "CLC++", LangStandard::lang_openclcpp)
.Default(LangStandard::lang_unspecified);
if (OpenCLLangStd == LangStandard::lang_unspecified) {
Modified: cfe/branches/release_90/test/CodeGenCXX/mangle-address-space.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenCXX/mangle-address-space.cpp?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenCXX/mangle-address-space.cpp (original)
+++ cfe/branches/release_90/test/CodeGenCXX/mangle-address-space.cpp Tue Jul 30 01:44:48 2019
@@ -1,7 +1,7 @@
// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - %s | FileCheck %s --check-prefixes=CHECK,CHECKNOOCL
// RUN: %clang_cc1 -emit-llvm -triple x86_64-windows-msvc -o - %s | FileCheck %s --check-prefixes=WIN,WINNOOCL
-// RUN: %clang_cc1 -cl-std=c++ -emit-llvm -triple %itanium_abi_triple -o - %s | FileCheck %s --check-prefixes=CHECK,CHECKOCL
-// RUN: %clang_cc1 -cl-std=c++ -emit-llvm -triple x86_64-windows-msvc -o - %s | FileCheck %s --check-prefixes=WIN,WINOCL
+// RUN: %clang_cc1 -cl-std=clc++ -emit-llvm -triple %itanium_abi_triple -o - %s | FileCheck %s --check-prefixes=CHECK,CHECKOCL
+// RUN: %clang_cc1 -cl-std=clc++ -emit-llvm -triple x86_64-windows-msvc -o - %s | FileCheck %s --check-prefixes=WIN,WINOCL
// CHECKNOOCL-LABEL: define {{.*}}void @_Z2f0Pc
// WINNOOCL-LABEL: define {{.*}}void @"?f0@@YAXPEAD at Z"
Modified: cfe/branches/release_90/test/CodeGenOpenCL/builtins.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCL/builtins.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCL/builtins.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCL/builtins.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -finclude-default-header -cl-std=c++ -fblocks -O0 -emit-llvm -o - -triple "spir-unknown-unknown" | FileCheck %s
+// RUN: %clang_cc1 %s -finclude-default-header -cl-std=clc++ -fblocks -O0 -emit-llvm -o - -triple "spir-unknown-unknown" | FileCheck %s
void testBranchingOnEnqueueKernel(queue_t default_queue, unsigned flags, ndrange_t ndrange) {
// Ensure `enqueue_kernel` can be branched upon.
Modified: cfe/branches/release_90/test/CodeGenOpenCL/images.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCL/images.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCL/images.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCL/images.cl Tue Jul 30 01:44:48 2019
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 %s -triple x86_64-unknown-linux-gnu -O0 -emit-llvm -o - | FileCheck %s
-// RUN: %clang_cc1 %s -triple x86_64-unknown-linux-gnu -O0 -emit-llvm -o - -cl-std=c++ | FileCheck %s
+// RUN: %clang_cc1 %s -triple x86_64-unknown-linux-gnu -O0 -emit-llvm -o - -cl-std=clc++ | FileCheck %s
__attribute__((overloadable)) void read_image(read_only image1d_t img_ro);
__attribute__((overloadable)) void read_image(write_only image1d_t img_wo);
Modified: cfe/branches/release_90/test/CodeGenOpenCL/logical-ops.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCL/logical-ops.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCL/logical-ops.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCL/logical-ops.cl Tue Jul 30 01:44:48 2019
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 %s -emit-llvm -o - -cl-std=CL1.2 -O1 -triple x86_64-unknown-linux-gnu | FileCheck %s
-// RUN: %clang_cc1 %s -emit-llvm -o - -cl-std=c++ -O1 -triple x86_64-unknown-linux-gnu | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - -cl-std=clc++ -O1 -triple x86_64-unknown-linux-gnu | FileCheck %s
#pragma OPENCL EXTENSION cl_khr_fp64 : enable
Modified: cfe/branches/release_90/test/CodeGenOpenCL/pipe_builtin.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCL/pipe_builtin.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCL/pipe_builtin.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCL/pipe_builtin.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -cl-ext=+cl_khr_subgroups -O0 -cl-std=c++ -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -cl-ext=+cl_khr_subgroups -O0 -cl-std=clc++ -o - %s | FileCheck %s
// FIXME: Add MS ABI manglings of OpenCL things and remove %itanium_abi_triple
// above to support OpenCL in the MS C++ ABI.
Modified: cfe/branches/release_90/test/CodeGenOpenCL/sampler.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCL/sampler.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCL/sampler.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCL/sampler.cl Tue Jul 30 01:44:48 2019
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 %s -emit-llvm -triple spir-unknown-unknown -o - -O0 | FileCheck %s
// RUN: %clang_cc1 %s -cl-std=CL2.0 -emit-llvm -triple spir-unknown-unknown -o - -O0 | FileCheck %s
-// RUN: %clang_cc1 %s -cl-std=c++ -emit-llvm -triple spir-unknown-unknown -o - -O0 | FileCheck %s
+// RUN: %clang_cc1 %s -cl-std=clc++ -emit-llvm -triple spir-unknown-unknown -o - -O0 | FileCheck %s
//
// This test covers 5 cases of sampler initialzation:
// 1. function argument passing
Modified: cfe/branches/release_90/test/CodeGenOpenCL/spir_version.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCL/spir_version.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCL/spir_version.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCL/spir_version.cl Tue Jul 30 01:44:48 2019
@@ -6,7 +6,7 @@
// RUN: %clang_cc1 %s -triple "spir64-unknown-unknown" -emit-llvm -o - -cl-std=CL2.0 | FileCheck %s --check-prefix=CHECK-SPIR-CL20
-// RUN: %clang_cc1 %s -triple "spir64-unknown-unknown" -emit-llvm -o - -cl-std=c++ | FileCheck %s --check-prefix=CHECK-SPIR-CL20
+// RUN: %clang_cc1 %s -triple "spir64-unknown-unknown" -emit-llvm -o - -cl-std=clc++ | FileCheck %s --check-prefix=CHECK-SPIR-CL20
// RUN: %clang_cc1 %s -triple "amdgcn--amdhsa" -emit-llvm -o - | FileCheck %s --check-prefix=CHECK-AMDGCN-CL10
// RUN: %clang_cc1 %s -triple "amdgcn--amdhsa" -emit-llvm -o - -cl-std=CL1.2 | FileCheck %s --check-prefix=CHECK-AMDGCN-CL12
Modified: cfe/branches/release_90/test/CodeGenOpenCL/to_addr_builtin.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCL/to_addr_builtin.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCL/to_addr_builtin.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCL/to_addr_builtin.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple spir-unknown-unknown -emit-llvm -O0 -cl-std=c++ -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple spir-unknown-unknown -emit-llvm -O0 -cl-std=clc++ -o - %s | FileCheck %s
// CHECK: %[[A:.*]] = type { float, float, float }
typedef struct {
Modified: cfe/branches/release_90/test/CodeGenOpenCLCXX/address-space-castoperators.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCLCXX/address-space-castoperators.cpp?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCLCXX/address-space-castoperators.cpp (original)
+++ cfe/branches/release_90/test/CodeGenOpenCLCXX/address-space-castoperators.cpp Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s
void test_reinterpret_cast(){
__private float x;
Modified: cfe/branches/release_90/test/CodeGenOpenCLCXX/address-space-deduction.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCLCXX/address-space-deduction.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCLCXX/address-space-deduction.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCLCXX/address-space-deduction.cl Tue Jul 30 01:44:48 2019
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -O0 -emit-llvm -o - | FileCheck %s -check-prefixes=COMMON,PTR
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -O0 -emit-llvm -o - -DREF | FileCheck %s -check-prefixes=COMMON,REF
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -O0 -emit-llvm -o - | FileCheck %s -check-prefixes=COMMON,PTR
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -O0 -emit-llvm -o - -DREF | FileCheck %s -check-prefixes=COMMON,REF
#ifdef REF
#define PTR &
Modified: cfe/branches/release_90/test/CodeGenOpenCLCXX/address-space-deduction2.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCLCXX/address-space-deduction2.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCLCXX/address-space-deduction2.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCLCXX/address-space-deduction2.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -O0 -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -O0 -emit-llvm -o - | FileCheck %s
class P {
public:
Modified: cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-conversion.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-conversion.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-conversion.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-conversion.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s
void bar(__generic volatile unsigned int* ptr)
{
Modified: cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-derived-base.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-derived-base.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-derived-base.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-derived-base.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -triple spir -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple spir -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s
struct B {
int mb;
Modified: cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-of-this.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-of-this.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-of-this.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-of-this.cl Tue Jul 30 01:44:48 2019
@@ -1,6 +1,6 @@
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -emit-llvm -pedantic -verify -O0 -o - -DDECL | FileCheck %s --check-prefixes="COMMON,EXPL"
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -emit-llvm -pedantic -verify -O0 -o - -DDECL -DUSE_DEFLT | FileCheck %s --check-prefixes="COMMON,IMPL"
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -emit-llvm -pedantic -verify -O0 -o - | FileCheck %s --check-prefixes="COMMON,IMPL"
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -emit-llvm -pedantic -verify -O0 -o - -DDECL | FileCheck %s --check-prefixes="COMMON,EXPL"
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -emit-llvm -pedantic -verify -O0 -o - -DDECL -DUSE_DEFLT | FileCheck %s --check-prefixes="COMMON,IMPL"
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -emit-llvm -pedantic -verify -O0 -o - | FileCheck %s --check-prefixes="COMMON,IMPL"
// expected-no-diagnostics
// Test that the 'this' pointer is in the __generic address space.
Modified: cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-operators.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-operators.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-operators.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-operators.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-//RUN: %clang_cc1 %s -triple spir -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s
+//RUN: %clang_cc1 %s -triple spir -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s
enum E {
a,
Modified: cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-references.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-references.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-references.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-references.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-//RUN: %clang_cc1 %s -cl-std=c++ -triple spir -emit-llvm -o - | FileCheck %s
+//RUN: %clang_cc1 %s -cl-std=clc++ -triple spir -emit-llvm -o - | FileCheck %s
int bar(const unsigned int &i);
// CHECK-LABEL: define spir_func void @_Z3foov()
Modified: cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-with-class.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-with-class.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-with-class.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCLCXX/addrspace-with-class.cl Tue Jul 30 01:44:48 2019
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s --check-prefix=CHECK-DEFINITIONS
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=CLC++ -emit-llvm -O0 -o - | FileCheck %s --check-prefix=CHECK-DEFINITIONS
// This test ensures the proper address spaces and address space cast are used
// for constructors, member functions and destructors.
Modified: cfe/branches/release_90/test/CodeGenOpenCLCXX/atexit.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCLCXX/atexit.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCLCXX/atexit.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCLCXX/atexit.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-//RUN: %clang_cc1 %s -triple spir -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s
+//RUN: %clang_cc1 %s -triple spir -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s
struct S {
~S(){};
Modified: cfe/branches/release_90/test/CodeGenOpenCLCXX/global_init.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCLCXX/global_init.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCLCXX/global_init.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCLCXX/global_init.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -triple spir -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple spir -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s
struct S {
S() {}
Modified: cfe/branches/release_90/test/CodeGenOpenCLCXX/local_addrspace_init.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCLCXX/local_addrspace_init.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCLCXX/local_addrspace_init.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCLCXX/local_addrspace_init.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -triple spir -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple spir -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s
// Test that we don't initialize local address space objects.
//CHECK: @_ZZ4testE1i = internal addrspace(3) global i32 undef
Modified: cfe/branches/release_90/test/CodeGenOpenCLCXX/method-overload-address-space.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCLCXX/method-overload-address-space.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCLCXX/method-overload-address-space.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCLCXX/method-overload-address-space.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-//RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s
+//RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -emit-llvm -O0 -o - | FileCheck %s
struct C {
void foo() __local;
Modified: cfe/branches/release_90/test/CodeGenOpenCLCXX/template-address-spaces.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGenOpenCLCXX/template-address-spaces.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGenOpenCLCXX/template-address-spaces.cl (original)
+++ cfe/branches/release_90/test/CodeGenOpenCLCXX/template-address-spaces.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -cl-std=c++ %s -emit-llvm -o - -O0 -triple spir-unknown-unknown | FileCheck %s
+// RUN: %clang_cc1 -cl-std=clc++ %s -emit-llvm -o - -O0 -triple spir-unknown-unknown | FileCheck %s
template <typename T>
struct S{
Modified: cfe/branches/release_90/test/Driver/autocomplete.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/Driver/autocomplete.c?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/Driver/autocomplete.c (original)
+++ cfe/branches/release_90/test/Driver/autocomplete.c Tue Jul 30 01:44:48 2019
@@ -34,8 +34,8 @@
// RUN: %clang --autocomplete=-cl-std=,CL2 | FileCheck %s -check-prefix=CLSTD
// CLSTD: CL2.0
// RUN: %clang --autocomplete=-cl-std= | FileCheck %s -check-prefix=CLSTDALL
-// CLSTDALL: c++
-// CLSTDALL-NEXT: cl
+
+// CLSTDALL: cl
// CLSTDALL-NEXT: CL
// CLSTDALL-NEXT: cl1.1
// CLSTDALL-NEXT: CL1.1
@@ -43,6 +43,8 @@
// CLSTDALL-NEXT: CL1.2
// CLSTDALL-NEXT: cl2.0
// CLSTDALL-NEXT: CL2.0
+// CLSTDALL-NEXT: clc++
+// CLSTDALL-NEXT: CLC++
// RUN: %clang --autocomplete=-fno-sanitize-coverage=,f | FileCheck %s -check-prefix=FNOSANICOVER
// FNOSANICOVER: func
// RUN: %clang --autocomplete=-fno-sanitize-coverage= | FileCheck %s -check-prefix=FNOSANICOVERALL
Modified: cfe/branches/release_90/test/Driver/opencl.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/Driver/opencl.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/Driver/opencl.cl (original)
+++ cfe/branches/release_90/test/Driver/opencl.cl Tue Jul 30 01:44:48 2019
@@ -2,7 +2,7 @@
// RUN: %clang -S -### -cl-std=CL1.1 %s 2>&1 | FileCheck --check-prefix=CHECK-CL11 %s
// RUN: %clang -S -### -cl-std=CL1.2 %s 2>&1 | FileCheck --check-prefix=CHECK-CL12 %s
// RUN: %clang -S -### -cl-std=CL2.0 %s 2>&1 | FileCheck --check-prefix=CHECK-CL20 %s
-// RUN: %clang -S -### -cl-std=c++ %s 2>&1 | FileCheck --check-prefix=CHECK-CLCPP %s
+// RUN: %clang -S -### -cl-std=clc++ %s 2>&1 | FileCheck --check-prefix=CHECK-CLCPP %s
// RUN: %clang -S -### -cl-opt-disable %s 2>&1 | FileCheck --check-prefix=CHECK-OPT-DISABLE %s
// RUN: %clang -S -### -cl-strict-aliasing %s 2>&1 | FileCheck --check-prefix=CHECK-STRICT-ALIASING %s
// RUN: %clang -S -### -cl-single-precision-constant %s 2>&1 | FileCheck --check-prefix=CHECK-SINGLE-PRECISION-CONST %s
@@ -22,7 +22,7 @@
// CHECK-CL11: "-cc1" {{.*}} "-cl-std=CL1.1"
// CHECK-CL12: "-cc1" {{.*}} "-cl-std=CL1.2"
// CHECK-CL20: "-cc1" {{.*}} "-cl-std=CL2.0"
-// CHECK-CLCPP: "-cc1" {{.*}} "-cl-std=c++"
+// CHECK-CLCPP: "-cc1" {{.*}} "-cl-std=clc++"
// CHECK-OPT-DISABLE: "-cc1" {{.*}} "-cl-opt-disable"
// CHECK-STRICT-ALIASING: "-cc1" {{.*}} "-cl-strict-aliasing"
// CHECK-SINGLE-PRECISION-CONST: "-cc1" {{.*}} "-cl-single-precision-constant"
Modified: cfe/branches/release_90/test/Frontend/opencl.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/Frontend/opencl.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/Frontend/opencl.cl (original)
+++ cfe/branches/release_90/test/Frontend/opencl.cl Tue Jul 30 01:44:48 2019
@@ -2,7 +2,7 @@
// RUN: %clang_cc1 %s -verify -fsyntax-only -cl-std=CL1.1 -DSYNTAX
// RUN: %clang_cc1 %s -verify -fsyntax-only -cl-std=CL1.2 -DSYNTAX
// RUN: %clang_cc1 %s -verify -fsyntax-only -cl-std=CL2.0 -DSYNTAX
-// RUN: %clang_cc1 %s -verify -fsyntax-only -cl-std=c++ -DSYNTAX
+// RUN: %clang_cc1 %s -verify -fsyntax-only -cl-std=clc++ -DSYNTAX
// RUN: %clang_cc1 %s -verify -fsyntax-only -fblocks -DBLOCKS -DSYNTAX
// RUN: %clang_cc1 %s -verify -fsyntax-only -cl-std=CL1.1 -fblocks -DBLOCKS -DSYNTAX
// RUN: %clang_cc1 %s -verify -fsyntax-only -cl-std=CL1.2 -fblocks -DBLOCKS -DSYNTAX
Modified: cfe/branches/release_90/test/Frontend/stdlang.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/Frontend/stdlang.c?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/Frontend/stdlang.c (original)
+++ cfe/branches/release_90/test/Frontend/stdlang.c Tue Jul 30 01:44:48 2019
@@ -4,11 +4,12 @@
// RUN: %clang_cc1 -x cl -cl-std=cl1.1 -DOPENCL %s
// RUN: %clang_cc1 -x cl -cl-std=cl1.2 -DOPENCL %s
// RUN: %clang_cc1 -x cl -cl-std=cl2.0 -DOPENCL %s
-// RUN: %clang_cc1 -x cl -cl-std=c++ -DOPENCL %s
+// RUN: %clang_cc1 -x cl -cl-std=clc++ -DOPENCL %s
// RUN: %clang_cc1 -x cl -cl-std=CL -DOPENCL %s
// RUN: %clang_cc1 -x cl -cl-std=CL1.1 -DOPENCL %s
// RUN: %clang_cc1 -x cl -cl-std=CL1.2 -DOPENCL %s
// RUN: %clang_cc1 -x cl -cl-std=CL2.0 -DOPENCL %s
+// RUN: %clang_cc1 -x cl -cl-std=CLC++ -DOPENCL %s
// RUN: not %clang_cc1 -x cl -std=c99 -DOPENCL %s 2>&1 | FileCheck --check-prefix=CHECK-C99 %s
// RUN: not %clang_cc1 -x cl -cl-std=invalid -DOPENCL %s 2>&1 | FileCheck --check-prefix=CHECK-INVALID %s
// CHECK-C99: error: invalid argument '-std=c99' not allowed with 'OpenCL'
Modified: cfe/branches/release_90/test/Headers/opencl-c-header.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/Headers/opencl-c-header.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/Headers/opencl-c-header.cl (original)
+++ cfe/branches/release_90/test/Headers/opencl-c-header.cl Tue Jul 30 01:44:48 2019
@@ -1,7 +1,7 @@
// RUN: %clang_cc1 -O0 -triple spir-unknown-unknown -internal-isystem ../../lib/Headers -include opencl-c.h -emit-llvm -o - %s -verify | FileCheck %s
// RUN: %clang_cc1 -O0 -triple spir-unknown-unknown -internal-isystem ../../lib/Headers -include opencl-c.h -emit-llvm -o - %s -verify -cl-std=CL1.1 | FileCheck %s
// RUN: %clang_cc1 -O0 -triple spir-unknown-unknown -internal-isystem ../../lib/Headers -include opencl-c.h -emit-llvm -o - %s -verify -cl-std=CL1.2 | FileCheck %s
-// RUN: %clang_cc1 -O0 -triple spir-unknown-unknown -internal-isystem ../../lib/Headers -include opencl-c.h -emit-llvm -o - %s -verify -cl-std=c++ | FileCheck %s --check-prefix=CHECK20
+// RUN: %clang_cc1 -O0 -triple spir-unknown-unknown -internal-isystem ../../lib/Headers -include opencl-c.h -emit-llvm -o - %s -verify -cl-std=clc++ | FileCheck %s --check-prefix=CHECK20
// Test including the default header as a module.
// The module should be compiled only once and loaded from cache afterwards.
Modified: cfe/branches/release_90/test/Parser/opencl-cxx-keywords.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/Parser/opencl-cxx-keywords.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/Parser/opencl-cxx-keywords.cl (original)
+++ cfe/branches/release_90/test/Parser/opencl-cxx-keywords.cl Tue Jul 30 01:44:48 2019
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -verify -fsyntax-only
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -verify -fsyntax-only -fexceptions -fcxx-exceptions
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -verify -fsyntax-only
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -verify -fsyntax-only -fexceptions -fcxx-exceptions
// This test checks that various C++ and OpenCL C keywords are not available
// in OpenCL.
Modified: cfe/branches/release_90/test/Parser/opencl-cxx-virtual.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/Parser/opencl-cxx-virtual.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/Parser/opencl-cxx-virtual.cl (original)
+++ cfe/branches/release_90/test/Parser/opencl-cxx-virtual.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -fsyntax-only -verify
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -fsyntax-only -verify
// Test that virtual functions and abstract classes are rejected.
class virtual_functions {
Modified: cfe/branches/release_90/test/Preprocessor/predefined-macros.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/Preprocessor/predefined-macros.c?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/Preprocessor/predefined-macros.c (original)
+++ cfe/branches/release_90/test/Preprocessor/predefined-macros.c Tue Jul 30 01:44:48 2019
@@ -131,7 +131,7 @@
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-CL20
// RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-fast-relaxed-math \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-FRM
-// RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-std=c++ \
+// RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-std=clc++ \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-CLCPP10
// CHECK-CL10: #define CL_VERSION_1_0 100
// CHECK-CL10: #define CL_VERSION_1_1 110
Modified: cfe/branches/release_90/test/SemaOpenCL/address-spaces-conversions-cl2.0.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCL/address-spaces-conversions-cl2.0.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCL/address-spaces-conversions-cl2.0.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCL/address-spaces-conversions-cl2.0.cl Tue Jul 30 01:44:48 2019
@@ -1,9 +1,9 @@
// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DCONSTANT -cl-std=CL2.0
// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGLOBAL -cl-std=CL2.0
// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGENERIC -cl-std=CL2.0
-// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DCONSTANT -cl-std=c++
-// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGLOBAL -cl-std=c++
-// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGENERIC -cl-std=c++
+// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DCONSTANT -cl-std=clc++
+// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGLOBAL -cl-std=clc++
+// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGENERIC -cl-std=clc++
/* OpenCLC v2.0 adds a set of restrictions for conversions between pointers to
* different address spaces, mainly described in Sections 6.5.5 and 6.5.6.
Modified: cfe/branches/release_90/test/SemaOpenCL/address-spaces.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCL/address-spaces.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCL/address-spaces.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCL/address-spaces.cl Tue Jul 30 01:44:48 2019
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only
// RUN: %clang_cc1 %s -cl-std=CL2.0 -verify -pedantic -fsyntax-only
-// RUN: %clang_cc1 %s -cl-std=c++ -verify -pedantic -fsyntax-only
+// RUN: %clang_cc1 %s -cl-std=clc++ -verify -pedantic -fsyntax-only
__constant int ci = 1;
Modified: cfe/branches/release_90/test/SemaOpenCL/builtin.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCL/builtin.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCL/builtin.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCL/builtin.cl Tue Jul 30 01:44:48 2019
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL1.2
-// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=c++
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=clc++
// expected-no-diagnostics
Modified: cfe/branches/release_90/test/SemaOpenCL/clk_event_t.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCL/clk_event_t.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCL/clk_event_t.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCL/clk_event_t.cl Tue Jul 30 01:44:48 2019
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL2.0
-// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=c++
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=clc++
// Taken from opencl-c.h
#define CLK_NULL_EVENT (__builtin_astype(((void*)(__SIZE_MAX__)), clk_event_t))
Modified: cfe/branches/release_90/test/SemaOpenCL/extension-version.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCL/extension-version.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCL/extension-version.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCL/extension-version.cl Tue Jul 30 01:44:48 2019
@@ -2,12 +2,12 @@
// RUN: %clang_cc1 -x cl -cl-std=CL1.1 %s -verify -triple spir-unknown-unknown
// RUN: %clang_cc1 -x cl -cl-std=CL1.2 %s -verify -triple spir-unknown-unknown
// RUN: %clang_cc1 -x cl -cl-std=CL2.0 %s -verify -triple spir-unknown-unknown
-// RUN: %clang_cc1 -x cl -cl-std=c++ %s -verify -triple spir-unknown-unknown
+// RUN: %clang_cc1 -x cl -cl-std=clc++ %s -verify -triple spir-unknown-unknown
// RUN: %clang_cc1 -x cl -cl-std=CL %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES
// RUN: %clang_cc1 -x cl -cl-std=CL1.1 %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES
// RUN: %clang_cc1 -x cl -cl-std=CL1.2 %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES
// RUN: %clang_cc1 -x cl -cl-std=CL2.0 %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES
-// RUN: %clang_cc1 -x cl -cl-std=c++ %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES
+// RUN: %clang_cc1 -x cl -cl-std=clc++ %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES
#if (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200) && !defined(TEST_CORE_FEATURES)
// expected-no-diagnostics
Modified: cfe/branches/release_90/test/SemaOpenCL/extensions.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCL/extensions.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCL/extensions.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCL/extensions.cl Tue Jul 30 01:44:48 2019
@@ -28,7 +28,7 @@
// enabled by default with -cl-std=CL2.0).
//
// RUN: %clang_cc1 %s -triple amdgcn-unknown-unknown -verify -pedantic -fsyntax-only -cl-std=CL2.0 -finclude-default-header
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-std=c++
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-std=clc++
#ifdef _OPENCL_H_
// expected-no-diagnostics
Modified: cfe/branches/release_90/test/SemaOpenCL/invalid-image.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCL/invalid-image.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCL/invalid-image.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCL/invalid-image.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -verify -cl-std=c++ %s
+// RUN: %clang_cc1 -verify -cl-std=clc++ %s
// RUN: %clang_cc1 -verify %s
// RUN: %clang_cc1 -verify -D=ATTR_TEST -fms-compatibility %s
Modified: cfe/branches/release_90/test/SemaOpenCL/invalid-pipes-cl2.0.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCL/invalid-pipes-cl2.0.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCL/invalid-pipes-cl2.0.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCL/invalid-pipes-cl2.0.cl Tue Jul 30 01:44:48 2019
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL2.0
-// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=c++
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=clc++
global pipe int gp; // expected-error {{type '__global read_only pipe int' can only be used as a function parameter in OpenCL}}
global reserve_id_t rid; // expected-error {{the '__global reserve_id_t' type cannot be used to declare a program scope variable}}
Modified: cfe/branches/release_90/test/SemaOpenCLCXX/address-space-deduction.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCLCXX/address-space-deduction.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCLCXX/address-space-deduction.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCLCXX/address-space-deduction.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-//RUN: %clang_cc1 %s -cl-std=c++ -pedantic -ast-dump -verify | FileCheck %s
+//RUN: %clang_cc1 %s -cl-std=clc++ -pedantic -ast-dump -verify | FileCheck %s
//expected-no-diagnostics
Modified: cfe/branches/release_90/test/SemaOpenCLCXX/address-space-of-this-class-scope.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCLCXX/address-space-of-this-class-scope.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCLCXX/address-space-of-this-class-scope.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCLCXX/address-space-of-this-class-scope.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-//RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -pedantic -verify
+//RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -pedantic -verify
struct C {
auto fGlob() __global -> decltype(this);
Modified: cfe/branches/release_90/test/SemaOpenCLCXX/address-space-of-this.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCLCXX/address-space-of-this.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCLCXX/address-space-of-this.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCLCXX/address-space-of-this.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -pedantic -verify -fsyntax-only
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -pedantic -verify -fsyntax-only
// expected-no-diagnostics
// Extract from PR38614
Modified: cfe/branches/release_90/test/SemaOpenCLCXX/address-space-references.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCLCXX/address-space-references.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCLCXX/address-space-references.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCLCXX/address-space-references.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -pedantic -verify -fsyntax-only
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -pedantic -verify -fsyntax-only
__global const int& f(__global float &ref) {
return ref; // expected-error{{reference of type 'const __global int &' cannot bind to a temporary object because of address space mismatch}}
Modified: cfe/branches/release_90/test/SemaOpenCLCXX/address-space-templates.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCLCXX/address-space-templates.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCLCXX/address-space-templates.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCLCXX/address-space-templates.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-//RUN: %clang_cc1 %s -cl-std=c++ -pedantic -verify -fsyntax-only
+//RUN: %clang_cc1 %s -cl-std=clc++ -pedantic -verify -fsyntax-only
template <typename T>
struct S {
Modified: cfe/branches/release_90/test/SemaOpenCLCXX/address_space_overloading.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCLCXX/address_space_overloading.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCLCXX/address_space_overloading.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCLCXX/address_space_overloading.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=c++
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=clc++
// expected-no-diagnostics
struct RetGlob {
Modified: cfe/branches/release_90/test/SemaOpenCLCXX/kernel_invalid.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCLCXX/kernel_invalid.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCLCXX/kernel_invalid.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCLCXX/kernel_invalid.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -cl-std=c++ -pedantic -verify -fsyntax-only
+// RUN: %clang_cc1 %s -cl-std=clc++ -pedantic -verify -fsyntax-only
struct C {
kernel void m(); //expected-error{{kernel functions cannot be class members}}
Modified: cfe/branches/release_90/test/SemaOpenCLCXX/method-overload-address-space.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCLCXX/method-overload-address-space.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCLCXX/method-overload-address-space.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCLCXX/method-overload-address-space.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-//RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -pedantic -verify
+//RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -pedantic -verify
struct C {
void m1() __local __local; //expected-warning{{multiple identical address spaces specified for type}}
Modified: cfe/branches/release_90/test/SemaOpenCLCXX/newdelete.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCLCXX/newdelete.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCLCXX/newdelete.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCLCXX/newdelete.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -pedantic -verify -fsyntax-only
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -pedantic -verify -fsyntax-only
class A {
public:
Modified: cfe/branches/release_90/test/SemaOpenCLCXX/restricted.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/SemaOpenCLCXX/restricted.cl?rev=367300&r1=367299&r2=367300&view=diff
==============================================================================
--- cfe/branches/release_90/test/SemaOpenCLCXX/restricted.cl (original)
+++ cfe/branches/release_90/test/SemaOpenCLCXX/restricted.cl Tue Jul 30 01:44:48 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -pedantic -verify -fsyntax-only
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=clc++ -pedantic -verify -fsyntax-only
// This test checks that various C/C++/OpenCL C constructs are not available in
// C++ for OpenCL.
More information about the llvm-branch-commits
mailing list