Minor changes to address comments and resolve branch merge conflicts

Author: schittir

clang/test/SemaSYCL/check-indirect-attribute-propagation.cpp

@@ -1,4 +1,4 @@
-// RUN: %clang %s -fsyntax-only -Xclang -ast-dump -fsycl-device-only | FileCheck %s
+// RUN: %clang_cc1 %s -fsyntax-only -ast-dump -fsycl -fsycl-is-device -triple spir64 | FileCheck %s
 
 [[intelfpga::no_global_work_offset]] void not_direct() {}
 
@@ -17,7 +17,7 @@ void parallel_for(Type lambda) {
 
 void invoke_foo2() {
   // CHECK-LABEL:  FunctionDecl {{.*}} invoke_foo2 'void ()'
-  // CHECK:  `-FunctionDecl {{.*}} _ZTSZ11invoke_foo2vE10KernelName 'void ()'
-  // CHECK:  -SYCLIntelNoGlobalWorkOffsetAttr {{.*}} Enabled
+  // CHECK:        `-FunctionDecl {{.*}}KernelName 'void ()'
+  // CHECK:        -SYCLIntelNoGlobalWorkOffsetAttr {{.*}} Enabled
   parallel_for<class KernelName>([]() {});
 }

clang/test/SemaSYCL/check-notdirect-attribute-propagation.cpp

@@ -21,7 +21,7 @@ void foo() {
 #else // __SYCL_DEVICE_ONLY__
 
 [[intelfpga::max_global_work_dim(2)]]
-void func_ignore() {}
+void func_do_not_ignore() {}
 
 struct FuncObj {
   [[intelfpga::max_global_work_dim(1)]]
@@ -68,9 +68,9 @@ int main() {
       []() [[intelfpga::max_global_work_dim(2)]] {});
 
   // CHECK-LABEL: FunctionDecl {{.*}}test_kernel3
-  // CHECK-NOT:   SYCLIntelMaxGlobalWorkDimAttr {{.*}}
+  // CHECK:       SYCLIntelMaxGlobalWorkDimAttr {{.*}}
   kernel<class test_kernel3>(
-      []() {func_ignore();});
+      []() {func_do_not_ignore();});
 
   kernel<class test_kernel4>(
       TRIFuncObjGood1());

clang/test/SemaSYCL/intel-max-global-work-dim.cpp

@@ -21,7 +21,7 @@ void foo() {
 #else // __SYCL_DEVICE_ONLY__
 
 [[intelfpga::max_work_group_size(2, 2, 2)]]
-void func_ignore() {}
+void func_do_not_ignore() {}
 
 struct FuncObj {
   [[intelfpga::max_work_group_size(4, 4, 4)]]
@@ -53,9 +53,9 @@ int main() {
       []() [[intelfpga::max_work_group_size(8, 8, 8)]] {});
 
   // CHECK-LABEL: FunctionDecl {{.*}}test_kernel3
-  // CHECK-NOT:   SYCLIntelMaxWorkGroupSizeAttr {{.*}}
+  // CHECK:       SYCLIntelMaxWorkGroupSizeAttr {{.*}}
   kernel<class test_kernel3>(
-      []() {func_ignore();});
+      []() {func_do_not_ignore();});
 
 #ifdef TRIGGER_ERROR
   [[intelfpga::max_work_group_size(1, 1, 1)]] int Var = 0; // expected-error{{'max_work_group_size' attribute only applies to functions}}

clang/test/SemaSYCL/intel-max-work-group-size.cpp

@@ -2,7 +2,7 @@
 // RUN: %clang_cc1 %s -fsyntax-only -ast-dump -fsycl -fsycl-is-device -triple spir64 | FileCheck %s
 
 [[intel::kernel_args_restrict]]
-void func_ignore() {}
+void func_do_not_ignore() {}
 
 struct FuncObj {
   [[intel::kernel_args_restrict]]
@@ -29,7 +29,7 @@ int main() {
       []() [[intel::kernel_args_restrict]] {});
 
   // CHECK-LABEL: FunctionDecl {{.*}}test_kernel3
-  // CHECK-NOT:   SYCLIntelKernelArgsRestrictAttr
+  // CHECK:       SYCLIntelKernelArgsRestrictAttr
   kernel<class test_kernel3>(
-      []() {func_ignore();});
+      []() {func_do_not_ignore();});
 }

clang/test/SemaSYCL/intel-restrict.cpp

@@ -21,7 +21,7 @@ void foo() {
 #else // __SYCL_DEVICE_ONLY__
 
 [[intelfpga::num_simd_work_items(2)]]
-void func_ignore() {}
+void func_do_not_ignore() {}
 
 struct FuncObj {
   [[intelfpga::num_simd_work_items(42)]]
@@ -45,9 +45,9 @@ int main() {
       []() [[intelfpga::num_simd_work_items(8)]] {});
 
   // CHECK-LABEL: FunctionDecl {{.*}}test_kernel3
-  // CHECK-NOT:   SYCLIntelNumSimdWorkItemsAttr {{.*}} 2
+  // CHECK:       SYCLIntelNumSimdWorkItemsAttr {{.*}} 2
   kernel<class test_kernel3>(
-      []() {func_ignore();});
+      []() {func_do_not_ignore();});
 
 #ifdef TRIGGER_ERROR
   [[intelfpga::num_simd_work_items(0)]] int Var = 0; // expected-error{{'num_simd_work_items' attribute only applies to functions}}