Author: jlebar
Date: Fri Oct 21 15:50:47 2016
New Revision: 284882
URL: http://llvm.org/viewvc/llvm-project?rev=284882&view=rev
Log:
[CUDA] Simplify some repeated diagnostic expectations in CUDA tests.
Instead of repeating the diagnostic, use "expected-note N".
Test-only change.
Modified:
cfe/trunk/test/SemaCUDA/bad-calls-on-same-line.cu
cfe/trunk/test/SemaCUDA/call-device-fn-from-host.cu
cfe/trunk/test/SemaCUDA/call-host-fn-from-device.cu
cfe/trunk/test/SemaCUDA/trace-through-global.cu
Modified: cfe/trunk/test/SemaCUDA/bad-calls-on-same-line.cu
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCUDA/bad-calls-on-same-line.cu?rev=284882&r1=284881&r2=284882&view=diff
==============================================================================
--- cfe/trunk/test/SemaCUDA/bad-calls-on-same-line.cu (original)
+++ cfe/trunk/test/SemaCUDA/bad-calls-on-same-line.cu Fri Oct 21 15:50:47 2016
@@ -28,8 +28,7 @@ struct Selector<double> {
template <typename T>
inline __host__ __device__ void hd() {
Selector<T>().f();
- // expected-error@-1 {{reference to __device__ function}}
- // expected-error@-2 {{reference to __device__ function}}
+ // expected-error@-1 2 {{reference to __device__ function}}
}
void host_fn() {
Modified: cfe/trunk/test/SemaCUDA/call-device-fn-from-host.cu
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCUDA/call-device-fn-from-host.cu?rev=284882&r1=284881&r2=284882&view=diff
==============================================================================
--- cfe/trunk/test/SemaCUDA/call-device-fn-from-host.cu (original)
+++ cfe/trunk/test/SemaCUDA/call-device-fn-from-host.cu Fri Oct 21 15:50:47 2016
@@ -7,16 +7,11 @@
#include "Inputs/cuda.h"
__device__ void device_fn() {}
-// expected-note@-1 {{'device_fn' declared here}}
-// expected-note@-2 {{'device_fn' declared here}}
-// expected-note@-3 {{'device_fn' declared here}}
-// expected-note@-4 {{'device_fn' declared here}}
-// expected-note@-5 {{'device_fn' declared here}}
+// expected-note@-1 5 {{'device_fn' declared here}}
struct S {
__device__ S() {}
- // expected-note@-1 {{'S' declared here}}
- // expected-note@-2 {{'S' declared here}}
+ // expected-note@-1 2 {{'S' declared here}}
__device__ ~S() { device_fn(); }
// expected-note@-1 {{'~S' declared here}}
int x;
Modified: cfe/trunk/test/SemaCUDA/call-host-fn-from-device.cu
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCUDA/call-host-fn-from-device.cu?rev=284882&r1=284881&r2=284882&view=diff
==============================================================================
--- cfe/trunk/test/SemaCUDA/call-host-fn-from-device.cu (original)
+++ cfe/trunk/test/SemaCUDA/call-host-fn-from-device.cu Fri Oct 21 15:50:47 2016
@@ -7,20 +7,13 @@
#include "Inputs/cuda.h"
extern "C" void host_fn() {}
-// expected-note@-1 {{'host_fn' declared here}}
-// expected-note@-2 {{'host_fn' declared here}}
-// expected-note@-3 {{'host_fn' declared here}}
-// expected-note@-4 {{'host_fn' declared here}}
-// expected-note@-5 {{'host_fn' declared here}}
-// expected-note@-6 {{'host_fn' declared here}}
-// expected-note@-7 {{'host_fn' declared here}}
+// expected-note@-1 7 {{'host_fn' declared here}}
struct Dummy {};
struct S {
S() {}
- // expected-note@-1 {{'S' declared here}}
- // expected-note@-2 {{'S' declared here}}
+ // expected-note@-1 2 {{'S' declared here}}
~S() { host_fn(); }
// expected-note@-1 {{'~S' declared here}}
int x;
Modified: cfe/trunk/test/SemaCUDA/trace-through-global.cu
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCUDA/trace-through-global.cu?rev=284882&r1=284881&r2=284882&view=diff
==============================================================================
--- cfe/trunk/test/SemaCUDA/trace-through-global.cu (original)
+++ cfe/trunk/test/SemaCUDA/trace-through-global.cu Fri Oct 21 15:50:47 2016
@@ -6,8 +6,7 @@
#include "Inputs/cuda.h"
__device__ void device_fn(int) {}
-// expected-note@-1 {{declared here}}
-// expected-note@-2 {{declared here}}
+// expected-note@-1 2 {{declared here}}
inline __host__ __device__ int hd1() {
device_fn(0); // expected-error {{reference to __device__ function}}
@@ -45,6 +44,5 @@ void launch_kernel() {
void host_fn() {
launch_kernel<int>();
- // expected-note@-1 {{called by 'host_fn'}}
- // expected-note@-2 {{called by 'host_fn'}}
+ // expected-note@-1 2 {{called by 'host_fn'}}
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
