[OpenCL] Allow -std={cl|CL}{|1.1|1.2|2.0} in driver

[yaxunl]

Summary

Fix a regression which forbids using -std=cl|CL1.1|CL1.2|CL2.0 in driver.

Allow -std and -cl-std={cl|CL}{|1.1|1.2|2.0}.

[yaxunl]

I will fix that. Thanks.

Sam

From: [e-mail] [mailto:[e-mail]] On Behalf Of Richard Smith
Sent: Wednesday, May 25, 2016 2:54 PM
To: Liu, Yaxun (Sam) <[e-mail]>; [e-mail]
Cc: [e-mail]; Anastasia Stulova <[e-mail]>; cfe-commits <[e-mail]>
Subject: Re: [PATCH] D20630: [OpenCL] Allow -std=CL|CL1.1|CL1.2|CL2.0 in driver

[yaxunl]

Revised as Richard suggested.

[rsmith]

lib/Frontend/CompilerInvocation.cpp

1587–1589

How about changing these to the lowercase form too, and treating the uppercase versions as (deprecated) synonyms? (And likewise changing LangStandards.def to list the lowercase versions, perhaps with the uppercase versions as aliases.)

[yaxunl]

lib/Frontend/CompilerInvocation.cpp

1587–1589

-cl-std=CL1.1|CL1.2|CL2.0 is defined by OpenCL spec. Allowing lower case may cause some confusion.

-cl-std=cl is not part of OpenCL spec.

How about keeping all -cl-std= options big letters and all -std= options small letters?

[rsmith]

lib/Frontend/CompilerInvocation.cpp

1587–1589

What? The OpenCL spec does not get to dictate our command-line argument syntax. If they think they do, they're just mistaken.

[Anastasia]

lib/Frontend/CompilerInvocation.cpp

1587–1589

OpenCL spec s5.8.4.5 standardizes the compiler option controlling the OpenCL C version to be as Sam mentioned above:

-cl-std=CL1.1|CL1.2|CL2.0

But this is a part of driver compilation API, and surely doesn't have anything to do with standalone Clang itself.

However, I must say using uppercase letters for CL version is quite common in OpenCL community while using lowercase format is more common for C community.

I don't have much preference here to be honest, as soon as we are consistent in one way or another.

[yaxunl]

Revised as Richard suggested.

[Anastasia]

LGTM! Thanks!

[yaxunl]

Ping!

Richard, are you OK with this? Thanks.

[Anastasia]

Ping! It would be nice to have this fix committed soon!

Thanks!

include/clang/Frontend/LangStandards.def

              Digraphs | HexFloat | GNUMode)
 
 // OpenCL
-LANGSTANDARD(opencl, "cl",
+LANGSTANDARD(opencl, "CL",
              "OpenCL 1.0",
              LineComment | C99 | Digraphs | HexFloat)
 LANGSTANDARD(opencl11, "CL1.1",

lib/Frontend/CompilerInvocation.cpp

     Opts.AddVFSOverlayFile(A->getValue());
 }
 
+bool isOpenCL(LangStandard::Kind LangStd) {
+  return LangStd == LangStandard::lang_opencl
+    || LangStd == LangStandard::lang_opencl11
+    || LangStd == LangStandard::lang_opencl12
+    || LangStd == LangStandard::lang_opencl20;
+}
+
 void CompilerInvocation::setLangDefaults(LangOptions &Opts, InputKind IK,
                                          const llvm::Triple &T,
                                          LangStandard::Kind LangStd) {

   Opts.ImplicitInt = Std.hasImplicitInt();
 
   // Set OpenCL Version.
-  Opts.OpenCL = LangStd == LangStandard::lang_opencl || IK == IK_OpenCL;
+  Opts.OpenCL = isOpenCL(LangStd) || IK == IK_OpenCL;
   if (LangStd == LangStandard::lang_opencl)
     Opts.OpenCLVersion = 100;
   else if (LangStd == LangStandard::lang_opencl11)

             << A->getAsString(Args) << "C++/ObjC++";
         break;
       case IK_OpenCL:
-        Diags.Report(diag::err_drv_argument_not_allowed_with)
-          << A->getAsString(Args) << "OpenCL";
+        if (!isOpenCL(LangStd))
+          Diags.Report(diag::err_drv_argument_not_allowed_with)
+            << A->getAsString(Args) << "OpenCL";
         break;
       case IK_CUDA:
       case IK_PreprocessedCuda:

test/Driver/opencl.cl

+// RUN: %clang %s
+// RUN: %clang -std=CL %s
+// RUN: %clang -std=CL1.1 %s
+// RUN: %clang -std=CL1.2 %s
+// RUN: %clang -std=CL2.0 %s
+// RUN: not %clang_cc1 -std=c99 -DOPENCL %s 2>&1 | FileCheck --check-prefix=CHECK-C99 %s
+// RUN: not %clang_cc1 -std=invalid -DOPENCL %s 2>&1 | FileCheck --check-prefix=CHECK-INVALID %s
+// CHECK-C99: error: invalid argument '-std=c99' not allowed with 'OpenCL'
+// CHECK-INVALID: error: invalid value 'invalid' in '-std=invalid'
+
+kernel void func(void);