[Openmp-commits] [openmp] [OpenMP][Runtime][test] Fix ompt task testcase fail randomly (PR #72337)

[via Openmp-commits]

https://github.com/MANGOPIE3 updated https://github.com/llvm/llvm-project/pull/72337

>From bbce99d838fba066b157627d6613bf9850c2d8c5 Mon Sep 17 00:00:00 2001
From: zhoujing <zhoujing106 at huawei.com>
Date: Wed, 15 Nov 2023 11:28:28 +0800
Subject: [PATCH 1/2] [OpenMP][Runtime][test] Fix ompt task testcase fail
 randomly

---
 openmp/runtime/test/ompt/tasks/explicit_task_thread_num.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/openmp/runtime/test/ompt/tasks/explicit_task_thread_num.c b/openmp/runtime/test/ompt/tasks/explicit_task_thread_num.c
index 9f2d4abfbf74776..668b5e091567d55 100644
--- a/openmp/runtime/test/ompt/tasks/explicit_task_thread_num.c
+++ b/openmp/runtime/test/ompt/tasks/explicit_task_thread_num.c
@@ -59,10 +59,8 @@ int main()
   // CHECK-DAG: {{^}}[[WORKER_ID:[0-9]+]]: ompt_event_implicit_task_begin
 
   // thread_num must be equal to 1 for both explicit and the implicit tasks
-  // CHECK: {{^}}[[WORKER_ID]]: ancestor_level=0 id=1 task_type=ompt_task_explicit
-  // CHECK-SAME: thread_num=1
-  // CHECK: {{^}}[[WORKER_ID]]: ancestor_level=1 id=0 task_type=ompt_task_implicit
-  // CHECK-SAME: thread_num=1
+  // CHECK-DAG: {{^}}[[WORKER_ID]]: ancestor_level=0 id=1 task_type=ompt_task_explicit{{.*}}thread_num=1
+  // CHECK-DAG: {{^}}[[WORKER_ID]]: ancestor_level=1 id=0 task_type=ompt_task_implicit{{.*}}thread_num=1
 
   return 0;
 }

>From 4bc7ee829a1909001ccbc131694fb9e9f166626c Mon Sep 17 00:00:00 2001
From: zhoujing <zhoujing106 at huawei.com>
Date: Wed, 15 Nov 2023 11:28:28 +0800
Subject: [PATCH 2/2] [OpenMP][Runtime][test] Fix ompt task testcase fail
 randomly

---
 openmp/runtime/test/ompt/tasks/explicit_task_thread_num.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openmp/runtime/test/ompt/tasks/explicit_task_thread_num.c b/openmp/runtime/test/ompt/tasks/explicit_task_thread_num.c
index 668b5e091567d55..96df5aaa71e02bd 100644
--- a/openmp/runtime/test/ompt/tasks/explicit_task_thread_num.c
+++ b/openmp/runtime/test/ompt/tasks/explicit_task_thread_num.c
@@ -55,8 +55,7 @@ int main()
 
   // parallel region used only to determine worker thread id
   // CHECK: {{^}}[[MASTER_ID]]: ompt_event_parallel_begin
-  // CHECK-DAG: {{^}}[[MASTER_ID]]: ompt_event_implicit_task_begin
-  // CHECK-DAG: {{^}}[[WORKER_ID:[0-9]+]]: ompt_event_implicit_task_begin
+  // CHECK: {{^}}[[WORKER_ID:[0-9]+]]: ompt_event_implicit_task_begin{{.*}}thread_num=1
 
   // thread_num must be equal to 1 for both explicit and the implicit tasks
   // CHECK-DAG: {{^}}[[WORKER_ID]]: ancestor_level=0 id=1 task_type=ompt_task_explicit{{.*}}thread_num=1