Fix lit failures due to merge conflicts

Signed-off-by: Soumi Manna <[email protected]>

Author: Soumi Manna

clang/test/CodeGenSYCL/disable_loop_pipelining.cpp

@@ -30,7 +30,7 @@ int main() {
 }
 
 // CHECK: define dso_local spir_kernel void @"{{.*}}test_kernel1"() #0 !kernel_arg_buffer_location ![[NUM4:[0-9]+]] !disable_loop_pipelining ![[NUM5:[0-9]+]]
-// CHECK: define {{.*}}spir_kernel void @"{{.*}}test_kernel2"() #0 !kernel_arg_buffer_location ![[NUM4]]
+// CHECK: define dso_local spir_kernel void @"{{.*}}test_kernel2"() #0 !kernel_arg_buffer_location ![[NUM4]]
 // CHECK: define dso_local spir_kernel void @"{{.*}}test_kernel3"() #0 !kernel_arg_buffer_location ![[NUM4]] !disable_loop_pipelining ![[NUM5]]
 // CHECK: ![[NUM4]] = !{}
 // CHECK: ![[NUM5]] = !{i32 1}

clang/test/Misc/pragma-attribute-supported-attributes-list.test

@@ -152,6 +152,8 @@
 // CHECK-NEXT: ReturnsTwice (SubjectMatchRule_function)
 // CHECK-NEXT: SYCLDevice (SubjectMatchRule_function)
 // CHECK-NEXT: SYCLDeviceIndirectlyCallable (SubjectMatchRule_function)
+// CHECK-NEXT: SYCLIntelFPGADisableLoopPipelining (SubjectMatchRule_function)
+// CHECK-NEXT: SYCLIntelFPGAInitiationInterval (SubjectMatchRule_function)
 // CHECK-NEXT: SYCLIntelKernelArgsRestrict (SubjectMatchRule_function)
 // CHECK-NEXT: SYCLIntelLoopFuse (SubjectMatchRule_function)
 // CHECK-NEXT: SYCLIntelMaxGlobalWorkDim (SubjectMatchRule_function)

clang/test/SemaSYCL/initiation_interval.cpp

@@ -9,7 +9,7 @@
 
 [[intel::initiation_interval(-1)]] void func1() {} // expected-error{{'initiation_interval' attribute requires a positive integral compile time constant expression}}
 
-[[intel::initiation_interval(0, 1)]] void func2() {} // expected-error{{'initiation_interval' attribute takes one argument}}
+[[intel::initiation_interval(0, 1)]] void func2() {} // expected-error{{'initiation_interval' attribute takes no more than 1 argument}}
 
 // Tests for Intel FPGA initiation_interval function attribute duplication.
 // No diagnostic is emitted because the arguments match. Duplicate attribute is silently ignored.

clang/test/SemaSYCL/intel-fpga-loops.cpp

@@ -8,11 +8,11 @@ sycl::queue deviceQueue;
 void foo() {
   // expected-error@+1 {{'ivdep' attribute cannot be applied to a declaration}}
   [[intel::ivdep]] int a[10];
-  // expected-error@+1 {{'initiation_interval' attribute cannot be applied to a declaration}}
+  // expected-error@+1 {{'initiation_interval' attribute only applies to 'for', 'while', 'do' statements, and functions}}
   [[intel::initiation_interval(2)]] int c[10];
   // expected-error@+1 {{'max_concurrency' attribute cannot be applied to a declaration}}
   [[intel::max_concurrency(2)]] int d[10];
-  // expected-error@+1 {{'disable_loop_pipelining' attribute cannot be applied to a declaration}}
+  // expected-error@+1 {{'disable_loop_pipelining' attribute only applies to 'for', 'while', 'do' statements, and functions}}
   [[intel::disable_loop_pipelining]] int g[10];
   // expected-error@+1 {{'loop_coalesce' attribute cannot be applied to a declaration}}
   [[intel::loop_coalesce(2)]] int h[10];