Skip to content

Commit b98d970

Browse files
author
jakub
committed
* omp-builtins.def (BUILT_IN_GOMP_LOOP_NONMONOTONIC_RUNTIME_START,
 BUILT_IN_GOMP_LOOP_MAYBE_NONMONOTONIC_RUNTIME_START, BUILT_IN_GOMP_LOOP_ULL_NONMONOTONIC_RUNTIME_START, BUILT_IN_GOMP_LOOP_ULL_MAYBE_NONMONOTONIC_RUNTIME_START, BUILT_IN_GOMP_PARALLEL_LOOP_NONMONOTONIC_RUNTIME, BUILT_IN_GOMP_PARALLEL_LOOP_MAYBE_NONMONOTONIC_RUNTIME): Fix up function types - remove one argument. * testsuite/libgomp.c-c++-common/for-16.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@267067 138bc75d-0d04-0410-961f-82ee72b054a4
1 parent 4a8a652 commit b98d970

File tree

4 files changed

+135
-6
lines changed

4 files changed

+135
-6
lines changed

‎gcc/ChangeLog

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
2018-12-12 Tom de Vries <tdevries@suse.de>
2+
Jakub Jelinek <jakub@redhat.com>
3+
4+
* omp-builtins.def (BUILT_IN_GOMP_LOOP_NONMONOTONIC_RUNTIME_START,
5+
BUILT_IN_GOMP_LOOP_MAYBE_NONMONOTONIC_RUNTIME_START,
6+
BUILT_IN_GOMP_LOOP_ULL_NONMONOTONIC_RUNTIME_START,
7+
BUILT_IN_GOMP_LOOP_ULL_MAYBE_NONMONOTONIC_RUNTIME_START,
8+
BUILT_IN_GOMP_PARALLEL_LOOP_NONMONOTONIC_RUNTIME,
9+
BUILT_IN_GOMP_PARALLEL_LOOP_MAYBE_NONMONOTONIC_RUNTIME): Fix up
10+
function types - remove one argument.
11+
112
2018-12-12 Martin Sebor <msebor@redhat.com>
213

314
* doc/extend.texi (attribute copy): Fix typos.

