[SYCL] Fix test. Fix review comments.

Sergey Kanaev · Sergey Kanaev · commit 68af6097d8ca · 2020-03-10T15:05:40.000+03:00
Signed-off-by: Sergey Kanaev &lt;sergey.kanaev@intel.com&gt;
diff --git a/clang/test/SemaSYCL/call-to-undefined-function.cpp b/clang/test/SemaSYCL/call-to-undefined-function.cpp
@@ -1,7 +1,6 @@
 // RUN: %clang_cc1 -fsycl-is-device -verify -fsyntax-only %s
 
 void defined() {
-  // empty
 }
 
 void undefined();
@@ -16,7 +15,6 @@ __attribute__((sycl_kernel)) void kernel_single_task(Func kernelFunc) {
 
 template <typename T>
 void definedTpl() {
-  // empty
 }
 
 template <typename T>
@@ -28,67 +26,57 @@ extern SYCL_EXTERNAL void undefinedExternalTpl();
 
 template <typename T, bool X>
 void definedPartialTpl() {
-  // empty
 }
 
 template <>
 void definedPartialTpl<char, true>() {
-  // empty
 }
 
 template <typename T, bool X>
 struct Tpl {
   void defined() {
-    // empty
   }
 };
 
 template <typename T>
 struct Tpl<T, true> {
   void defined() {
-    // empty
   }
 };
 
 template <typename T, bool X>
 struct TplWithTplMethod {
   template <typename T2, bool Y>
   void defined() {
-    // empty
   }
 };
 
 template <typename T>
 struct TplWithTplMethod<T, true> {
   template <typename T2, bool Y>
   void defined() {
-    // empty
   }
 };
 
 template <typename T, bool X>
 struct TplWithTplMethod2 {
   template <typename T2, bool Y>
   void defined() {
-    // empty
   }
 
   template <>
   void defined<char, true>() {
-    // empty
   }
 };
 
 template <typename T>
 struct TplWithTplMethod2<T, true> {
   template <typename T2, bool Y>
   void defined() {
-    // empty
   }
 
   template <>
   void defined<char, true>() {
-    // empty
   }
 };
 
@@ -101,7 +89,6 @@ void useFwDeclFn() {
 }
 
 void forwardDeclFn() {
-  // empty
 }
 
 int main() {
@@ -179,5 +166,4 @@ int main() {
 }
 
 void forwardDeclFn2() {
-  // empty
 }
diff --git a/clang/test/SemaSYCL/deferred-diagnostics-emit.cpp b/clang/test/SemaSYCL/deferred-diagnostics-emit.cpp
@@ -16,7 +16,7 @@ __attribute__((sycl_kernel)) void kernel_single_task(Func kernelFunc) {
 } // namespace cl
 
 //variadic functions from SYCL kernels emit a deferred diagnostic
-void variadic(int, ...);
+void variadic(int, ...) {}
 
 int calledFromKernel(int a) {
   // expected-error@+1 {{zero-length arrays are not permitted in C++}}
diff --git a/clang/test/SemaSYCL/sycl-restrict.cpp b/clang/test/SemaSYCL/sycl-restrict.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fcxx-exceptions -triple spir64 -fsycl-is-device -Wno-return-type -verify -fsyntax-only -std=c++17 -DSYCL_STRICT %s
+// RUN: %clang_cc1 -fcxx-exceptions -triple spir64 -fsycl-is-device -Wno-return-type -verify -fsyntax-only -std=c++17 %s
 // RUN: %clang_cc1 -fcxx-exceptions -triple spir64 -fsycl-is-device -fno-sycl-allow-func-ptr -Wno-return-type -verify -fsyntax-only -std=c++17 %s
 // RUN: %clang_cc1 -fcxx-exceptions -triple spir64 -fsycl-is-device -DALLOW_FP=1 -fsycl-allow-func-ptr -Wno-return-type -verify -fsyntax-only -std=c++17 %s
 
diff --git a/clang/test/SemaSYCL/sycl-varargs-cconv.cpp b/clang/test/SemaSYCL/sycl-varargs-cconv.cpp
@@ -1,5 +1,5 @@
-// The following runs only uses -Wno-sycl-strict to bypass SYCL_EXTERNAL applied
-// to funtion with raw pointer parameter
+// The following runs uses -Wno-sycl-strict to bypass SYCL_EXTERNAL applied to
+// funtion with raw pointer parameter
 // RUN: %clang_cc1 -fsycl-is-device -verify -Wno-sycl-strict -fsyntax-only %s
 // RUN: %clang_cc1 -fsycl-is-device -verify -Wno-sycl-strict -fsyntax-only -DPRINTF_INVALID_DEF %s
 // RUN: %clang_cc1 -fsycl-is-device -verify -fsyntax-only -Wno-sycl-strict -DPRINTF_INVALID_DECL %s

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`// RUN: %clang_cc1 -fsycl-is-device -verify -fsyntax-only %s`
`2`	`2`
`3`	`3`	`void defined() {`
`4`		`- // empty`
`5`	`4`	`}`
`6`	`5`
`7`	`6`	`void undefined();`
`@@ -16,7 +15,6 @@ __attribute__((sycl_kernel)) void kernel_single_task(Func kernelFunc) {`
`16`	`15`
`17`	`16`	`template <typename T>`
`18`	`17`	`void definedTpl() {`
`19`		`- // empty`
`20`	`18`	`}`
`21`	`19`
`22`	`20`	`template <typename T>`
`@@ -28,67 +26,57 @@ extern SYCL_EXTERNAL void undefinedExternalTpl();`
`28`	`26`
`29`	`27`	`template <typename T, bool X>`
`30`	`28`	`void definedPartialTpl() {`
`31`		`- // empty`
`32`	`29`	`}`
`33`	`30`
`34`	`31`	`template <>`
`35`	`32`	`void definedPartialTpl<char, true>() {`
`36`		`- // empty`
`37`	`33`	`}`
`38`	`34`
`39`	`35`	`template <typename T, bool X>`
`40`	`36`	`struct Tpl {`
`41`	`37`	`void defined() {`
`42`		`- // empty`
`43`	`38`	`}`
`44`	`39`	`};`
`45`	`40`
`46`	`41`	`template <typename T>`
`47`	`42`	`struct Tpl<T, true> {`
`48`	`43`	`void defined() {`
`49`		`- // empty`
`50`	`44`	`}`
`51`	`45`	`};`
`52`	`46`
`53`	`47`	`template <typename T, bool X>`
`54`	`48`	`struct TplWithTplMethod {`
`55`	`49`	`template <typename T2, bool Y>`
`56`	`50`	`void defined() {`
`57`		`- // empty`
`58`	`51`	`}`
`59`	`52`	`};`
`60`	`53`
`61`	`54`	`template <typename T>`
`62`	`55`	`struct TplWithTplMethod<T, true> {`
`63`	`56`	`template <typename T2, bool Y>`
`64`	`57`	`void defined() {`
`65`		`- // empty`
`66`	`58`	`}`
`67`	`59`	`};`
`68`	`60`
`69`	`61`	`template <typename T, bool X>`
`70`	`62`	`struct TplWithTplMethod2 {`
`71`	`63`	`template <typename T2, bool Y>`
`72`	`64`	`void defined() {`
`73`		`- // empty`
`74`	`65`	`}`
`75`	`66`
`76`	`67`	`template <>`
`77`	`68`	`void defined<char, true>() {`
`78`		`- // empty`
`79`	`69`	`}`
`80`	`70`	`};`
`81`	`71`
`82`	`72`	`template <typename T>`
`83`	`73`	`struct TplWithTplMethod2<T, true> {`
`84`	`74`	`template <typename T2, bool Y>`
`85`	`75`	`void defined() {`
`86`		`- // empty`
`87`	`76`	`}`
`88`	`77`
`89`	`78`	`template <>`
`90`	`79`	`void defined<char, true>() {`
`91`		`- // empty`
`92`	`80`	`}`
`93`	`81`	`};`
`94`	`82`
`@@ -101,7 +89,6 @@ void useFwDeclFn() {`
`101`	`89`	`}`
`102`	`90`
`103`	`91`	`void forwardDeclFn() {`
`104`		`- // empty`
`105`	`92`	`}`
`106`	`93`
`107`	`94`	`int main() {`
`@@ -179,5 +166,4 @@ int main() {`
`179`	`166`	`}`
`180`	`167`
`181`	`168`	`void forwardDeclFn2() {`
`182`		`- // empty`
`183`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %clang_cc1 -fcxx-exceptions -triple spir64 -fsycl-is-device -Wno-return-type -verify -fsyntax-only -std=c++17 -DSYCL_STRICT %s`
	`1`	`+// RUN: %clang_cc1 -fcxx-exceptions -triple spir64 -fsycl-is-device -Wno-return-type -verify -fsyntax-only -std=c++17 %s`
`2`	`2`	`// RUN: %clang_cc1 -fcxx-exceptions -triple spir64 -fsycl-is-device -fno-sycl-allow-func-ptr -Wno-return-type -verify -fsyntax-only -std=c++17 %s`
`3`	`3`	`// RUN: %clang_cc1 -fcxx-exceptions -triple spir64 -fsycl-is-device -DALLOW_FP=1 -fsycl-allow-func-ptr -Wno-return-type -verify -fsyntax-only -std=c++17 %s`
`4`	`4`