Author: eliben
Date: Mon Apr 28 17:21:28 2014
New Revision: 207453
URL: http://llvm.org/viewvc/llvm-project?rev=207453&view=rev
Log:
Move all CUDA testing inputs to Inputs/ subdirectory inside the tests.
Added:
cfe/trunk/test/CodeGenCUDA/Inputs/
cfe/trunk/test/CodeGenCUDA/Inputs/cuda.h
- copied unchanged from r207447, cfe/trunk/test/SemaCUDA/cuda.h
cfe/trunk/test/PCH/Inputs/cuda.h
- copied unchanged from r207447, cfe/trunk/test/SemaCUDA/cuda.h
cfe/trunk/test/SemaCUDA/Inputs/
cfe/trunk/test/SemaCUDA/Inputs/cuda.h
- copied unchanged from r207447, cfe/trunk/test/SemaCUDA/cuda.h
Removed:
cfe/trunk/test/SemaCUDA/cuda.h
Modified:
cfe/trunk/test/CodeGenCUDA/address-spaces.cu
cfe/trunk/test/CodeGenCUDA/device-stub.cu
cfe/trunk/test/CodeGenCUDA/filter-decl.cu
cfe/trunk/test/CodeGenCUDA/kernel-call.cu
cfe/trunk/test/CodeGenCUDA/launch-bounds.cu
cfe/trunk/test/CodeGenCUDA/ptx-kernels.cu
cfe/trunk/test/PCH/cuda-kernel-call.cu
cfe/trunk/test/SemaCUDA/function-target.cu
cfe/trunk/test/SemaCUDA/kernel-call.cu
cfe/trunk/test/SemaCUDA/launch_bounds.cu
cfe/trunk/test/SemaCUDA/qualifiers.cu
Modified: cfe/trunk/test/CodeGenCUDA/address-spaces.cu
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCUDA/address-spaces.cu?rev=207453&r1=207452&r2=207453&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCUDA/address-spaces.cu (original)
+++ cfe/trunk/test/CodeGenCUDA/address-spaces.cu Mon Apr 28 17:21:28 2014
@@ -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;
Modified: cfe/trunk/test/CodeGenCUDA/device-stub.cu
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCUDA/device-stub.cu?rev=207453&r1=207452&r2=207453&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCUDA/device-stub.cu (original)
+++ cfe/trunk/test/CodeGenCUDA/device-stub.cu Mon Apr 28 17:21:28 2014
@@ -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.
Modified: cfe/trunk/test/CodeGenCUDA/filter-decl.cu
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCUDA/filter-decl.cu?rev=207453&r1=207452&r2=207453&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCUDA/filter-decl.cu (original)
+++ cfe/trunk/test/CodeGenCUDA/filter-decl.cu Mon Apr 28 17:21:28 2014
@@ -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
Modified: cfe/trunk/test/CodeGenCUDA/kernel-call.cu
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCUDA/kernel-call.cu?rev=207453&r1=207452&r2=207453&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCUDA/kernel-call.cu (original)
+++ cfe/trunk/test/CodeGenCUDA/kernel-call.cu Mon Apr 28 17:21:28 2014
@@ -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) {}
Modified: cfe/trunk/test/CodeGenCUDA/launch-bounds.cu
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCUDA/launch-bounds.cu?rev=207453&r1=207452&r2=207453&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCUDA/launch-bounds.cu (original)
+++ cfe/trunk/test/CodeGenCUDA/launch-bounds.cu Mon Apr 28 17:21:28 2014
@@ -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
Modified: cfe/trunk/test/CodeGenCUDA/ptx-kernels.cu
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCUDA/ptx-kernels.cu?rev=207453&r1=207452&r2=207453&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCUDA/ptx-kernels.cu (original)
+++ cfe/trunk/test/CodeGenCUDA/ptx-kernels.cu Mon Apr 28 17:21:28 2014
@@ -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"
Modified: cfe/trunk/test/PCH/cuda-kernel-call.cu
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/cuda-kernel-call.cu?rev=207453&r1=207452&r2=207453&view=diff
==============================================================================
--- cfe/trunk/test/PCH/cuda-kernel-call.cu (original)
+++ cfe/trunk/test/PCH/cuda-kernel-call.cu Mon Apr 28 17:21:28 2014
@@ -5,7 +5,7 @@
#define HEADER
// Header.
-#include "../SemaCUDA/cuda.h"
+#include "Inputs/cuda.h"
void kcall(void (*kp)()) {
kp<<<1, 1>>>();
Removed: cfe/trunk/test/SemaCUDA/cuda.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCUDA/cuda.h?rev=207452&view=auto
==============================================================================
--- cfe/trunk/test/SemaCUDA/cuda.h (original)
+++ cfe/trunk/test/SemaCUDA/cuda.h (removed)
@@ -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);
Modified: cfe/trunk/test/SemaCUDA/function-target.cu
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCUDA/function-target.cu?rev=207453&r1=207452&r2=207453&view=diff
==============================================================================
--- cfe/trunk/test/SemaCUDA/function-target.cu (original)
+++ cfe/trunk/test/SemaCUDA/function-target.cu Mon Apr 28 17:21:28 2014
@@ -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}}
Modified: cfe/trunk/test/SemaCUDA/kernel-call.cu
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCUDA/kernel-call.cu?rev=207453&r1=207452&r2=207453&view=diff
==============================================================================
--- cfe/trunk/test/SemaCUDA/kernel-call.cu (original)
+++ cfe/trunk/test/SemaCUDA/kernel-call.cu Mon Apr 28 17:21:28 2014
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
-#include "cuda.h"
+#include "Inputs/cuda.h"
__global__ void g1(int x) {}
Modified: cfe/trunk/test/SemaCUDA/launch_bounds.cu
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCUDA/launch_bounds.cu?rev=207453&r1=207452&r2=207453&view=diff
==============================================================================
--- cfe/trunk/test/SemaCUDA/launch_bounds.cu (original)
+++ cfe/trunk/test/SemaCUDA/launch_bounds.cu Mon Apr 28 17:21:28 2014
@@ -1,14 +1,14 @@
-// RUN: %clang_cc1 -fsyntax-only -verify %s
-
-#include "cuda.h"
-
-__launch_bounds__(128, 7) void Test1(void);
-__launch_bounds__(128) void Test2(void);
-
-__launch_bounds__(1, 2, 3) void Test3(void); // expected-error
{{'launch_bounds' attribute takes no more than 2 arguments}}
-
-// FIXME: the error should read that the attribute takes exactly one or two
arguments, but there
-// is no support for such a diagnostic currently.
-__launch_bounds__() void Test4(void); // expected-error {{'launch_bounds'
attribute takes no more than 2 arguments}}
-
-int Test5 __launch_bounds__(128, 7); // expected-warning {{'launch_bounds'
attribute only applies to functions and methods}}
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+
+#include "Inputs/cuda.h"
+
+__launch_bounds__(128, 7) void Test1(void);
+__launch_bounds__(128) void Test2(void);
+
+__launch_bounds__(1, 2, 3) void Test3(void); // expected-error
{{'launch_bounds' attribute takes no more than 2 arguments}}
+
+// FIXME: the error should read that the attribute takes exactly one or two
arguments, but there
+// is no support for such a diagnostic currently.
+__launch_bounds__() void Test4(void); // expected-error {{'launch_bounds'
attribute takes no more than 2 arguments}}
+
+int Test5 __launch_bounds__(128, 7); // expected-warning {{'launch_bounds'
attribute only applies to functions and methods}}
Modified: cfe/trunk/test/SemaCUDA/qualifiers.cu
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCUDA/qualifiers.cu?rev=207453&r1=207452&r2=207453&view=diff
==============================================================================
--- cfe/trunk/test/SemaCUDA/qualifiers.cu (original)
+++ cfe/trunk/test/SemaCUDA/qualifiers.cu Mon Apr 28 17:21:28 2014
@@ -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}}
_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
