Skip to content

Commit c9c12a2

Browse files
committed
Align tests with the 42e4959 Remove space from vector type string
1 parent 4b47f7f commit c9c12a2

18 files changed

+207
-207
lines changed

clang/test/SemaSYCL/array-kernel-param.cpp

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,15 @@ int main() {
134134
// CHECK-NEXT: DeclStmt
135135
// CHECK-NEXT: VarDecl {{.*}} cinit
136136
// CHECK-NEXT: InitListExpr
137-
// CHECK-NEXT: ArrayInitLoopExpr {{.*}} 'int [2]'
138-
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'int [2]' lvalue
139-
// CHECK-NEXT: MemberExpr {{.*}} 'int [2]' lvalue .
137+
// CHECK-NEXT: ArrayInitLoopExpr {{.*}} 'int[2]'
138+
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'int[2]' lvalue
139+
// CHECK-NEXT: MemberExpr {{.*}} 'int[2]' lvalue .
140140
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_' '__wrapper_class'
141141
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int' <LValueToRValue>
142142
// CHECK-NEXT: ArraySubscriptExpr {{.*}} 'int' lvalue
143143
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int *' <ArrayToPointerDecay>
144-
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'int [2]' lvalue
145-
// CHECK-NEXT: MemberExpr {{.*}} 'int [2]' lvalue .
144+
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'int[2]' lvalue
145+
// CHECK-NEXT: MemberExpr {{.*}} 'int[2]' lvalue .
146146
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_' '__wrapper_class'
147147

148148
// Check Kernel_Array_Ptrs parameters
@@ -177,7 +177,7 @@ int main() {
177177
// CHECK-NEXT: VarDecl {{.*}} used '(lambda at {{.*}}array-kernel-param.cpp{{.*}})' cinit
178178
// CHECK-NEXT: InitListExpr {{.*}} '(lambda at {{.*}}array-kernel-param.cpp{{.*}})'
179179
// CHECK-NEXT: InitListExpr {{.*}} 'StructWithAccessors'
180-
// CHECK-NEXT: InitListExpr {{.*}} 'Accessor [2]'
180+
// CHECK-NEXT: InitListExpr {{.*}} 'Accessor[2]'
181181
// CHECK-NEXT: CXXConstructExpr {{.*}} 'Accessor'
182182
// CHECK-NEXT: CXXConstructExpr {{.*}} 'Accessor'
183183

@@ -219,15 +219,15 @@ int main() {
219219
// CHECK-NEXT: InitListExpr {{.*}} '(lambda at {{.*}}array-kernel-param.cpp{{.*}})'
220220

221221
// Initializer for struct array i.e. DecomposedStruct DecompStructArray[2]
222-
// CHECK-NEXT: InitListExpr {{.*}} 'DecomposedStruct [2]'
222+
// CHECK-NEXT: InitListExpr {{.*}} 'DecomposedStruct[2]'
223223

224224
// Initializer for first element of DecompStructArray
225225
// CHECK-NEXT: InitListExpr {{.*}} 'DecomposedStruct'
226226
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int' <LValueToRValue>
227227
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' lvalue ParmVar {{.*}} '_arg_a' 'int'
228228

229229
// Initializer for struct array inside DecomposedStruct i.e. StructWithPointers SWPtrsMem[2]
230-
// CHECK-NEXT: InitListExpr {{.*}} 'StructWithPointers [2]'
230+
// CHECK-NEXT: InitListExpr {{.*}} 'StructWithPointers[2]'
231231
// Initializer for first element of inner struct array
232232
// CHECK-NEXT: InitListExpr {{.*}} 'StructWithPointers'
233233
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int' <LValueToRValue>
@@ -278,7 +278,7 @@ int main() {
278278
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' lvalue ParmVar {{.*}} '_arg_a' 'int'
279279

280280
// Initializer for struct array inside DecomposedStruct i.e. StructWithPointers SWPtrsMem[2]
281-
// CHECK-NEXT: InitListExpr {{.*}} 'StructWithPointers [2]'
281+
// CHECK-NEXT: InitListExpr {{.*}} 'StructWithPointers[2]'
282282
// Initializer for first element of inner struct array
283283
// CHECK-NEXT: InitListExpr {{.*}} 'StructWithPointers'
284284
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int' <LValueToRValue>
@@ -340,26 +340,26 @@ int main() {
340340
// CHECK-NEXT: DeclStmt
341341
// CHECK-NEXT: VarDecl {{.*}} cinit
342342
// CHECK-NEXT: InitListExpr
343-
// CHECK-NEXT: ArrayInitLoopExpr {{.*}} 'int [2][3]'
344-
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'int [2][3]' lvalue
345-
// CHECK-NEXT: MemberExpr {{.*}} 'int [2][3]' lvalue .
343+
// CHECK-NEXT: ArrayInitLoopExpr {{.*}} 'int[2][3]'
344+
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'int[2][3]' lvalue
345+
// CHECK-NEXT: MemberExpr {{.*}} 'int[2][3]' lvalue .
346346
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_' '__wrapper_class'
347-
// CHECK-NEXT: ArrayInitLoopExpr {{.*}} 'int [3]'
348-
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'int [3]' lvalue
349-
// CHECK-NEXT: ArraySubscriptExpr {{.*}} 'int [3]' lvalue
347+
// CHECK-NEXT: ArrayInitLoopExpr {{.*}} 'int[3]'
348+
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'int[3]' lvalue
349+
// CHECK-NEXT: ArraySubscriptExpr {{.*}} 'int[3]' lvalue
350350
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int (*)[3]' <ArrayToPointerDecay>
351-
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'int [2][3]' lvalue
352-
// CHECK-NEXT: MemberExpr {{.*}} 'int [2][3]' lvalue .
351+
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'int[2][3]' lvalue
352+
// CHECK-NEXT: MemberExpr {{.*}} 'int[2][3]' lvalue .
353353
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_' '__wrapper_class'
354354
// CHECK-NEXT: ArrayInitIndexExpr {{.*}} 'unsigned
355355
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int' <LValueToRValue>
356356
// CHECK-NEXT: ArraySubscriptExpr {{.*}} 'int' lvalue
357357
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int *' <ArrayToPointerDecay>
358-
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'int [3]' lvalue
359-
// CHECK-NEXT: ArraySubscriptExpr {{.*}} 'int [3]' lvalue
358+
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'int[3]' lvalue
359+
// CHECK-NEXT: ArraySubscriptExpr {{.*}} 'int[3]' lvalue
360360
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int (*)[3]' <ArrayToPointerDecay>
361-
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'int [2][3]' lvalue
362-
// CHECK-NEXT: MemberExpr {{.*}} 'int [2][3]' lvalue .
361+
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'int[2][3]' lvalue
362+
// CHECK-NEXT: MemberExpr {{.*}} 'int[2][3]' lvalue .
363363
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_' '__wrapper_class'
364364
// CHECK-NEXT: ArrayInitIndexExpr {{.*}} 'unsigned
365365
// CHECK-NEXT: ArrayInitIndexExpr {{.*}} 'unsigned
@@ -372,15 +372,15 @@ int main() {
372372
// CHECK-NEXT: DeclStmt
373373
// CHECK-NEXT: VarDecl {{.*}} cinit
374374
// CHECK-NEXT: InitListExpr
375-
// CHECK-NEXT: ArrayInitLoopExpr {{.*}} 'NonDecomposedStruct [2]'
376-
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'NonDecomposedStruct [2]' lvalue
377-
// CHECK-NEXT: MemberExpr {{.*}} 'NonDecomposedStruct [2]' lvalue .
375+
// CHECK-NEXT: ArrayInitLoopExpr {{.*}} 'NonDecomposedStruct[2]'
376+
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'NonDecomposedStruct[2]' lvalue
377+
// CHECK-NEXT: MemberExpr {{.*}} 'NonDecomposedStruct[2]' lvalue .
378378
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_' '__wrapper_class'
379379
// CHECK-NEXT: CXXConstructExpr {{.*}} 'NonDecomposedStruct' 'void (const NonDecomposedStruct &) noexcept'
380380
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'const NonDecomposedStruct' lvalue <NoOp>
381381
// CHECK-NEXT: ArraySubscriptExpr {{.*}} 'NonDecomposedStruct' lvalue
382382
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'NonDecomposedStruct *' <ArrayToPointerDecay>
383-
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'NonDecomposedStruct [2]' lvalue
384-
// CHECK-NEXT: MemberExpr {{.*}} 'NonDecomposedStruct [2]' lvalue .
383+
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'NonDecomposedStruct[2]' lvalue
384+
// CHECK-NEXT: MemberExpr {{.*}} 'NonDecomposedStruct[2]' lvalue .
385385
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_' '__wrapper_class'
386386
// CHECK-NEXT: ArrayInitIndexExpr {{.*}} 'unsigned

clang/test/SemaSYCL/initiation_interval.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
[[intel::initiation_interval(5)]] int a; // expected-error{{'initiation_interval' attribute only applies to 'for', 'while', 'do' statements, and functions}}
99

10-
[[intel::initiation_interval("foo")]] void func() {} // expected-error{{integral constant expression must have integral or unscoped enumeration type, not 'const char [4]'}}
10+
[[intel::initiation_interval("foo")]] void func() {} // expected-error{{integral constant expression must have integral or unscoped enumeration type, not 'const char[4]'}}
1111

1212
[[intel::initiation_interval(-1)]] void func1() {} // expected-error{{'initiation_interval' attribute requires a positive integral compile time constant expression}}
1313

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ void diagnostics()
430430
[[intel::simple_dual_port]] unsigned int sdp_reg[64];
431431

432432
// Checking of different argument values.
433-
//CHECK: VarDecl{{.*}}bw_bw 'unsigned int [64]'
433+
//CHECK: VarDecl{{.*}}bw_bw 'unsigned int[64]'
434434
//CHECK:IntelFPGAMemoryAttr{{.*}}Implicit Default
435435
//CHECK: IntelFPGABankWidthAttr
436436
//CHECK-NEXT: ConstantExpr{{.*}}'int'
@@ -509,7 +509,7 @@ void diagnostics()
509509
//expected-note@-2 {{conflicting attribute is here}}
510510
unsigned int nb_reg[64];
511511

512-
//CHECK: VarDecl{{.*}}nb_nb 'unsigned int [64]'
512+
//CHECK: VarDecl{{.*}}nb_nb 'unsigned int[64]'
513513
//CHECK: IntelFPGAMemoryAttr{{.*}}Implicit Default
514514
//CHECK:IntelFPGANumBanksAttr
515515
//CHECK-NEXT: ConstantExpr{{.*}}'int'
@@ -595,7 +595,7 @@ void diagnostics()
595595
//CHECK-NEXT: IntegerLiteral{{.*}}5{{$}}
596596
[[intel::bank_bits(2, 3, 4, 5)]] unsigned int bankbits[64];
597597

598-
//CHECK: VarDecl{{.*}} bb_reg 'unsigned int [4]'
598+
//CHECK: VarDecl{{.*}} bb_reg 'unsigned int[4]'
599599
//CHECK: IntelFPGANumBanksAttr{{.*}}Implicit
600600
//CHECK-NEXT: IntegerLiteral{{.*}}'int' 4
601601
//CHECK: IntelFPGAMemoryAttr{{.*}}Implicit Default

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,19 +149,19 @@ void goo() {
149149
// expected-error@+1 {{unknown argument to 'ivdep'; expected integer or array variable}}
150150
[[intel::ivdep("test123")]] for (int i = 0; i != 10; ++i)
151151
a[i] = 0;
152-
// expected-error@+1 {{integral constant expression must have integral or unscoped enumeration type, not 'const char [8]'}}
152+
// expected-error@+1 {{integral constant expression must have integral or unscoped enumeration type, not 'const char[8]'}}
153153
[[intel::initiation_interval("test123")]] for (int i = 0; i != 10; ++i)
154154
a[i] = 0;
155-
// expected-error@+1 {{integral constant expression must have integral or unscoped enumeration type, not 'const char [8]'}}
155+
// expected-error@+1 {{integral constant expression must have integral or unscoped enumeration type, not 'const char[8]'}}
156156
[[intel::max_concurrency("test123")]] for (int i = 0; i != 10; ++i)
157157
a[i] = 0;
158-
// expected-error@+1 {{integral constant expression must have integral or unscoped enumeration type, not 'const char [8]'}}
158+
// expected-error@+1 {{integral constant expression must have integral or unscoped enumeration type, not 'const char[8]'}}
159159
[[intel::loop_coalesce("test123")]] for (int i = 0; i != 10; ++i)
160160
a[i] = 0;
161-
// expected-error@+1 {{integral constant expression must have integral or unscoped enumeration type, not 'const char [8]'}}
161+
// expected-error@+1 {{integral constant expression must have integral or unscoped enumeration type, not 'const char[8]'}}
162162
[[intel::max_interleaving("test123")]] for (int i = 0; i != 10; ++i)
163163
a[i] = 0;
164-
// expected-error@+1 {{integral constant expression must have integral or unscoped enumeration type, not 'const char [8]'}}
164+
// expected-error@+1 {{integral constant expression must have integral or unscoped enumeration type, not 'const char[8]'}}
165165
[[intel::speculated_iterations("test123")]] for (int i = 0; i != 10; ++i)
166166
a[i] = 0;
167167
// expected-error@+1 {{unknown argument to 'ivdep'; expected integer or array variable}}
@@ -200,7 +200,7 @@ void goo() {
200200
// expected-error@+1 {{'loop_count_avg' attribute requires a non-negative integral compile time constant expression}}
201201
[[intel::loop_count_avg(-1)]] for (int i = 0; i != 10; ++i)
202202
a[i] = 0;
203-
// expected-error@+1 {{integral constant expression must have integral or unscoped enumeration type, not 'const char [4]'}}
203+
// expected-error@+1 {{integral constant expression must have integral or unscoped enumeration type, not 'const char[4]'}}
204204
[[intel::loop_count_avg("abc")]] for (int i = 0; i != 10; ++i)
205205
a[i] = 0;
206206
}

clang/test/SemaSYCL/intel-fpga-no-global-work-offset.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ int main() {
5151
[]() [[intel::no_global_work_offset,
5252
intel::no_global_work_offset]]{}); // OK
5353

54-
// expected-error@+2{{integral constant expression must have integral or unscoped enumeration type, not 'const char [4]'}}
54+
// expected-error@+2{{integral constant expression must have integral or unscoped enumeration type, not 'const char[4]'}}
5555
h.single_task<class test_kernel6>(
5656
[]() [[intel::no_global_work_offset("foo")]]{});
5757

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void foo() {
4242
int *bp = __builtin_intel_fpga_reg(ap);
4343
int intArr[10] = {0};
4444
int *k = __builtin_intel_fpga_reg(intArr);
45-
// expected-error@-1{{illegal argument of type 'int [10]' to __builtin_intel_fpga_reg}}
45+
// expected-error@-1{{illegal argument of type 'int[10]' to __builtin_intel_fpga_reg}}
4646

4747
void (*fp1)();
4848
void (*fp2)() = __builtin_intel_fpga_reg(fp1);

clang/test/SemaSYCL/loop_fusion.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Tests for incorrect argument values for Intel FPGA loop fusion function attributes
44
[[intel::loop_fuse(5)]] int a; // expected-error{{'loop_fuse' attribute only applies to functions}}
55

6-
[[intel::loop_fuse("foo")]] void func() {} // expected-error{{integral constant expression must have integral or unscoped enumeration type, not 'const char [4]'}}
6+
[[intel::loop_fuse("foo")]] void func() {} // expected-error{{integral constant expression must have integral or unscoped enumeration type, not 'const char[4]'}}
77

88
[[intel::loop_fuse(1048577)]] void func1() {} // OK
99
[[intel::loop_fuse_independent(-1)]] void func2() {} // expected-error{{'loop_fuse_independent' attribute requires a non-negative integral compile time constant expression}}

clang/test/SemaSYCL/max-concurrency.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class Functor6 {
7272
}
7373
};
7474

75-
// expected-error@+1 {{integral constant expression must have integral or unscoped enumeration type, not 'const char [16]'}}
75+
// expected-error@+1 {{integral constant expression must have integral or unscoped enumeration type, not 'const char[16]'}}
7676
[[intel::max_concurrency("numberofthreads")]] void zoo() {}
7777

7878
template <int NT>

clang/test/SemaSYCL/scheduler_target_fmax_mhz.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
[[intel::scheduler_target_fmax_mhz(1048577)]] void correct() {} // OK
1313

14-
[[intel::scheduler_target_fmax_mhz("foo")]] void func() {} // expected-error{{integral constant expression must have integral or unscoped enumeration type, not 'const char [4]'}}
14+
[[intel::scheduler_target_fmax_mhz("foo")]] void func() {} // expected-error{{integral constant expression must have integral or unscoped enumeration type, not 'const char[4]'}}
1515

1616
[[intel::scheduler_target_fmax_mhz(-1)]] void func1() {} // expected-error{{'scheduler_target_fmax_mhz' attribute requires a non-negative integral compile time constant expression}}
1717

0 commit comments

Comments
 (0)