Skip to content

Commit 776e521

Browse files
ronliebronlieb
authored
[OpenMP] Update no-loop and big-jump-loop tests after PR#154105 (llvm#3643)
2 parents 46abf9b + cd4e64a commit 776e521

13 files changed

+55
-55
lines changed

‎offload/test/multi_device/collapse-clause.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ int main() {
3535
}
3636

3737
// clang-format off
38-
// CHECK: DEVID: 0 SGN:5 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:0 md_UB:4999
39-
// CHECK: DEVID: 1 SGN:5 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:5000 md_UB:9999
38+
// CHECK: DEVID: 0 SGN:7 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:0 md_UB:4999
39+
// CHECK: DEVID: 1 SGN:7 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:5000 md_UB:9999
4040
// clang-format on
4141

4242
// Checking the results are correct:

‎offload/test/multi_device/mixed-multi-device.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ int main() {
4949

5050
// clang-format off
5151
// CHECK: DEVID: 0 SGN:2 {{.*}} tripcount:0 rpc:1 md:0
52-
// CHECK: DEVID: 0 SGN:5 {{.*}} tripcount:9999 rpc:1 md:1 md_LB:0 md_UB:4998
53-
// CHECK: DEVID: 1 SGN:5 {{.*}} tripcount:9999 rpc:1 md:1 md_LB:4999 md_UB:9998
52+
// CHECK: DEVID: 0 SGN:7 {{.*}} tripcount:9999 rpc:1 md:1 md_LB:0 md_UB:4998
53+
// CHECK: DEVID: 1 SGN:7 {{.*}} tripcount:9999 rpc:1 md:1 md_LB:4999 md_UB:9998
5454
// CHECK: DEVID: 0 SGN:1 {{.*}} tripcount:0 rpc:1 md:0
5555
// clang-format on
5656

‎offload/test/multi_device/no-copy-globals-no-force-usm.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ int main() {
2828
rho[i] = 1.0;
2929

3030
// clang-format off
31-
// CHECK: DEVID: 0 SGN:5 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:0 md_UB:4999
32-
// CHECK: DEVID: 1 SGN:5 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:5000 md_UB:9999
31+
// CHECK: DEVID: 0 SGN:7 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:0 md_UB:4999
32+
// CHECK: DEVID: 1 SGN:7 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:5000 md_UB:9999
3333
// clang-format on
3434
#pragma omp target teams distribute parallel for
3535
for (int i = 0; i < N; i++) {

‎offload/test/multi_device/no-copy-globals-target-fast-no-force-usm.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ int main() {
2828
rho[i] = 1.0;
2929

3030
// clang-format off
31-
// CHECK: DEVID: 0 SGN:4 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:0 md_UB:4999
32-
// CHECK: DEVID: 1 SGN:4 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:5000 md_UB:9999
31+
// CHECK: DEVID: 0 SGN:6 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:0 md_UB:4999
32+
// CHECK: DEVID: 1 SGN:6 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:5000 md_UB:9999
3333
// clang-format on
3434
#pragma omp target teams distribute parallel for
3535
for (int i = 0; i < N; i++) {

‎offload/test/multi_device/no-copy-globals-with-target-fast.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ int main() {
2828
rho[i] = 1.0;
2929

3030
// clang-format off
31-
// CHECK: DEVID: 0 SGN:4 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:0 md_UB:4999
32-
// CHECK: DEVID: 1 SGN:4 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:5000 md_UB:9999
31+
// CHECK: DEVID: 0 SGN:6 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:0 md_UB:4999
32+
// CHECK: DEVID: 1 SGN:6 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:5000 md_UB:9999
3333
// clang-format on
3434

3535
#pragma omp target teams distribute parallel for

‎offload/test/multi_device/no-copy-globals.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ int main() {
2828
rho[i] = 1.0;
2929

3030
// clang-format off
31-
// CHECK: DEVID: 0 SGN:5 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:0 md_UB:4999
32-
// CHECK: DEVID: 1 SGN:5 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:5000 md_UB:9999
31+
// CHECK: DEVID: 0 SGN:7 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:0 md_UB:4999
32+
// CHECK: DEVID: 1 SGN:7 {{.*}} tripcount:10000 rpc:0 md:1 md_LB:5000 md_UB:9999
3333
// clang-format on
3434

3535
#pragma omp target teams distribute parallel for

‎offload/test/multi_device/non-unit-stride.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ int main() {
3333
}
3434

3535
// clang-format off
36-
// CHECK: DEVID: 0 SGN:5 {{.*}} tripcount:588 rpc:0 md:1 md_LB:0 md_UB:293
37-
// CHECK: DEVID: 1 SGN:5 {{.*}} tripcount:588 rpc:0 md:1 md_LB:294 md_UB:587
36+
// CHECK: DEVID: 0 SGN:7 {{.*}} tripcount:588 rpc:0 md:1 md_LB:0 md_UB:293
37+
// CHECK: DEVID: 1 SGN:7 {{.*}} tripcount:588 rpc:0 md:1 md_LB:294 md_UB:587
3838
// clang-format on
3939

4040
// Checking the results are correct:

‎offload/test/multi_device/simple-loop-big-jump.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,23 @@ int main() {
6161
}
6262

6363
// clang-format off
64-
// CHECK: DEVID: 0 SGN:5 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
65-
// CHECK: DEVID: 1 SGN:5 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
64+
// CHECK: DEVID: 0 SGN:7 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
65+
// CHECK: DEVID: 1 SGN:7 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
6666

67-
// CHECK: DEVID: 0 SGN:5 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
68-
// CHECK: DEVID: 1 SGN:5 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
67+
// CHECK: DEVID: 0 SGN:7 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
68+
// CHECK: DEVID: 1 SGN:7 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
6969

70-
// CHECK: DEVID: 0 SGN:5 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
71-
// CHECK: DEVID: 1 SGN:5 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
70+
// CHECK: DEVID: 0 SGN:7 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
71+
// CHECK: DEVID: 1 SGN:7 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
7272

73-
// CHECK: DEVID: 0 SGN:5 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
74-
// CHECK: DEVID: 1 SGN:5 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
73+
// CHECK: DEVID: 0 SGN:7 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
74+
// CHECK: DEVID: 1 SGN:7 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
7575

76-
// CHECK: DEVID: 0 SGN:5 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
77-
// CHECK: DEVID: 1 SGN:5 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
76+
// CHECK: DEVID: 0 SGN:7 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
77+
// CHECK: DEVID: 1 SGN:7 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
7878

79-
// CHECK: DEVID: 0 SGN:5 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
80-
// CHECK: DEVID: 1 SGN:5 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
79+
// CHECK: DEVID: 0 SGN:7 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
80+
// CHECK: DEVID: 1 SGN:7 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
8181
// clang-format on
8282

8383
// CHECK: a[40] = 12

‎offload/test/multi_device/simple-loop-no-loop.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,23 @@ int main() {
6161
}
6262

6363
// clang-format off
64-
// CHECK: DEVID: 0 SGN:4 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
65-
// CHECK: DEVID: 1 SGN:4 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
64+
// CHECK: DEVID: 0 SGN:6 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
65+
// CHECK: DEVID: 1 SGN:6 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
6666

67-
// CHECK: DEVID: 0 SGN:4 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
68-
// CHECK: DEVID: 1 SGN:4 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
67+
// CHECK: DEVID: 0 SGN:6 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
68+
// CHECK: DEVID: 1 SGN:6 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
6969

70-
// CHECK: DEVID: 0 SGN:4 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
71-
// CHECK: DEVID: 1 SGN:4 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
70+
// CHECK: DEVID: 0 SGN:6 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
71+
// CHECK: DEVID: 1 SGN:6 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
7272

73-
// CHECK: DEVID: 0 SGN:4 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
74-
// CHECK: DEVID: 1 SGN:4 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
73+
// CHECK: DEVID: 0 SGN:6 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
74+
// CHECK: DEVID: 1 SGN:6 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
7575

76-
// CHECK: DEVID: 0 SGN:4 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
77-
// CHECK: DEVID: 1 SGN:4 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
76+
// CHECK: DEVID: 0 SGN:6 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
77+
// CHECK: DEVID: 1 SGN:6 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
7878

79-
// CHECK: DEVID: 0 SGN:4 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
80-
// CHECK: DEVID: 1 SGN:4 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
79+
// CHECK: DEVID: 0 SGN:6 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:0 md_UB:4995
80+
// CHECK: DEVID: 1 SGN:6 {{.*}} tripcount:9993 rpc:0 md:1 md_LB:4996 md_UB:9992
8181
// clang-format on
8282

8383
// CHECK: a[40] = 12

‎offload/test/multi_device/small-trip-count-threshold.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ int main() {
3232
}
3333

3434
// clang-format off
35-
// CHECK: DEVID: 0 SGN:5 {{.*}} tripcount:15000 rpc:0 md:1 md_LB:0 md_UB:7499
36-
// CHECK: DEVID: 1 SGN:5 {{.*}} tripcount:15000 rpc:0 md:1 md_LB:7500 md_UB:14999
35+
// CHECK: DEVID: 0 SGN:7 {{.*}} tripcount:15000 rpc:0 md:1 md_LB:0 md_UB:7499
36+
// CHECK: DEVID: 1 SGN:7 {{.*}} tripcount:15000 rpc:0 md:1 md_LB:7500 md_UB:14999
3737
// clang-format on
3838

3939
// Checking the results are correct:

0 commit comments

Comments
 (0)