‎gcc/omp-builtins.def

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ DEF_GOMP_BUILTIN (BUILT_IN_GOMP_LOOP_NONMONOTONIC_GUIDED_START,
126126
ATTR_NOTHROW_LEAF_LIST)
127127
DEF_GOMP_BUILTIN (BUILT_IN_GOMP_LOOP_NONMONOTONIC_RUNTIME_START,
128128
"GOMP_loop_nonmonotonic_runtime_start",
129-
BT_FN_BOOL_LONG_LONG_LONG_LONG_LONGPTR_LONGPTR,
129+
BT_FN_BOOL_LONG_LONG_LONG_LONGPTR_LONGPTR,
130130
ATTR_NOTHROW_LEAF_LIST)
131131
DEF_GOMP_BUILTIN (BUILT_IN_GOMP_LOOP_MAYBE_NONMONOTONIC_RUNTIME_START,
132132
"GOMP_loop_maybe_nonmonotonic_runtime_start",
133-
BT_FN_BOOL_LONG_LONG_LONG_LONG_LONGPTR_LONGPTR,
133+
BT_FN_BOOL_LONG_LONG_LONG_LONGPTR_LONGPTR,
134134
ATTR_NOTHROW_LEAF_LIST)
135135
DEF_GOMP_BUILTIN (BUILT_IN_GOMP_LOOP_ORDERED_STATIC_START,
136136
"GOMP_loop_ordered_static_start",
@@ -234,11 +234,11 @@ DEF_GOMP_BUILTIN (BUILT_IN_GOMP_LOOP_ULL_NONMONOTONIC_GUIDED_START,
234234
ATTR_NOTHROW_LEAF_LIST)
235235
DEF_GOMP_BUILTIN (BUILT_IN_GOMP_LOOP_ULL_NONMONOTONIC_RUNTIME_START,
236236
"GOMP_loop_ull_nonmonotonic_runtime_start",
237-
BT_FN_BOOL_BOOL_ULL_ULL_ULL_ULL_ULLPTR_ULLPTR,
237+
BT_FN_BOOL_BOOL_ULL_ULL_ULL_ULLPTR_ULLPTR,
238238
ATTR_NOTHROW_LEAF_LIST)
239239
DEF_GOMP_BUILTIN (BUILT_IN_GOMP_LOOP_ULL_MAYBE_NONMONOTONIC_RUNTIME_START,
240240
"GOMP_loop_ull_maybe_nonmonotonic_runtime_start",
241-
BT_FN_BOOL_BOOL_ULL_ULL_ULL_ULL_ULLPTR_ULLPTR,
241+
BT_FN_BOOL_BOOL_ULL_ULL_ULL_ULLPTR_ULLPTR,
242242
ATTR_NOTHROW_LEAF_LIST)
243243
DEF_GOMP_BUILTIN (BUILT_IN_GOMP_LOOP_ULL_ORDERED_STATIC_START,
244244
"GOMP_loop_ull_ordered_static_start",
@@ -349,11 +349,11 @@ DEF_GOMP_BUILTIN (BUILT_IN_GOMP_PARALLEL_LOOP_NONMONOTONIC_GUIDED,
349349
ATTR_NOTHROW_LIST)
350350
DEF_GOMP_BUILTIN (BUILT_IN_GOMP_PARALLEL_LOOP_NONMONOTONIC_RUNTIME,
351351
"GOMP_parallel_loop_nonmonotonic_runtime",
352-
BT_FN_VOID_OMPFN_PTR_UINT_LONG_LONG_LONG_LONG_UINT,
352+
BT_FN_VOID_OMPFN_PTR_UINT_LONG_LONG_LONG_UINT,
353353
ATTR_NOTHROW_LIST)
354354
DEF_GOMP_BUILTIN (BUILT_IN_GOMP_PARALLEL_LOOP_MAYBE_NONMONOTONIC_RUNTIME,
355355
"GOMP_parallel_loop_maybe_nonmonotonic_runtime",
356-
BT_FN_VOID_OMPFN_PTR_UINT_LONG_LONG_LONG_LONG_UINT,
356+
BT_FN_VOID_OMPFN_PTR_UINT_LONG_LONG_LONG_UINT,
357357
ATTR_NOTHROW_LIST)
358358
DEF_GOMP_BUILTIN (BUILT_IN_GOMP_LOOP_END, "GOMP_loop_end",
359359
BT_FN_VOID, ATTR_NOTHROW_LEAF_LIST)

‎libgomp/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2018-12-12 Jakub Jelinek <jakub@redhat.com>
2+
3+
* testsuite/libgomp.c-c++-common/for-16.c: New test.
4+
15
2018-12-12 Andreas Schwab <schwab@suse.de>
26

37
* config/linux/ia64/futex.h (sys_futex0): Don't mark r12 as

‎libgomp/testsuite/libgomp.c-c++-common/for-16.c

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
extern
2+
#ifdef __cplusplus
3+
"C"
4+
#endif
5+
void abort (void);
6+
7+
unsigned long long int k = 16;
8+
#pragma omp declare target to (k)
9+
10+
int
11+
main ()
12+
{
13+
unsigned char a[144], b[144], c[144];
14+
int l;
15+
#pragma omp target map(from:a, b, c)
16+
{
17+
int i;
18+
unsigned long long int j;
19+
#pragma omp parallel for schedule (runtime)
20+
for (i = 0; i < 16; i++)
21+
a[i] = i;
22+
#pragma omp parallel for schedule (monotonic: runtime)
23+
for (i = 0; i < 16; i++)
24+
a[i + 16] = i + 16;
25+
#pragma omp parallel for schedule (nonmonotonic: runtime)
26+
for (i = 0; i < 16; i++)
27+
a[i + 32] = i + 32;
28+
#pragma omp parallel
29+
{
30+
#pragma omp for schedule (runtime)
31+
for (i = 0; i < 16; i++)
32+
a[i + 48] = i + 48;
33+
#pragma omp for schedule (monotonic: runtime)
34+
for (i = 0; i < 16; i++)
35+
a[i + 64] = i + 64;
36+
#pragma omp for schedule (nonmonotonic: runtime)
37+
for (i = 0; i < 16; i++)
38+
a[i + 80] = i + 80;
39+
#pragma omp for schedule (runtime)
40+
for (j = 0; j < k; j++)
41+
a[j + 96] = j + 96;
42+
#pragma omp for schedule (monotonic: runtime)
43+
for (j = 0; j < k; j++)
44+
a[j + 112] = j + 112;
45+
#pragma omp for schedule (nonmonotonic: runtime)
46+
for (j = 0; j < k; j++)
47+
a[j + 128] = j + 128;
48+
}
49+
#pragma omp parallel for schedule (dynamic)
50+
for (i = 0; i < 16; i++)
51+
b[i] = i;
52+
#pragma omp parallel for schedule (monotonic: dynamic)
53+
for (i = 0; i < 16; i++)
54+
b[i + 16] = i + 16;
55+
#pragma omp parallel for schedule (nonmonotonic: dynamic)
56+
for (i = 0; i < 16; i++)
57+
b[i + 32] = i + 32;
58+
#pragma omp parallel
59+
{
60+
#pragma omp for schedule (dynamic)
61+
for (i = 0; i < 16; i++)
62+
b[i + 48] = i + 48;
63+
#pragma omp for schedule (monotonic: dynamic)
64+
for (i = 0; i < 16; i++)
65+
b[i + 64] = i + 64;
66+
#pragma omp for schedule (nonmonotonic: dynamic)
67+
for (i = 0; i < 16; i++)
68+
b[i + 80] = i + 80;
69+
#pragma omp for schedule (dynamic)
70+
for (j = 0; j < k; j++)
71+
b[j + 96] = j + 96;
72+
#pragma omp for schedule (monotonic: dynamic)
73+
for (j = 0; j < k; j++)
74+
b[j + 112] = j + 112;
75+
#pragma omp for schedule (nonmonotonic: dynamic)
76+
for (j = 0; j < k; j++)
77+
b[j + 128] = j + 128;
78+
}
79+
#pragma omp parallel for schedule (guided)
80+
for (i = 0; i < 16; i++)
81+
c[i] = i;
82+
#pragma omp parallel for schedule (monotonic: guided)
83+
for (i = 0; i < 16; i++)
84+
c[i + 16] = i + 16;
85+
#pragma omp parallel for schedule (nonmonotonic: guided)
86+
for (i = 0; i < 16; i++)
87+
c[i + 32] = i + 32;
88+
#pragma omp parallel
89+
{
90+
#pragma omp for schedule (guided)
91+
for (i = 0; i < 16; i++)
92+
c[i + 48] = i + 48;
93+
#pragma omp for schedule (monotonic: guided)
94+
for (i = 0; i < 16; i++)
95+
c[i + 64] = i + 64;
96+
#pragma omp for schedule (nonmonotonic: guided)
97+
for (i = 0; i < 16; i++)
98+
c[i + 80] = i + 80;
99+
#pragma omp for schedule (guided)
100+
for (j = 0; j < k; j++)
101+
c[j + 96] = j + 96;
102+
#pragma omp for schedule (monotonic: guided)
103+
for (j = 0; j < k; j++)
104+
c[j + 112] = j + 112;
105+
#pragma omp for schedule (nonmonotonic: guided)
106+
for (j = 0; j < k; j++)
107+
c[j + 128] = j + 128;
108+
}
109+
}
110+
for (l = 0; l < 144; ++l)
111+
if (a[l] != l || b[l] != l || c[l] != l)
112+
abort ();
113+
return 0;
114+
}

0 commit comments

Comments
 (0)