Make the tests better behaved and isolated by having all their input files
in Inputs/ relative to the test itself (instead of reaching out into other
tests' subdirectories).
Note that this duplicates the contents of cuda.h, though it doesn't seem
too bad in this case.
Index: test/PCH/cuda-kernel-call.cu
===================================================================
--- test/PCH/cuda-kernel-call.cu (revision 207447)
+++ test/PCH/cuda-kernel-call.cu (working copy)
@@ -5,7 +5,7 @@
#define HEADER
// Header.
-#include "../SemaCUDA/cuda.h"
+#include "Inputs/cuda.h"
void kcall(void (*kp)()) {
kp<<<1, 1>>>();
Index: test/SemaCUDA/function-target.cu
===================================================================
--- test/SemaCUDA/function-target.cu (revision 207447)
+++ test/SemaCUDA/function-target.cu (working copy)
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
-#include "cuda.h"
+#include "Inputs/cuda.h"
__host__ void h1h(void);
__device__ void h1d(void); // expected-note {{candidate function not viable: call to __device__ function from __host__ function}}
Index: test/SemaCUDA/kernel-call.cu
===================================================================
--- test/SemaCUDA/kernel-call.cu (revision 207447)
+++ test/SemaCUDA/kernel-call.cu (working copy)
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
-#include "cuda.h"
+#include "Inputs/cuda.h"
__global__ void g1(int x) {}
Index: test/SemaCUDA/cuda.h
===================================================================
--- test/SemaCUDA/cuda.h (revision 207447)
+++ test/SemaCUDA/cuda.h (working copy)
@@ -1,20 +0,0 @@
-/* Minimal declarations for CUDA support. Testing purposes only. */
-
-#include <stddef.h>
-
-#define __constant__ __attribute__((constant))
-#define __device__ __attribute__((device))
-#define __global__ __attribute__((global))
-#define __host__ __attribute__((host))
-#define __shared__ __attribute__((shared))
-#define __launch_bounds__(...) __attribute__((launch_bounds(__VA_ARGS__)))
-
-struct dim3 {
- unsigned x, y, z;
- __host__ __device__ dim3(unsigned x, unsigned y = 1, unsigned z = 1) : x(x), y(y), z(z) {}
-};
-
-typedef struct cudaStream *cudaStream_t;
-
-int cudaConfigureCall(dim3 gridSize, dim3 blockSize, size_t sharedSize = 0,
- cudaStream_t stream = 0);
Index: test/SemaCUDA/qualifiers.cu
===================================================================
--- test/SemaCUDA/qualifiers.cu (revision 207447)
+++ test/SemaCUDA/qualifiers.cu (working copy)
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
-#include "cuda.h"
+#include "Inputs/cuda.h"
__global__ void g1(int x) {}
__global__ int g2(int x) { // expected-error {{must have void return type}}
Index: test/SemaCUDA/launch_bounds.cu
===================================================================
--- test/SemaCUDA/launch_bounds.cu (revision 207447)
+++ test/SemaCUDA/launch_bounds.cu (working copy)
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
-#include "cuda.h"
+#include "Inputs/cuda.h"
__launch_bounds__(128, 7) void Test1(void);
__launch_bounds__(128) void Test2(void);
Index: test/CodeGenCUDA/kernel-call.cu
===================================================================
--- test/CodeGenCUDA/kernel-call.cu (revision 207447)
+++ test/CodeGenCUDA/kernel-call.cu (working copy)
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s
-#include "../SemaCUDA/cuda.h"
+#include "Inputs/cuda.h"
__global__ void g1(int x) {}
Index: test/CodeGenCUDA/device-stub.cu
===================================================================
--- test/CodeGenCUDA/device-stub.cu (revision 207447)
+++ test/CodeGenCUDA/device-stub.cu (working copy)
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s
-#include "../SemaCUDA/cuda.h"
+#include "Inputs/cuda.h"
// Test that we build the correct number of calls to cudaSetupArgument followed
// by a call to cudaLaunch.
Index: test/CodeGenCUDA/filter-decl.cu
===================================================================
--- test/CodeGenCUDA/filter-decl.cu (revision 207447)
+++ test/CodeGenCUDA/filter-decl.cu (working copy)
@@ -1,7 +1,7 @@
// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck -check-prefix=CHECK-HOST %s
// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm %s -o - -fcuda-is-device | FileCheck -check-prefix=CHECK-DEVICE %s
-#include "../SemaCUDA/cuda.h"
+#include "Inputs/cuda.h"
// CHECK-HOST-NOT: constantdata = global
// CHECK-DEVICE: constantdata = global
Index: test/CodeGenCUDA/ptx-kernels.cu
===================================================================
--- test/CodeGenCUDA/ptx-kernels.cu (revision 207447)
+++ test/CodeGenCUDA/ptx-kernels.cu (working copy)
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 %s -triple nvptx-unknown-unknown -fcuda-is-device -emit-llvm -o - | FileCheck %s
-#include "../SemaCUDA/cuda.h"
+#include "Inputs/cuda.h"
// CHECK-LABEL: define void @device_function
extern "C"
Index: test/CodeGenCUDA/address-spaces.cu
===================================================================
--- test/CodeGenCUDA/address-spaces.cu (revision 207447)
+++ test/CodeGenCUDA/address-spaces.cu (working copy)
@@ -3,7 +3,7 @@
// Verifies Clang emits correct address spaces and addrspacecast instructions
// for CUDA code.
-#include "../SemaCUDA/cuda.h"
+#include "Inputs/cuda.h"
// CHECK: @i = addrspace(1) global
__device__ int i;
Index: test/CodeGenCUDA/launch-bounds.cu
===================================================================
--- test/CodeGenCUDA/launch-bounds.cu (revision 207447)
+++ test/CodeGenCUDA/launch-bounds.cu (working copy)
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 %s -triple nvptx-unknown-unknown -fcuda-is-device -emit-llvm -o - | FileCheck %s
-#include "../SemaCUDA/cuda.h"
+#include "Inputs/cuda.h"
#define MAX_THREADS_PER_BLOCK 256
#define MIN_BLOCKS_PER_MP 2
_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
