Skip to content

Commit 6fd3381

Browse files
rorthrorth
authored
[OpenMP][test] Properly check for NULL (#139364)
Only 2 `openmp` testsuite failures remain on Solaris/amd64. They are due the same issue: the tests in question assume `NULL` pointers to be printed as `(nil)` while the rest of the testsuite uses `[[NULL]]` for that. This patch changes them to follow suit. Tested on `amd64-pc-solaris2.11` and `x86_64-pc-linux-gnu`.
1 parent 58014a5 commit 6fd3381

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎openmp/tools/multiplex/tests/custom_data_storage/custom_data_storage.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ int main() {
5454

5555
// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool: ompt_event_parallel_begin:
5656
// CHECK-SAME: parent_task_id=[[_FIRST_INITIAL_TASK_ID]],
57-
// CHECK-SAME: parent_task_frame.exit=(nil),
57+
// CHECK-SAME: parent_task_frame.exit=[[NULL]],
5858
// CHECK-SAME: parent_task_frame.reenter={{(0x)?[0-f]+}},
5959
// CHECK-SAME: parallel_id=[[_FIRST_PARALLEL_ID:[0-9]+]], requested_team_size=2,
6060
// CHECK-SAME: codeptr_ra={{(0x)?[0-f]+}}, invoker
@@ -100,7 +100,7 @@ int main() {
100100
// CHECK-SAME: prior_task_status=ompt_task_switch=7
101101

102102
// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool: ompt_event_control_tool:
103-
// CHECK-SAME: command=5, modifier=1, arg=(nil),
103+
// CHECK-SAME: command=5, modifier=1, arg=[[NULL]],
104104
// CHECK-SAME: codeptr_ra={{(0x)?[0-f]+}}
105105

106106
// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool: task level 0:
@@ -130,12 +130,12 @@ int main() {
130130
// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool:
131131
// CHECK-SAME: ompt_event_wait_barrier_implicit_parallel_end:
132132
// CHECK-SAME: parallel_id=0,
133-
// CHECK-SAME: task_id=[[_FIRST_MASTER_IMPLICIT_TASK_ID]], codeptr_ra=(nil)
133+
// CHECK-SAME: task_id=[[_FIRST_MASTER_IMPLICIT_TASK_ID]], codeptr_ra=[[NULL]]
134134

135135
// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool:
136136
// CHECK-SAME: ompt_event_barrier_implicit_parallel_end:
137137
// CHECK-SAME: parallel_id=0,
138-
// CHECK-SAME: task_id=[[_FIRST_MASTER_IMPLICIT_TASK_ID]], codeptr_ra=(nil)
138+
// CHECK-SAME: task_id=[[_FIRST_MASTER_IMPLICIT_TASK_ID]], codeptr_ra=[[NULL]]
139139

140140
// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool: ompt_event_implicit_task_end:
141141
// CHECK-SAME: parallel_id=0, task_id=[[_FIRST_MASTER_IMPLICIT_TASK_ID]],
@@ -160,7 +160,7 @@ int main() {
160160

161161
// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool: ompt_event_parallel_begin:
162162
// CHECK-SAME: parent_task_id=[[SECOND_INITIAL_TASK_ID]],
163-
// CHECK-SAME: parent_task_frame.exit=(nil),
163+
// CHECK-SAME: parent_task_frame.exit=[[NULL]],
164164
// CHECK-SAME: parent_task_frame.reenter={{(0x)?[0-f]+}},
165165
// CHECK-SAME: parallel_id=[[SECOND_PARALLEL_ID:[0-9]+]], requested_team_size=2,
166166
// CHECK-SAME: codeptr_ra={{(0x)?[0-f]+}}, invoker
@@ -206,7 +206,7 @@ int main() {
206206
// CHECK-SAME: prior_task_status=ompt_task_switch=7
207207

208208
// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool: ompt_event_control_tool:
209-
// CHECK-SAME: command=5, modifier=1, arg=(nil),
209+
// CHECK-SAME: command=5, modifier=1, arg=[[NULL]],
210210
// CHECK-SAME: codeptr_ra={{(0x)?[0-f]+}}
211211

212212
// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool: task level 0:
@@ -236,12 +236,12 @@ int main() {
236236
// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool:
237237
// CHECK-SAME: ompt_event_wait_barrier_implicit_parallel_end:
238238
// CHECK-SAME: parallel_id=0,
239-
// CHECK-SAME: task_id=[[SECOND_MASTER_IMPLICIT_TASK_ID]], codeptr_ra=(nil)
239+
// CHECK-SAME: task_id=[[SECOND_MASTER_IMPLICIT_TASK_ID]], codeptr_ra=[[NULL]]
240240

241241
// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool:
242242
// CHECK-SAME: ompt_event_barrier_implicit_parallel_end:
243243
// CHECK-SAME: parallel_id=0,
244-
// CHECK-SAME: task_id=[[SECOND_MASTER_IMPLICIT_TASK_ID]], codeptr_ra=(nil)
244+
// CHECK-SAME: task_id=[[SECOND_MASTER_IMPLICIT_TASK_ID]], codeptr_ra=[[NULL]]
245245

246246
// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool: ompt_event_implicit_task_end:
247247
// CHECK-SAME: parallel_id=0,
@@ -268,22 +268,22 @@ int main() {
268268
// CHECK: {{^}}[[_1ST_WRKR_TID]]: _first_tool:
269269
// CHECK-SAME: ompt_event_barrier_implicit_parallel_begin:
270270
// CHECK-SAME: parallel_id=[[_FIRST_PARALLEL_ID]],
271-
// CHECK-SAME: task_id=[[_FIRST_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=(nil)
271+
// CHECK-SAME: task_id=[[_FIRST_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=[[NULL]]
272272

273273
// CHECK: {{^}}[[_1ST_WRKR_TID]]: _first_tool:
274274
// CHECK-SAME: ompt_event_wait_barrier_implicit_parallel_begin:
275275
// CHECK-SAME: parallel_id=[[_FIRST_PARALLEL_ID]],
276-
// CHECK-SAME: task_id=[[_FIRST_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=(nil)
276+
// CHECK-SAME: task_id=[[_FIRST_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=[[NULL]]
277277

278278
// CHECK: {{^}}[[_1ST_WRKR_TID]]: _first_tool:
279279
// CHECK-SAME: ompt_event_wait_barrier_implicit_parallel_end:
280280
// CHECK-SAME: parallel_id=0,
281-
// CHECK-SAME: task_id=[[_FIRST_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=(nil)
281+
// CHECK-SAME: task_id=[[_FIRST_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=[[NULL]]
282282

283283
// CHECK: {{^}}[[_1ST_WRKR_TID]]: _first_tool:
284284
// CHECK-SAME: ompt_event_barrier_implicit_parallel_end:
285285
// CHECK-SAME: parallel_id=0,
286-
// CHECK-SAME: task_id=[[_FIRST_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=(nil)
286+
// CHECK-SAME: task_id=[[_FIRST_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=[[NULL]]
287287

288288
// CHECK: {{^}}[[_1ST_WRKR_TID]]: _first_tool: ompt_event_implicit_task_end:
289289
// CHECK-SAME: parallel_id=0,
@@ -305,22 +305,22 @@ int main() {
305305
// CHECK: {{^}}[[_2ND_WRKR_TID]]: second_tool:
306306
// CHECK-SAME: ompt_event_barrier_implicit_parallel_begin:
307307
// CHECK-SAME: parallel_id=[[SECOND_PARALLEL_ID]],
308-
// CHECK-SAME: task_id=[[SECOND_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=(nil)
308+
// CHECK-SAME: task_id=[[SECOND_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=[[NULL]]
309309

310310
// CHECK: {{^}}[[_2ND_WRKR_TID]]: second_tool:
311311
// CHECK-SAME: ompt_event_wait_barrier_implicit_parallel_begin:
312312
// CHECK-SAME: parallel_id=[[SECOND_PARALLEL_ID]],
313-
// CHECK-SAME: task_id=[[SECOND_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=(nil)
313+
// CHECK-SAME: task_id=[[SECOND_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=[[NULL]]
314314

315315
// CHECK: {{^}}[[_2ND_WRKR_TID]]: second_tool:
316316
// CHECK-SAME: ompt_event_wait_barrier_implicit_parallel_end:
317317
// CHECK-SAME: parallel_id=0,
318-
// CHECK-SAME: task_id=[[SECOND_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=(nil)
318+
// CHECK-SAME: task_id=[[SECOND_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=[[NULL]]
319319

320320
// CHECK: {{^}}[[_2ND_WRKR_TID]]: second_tool:
321321
// CHECK-SAME: ompt_event_barrier_implicit_parallel_end:
322322
// CHECK-SAME: parallel_id=0,
323-
// CHECK-SAME: task_id=[[SECOND_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=(nil)
323+
// CHECK-SAME: task_id=[[SECOND_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=[[NULL]]
324324

325325
// CHECK: {{^}}[[_2ND_WRKR_TID]]: second_tool: ompt_event_implicit_task_end:
326326
// CHECK-SAME: parallel_id=0,

‎openmp/tools/multiplex/tests/print/print.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ int main() {
5555

5656
// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool: ompt_event_parallel_begin:
5757
// CHECK-SAME: parent_task_id=[[_FIRST_INITIAL_TASK_ID]],
58-
// CHECK-SAME: parent_task_frame.exit=(nil),
58+
// CHECK-SAME: parent_task_frame.exit=[[NULL]],
5959
// CHECK-SAME: parent_task_frame.reenter={{(0x)?[0-f]+}},
6060
// CHECK-SAME: parallel_id=[[_FIRST_PARALLEL_ID:[0-9]+]],
6161
// CHECK-SAME: requested_team_size=2, codeptr_ra={{(0x)?[0-f]+}}, invoker
@@ -101,7 +101,7 @@ int main() {
101101
// CHECK-SAME: prior_task_status=ompt_task_switch=7
102102

103103
// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool: ompt_event_control_tool:
104-
// CHECK-SAME: command=5, modifier=1, arg=(nil), codeptr_ra={{(0x)?[0-f]+}}
104+
// CHECK-SAME: command=5, modifier=1, arg=[[NULL]], codeptr_ra={{(0x)?[0-f]+}}
105105

106106
// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool: task level 0:
107107
// CHECK-SAME: task_id=[[_FIRST_EXPLICIT_TASK_ID]]
@@ -129,12 +129,12 @@ int main() {
129129
// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool:
130130
// CHECK-SAME: ompt_event_wait_barrier_implicit_parallel_end:
131131
// CHECK-SAME: parallel_id=0, task_id=[[_FIRST_MASTER_IMPLICIT_TASK_ID]],
132-
// CHECK-SAME: codeptr_ra=(nil)
132+
// CHECK-SAME: codeptr_ra=[[NULL]]
133133

134134
// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool:
135135
// CHECK-SAME: ompt_event_barrier_implicit_parallel_end:
136136
// CHECK-SAME: parallel_id=0, task_id=[[_FIRST_MASTER_IMPLICIT_TASK_ID]],
137-
// CHECK-SAME: codeptr_ra=(nil)
137+
// CHECK-SAME: codeptr_ra=[[NULL]]
138138

139139
// CHECK: {{^}}[[_1ST_MSTR_TID]]: _first_tool: ompt_event_implicit_task_end:
140140
// CHECK-SAME: parallel_id=0, task_id=[[_FIRST_MASTER_IMPLICIT_TASK_ID]],
@@ -157,7 +157,7 @@ int main() {
157157

158158
// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool: ompt_event_parallel_begin:
159159
// CHECK-SAME: parent_task_id=[[SECOND_INITIAL_TASK_ID]],
160-
// CHECK-SAME: parent_task_frame.exit=(nil),
160+
// CHECK-SAME: parent_task_frame.exit=[[NULL]],
161161
// CHECK-SAME: parent_task_frame.reenter={{(0x)?[0-f]+}},
162162
// CHECK-SAME: parallel_id=[[SECOND_PARALLEL_ID:[0-9]+]],
163163
// CHECK-SAME: requested_team_size=2, codeptr_ra={{(0x)?[0-f]+}}, invoker
@@ -203,7 +203,7 @@ int main() {
203203
// CHECK-SAME: prior_task_status=ompt_task_switch=7
204204

205205
// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool: ompt_event_control_tool:
206-
// CHECK-SAME: command=5, modifier=1, arg=(nil), codeptr_ra={{(0x)?[0-f]+}}
206+
// CHECK-SAME: command=5, modifier=1, arg=[[NULL]], codeptr_ra={{(0x)?[0-f]+}}
207207

208208
// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool: task level 0:
209209
// CHECK-SAME: task_id=[[SECOND_EXPLICIT_TASK_ID]]
@@ -231,12 +231,12 @@ int main() {
231231
// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool:
232232
// CHECK-SAME: ompt_event_wait_barrier_implicit_parallel_end:
233233
// CHECK-SAME: parallel_id=0, task_id=[[SECOND_MASTER_IMPLICIT_TASK_ID]],
234-
// CHECK-SAME: codeptr_ra=(nil)
234+
// CHECK-SAME: codeptr_ra=[[NULL]]
235235

236236
// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool:
237237
// CHECK-SAME: ompt_event_barrier_implicit_parallel_end:
238238
// CHECK-SAME: parallel_id=0, task_id=[[SECOND_MASTER_IMPLICIT_TASK_ID]],
239-
// CHECK-SAME: codeptr_ra=(nil)
239+
// CHECK-SAME: codeptr_ra=[[NULL]]
240240

241241
// CHECK: {{^}}[[_2ND_MSTR_TID]]: second_tool: ompt_event_implicit_task_end:
242242
// CHECK-SAME: parallel_id=0, task_id=[[SECOND_MASTER_IMPLICIT_TASK_ID]],
@@ -261,22 +261,22 @@ int main() {
261261
// CHECK: {{^}}[[_1ST_WRKR_TID]]: _first_tool:
262262
// CHECK-SAME: ompt_event_barrier_implicit_parallel_begin:
263263
// CHECK-SAME: parallel_id=[[_FIRST_PARALLEL_ID]],
264-
// CHECK-SAME: task_id=[[_FIRST_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=(nil)
264+
// CHECK-SAME: task_id=[[_FIRST_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=[[NULL]]
265265

266266
// CHECK: {{^}}[[_1ST_WRKR_TID]]: _first_tool:
267267
// CHECK-SAME: ompt_event_wait_barrier_implicit_parallel_begin:
268268
// CHECK-SAME: parallel_id=[[_FIRST_PARALLEL_ID]],
269-
// CHECK-SAME: task_id=[[_FIRST_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=(nil)
269+
// CHECK-SAME: task_id=[[_FIRST_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=[[NULL]]
270270

271271
// CHECK: {{^}}[[_1ST_WRKR_TID]]: _first_tool:
272272
// CHECK-SAME: ompt_event_wait_barrier_implicit_parallel_end:
273273
// CHECK-SAME: parallel_id=0, task_id=[[_FIRST_WORKER_IMPLICIT_TASK_ID]],
274-
// CHECK-SAME: codeptr_ra=(nil)
274+
// CHECK-SAME: codeptr_ra=[[NULL]]
275275

276276
// CHECK: {{^}}[[_1ST_WRKR_TID]]: _first_tool:
277277
// CHECK-SAME: ompt_event_barrier_implicit_parallel_end:
278278
// CHECK-SAME: parallel_id=0, task_id=[[_FIRST_WORKER_IMPLICIT_TASK_ID]],
279-
// CHECK-SAME: codeptr_ra=(nil)
279+
// CHECK-SAME: codeptr_ra=[[NULL]]
280280

281281
// CHECK: {{^}}[[_1ST_WRKR_TID]]: _first_tool: ompt_event_implicit_task_end:
282282
// CHECK-SAME: parallel_id=0, task_id=[[_FIRST_WORKER_IMPLICIT_TASK_ID]],
@@ -297,22 +297,22 @@ int main() {
297297
// CHECK: {{^}}[[_2ND_WRKR_TID]]: second_tool:
298298
// CHECK-SAME: ompt_event_barrier_implicit_parallel_begin:
299299
// CHECK-SAME: parallel_id=[[SECOND_PARALLEL_ID]],
300-
// CHECK-SAME: task_id=[[SECOND_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=(nil)
300+
// CHECK-SAME: task_id=[[SECOND_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=[[NULL]]
301301

302302
// CHECK: {{^}}[[_2ND_WRKR_TID]]: second_tool:
303303
// CHECK-SAME: ompt_event_wait_barrier_implicit_parallel_begin:
304304
// CHECK-SAME: parallel_id=[[SECOND_PARALLEL_ID]],
305-
// CHECK-SAME: task_id=[[SECOND_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=(nil)
305+
// CHECK-SAME: task_id=[[SECOND_WORKER_IMPLICIT_TASK_ID]], codeptr_ra=[[NULL]]
306306

307307
// CHECK: {{^}}[[_2ND_WRKR_TID]]: second_tool:
308308
// CHECK-SAME: ompt_event_wait_barrier_implicit_parallel_end:
309309
// CHECK-SAME: parallel_id=0, task_id=[[SECOND_WORKER_IMPLICIT_TASK_ID]],
310-
// CHECK-SAME: codeptr_ra=(nil)
310+
// CHECK-SAME: codeptr_ra=[[NULL]]
311311

312312
// CHECK: {{^}}[[_2ND_WRKR_TID]]: second_tool:
313313
// CHECK-SAME: ompt_event_barrier_implicit_parallel_end:
314314
// CHECK-SAME: parallel_id=0, task_id=[[SECOND_WORKER_IMPLICIT_TASK_ID]],
315-
// CHECK-SAME: codeptr_ra=(nil)
315+
// CHECK-SAME: codeptr_ra=[[NULL]]
316316

317317
// CHECK: {{^}}[[_2ND_WRKR_TID]]: second_tool: ompt_event_implicit_task_end:
318318
// CHECK-SAME: parallel_id=0, task_id=[[SECOND_WORKER_IMPLICIT_TASK_ID]],

0 commit comments

Comments
 (0)