[PATCH] [cuda] Preserve TLS storage class of host variable during device-side compilation.

Artem Belevich tra at google.com
Tue Apr 28 13:13:55 PDT 2015

Added a comment explaining why some test runs use 'not' to run cc1.



Index: lib/Sema/SemaDecl.cpp
--- lib/Sema/SemaDecl.cpp
+++ lib/Sema/SemaDecl.cpp
@@ -5769,12 +5769,16 @@
         << DeclSpec::getSpecifierName(TSCS);
     else if (!Context.getTargetInfo().isTLSSupported()) {
-      if (getLangOpts().CUDA)
+      if (getLangOpts().CUDA) {
         // Postpone error emission until we've collected attributes required to
         // figure out whether it's a host or device variable and whether the
         // error should be ignored.
         EmitTLSUnsupportedError = true;
-      else
+        // We still need to mark the variable as TLS so it shows up in AST with
+        // proper storage class for other tools to use even if we're not going
+        // to emit any code for it.
+        NewVD->setTSCSpec(TSCS);
+      } else
     } else
Index: test/SemaCUDA/qualifiers.cu
--- test/SemaCUDA/qualifiers.cu
+++ test/SemaCUDA/qualifiers.cu
@@ -1,21 +1,33 @@
 // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fsyntax-only -verify %s
 // RUN: %clang_cc1 -triple nvptx-unknown-cuda -fsyntax-only -verify -fcuda-is-device %s
+// We run clang_cc1 with 'not' here because source file contains
+// intentional errors and failure is expected.
+// RUN: not %clang_cc1 -triple x86_64-unknown-linux-gnu -fsyntax-only -ast-dump %s \
+// RUN:   | FileCheck %s --check-prefix=CHECK-ALL --check-prefix=CHECK-HOST
+// RUN: not %clang_cc1 -triple nvptx-unknown-cuda -fsyntax-only -ast-dump -fcuda-is-device %s \
+// RUN:   | FileCheck %s --check-prefix=CHECK-ALL --check-prefix=CHECK-DEVICE
 #include "Inputs/cuda.h"
 // Host (x86) supports TLS and device-side compilation should ignore
 // host variables. No errors in either case.
 int __thread host_tls_var;
+// CHECK-ALL: host_tls_var 'int' tls
 #if defined(__CUDA_ARCH__)
 // NVPTX does not support TLS
 __device__ int __thread device_tls_var; // expected-error {{thread-local storage is not supported for the current target}}
+// CHECK-DEVICE: device_tls_var 'int' tls
 __shared__ int __thread shared_tls_var; // expected-error {{thread-local storage is not supported for the current target}}
+// CHECK-DEVICE: shared_tls_var 'int' tls
 // Device-side vars should not produce any errors during host-side
 // compilation.
 __device__ int __thread device_tls_var;
+// CHECK-HOST: device_tls_var 'int' tls
 __shared__ int __thread shared_tls_var;
+// CHECK-HOST: shared_tls_var 'int' tls
 __global__ void g1(int x) {}

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D9327.24570.patch
Type: text/x-patch
Size: 2710 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20150428/d8b20242/attachment.bin>

More information about the cfe-commits mailing list