[clang] e0fd86d - Revert "[OpenMP] Clang Support for taskwait nowait clause"
Chen, Chi Chun via cfe-commits
cfe-commits at lists.llvm.org
Fri Dec 9 09:51:43 PST 2022
My bad, the original commit lead to tests failure on Windows build and the author contacted me for the revert.
Thanks,
Chi Chun
From: Roman Lebedev <lebedev.ri at gmail.com>
Date: Friday, December 9, 2022 at 11:08 AM
To: Chen, Chi Chun <chichun.chen at hpe.com>, Chi Chun Chen <llvmlistbot at llvm.org>
Cc: cfe-commits at lists.llvm.org <cfe-commits at lists.llvm.org>
Subject: Re: [clang] e0fd86d - Revert "[OpenMP] Clang Support for taskwait nowait clause"
Reminder to please always mention the reason for the revert in the
commit message.
On Fri, Dec 9, 2022 at 8:07 PM Chi Chun Chen via cfe-commits
<cfe-commits at lists.llvm.org> wrote:
>
>
> Author: Chi Chun Chen
> Date: 2022-12-09T11:06:45-06:00
> New Revision: e0fd86db09a87f25df0eff6c1c755d86434dea0b
>
> URL: https://github.com/llvm/llvm-project/commit/e0fd86db09a87f25df0eff6c1c755d86434dea0b
> DIFF: https://github.com/llvm/llvm-project/commit/e0fd86db09a87f25df0eff6c1c755d86434dea0b.diff
>
> LOG: Revert "[OpenMP] Clang Support for taskwait nowait clause"
>
> This reverts commit 100dfe7a8ad3789a98df623482b88d9a3a02e176.
>
> Added:
>
>
> Modified:
> clang/lib/CodeGen/CGOpenMPRuntime.cpp
> clang/lib/CodeGen/CGOpenMPRuntime.h
> clang/lib/CodeGen/CGStmtOpenMP.cpp
> clang/test/OpenMP/target_depend_codegen.cpp
> clang/test/OpenMP/target_enter_data_depend_codegen.cpp
> clang/test/OpenMP/target_exit_data_depend_codegen.cpp
> clang/test/OpenMP/target_parallel_depend_codegen.cpp
> clang/test/OpenMP/target_parallel_for_depend_codegen.cpp
> clang/test/OpenMP/target_parallel_for_simd_depend_codegen.cpp
> clang/test/OpenMP/target_simd_depend_codegen.cpp
> clang/test/OpenMP/target_teams_depend_codegen.cpp
> clang/test/OpenMP/target_teams_distribute_depend_codegen.cpp
> clang/test/OpenMP/target_teams_distribute_parallel_for_depend_codegen.cpp
> clang/test/OpenMP/target_teams_distribute_parallel_for_simd_depend_codegen.cpp
> clang/test/OpenMP/target_teams_distribute_simd_depend_codegen.cpp
> clang/test/OpenMP/target_update_depend_codegen.cpp
> clang/test/OpenMP/task_codegen.cpp
> clang/test/OpenMP/task_if_codegen.cpp
> clang/test/OpenMP/taskwait_ast_print.cpp
> clang/test/OpenMP/taskwait_codegen.cpp
> clang/test/OpenMP/taskwait_depend_codegen.cpp
> llvm/include/llvm/Frontend/OpenMP/OMP.td
> llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h
> llvm/include/llvm/Frontend/OpenMP/OMPKinds.def
> llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
> mlir/test/Target/LLVMIR/openmp-llvm.mlir
> openmp/runtime/src/dllexports
> openmp/runtime/src/kmp.h
> openmp/runtime/src/kmp_taskdeps.cpp
> openmp/runtime/src/kmp_tasking.cpp
>
> Removed:
> clang/test/OpenMP/taskwait_depend_nowait_codegen.cpp
> clang/test/OpenMP/taskwait_nowait_codegen.cpp
>
>
> ################################################################################
> diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
> index 396075183102d..a75e31f40e074 100644
> --- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp
> +++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
> @@ -4756,7 +4756,7 @@ void CGOpenMPRuntime::emitTaskCall(CodeGenFunction &CGF, SourceLocation Loc,
> Region->emitUntiedSwitch(CGF);
> };
>
> - llvm::Value *DepWaitTaskArgs[7];
> + llvm::Value *DepWaitTaskArgs[6];
> if (!Data.Dependences.empty()) {
> DepWaitTaskArgs[0] = UpLoc;
> DepWaitTaskArgs[1] = ThreadID;
> @@ -4764,8 +4764,6 @@ void CGOpenMPRuntime::emitTaskCall(CodeGenFunction &CGF, SourceLocation Loc,
> DepWaitTaskArgs[3] = DependenciesArray.getPointer();
> DepWaitTaskArgs[4] = CGF.Builder.getInt32(0);
> DepWaitTaskArgs[5] = llvm::ConstantPointerNull::get(CGF.VoidPtrTy);
> - DepWaitTaskArgs[6] =
> - llvm::ConstantInt::get(CGF.Int32Ty, Data.HasNowaitClause);
> }
> auto &M = CGM.getModule();
> auto &&ElseCodeGen = [this, &M, &TaskArgs, ThreadID, NewTaskNewTaskTTy,
> @@ -4777,9 +4775,9 @@ void CGOpenMPRuntime::emitTaskCall(CodeGenFunction &CGF, SourceLocation Loc,
> // ndeps_noalias, kmp_depend_info_t *noalias_dep_list); if dependence info
> // is specified.
> if (!Data.Dependences.empty())
> - CGF.EmitRuntimeCall(OMPBuilder.getOrCreateRuntimeFunction(
> - M, OMPRTL___kmpc_omp_taskwait_deps_51),
> - DepWaitTaskArgs);
> + CGF.EmitRuntimeCall(
> + OMPBuilder.getOrCreateRuntimeFunction(M, OMPRTL___kmpc_omp_wait_deps),
> + DepWaitTaskArgs);
> // Call proxy_task_entry(gtid, new_task);
> auto &&CodeGen = [TaskEntry, ThreadID, NewTaskNewTaskTTy,
> Loc](CodeGenFunction &CGF, PrePostActionTy &Action) {
> @@ -5818,7 +5816,7 @@ void CGOpenMPRuntime::emitTaskwaitCall(CodeGenFunction &CGF, SourceLocation Loc,
>
> if (CGF.CGM.getLangOpts().OpenMPIRBuilder && Data.Dependences.empty()) {
> // TODO: Need to support taskwait with dependences in the OpenMPIRBuilder.
> - OMPBuilder.createTaskwait(CGF.Builder, Data.HasNowaitClause);
> + OMPBuilder.createTaskwait(CGF.Builder);
> } else {
> llvm::Value *ThreadID = getThreadID(CGF, Loc);
> llvm::Value *UpLoc = emitUpdateLocation(CGF, Loc);
> @@ -5827,38 +5825,34 @@ void CGOpenMPRuntime::emitTaskwaitCall(CodeGenFunction &CGF, SourceLocation Loc,
> llvm::Value *NumOfElements;
> std::tie(NumOfElements, DependenciesArray) =
> emitDependClause(CGF, Data.Dependences, Loc);
> + llvm::Value *DepWaitTaskArgs[6];
> if (!Data.Dependences.empty()) {
> - llvm::Value *DepWaitTaskArgs[7];
> DepWaitTaskArgs[0] = UpLoc;
> DepWaitTaskArgs[1] = ThreadID;
> DepWaitTaskArgs[2] = NumOfElements;
> DepWaitTaskArgs[3] = DependenciesArray.getPointer();
> DepWaitTaskArgs[4] = CGF.Builder.getInt32(0);
> DepWaitTaskArgs[5] = llvm::ConstantPointerNull::get(CGF.VoidPtrTy);
> - DepWaitTaskArgs[6] =
> - llvm::ConstantInt::get(CGF.Int32Ty, Data.HasNowaitClause);
>
> CodeGenFunction::RunCleanupsScope LocalScope(CGF);
>
> - // Build void __kmpc_omp_taskwait_deps_51(ident_t *, kmp_int32 gtid,
> + // Build void __kmpc_omp_wait_deps(ident_t *, kmp_int32 gtid,
> // kmp_int32 ndeps, kmp_depend_info_t *dep_list, kmp_int32
> - // ndeps_noalias, kmp_depend_info_t *noalias_dep_list,
> - // kmp_int32 has_no_wait); if dependence info is specified.
> - CGF.EmitRuntimeCall(OMPBuilder.getOrCreateRuntimeFunction(
> - M, OMPRTL___kmpc_omp_taskwait_deps_51),
> - DepWaitTaskArgs);
> + // ndeps_noalias, kmp_depend_info_t *noalias_dep_list); if dependence info
> + // is specified.
> + CGF.EmitRuntimeCall(
> + OMPBuilder.getOrCreateRuntimeFunction(M, OMPRTL___kmpc_omp_wait_deps),
> + DepWaitTaskArgs);
>
> } else {
>
> // Build call kmp_int32 __kmpc_omp_taskwait(ident_t *loc, kmp_int32
> // global_tid);
> - llvm::Value *HasNowaitClauseVal =
> - llvm::ConstantInt::get(CGF.IntTy, Data.HasNowaitClause);
> - llvm::Value *Args[3] = {UpLoc, ThreadID, HasNowaitClauseVal};
> + llvm::Value *Args[] = {UpLoc, ThreadID};
> // Ignore return result until untied tasks are supported.
> - CGF.EmitRuntimeCall(OMPBuilder.getOrCreateRuntimeFunction(
> - M, OMPRTL___kmpc_omp_taskwait_51),
> - Args);
> + CGF.EmitRuntimeCall(
> + OMPBuilder.getOrCreateRuntimeFunction(M, OMPRTL___kmpc_omp_taskwait),
> + Args);
> }
> }
>
>
> diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.h b/clang/lib/CodeGen/CGOpenMPRuntime.h
> index e7c1a098c7689..b51fd58a3a0ac 100644
> --- a/clang/lib/CodeGen/CGOpenMPRuntime.h
> +++ b/clang/lib/CodeGen/CGOpenMPRuntime.h
> @@ -121,7 +121,6 @@ struct OMPTaskDataTy final {
> bool Nogroup = false;
> bool IsReductionWithTaskMod = false;
> bool IsWorksharingReduction = false;
> - bool HasNowaitClause = false;
> };
>
> /// Class intended to support codegen of all kind of the reduction clauses.
>
> diff --git a/clang/lib/CodeGen/CGStmtOpenMP.cpp b/clang/lib/CodeGen/CGStmtOpenMP.cpp
> index cf9b704e0ae6f..2e29a8d1e6e4f 100644
> --- a/clang/lib/CodeGen/CGStmtOpenMP.cpp
> +++ b/clang/lib/CodeGen/CGStmtOpenMP.cpp
> @@ -5263,7 +5263,6 @@ void CodeGenFunction::EmitOMPTaskwaitDirective(const OMPTaskwaitDirective &S) {
> OMPTaskDataTy Data;
> // Build list of dependences
> buildDependences(S, Data);
> - Data.HasNowaitClause = S.hasClausesOfKind<OMPNowaitClause>();
> CGM.getOpenMPRuntime().emitTaskwaitCall(*this, S.getBeginLoc(), Data);
> }
>
>
> diff --git a/clang/test/OpenMP/target_depend_codegen.cpp b/clang/test/OpenMP/target_depend_codegen.cpp
> index 3b09a2ed13444..a9136b6d55a24 100644
> --- a/clang/test/OpenMP/target_depend_codegen.cpp
> +++ b/clang/test/OpenMP/target_depend_codegen.cpp
> @@ -89,7 +89,7 @@ int foo(int n) {
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* [[DEP_START]], i[[SZ]] 2
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* [[DEP_START]], i[[SZ]] 3
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* [[DEP_START]] to i8*
> -// CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* @1, i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null, i32 0)
> +// CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* @1, i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* @1, i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY0]](i32 [[GTID]], [[TASK_TY0]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* @1, i32 [[GTID]], i8* [[TASK]])
> @@ -209,7 +209,7 @@ int foo(int n) {
> // CHECK: [[TASK:%.+]] = call i8* @__kmpc_omp_task_alloc(%struct.ident_t* @1, i32 [[GTID]], i32 1, i[[SZ]] {{48|24}}, i[[SZ]] 4, i32 (i32, i8*)* bitcast (i32 (i32, %{{.+}}*)* [[TASK_ENTRY2:@.+]] to i32 (i32, i8*)*))
> // CHECK: [[BC_TASK:%.+]] = bitcast i8* [[TASK]] to [[TASK_TY2:%.+]]*
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> -// CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* @1, i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null, i32 0)
> +// CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* @1, i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* @1, i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY2]](i32 [[GTID]], [[TASK_TY2]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* @1, i32 [[GTID]], i8* [[TASK]])
>
> diff --git a/clang/test/OpenMP/target_enter_data_depend_codegen.cpp b/clang/test/OpenMP/target_enter_data_depend_codegen.cpp
> index b29bf4f50798d..2c8a21fe973ea 100644
> --- a/clang/test/OpenMP/target_enter_data_depend_codegen.cpp
> +++ b/clang/test/OpenMP/target_enter_data_depend_codegen.cpp
> @@ -184,7 +184,7 @@ void foo(int arg) {
> // CK1: [[DEP_ATTRS:%.+]] = getelementptr inbounds %struct.kmp_depend_info, %struct.kmp_depend_info* [[DEP]], i32 0, i32 2
> // CK1: store i8 3, i8* [[DEP_ATTRS]]
> // CK1: [[BC:%.+]] = bitcast %struct.kmp_depend_info* [[MAIN_DEP]] to i8*
> - // CK1: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 3, i8* [[BC]], i32 0, i8* null, i32 0)
> + // CK1: call void @__kmpc_omp_wait_deps(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 3, i8* [[BC]], i32 0, i8* null)
> // CK1: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
> // CK1: = call i32 [[TASK_ENTRY2]](i32 %{{.+}}, %struct.kmp_task_t_with_privates{{.+}}* [[RES_BC]])
> // CK1: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
> @@ -273,7 +273,7 @@ void foo(int arg) {
> // CK1: [[DEP_ATTRS:%.+]] = getelementptr inbounds %struct.kmp_depend_info, %struct.kmp_depend_info* [[DEP]], i32 0, i32 2
> // CK1: store i8 3, i8* [[DEP_ATTRS]]
> // CK1: [[BC:%.+]] = bitcast %struct.kmp_depend_info* [[MAIN_DEP]] to i8*
> - // CK1: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 4, i8* [[BC]], i32 0, i8* null, i32 0)
> + // CK1: call void @__kmpc_omp_wait_deps(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 4, i8* [[BC]], i32 0, i8* null)
> // CK1: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
> // CK1: = call i32 [[TASK_ENTRY3]](i32 %{{.+}}, %struct.kmp_task_t_with_privates{{.+}}* [[RES_BC]])
> // CK1: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
> @@ -371,7 +371,7 @@ void foo(int arg) {
> // CK1: [[DEP_ATTRS:%.+]] = getelementptr inbounds %struct.kmp_depend_info, %struct.kmp_depend_info* [[DEP]], i32 0, i32 2
> // CK1: store i8 1, i8* [[DEP_ATTRS]]
> // CK1: [[BC:%.+]] = bitcast %struct.kmp_depend_info* [[MAIN_DEP]] to i8*
> - // CK1: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 5, i8* [[BC]], i32 0, i8* null, i32 0)
> + // CK1: call void @__kmpc_omp_wait_deps(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 5, i8* [[BC]], i32 0, i8* null)
> // CK1: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
> // CK1: = call i32 [[TASK_ENTRY4]](i32 %{{.+}}, %struct.kmp_task_t_with_privates{{.+}}* [[RES_BC]])
> // CK1: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
>
> diff --git a/clang/test/OpenMP/target_exit_data_depend_codegen.cpp b/clang/test/OpenMP/target_exit_data_depend_codegen.cpp
> index d562146e7e95d..d40bbf7fbf9f3 100644
> --- a/clang/test/OpenMP/target_exit_data_depend_codegen.cpp
> +++ b/clang/test/OpenMP/target_exit_data_depend_codegen.cpp
> @@ -184,7 +184,7 @@ void foo(int arg) {
> // CK1: [[DEP_ATTRS:%.+]] = getelementptr inbounds %struct.kmp_depend_info, %struct.kmp_depend_info* [[DEP]], i32 0, i32 2
> // CK1: store i8 3, i8* [[DEP_ATTRS]]
> // CK1: [[BC:%.+]] = bitcast %struct.kmp_depend_info* [[MAIN_DEP]] to i8*
> - // CK1: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 3, i8* [[BC]], i32 0, i8* null, i32 0)
> + // CK1: call void @__kmpc_omp_wait_deps(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 3, i8* [[BC]], i32 0, i8* null)
> // CK1: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
> // CK1: = call i32 [[TASK_ENTRY2]](i32 %{{.+}}, %struct.kmp_task_t_with_privates{{.+}}* [[RES_BC]])
> // CK1: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
> @@ -273,7 +273,7 @@ void foo(int arg) {
> // CK1: [[DEP_ATTRS:%.+]] = getelementptr inbounds %struct.kmp_depend_info, %struct.kmp_depend_info* [[DEP]], i32 0, i32 2
> // CK1: store i8 3, i8* [[DEP_ATTRS]]
> // CK1: [[BC:%.+]] = bitcast %struct.kmp_depend_info* [[MAIN_DEP]] to i8*
> - // CK1: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 4, i8* [[BC]], i32 0, i8* null, i32 0)
> + // CK1: call void @__kmpc_omp_wait_deps(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 4, i8* [[BC]], i32 0, i8* null)
> // CK1: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
> // CK1: = call i32 [[TASK_ENTRY3]](i32 %{{.+}}, %struct.kmp_task_t_with_privates{{.+}}* [[RES_BC]])
> // CK1: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
> @@ -371,7 +371,7 @@ void foo(int arg) {
> // CK1: [[DEP_ATTRS:%.+]] = getelementptr inbounds %struct.kmp_depend_info, %struct.kmp_depend_info* [[DEP]], i32 0, i32 2
> // CK1: store i8 1, i8* [[DEP_ATTRS]]
> // CK1: [[BC:%.+]] = bitcast %struct.kmp_depend_info* [[MAIN_DEP]] to i8*
> - // CK1: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 5, i8* [[BC]], i32 0, i8* null, i32 0)
> + // CK1: call void @__kmpc_omp_wait_deps(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 5, i8* [[BC]], i32 0, i8* null)
> // CK1: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
> // CK1: = call i32 [[TASK_ENTRY4]](i32 %{{.+}}, %struct.kmp_task_t_with_privates{{.+}}* [[RES_BC]])
> // CK1: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
>
> diff --git a/clang/test/OpenMP/target_parallel_depend_codegen.cpp b/clang/test/OpenMP/target_parallel_depend_codegen.cpp
> index 49cb76f61dc03..9a4b8923dcee6 100644
> --- a/clang/test/OpenMP/target_parallel_depend_codegen.cpp
> +++ b/clang/test/OpenMP/target_parallel_depend_codegen.cpp
> @@ -87,7 +87,7 @@ int foo(int n) {
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 2
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 3
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> -// CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* @1, i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null, i32 0)
> +// CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* @1, i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* @1, i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY0]](i32 [[GTID]], [[TASK_TY0]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* @1, i32 [[GTID]], i8* [[TASK]])
> @@ -164,7 +164,7 @@ int foo(int n) {
> // CHECK: [[BC_TASK:%.+]] = bitcast i8* [[TASK]] to [[TASK_TY2:%.+]]*
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 0
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> -// CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* @1, i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null, i32 0)
> +// CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* @1, i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* @1, i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY2]](i32 [[GTID]], [[TASK_TY2]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* @1, i32 [[GTID]], i8* [[TASK]])
>
> diff --git a/clang/test/OpenMP/target_parallel_for_depend_codegen.cpp b/clang/test/OpenMP/target_parallel_for_depend_codegen.cpp
> index d243bbca6a77e..193d2c5500523 100644
> --- a/clang/test/OpenMP/target_parallel_for_depend_codegen.cpp
> +++ b/clang/test/OpenMP/target_parallel_for_depend_codegen.cpp
> @@ -87,7 +87,7 @@ int foo(int n) {
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 2
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 3
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> - // CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* [[IN]], i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null, i32 0)
> + // CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* [[IN]], i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* [[IN]], i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY0]](i32 [[GTID]], [[TASK_TY0]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* [[IN]], i32 [[GTID]], i8* [[TASK]])
> @@ -160,7 +160,7 @@ int foo(int n) {
> // CHECK: [[BC_TASK:%.+]] = bitcast i8* [[TASK]] to [[TASK_TY2:%.+]]*
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 0
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> - // CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* [[IN]], i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null, i32 0)
> + // CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* [[IN]], i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* [[IN]], i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY2]](i32 [[GTID]], [[TASK_TY2]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* [[IN]], i32 [[GTID]], i8* [[TASK]])
>
> diff --git a/clang/test/OpenMP/target_parallel_for_simd_depend_codegen.cpp b/clang/test/OpenMP/target_parallel_for_simd_depend_codegen.cpp
> index 4a13c711948fb..60c77d9121072 100644
> --- a/clang/test/OpenMP/target_parallel_for_simd_depend_codegen.cpp
> +++ b/clang/test/OpenMP/target_parallel_for_simd_depend_codegen.cpp
> @@ -87,7 +87,7 @@ int foo(int n) {
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 2
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 3
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> - // CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* [[IN]], i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null, i32 0)
> + // CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* [[IN]], i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* [[IN]], i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY0]](i32 [[GTID]], [[TASK_TY0]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* [[IN]], i32 [[GTID]], i8* [[TASK]])
> @@ -160,7 +160,7 @@ int foo(int n) {
> // CHECK: [[BC_TASK:%.+]] = bitcast i8* [[TASK]] to [[TASK_TY2:%.+]]*
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 0
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> - // CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* [[IN]], i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null, i32 0)
> + // CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* [[IN]], i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* [[IN]], i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY2]](i32 [[GTID]], [[TASK_TY2]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* [[IN]], i32 [[GTID]], i8* [[TASK]])
>
> diff --git a/clang/test/OpenMP/target_simd_depend_codegen.cpp b/clang/test/OpenMP/target_simd_depend_codegen.cpp
> index fa7d87c647d5b..aad4f4817c143 100644
> --- a/clang/test/OpenMP/target_simd_depend_codegen.cpp
> +++ b/clang/test/OpenMP/target_simd_depend_codegen.cpp
> @@ -87,7 +87,7 @@ int foo(int n) {
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 2
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 3
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> -// CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* @1, i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null, i32 0)
> +// CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* @1, i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* @1, i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY0]](i32 [[GTID]], [[TASK_TY0]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* @1, i32 [[GTID]], i8* [[TASK]])
> @@ -163,7 +163,7 @@ int foo(int n) {
> // CHECK: [[BC_TASK:%.+]] = bitcast i8* [[TASK]] to [[TASK_TY2:%.+]]*
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 0
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> -// CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* @1, i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null, i32 0)
> +// CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* @1, i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* @1, i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY2]](i32 [[GTID]], [[TASK_TY2]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* @1, i32 [[GTID]], i8* [[TASK]])
>
> diff --git a/clang/test/OpenMP/target_teams_depend_codegen.cpp b/clang/test/OpenMP/target_teams_depend_codegen.cpp
> index cdd220a1023af..7011d27fc4907 100644
> --- a/clang/test/OpenMP/target_teams_depend_codegen.cpp
> +++ b/clang/test/OpenMP/target_teams_depend_codegen.cpp
> @@ -87,7 +87,7 @@ int foo(int n) {
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 2
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 3
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> -// CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* @1, i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null, i32 0)
> +// CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* @1, i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* @1, i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY0]](i32 [[GTID]], [[TASK_TY0]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* @1, i32 [[GTID]], i8* [[TASK]])
> @@ -163,7 +163,7 @@ int foo(int n) {
> // CHECK: [[BC_TASK:%.+]] = bitcast i8* [[TASK]] to [[TASK_TY2:%.+]]*
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 0
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> -// CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* @1, i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null, i32 0)
> +// CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* @1, i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* @1, i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY2]](i32 [[GTID]], [[TASK_TY2]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* @1, i32 [[GTID]], i8* [[TASK]])
>
> diff --git a/clang/test/OpenMP/target_teams_distribute_depend_codegen.cpp b/clang/test/OpenMP/target_teams_distribute_depend_codegen.cpp
> index 56d28b2f4ce4e..d0d3f726ed7b4 100644
> --- a/clang/test/OpenMP/target_teams_distribute_depend_codegen.cpp
> +++ b/clang/test/OpenMP/target_teams_distribute_depend_codegen.cpp
> @@ -87,7 +87,7 @@ int foo(int n) {
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 2
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 3
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> - // CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* [[ID]], i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null, i32 0)
> + // CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* [[ID]], i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* [[ID]], i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY0]](i32 [[GTID]], [[TASK_TY0]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* [[ID]], i32 [[GTID]], i8* [[TASK]])
> @@ -160,7 +160,7 @@ int foo(int n) {
> // CHECK: [[BC_TASK:%.+]] = bitcast i8* [[TASK]] to [[TASK_TY2:%.+]]*
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 0
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> - // CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* [[ID]], i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null, i32 0)
> + // CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* [[ID]], i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* [[ID]], i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY2]](i32 [[GTID]], [[TASK_TY2]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* [[ID]], i32 [[GTID]], i8* [[TASK]])
>
> diff --git a/clang/test/OpenMP/target_teams_distribute_parallel_for_depend_codegen.cpp b/clang/test/OpenMP/target_teams_distribute_parallel_for_depend_codegen.cpp
> index 5cb55b6204795..67fcde3b66f27 100644
> --- a/clang/test/OpenMP/target_teams_distribute_parallel_for_depend_codegen.cpp
> +++ b/clang/test/OpenMP/target_teams_distribute_parallel_for_depend_codegen.cpp
> @@ -87,7 +87,7 @@ int foo(int n) {
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 2
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 3
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> - // CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* [[ID]], i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null, i32 0)
> + // CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* [[ID]], i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* [[ID]], i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY0]](i32 [[GTID]], [[TASK_TY0]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* [[ID]], i32 [[GTID]], i8* [[TASK]])
> @@ -160,7 +160,7 @@ int foo(int n) {
> // CHECK: [[BC_TASK:%.+]] = bitcast i8* [[TASK]] to [[TASK_TY2:%.+]]*
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 0
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> - // CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* [[ID]], i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null, i32 0)
> + // CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* [[ID]], i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* [[ID]], i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY2]](i32 [[GTID]], [[TASK_TY2]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* [[ID]], i32 [[GTID]], i8* [[TASK]])
>
> diff --git a/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_depend_codegen.cpp b/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_depend_codegen.cpp
> index 1c9ebfaea8592..92668b110f935 100644
> --- a/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_depend_codegen.cpp
> +++ b/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_depend_codegen.cpp
> @@ -87,7 +87,7 @@ int foo(int n) {
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 2
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 3
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> - // CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* [[ID]], i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null, i32 0)
> + // CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* [[ID]], i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* [[ID]], i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY0]](i32 [[GTID]], [[TASK_TY0]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* [[ID]], i32 [[GTID]], i8* [[TASK]])
> @@ -160,7 +160,7 @@ int foo(int n) {
> // CHECK: [[BC_TASK:%.+]] = bitcast i8* [[TASK]] to [[TASK_TY2:%.+]]*
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 0
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> - // CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* [[ID]], i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null, i32 0)
> + // CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* [[ID]], i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* [[ID]], i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY2]](i32 [[GTID]], [[TASK_TY2]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* [[ID]], i32 [[GTID]], i8* [[TASK]])
>
> diff --git a/clang/test/OpenMP/target_teams_distribute_simd_depend_codegen.cpp b/clang/test/OpenMP/target_teams_distribute_simd_depend_codegen.cpp
> index 0076db7750e20..14ae36c5bf426 100644
> --- a/clang/test/OpenMP/target_teams_distribute_simd_depend_codegen.cpp
> +++ b/clang/test/OpenMP/target_teams_distribute_simd_depend_codegen.cpp
> @@ -101,7 +101,7 @@ int foo(int n) {
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 2
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 3
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> - // CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* [[ID]], i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null, i32 0)
> + // CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* [[ID]], i32 [[GTID]], i32 4, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* [[ID]], i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY0]](i32 [[GTID]], [[TASK_TY0]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* [[ID]], i32 [[GTID]], i8* [[TASK]])
> @@ -199,7 +199,7 @@ int foo(int n) {
> // CHECK: [[BC_TASK:%.+]] = bitcast i8* [[TASK]] to [[TASK_TY2:%.+]]*
> // CHECK: getelementptr %struct.kmp_depend_info, %struct.kmp_depend_info* %{{.+}}, i[[SZ]] 0
> // CHECK: [[DEP:%.+]] = bitcast %struct.kmp_depend_info* %{{.+}} to i8*
> - // CHECK: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* [[ID]], i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null, i32 0)
> + // CHECK: call void @__kmpc_omp_wait_deps(%struct.ident_t* [[ID]], i32 [[GTID]], i32 1, i8* [[DEP]], i32 0, i8* null)
> // CHECK: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* [[ID]], i32 [[GTID]], i8* [[TASK]])
> // CHECK: call i32 [[TASK_ENTRY2]](i32 [[GTID]], [[TASK_TY2]]* [[BC_TASK]])
> // CHECK: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* [[ID]], i32 [[GTID]], i8* [[TASK]])
>
> diff --git a/clang/test/OpenMP/target_update_depend_codegen.cpp b/clang/test/OpenMP/target_update_depend_codegen.cpp
> index da0207017cd7f..bdcbb02fdbdeb 100644
> --- a/clang/test/OpenMP/target_update_depend_codegen.cpp
> +++ b/clang/test/OpenMP/target_update_depend_codegen.cpp
> @@ -184,7 +184,7 @@ void foo(int arg) {
> // CK1: [[DEP_ATTRS:%.+]] = getelementptr inbounds %struct.kmp_depend_info, %struct.kmp_depend_info* [[DEP]], i32 0, i32 2
> // CK1: store i8 3, i8* [[DEP_ATTRS]]
> // CK1: [[BC:%.+]] = bitcast %struct.kmp_depend_info* [[MAIN_DEP]] to i8*
> - // CK1: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 3, i8* [[BC]], i32 0, i8* null, i32 0)
> + // CK1: call void @__kmpc_omp_wait_deps(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 3, i8* [[BC]], i32 0, i8* null)
> // CK1: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
> // CK1: = call i32 [[TASK_ENTRY2]](i32 %{{.+}}, %struct.kmp_task_t_with_privates{{.+}}* [[RES_BC]])
> // CK1: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
> @@ -273,7 +273,7 @@ void foo(int arg) {
> // CK1: [[DEP_ATTRS:%.+]] = getelementptr inbounds %struct.kmp_depend_info, %struct.kmp_depend_info* [[DEP]], i32 0, i32 2
> // CK1: store i8 3, i8* [[DEP_ATTRS]]
> // CK1: [[BC:%.+]] = bitcast %struct.kmp_depend_info* [[MAIN_DEP]] to i8*
> - // CK1: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 4, i8* [[BC]], i32 0, i8* null, i32 0)
> + // CK1: call void @__kmpc_omp_wait_deps(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 4, i8* [[BC]], i32 0, i8* null)
> // CK1: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
> // CK1: = call i32 [[TASK_ENTRY3]](i32 %{{.+}}, %struct.kmp_task_t_with_privates{{.+}}* [[RES_BC]])
> // CK1: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
> @@ -371,7 +371,7 @@ void foo(int arg) {
> // CK1: [[DEP_ATTRS:%.+]] = getelementptr inbounds %struct.kmp_depend_info, %struct.kmp_depend_info* [[DEP]], i32 0, i32 2
> // CK1: store i8 1, i8* [[DEP_ATTRS]]
> // CK1: [[BC:%.+]] = bitcast %struct.kmp_depend_info* [[MAIN_DEP]] to i8*
> - // CK1: call void @__kmpc_omp_taskwait_deps_51(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 5, i8* [[BC]], i32 0, i8* null, i32 0)
> + // CK1: call void @__kmpc_omp_wait_deps(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i32 5, i8* [[BC]], i32 0, i8* null)
> // CK1: call void @__kmpc_omp_task_begin_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
> // CK1: = call i32 [[TASK_ENTRY4]](i32 %{{.+}}, %struct.kmp_task_t_with_privates{{.+}}* [[RES_BC]])
> // CK1: call void @__kmpc_omp_task_complete_if0(%struct.ident_t* @{{.+}}, i32 %{{.+}}, i8* [[RES]])
>
> diff --git a/clang/test/OpenMP/task_codegen.cpp b/clang/test/OpenMP/task_codegen.cpp
> index 8eb642d27e69b..d9d838bfdbf92 100644
> --- a/clang/test/OpenMP/task_codegen.cpp
> +++ b/clang/test/OpenMP/task_codegen.cpp
> @@ -1093,7 +1093,7 @@ void test_omp_all_memory()
> // CHECK1-NEXT: call void @_ZN1SD1Ev(ptr noundef nonnull align 4 dereferenceable(4) [[REF_TMP_I]]) #[[ATTR4]]
> // CHECK1-NEXT: store i32 10, ptr [[TMP15]], align 4
> // CHECK1-NEXT: [[TMP43:%.*]] = load i32, ptr [[DOTGLOBAL_TID__ADDR_I]], align 4, !noalias !112
> -// CHECK1-NEXT: [[TMP44:%.*]] = call i32 @__kmpc_omp_taskwait_51(ptr @[[GLOB1]], i32 [[TMP43]], i32 0)
> +// CHECK1-NEXT: [[TMP44:%.*]] = call i32 @__kmpc_omp_taskwait(ptr @[[GLOB1]], i32 [[TMP43]])
> // CHECK1-NEXT: [[TMP45:%.*]] = load ptr, ptr [[DOTPART_ID__ADDR_I]], align 8, !noalias !112
> // CHECK1-NEXT: store i32 5, ptr [[TMP45]], align 4
> // CHECK1-NEXT: [[TMP46:%.*]] = load i32, ptr [[DOTGLOBAL_TID__ADDR_I]], align 4, !noalias !112
> @@ -2213,7 +2213,7 @@ void test_omp_all_memory()
> // CHECK2-NEXT: call void @_ZN1SD1Ev(ptr noundef nonnull align 4 dereferenceable(4) [[REF_TMP_I]]) #[[ATTR4]]
> // CHECK2-NEXT: store i32 10, ptr [[TMP15]], align 4
> // CHECK2-NEXT: [[TMP43:%.*]] = load i32, ptr [[DOTGLOBAL_TID__ADDR_I]], align 4, !noalias !112
> -// CHECK2-NEXT: [[TMP44:%.*]] = call i32 @__kmpc_omp_taskwait_51(ptr @[[GLOB1]], i32 [[TMP43]], i32 0)
> +// CHECK2-NEXT: [[TMP44:%.*]] = call i32 @__kmpc_omp_taskwait(ptr @[[GLOB1]], i32 [[TMP43]])
> // CHECK2-NEXT: [[TMP45:%.*]] = load ptr, ptr [[DOTPART_ID__ADDR_I]], align 8, !noalias !112
> // CHECK2-NEXT: store i32 5, ptr [[TMP45]], align 4
> // CHECK2-NEXT: [[TMP46:%.*]] = load i32, ptr [[DOTGLOBAL_TID__ADDR_I]], align 4, !noalias !112
> @@ -3415,7 +3415,7 @@ void test_omp_all_memory()
> // CHECK2-51-NEXT: call void @_ZN1SD1Ev(ptr noundef nonnull align 4 dereferenceable(4) [[REF_TMP_I]]) #[[ATTR4]]
> // CHECK2-51-NEXT: store i32 10, ptr [[TMP15]], align 4
> // CHECK2-51-NEXT: [[TMP43:%.*]] = load i32, ptr [[DOTGLOBAL_TID__ADDR_I]], align 4, !noalias !122
> -// CHECK2-51-NEXT: [[TMP44:%.*]] = call i32 @__kmpc_omp_taskwait_51(ptr @[[GLOB1]], i32 [[TMP43]], i32 0)
> +// CHECK2-51-NEXT: [[TMP44:%.*]] = call i32 @__kmpc_omp_taskwait(ptr @[[GLOB1]], i32 [[TMP43]])
> // CHECK2-51-NEXT: [[TMP45:%.*]] = load ptr, ptr [[DOTPART_ID__ADDR_I]], align 8, !noalias !122
> // CHECK2-51-NEXT: store i32 5, ptr [[TMP45]], align 4
> // CHECK2-51-NEXT: [[TMP46:%.*]] = load i32, ptr [[DOTGLOBAL_TID__ADDR_I]], align 4, !noalias !122
> @@ -4953,7 +4953,7 @@ void test_omp_all_memory()
> // CHECK3-NEXT: call void @_ZN1SD1Ev(ptr noundef nonnull align 4 dereferenceable(4) [[REF_TMP_I]]) #[[ATTR4]]
> // CHECK3-NEXT: store i32 10, ptr [[S2_I]], align 4, !noalias !112
> // CHECK3-NEXT: [[OMP_GLOBAL_THREAD_NUM13_I:%.*]] = call i32 @__kmpc_global_thread_num(ptr @[[GLOB1]])
> -// CHECK3-NEXT: [[TMP31:%.*]] = call i32 @__kmpc_omp_taskwait_51(ptr @[[GLOB1]], i32 [[OMP_GLOBAL_THREAD_NUM13_I]], i32 0)
> +// CHECK3-NEXT: [[TMP31:%.*]] = call i32 @__kmpc_omp_taskwait(ptr @[[GLOB1]], i32 [[OMP_GLOBAL_THREAD_NUM13_I]])
> // CHECK3-NEXT: [[TMP32:%.*]] = load ptr, ptr [[DOTPART_ID__ADDR_I]], align 8, !noalias !112
> // CHECK3-NEXT: store i32 4, ptr [[TMP32]], align 4
> // CHECK3-NEXT: [[OMP_GLOBAL_THREAD_NUM14_I:%.*]] = call i32 @__kmpc_global_thread_num(ptr @[[GLOB21]])
> @@ -5969,7 +5969,7 @@ void test_omp_all_memory()
> // CHECK4-NEXT: call void @_ZN1SD1Ev(ptr noundef nonnull align 4 dereferenceable(4) [[REF_TMP_I]]) #[[ATTR4]]
> // CHECK4-NEXT: store i32 10, ptr [[S2_I]], align 4, !noalias !112
> // CHECK4-NEXT: [[OMP_GLOBAL_THREAD_NUM13_I:%.*]] = call i32 @__kmpc_global_thread_num(ptr @[[GLOB1]])
> -// CHECK4-NEXT: [[TMP31:%.*]] = call i32 @__kmpc_omp_taskwait_51(ptr @[[GLOB1]], i32 [[OMP_GLOBAL_THREAD_NUM13_I]], i32 0)
> +// CHECK4-NEXT: [[TMP31:%.*]] = call i32 @__kmpc_omp_taskwait(ptr @[[GLOB1]], i32 [[OMP_GLOBAL_THREAD_NUM13_I]])
> // CHECK4-NEXT: [[TMP32:%.*]] = load ptr, ptr [[DOTPART_ID__ADDR_I]], align 8, !noalias !112
> // CHECK4-NEXT: store i32 4, ptr [[TMP32]], align 4
> // CHECK4-NEXT: [[OMP_GLOBAL_THREAD_NUM14_I:%.*]] = call i32 @__kmpc_global_thread_num(ptr @[[GLOB21]])
> @@ -7069,7 +7069,7 @@ void test_omp_all_memory()
> // CHECK3-51-NEXT: call void @_ZN1SD1Ev(ptr noundef nonnull align 4 dereferenceable(4) [[REF_TMP_I]]) #[[ATTR4]]
> // CHECK3-51-NEXT: store i32 10, ptr [[S2_I]], align 4, !noalias !122
> // CHECK3-51-NEXT: [[OMP_GLOBAL_THREAD_NUM13_I:%.*]] = call i32 @__kmpc_global_thread_num(ptr @[[GLOB1]])
> -// CHECK3-51-NEXT: [[TMP31:%.*]] = call i32 @__kmpc_omp_taskwait_51(ptr @[[GLOB1]], i32 [[OMP_GLOBAL_THREAD_NUM13_I]], i32 0)
> +// CHECK3-51-NEXT: [[TMP31:%.*]] = call i32 @__kmpc_omp_taskwait(ptr @[[GLOB1]], i32 [[OMP_GLOBAL_THREAD_NUM13_I]])
> // CHECK3-51-NEXT: [[TMP32:%.*]] = load ptr, ptr [[DOTPART_ID__ADDR_I]], align 8, !noalias !122
> // CHECK3-51-NEXT: store i32 4, ptr [[TMP32]], align 4
> // CHECK3-51-NEXT: [[OMP_GLOBAL_THREAD_NUM14_I:%.*]] = call i32 @__kmpc_global_thread_num(ptr @[[GLOB23]])
> @@ -8503,7 +8503,7 @@ void test_omp_all_memory()
> // CHECK4-51-NEXT: call void @_ZN1SD1Ev(ptr noundef nonnull align 4 dereferenceable(4) [[REF_TMP_I]]) #[[ATTR4]]
> // CHECK4-51-NEXT: store i32 10, ptr [[S2_I]], align 4, !noalias !112
> // CHECK4-51-NEXT: [[OMP_GLOBAL_THREAD_NUM13_I:%.*]] = call i32 @__kmpc_global_thread_num(ptr @[[GLOB1]])
> -// CHECK4-51-NEXT: [[TMP31:%.*]] = call i32 @__kmpc_omp_taskwait_51(ptr @[[GLOB1]], i32 [[OMP_GLOBAL_THREAD_NUM13_I]], i32 0)
> +// CHECK4-51-NEXT: [[TMP31:%.*]] = call i32 @__kmpc_omp_taskwait(ptr @[[GLOB1]], i32 [[OMP_GLOBAL_THREAD_NUM13_I]])
> // CHECK4-51-NEXT: [[TMP32:%.*]] = load ptr, ptr [[DOTPART_ID__ADDR_I]], align 8, !noalias !112
> // CHECK4-51-NEXT: store i32 4, ptr [[TMP32]], align 4
> // CHECK4-51-NEXT: [[OMP_GLOBAL_THREAD_NUM14_I:%.*]] = call i32 @__kmpc_global_thread_num(ptr @[[GLOB21]])
>
> diff --git a/clang/test/OpenMP/task_if_codegen.cpp b/clang/test/OpenMP/task_if_codegen.cpp
> index 1809951e9379b..742833d7e3665 100644
> --- a/clang/test/OpenMP/task_if_codegen.cpp
> +++ b/clang/test/OpenMP/task_if_codegen.cpp
> @@ -198,7 +198,7 @@ int main() {
> // CHECK1-NEXT: [[TMP25:%.*]] = call i32 @__kmpc_omp_task_with_deps(ptr @[[GLOB1]], i32 [[TMP0]], ptr [[TMP15]], i32 1, ptr [[TMP18]], i32 0, ptr null)
> // CHECK1-NEXT: br label [[OMP_IF_END7:%.*]]
> // CHECK1: omp_if.else6:
> -// CHECK1-NEXT: call void @__kmpc_omp_taskwait_deps_51(ptr @[[GLOB1]], i32 [[TMP0]], i32 1, ptr [[TMP18]], i32 0, ptr null, i32 0)
> +// CHECK1-NEXT: call void @__kmpc_omp_wait_deps(ptr @[[GLOB1]], i32 [[TMP0]], i32 1, ptr [[TMP18]], i32 0, ptr null)
> // CHECK1-NEXT: call void @__kmpc_omp_task_begin_if0(ptr @[[GLOB1]], i32 [[TMP0]], ptr [[TMP15]])
> // CHECK1-NEXT: [[TMP26:%.*]] = call i32 @.omp_task_entry..9(i32 [[TMP0]], ptr [[TMP15]]) #[[ATTR3]]
> // CHECK1-NEXT: call void @__kmpc_omp_task_complete_if0(ptr @[[GLOB1]], i32 [[TMP0]], ptr [[TMP15]])
> @@ -404,7 +404,7 @@ int main() {
> // CHECK1-NEXT: [[TMP26:%.*]] = call i32 @__kmpc_omp_task_with_deps(ptr @[[GLOB1]], i32 [[TMP0]], ptr [[TMP15]], i32 1, ptr [[TMP18]], i32 0, ptr null)
> // CHECK1-NEXT: br label [[OMP_IF_END7:%.*]]
> // CHECK1: omp_if.else6:
> -// CHECK1-NEXT: call void @__kmpc_omp_taskwait_deps_51(ptr @[[GLOB1]], i32 [[TMP0]], i32 1, ptr [[TMP18]], i32 0, ptr null, i32 0)
> +// CHECK1-NEXT: call void @__kmpc_omp_wait_deps(ptr @[[GLOB1]], i32 [[TMP0]], i32 1, ptr [[TMP18]], i32 0, ptr null)
> // CHECK1-NEXT: call void @__kmpc_omp_task_begin_if0(ptr @[[GLOB1]], i32 [[TMP0]], ptr [[TMP15]])
> // CHECK1-NEXT: [[TMP27:%.*]] = call i32 @.omp_task_entry..17(i32 [[TMP0]], ptr [[TMP15]]) #[[ATTR3]]
> // CHECK1-NEXT: call void @__kmpc_omp_task_complete_if0(ptr @[[GLOB1]], i32 [[TMP0]], ptr [[TMP15]])
> @@ -429,7 +429,7 @@ int main() {
> // CHECK1-NEXT: [[TMP39:%.*]] = call i32 @__kmpc_omp_task_with_deps(ptr @[[GLOB1]], i32 [[TMP0]], ptr [[TMP28]], i32 1, ptr [[TMP31]], i32 0, ptr null)
> // CHECK1-NEXT: br label [[OMP_IF_END14:%.*]]
> // CHECK1: omp_if.else13:
> -// CHECK1-NEXT: call void @__kmpc_omp_taskwait_deps_51(ptr @[[GLOB1]], i32 [[TMP0]], i32 1, ptr [[TMP31]], i32 0, ptr null, i32 0)
> +// CHECK1-NEXT: call void @__kmpc_omp_wait_deps(ptr @[[GLOB1]], i32 [[TMP0]], i32 1, ptr [[TMP31]], i32 0, ptr null)
> // CHECK1-NEXT: call void @__kmpc_omp_task_begin_if0(ptr @[[GLOB1]], i32 [[TMP0]], ptr [[TMP28]])
> // CHECK1-NEXT: [[TMP40:%.*]] = call i32 @.omp_task_entry..19(i32 [[TMP0]], ptr [[TMP28]]) #[[ATTR3]]
> // CHECK1-NEXT: call void @__kmpc_omp_task_complete_if0(ptr @[[GLOB1]], i32 [[TMP0]], ptr [[TMP28]])
> @@ -454,7 +454,7 @@ int main() {
> // CHECK1-NEXT: [[TMP52:%.*]] = call i32 @__kmpc_omp_task_with_deps(ptr @[[GLOB1]], i32 [[TMP0]], ptr [[TMP41]], i32 1, ptr [[TMP44]], i32 0, ptr null)
> // CHECK1-NEXT: br label [[OMP_IF_END21:%.*]]
> // CHECK1: omp_if.else20:
> -// CHECK1-NEXT: call void @__kmpc_omp_taskwait_deps_51(ptr @[[GLOB1]], i32 [[TMP0]], i32 1, ptr [[TMP44]], i32 0, ptr null, i32 0)
> +// CHECK1-NEXT: call void @__kmpc_omp_wait_deps(ptr @[[GLOB1]], i32 [[TMP0]], i32 1, ptr [[TMP44]], i32 0, ptr null)
> // CHECK1-NEXT: call void @__kmpc_omp_task_begin_if0(ptr @[[GLOB1]], i32 [[TMP0]], ptr [[TMP41]])
> // CHECK1-NEXT: [[TMP53:%.*]] = call i32 @.omp_task_entry..21(i32 [[TMP0]], ptr [[TMP41]]) #[[ATTR3]]
> // CHECK1-NEXT: call void @__kmpc_omp_task_complete_if0(ptr @[[GLOB1]], i32 [[TMP0]], ptr [[TMP41]])
>
> diff --git a/clang/test/OpenMP/taskwait_ast_print.cpp b/clang/test/OpenMP/taskwait_ast_print.cpp
> index 6392356a6082b..5b40242ece1cb 100644
> --- a/clang/test/OpenMP/taskwait_ast_print.cpp
> +++ b/clang/test/OpenMP/taskwait_ast_print.cpp
> @@ -1,10 +1,10 @@
> -// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=51 -ast-print %s | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp -fopenmp-version=51 -x c++ -std=c++11 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp -fopenmp-version=51 -std=c++11 -include-pch %t -fsyntax-only -verify %s -ast-print | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=50 -ast-print %s | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -fopenmp-version=50 -x c++ -std=c++11 -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -fopenmp-version=50 -std=c++11 -include-pch %t -fsyntax-only -verify %s -ast-print | FileCheck %s
>
> -// RUN: %clang_cc1 -verify -fopenmp-simd -fopenmp-version=51 -ast-print %s | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp-simd -fopenmp-version=51 -x c++ -std=c++11 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp-simd -fopenmp-version=51 -std=c++11 -include-pch %t -fsyntax-only -verify %s -ast-print | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp-simd -fopenmp-version=50 -ast-print %s | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp-simd -fopenmp-version=50 -x c++ -std=c++11 -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp-simd -fopenmp-version=50 -std=c++11 -include-pch %t -fsyntax-only -verify %s -ast-print | FileCheck %s
> // expected-no-diagnostics
>
> #ifndef HEADER
> @@ -19,23 +19,6 @@ T tmain(T argc) {
> #pragma omp taskwait depend(in:a, argc)
> return a + argc;
> }
> -
> -template <class T>
> -T nmain(T argc) {
> - static T a;
> -#pragma omp taskwait
> -#pragma omp taskwait nowait
> - return a + argc;
> -}
> -
> -template <class T>
> -T ndmain(T argc) {
> - static T a;
> -#pragma omp taskwait
> -#pragma omp taskwait depend(in:a, argc) nowait
> - return a + argc;
> -}
> -
> // CHECK: static T a;
> // CHECK-NEXT: #pragma omp taskwait{{$}}
> // CHECK-NEXT: #pragma omp taskwait depend(in : a,argc){{$}}
> @@ -46,26 +29,6 @@ T ndmain(T argc) {
> // CHECK-NEXT: #pragma omp taskwait
> // CHECK-NEXT: #pragma omp taskwait depend(in : a,argc){{$}}
>
> -// CHECK: static T a;
> -// CHECK-NEXT: #pragma omp taskwait{{$}}
> -// CHECK-NEXT: #pragma omp taskwait nowait{{$}}
> -// CHECK: static int a;
> -// CHECK-NEXT: #pragma omp taskwait
> -// CHECK-NEXT: #pragma omp taskwait nowait{{$}}
> -// CHECK: static char a;
> -// CHECK-NEXT: #pragma omp taskwait
> -// CHECK-NEXT: #pragma omp taskwait nowait{{$}}
> -
> -// CHECK: static T a;
> -// CHECK-NEXT: #pragma omp taskwait{{$}}
> -// CHECK-NEXT: #pragma omp taskwait depend(in : a,argc) nowait{{$}}
> -// CHECK: static int a;
> -// CHECK-NEXT: #pragma omp taskwait
> -// CHECK-NEXT: #pragma omp taskwait depend(in : a,argc) nowait{{$}}
> -// CHECK: static char a;
> -// CHECK-NEXT: #pragma omp taskwait
> -// CHECK-NEXT: #pragma omp taskwait depend(in : a,argc) nowait{{$}}
> -
> int main(int argc, char **argv) {
> static int a;
> // CHECK: static int a;
> @@ -73,7 +36,7 @@ int main(int argc, char **argv) {
> #pragma omp taskwait depend(out:a, argc)
> // CHECK-NEXT: #pragma omp taskwait
> // CHECK-NEXT: #pragma omp taskwait depend(out : a,argc)
> - return tmain(argc) + tmain(argv[0][0]) + a + nmain(argc) + nmain(argv[0][0]) + ndmain(argc) + ndmain(argv[0][0]);
> + return tmain(argc) + tmain(argv[0][0]) + a;
> }
>
> #endif
>
> diff --git a/clang/test/OpenMP/taskwait_codegen.cpp b/clang/test/OpenMP/taskwait_codegen.cpp
> index 888a59e1d2867..4ea8af9afc309 100644
> --- a/clang/test/OpenMP/taskwait_codegen.cpp
> +++ b/clang/test/OpenMP/taskwait_codegen.cpp
> @@ -29,11 +29,11 @@ int main(int argc, char **argv) {
>
> // CHECK-LABEL: @main
> // CHECK: [[GTID:%.+]] = call i32 @__kmpc_global_thread_num(ptr @{{.+}})
> -// CHECK: call i32 @__kmpc_omp_taskwait_51(ptr @{{.+}}, i32 [[GTID]], i32 0)
> +// CHECK: call i32 @__kmpc_omp_taskwait(ptr @{{.+}}, i32 [[GTID]])
>
> // CHECK-LABEL: tmain
> // CHECK: [[GTID:%.+]] = call i32 @__kmpc_global_thread_num(ptr @{{.+}})
> -// CHECK: call i32 @__kmpc_omp_taskwait_51(ptr @{{.+}}, i32 [[GTID]], i32 0)
> +// CHECK: call i32 @__kmpc_omp_taskwait(ptr @{{.+}}, i32 [[GTID]])
>
>
> #endif
>
> diff --git a/clang/test/OpenMP/taskwait_depend_codegen.cpp b/clang/test/OpenMP/taskwait_depend_codegen.cpp
> index 81b4dce29c783..e68fbc1debb3f 100644
> --- a/clang/test/OpenMP/taskwait_depend_codegen.cpp
> +++ b/clang/test/OpenMP/taskwait_depend_codegen.cpp
> @@ -32,7 +32,7 @@ int main(int argc, char **argv) {
>
> // CHECK-LABEL: tmain
> // CHECK: [[GTID:%.+]] = call i32 @__kmpc_global_thread_num(ptr @{{.+}})
> -// CHECK: call void @__kmpc_omp_taskwait_deps_51(ptr @{{.+}}, i32 [[GTID]], i32 1, ptr %{{.}}, i32 0, ptr null, i32 0)
> +// CHECK: call void @__kmpc_omp_wait_deps(ptr @{{.+}}, i32 [[GTID]], i32 1, ptr %{{.}}, i32 0, ptr null)
>
>
> #endif
>
> diff --git a/clang/test/OpenMP/taskwait_depend_nowait_codegen.cpp b/clang/test/OpenMP/taskwait_depend_nowait_codegen.cpp
> deleted file mode 100644
> index 2c08b83516fad..0000000000000
> --- a/clang/test/OpenMP/taskwait_depend_nowait_codegen.cpp
> +++ /dev/null
> @@ -1,50 +0,0 @@
> -// RUN: %clang_cc1 -no-opaque-pointers -verify -triple x86_64-apple-darwin10 -fopenmp -fopenmp-version=51 -x c++ -emit-llvm %s -o - | FileCheck %s
> -// RUN: %clang_cc1 -no-opaque-pointers -fopenmp -fopenmp-version=51 -x c++ -triple x86_64-apple-darwin10 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -no-opaque-pointers -fopenmp -fopenmp-version=51 -x c++ -triple x86_64-apple-darwin10 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> -
> -// RUN: %clang_cc1 -no-opaque-pointers -verify -triple x86_64-apple-darwin10 -fopenmp-simd -fopenmp-version=51 -x c++ -emit-llvm %s -o - | FileCheck --check-prefix SIMD-ONLY0 %s
> -// RUN: %clang_cc1 -no-opaque-pointers -fopenmp-simd -fopenmp-version=51 -x c++ -triple x86_64-apple-darwin10 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -no-opaque-pointers -fopenmp-simd -fopenmp-version=51 -x c++ -triple x86_64-apple-darwin10 -include-pch %t -verify %s -emit-llvm -o - | FileCheck --check-prefix SIMD-ONLY0 %s
> -// SIMD-ONLY0-NOT: {{__kmpc|__tgt}}
> -// expected-no-diagnostics
> -#ifndef HEADER
> -#define HEADER
> -
> -void foo() {}
> -
> -template <class T>
> -T tmain(T &argc) {
> - static T a;
> - #pragma omp taskwait depend(in:argc)
> - return a + argc;
> -}
> -
> -template <class T>
> -T nmain(T &argc) {
> - static T a;
> - #pragma omp taskwait depend(in:argc) nowait
> - return a + argc;
> -}
> -
> -int main(int argc, char **argv) {
> - int n = 0;
> - #pragma omp task shared(n,argc) depend(out:n)
> - n = argc;
> - return tmain(n) + nmain(n);
> -}
> -
> -// CHECK-LABEL: @main
> -// CHECK: [[GTID:%.+]] = call i32 @__kmpc_global_thread_num(%{{.+}}* @{{.+}})
> -// CHECK: [[ALLOC:%.+]] = call i8* @__kmpc_omp_task_alloc(%{{.+}}* @{{.+}}, i32 [[GTID]], i32 1, i64 40, i64 16, i32 (i32, i8*)* bitcast (i32 (i32, %{{.+}}*)* @{{.+}} to i32 (i32, i8*)*))
> -// CHECK: %{{.+}} = call i32 @__kmpc_omp_task_with_deps(%{{.+}}* @{{.+}}, i32 [[GTID]], i8* [[ALLOC]], i32 1, i8* %{{[0-9]*}}, i32 0, i8* null)
> -
> -// CHECK-LABEL: define {{.*}} @{{.*}}tmain{{.*}}
> -// CHECK: [[GTID:%.+]] = call i32 @__kmpc_global_thread_num(%{{.+}}* @{{.+}})
> -// CHECK: call void @__kmpc_omp_taskwait_deps_51(%{{.+}}* @{{.+}}, i32 [[GTID]], i32 1, i8* %{{.}}, i32 0, i8* null, i32 0)
> -
> -// CHECK-LABEL: define {{.*}} @{{.*}}nmain{{.*}}
> -// CHECK: [[GTID:%.+]] = call i32 @__kmpc_global_thread_num(%{{.+}}* @{{.+}})
> -// CHECK: call void @__kmpc_omp_taskwait_deps_51(%{{.+}}* @{{.+}}, i32 [[GTID]], i32 1, i8* %{{.}}, i32 0, i8* null, i32 1)
> -
> -
> -#endif
>
> diff --git a/clang/test/OpenMP/taskwait_nowait_codegen.cpp b/clang/test/OpenMP/taskwait_nowait_codegen.cpp
> deleted file mode 100644
> index af843a9363c05..0000000000000
> --- a/clang/test/OpenMP/taskwait_nowait_codegen.cpp
> +++ /dev/null
> @@ -1,51 +0,0 @@
> -// RUN: %clang_cc1 -no-opaque-pointers -verify -triple x86_64-apple-darwin10 -fopenmp -fopenmp-version=51 -x c++ -emit-llvm %s -o - | FileCheck %s
> -// RUN: %clang_cc1 -no-opaque-pointers -fopenmp -fopenmp-version=51 -x c++ -triple x86_64-apple-darwin10 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -no-opaque-pointers -fopenmp -fopenmp-version=51 -x c++ -triple x86_64-apple-darwin10 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> -//
> -// RUN: %clang_cc1 -no-opaque-pointers -verify -triple x86_64-apple-darwin10 -fopenmp -fopenmp-version=51 -fopenmp-enable-irbuilder -x c++ -emit-llvm %s -o - | FileCheck %s
> -// RUN: %clang_cc1 -no-opaque-pointers -fopenmp -fopenmp-version=51 -fopenmp-enable-irbuilder -x c++ -triple x86_64-apple-darwin10 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -no-opaque-pointers -fopenmp -fopenmp-version=51 -fopenmp-enable-irbuilder -x c++ -triple x86_64-apple-darwin10 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> -
> -// RUN: %clang_cc1 -no-opaque-pointers -verify -triple x86_64-apple-darwin10 -fopenmp-simd -fopenmp-version=51 -x c++ -emit-llvm %s -o - | FileCheck --check-prefix SIMD-ONLY0 %s
> -// RUN: %clang_cc1 -no-opaque-pointers -fopenmp-simd -fopenmp-version=51 -x c++ -triple x86_64-apple-darwin10 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -no-opaque-pointers -fopenmp-simd -fopenmp-version=51 -x c++ -triple x86_64-apple-darwin10 -include-pch %t -verify %s -emit-llvm -o - | FileCheck --check-prefix SIMD-ONLY0 %s
> -// SIMD-ONLY0-NOT: {{__kmpc|__tgt}}
> -// expected-no-diagnostics
> -#ifndef HEADER
> -#define HEADER
> -
> -void foo() {}
> -
> -template <class T>
> -T tmain(T argc) {
> - static T a;
> -#pragma omp taskwait
> - return a + argc;
> -}
> -
> -template <class T>
> -T no_wait(T argc) {
> - static T a;
> -#pragma omp taskwait nowait
> - return a + argc;
> -}
> -
> -int main(int argc, char **argv) {
> -#pragma omp taskwait
> - return tmain(argc)+no_wait(argc);
> -}
> -
> -// CHECK-LABEL: @main
> -// CHECK: [[GTID:%.+]] = call i32 @__kmpc_global_thread_num(%{{.+}}* @{{.+}})
> -// CHECK: call i32 @__kmpc_omp_taskwait_51(%{{.+}}* @{{.+}}, i32 [[GTID]], i32 0)
> -
> -// CHECK-LABEL: define {{.*}} @{{.*}}tmain{{.*}}
> -// CHECK: [[GTID:%.+]] = call i32 @__kmpc_global_thread_num(%{{.+}}* @{{.+}})
> -// CHECK: call i32 @__kmpc_omp_taskwait_51(%{{.+}}* @{{.+}}, i32 [[GTID]], i32 0)
> -//
> -// CHECK-LABEL: define {{.*}} @{{.*}}no_wait{{.*}}
> -// CHECK: [[GTID:%.+]] = call i32 @__kmpc_global_thread_num(%{{.+}}* @{{.+}})
> -// CHECK: call i32 @__kmpc_omp_taskwait_51(%{{.+}}* @{{.+}}, i32 [[GTID]], i32 1)
> -
> -
> -#endif
>
> diff --git a/llvm/include/llvm/Frontend/OpenMP/OMP.td b/llvm/include/llvm/Frontend/OpenMP/OMP.td
> index f2bd5b4c9eb88..a43e9f6cd68f3 100644
> --- a/llvm/include/llvm/Frontend/OpenMP/OMP.td
> +++ b/llvm/include/llvm/Frontend/OpenMP/OMP.td
> @@ -563,8 +563,7 @@ def OMP_Error : Directive<"error"> {
> }
> def OMP_TaskWait : Directive<"taskwait"> {
> let allowedClauses = [
> - VersionedClause<OMPC_Depend, 50>,
> - VersionedClause<OMPC_NoWait, 51>
> + VersionedClause<OMPC_Depend, 50>
> ];
> }
> def OMP_TaskGroup : Directive<"taskgroup"> {
>
> diff --git a/llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h b/llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h
> index 507d11ececfca..f029e32e85f95 100644
> --- a/llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h
> +++ b/llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h
> @@ -729,8 +729,7 @@ class OpenMPIRBuilder {
> /// Generator for '#omp taskwait'
> ///
> /// \param Loc The location where the taskwait directive was encountered.
> - void createTaskwait(const LocationDescription &Loc,
> - bool HasNowaitClause = false);
> + void createTaskwait(const LocationDescription &Loc);
>
> /// Generator for '#omp taskyield'
> ///
> @@ -1019,8 +1018,7 @@ class OpenMPIRBuilder {
> /// Generate a taskwait runtime call.
> ///
> /// \param Loc The location at which the request originated and is fulfilled.
> - void emitTaskwaitImpl(const LocationDescription &Loc,
> - bool HasNowaitClause = false);
> + void emitTaskwaitImpl(const LocationDescription &Loc);
>
> /// Generate a taskyield runtime call.
> ///
>
> diff --git a/llvm/include/llvm/Frontend/OpenMP/OMPKinds.def b/llvm/include/llvm/Frontend/OpenMP/OMPKinds.def
> index bef838afb9f8e..8ff66f41b7b86 100644
> --- a/llvm/include/llvm/Frontend/OpenMP/OMPKinds.def
> +++ b/llvm/include/llvm/Frontend/OpenMP/OMPKinds.def
> @@ -206,7 +206,6 @@ __OMP_RTL(__kmpc_fork_call, true, Void, IdentPtr, Int32, ParallelTaskPtr)
> __OMP_RTL(__kmpc_fork_call_if, false, Void, IdentPtr, Int32, ParallelTaskPtr,
> Int32, VoidPtr)
> __OMP_RTL(__kmpc_omp_taskwait, false, Int32, IdentPtr, Int32)
> -__OMP_RTL(__kmpc_omp_taskwait_51, false, Int32, IdentPtr, Int32, Int32)
> __OMP_RTL(__kmpc_omp_taskyield, false, Int32, IdentPtr, Int32, /* Int */ Int32)
> __OMP_RTL(__kmpc_push_num_threads, false, Void, IdentPtr, Int32,
> /* Int */ Int32)
> @@ -374,8 +373,6 @@ __OMP_RTL(__kmpc_proxy_task_completed_ooo, false, Void, VoidPtr)
>
> __OMP_RTL(__kmpc_omp_wait_deps, false, Void, IdentPtr, Int32, Int32,
> /* kmp_depend_info_t */ VoidPtr, Int32, VoidPtr)
> -__OMP_RTL(__kmpc_omp_taskwait_deps_51, false, Void, IdentPtr, Int32, Int32,
> - /* kmp_depend_info_t */ VoidPtr, Int32, VoidPtr, Int32)
> __OMP_RTL(__kmpc_cancellationpoint, false, Int32, IdentPtr, Int32, Int32)
>
> __OMP_RTL(__kmpc_fork_teams, true, Void, IdentPtr, Int32, ParallelTaskPtr)
> @@ -639,8 +636,6 @@ __OMP_RTL_ATTRS(__kmpc_fork_call, ForkAttrs, AttributeSet(),
> ParamAttrs(ReadOnlyPtrAttrs, AttributeSet(), ReadOnlyPtrAttrs))
> __OMP_RTL_ATTRS(__kmpc_omp_taskwait, BarrierAttrs, AttributeSet(),
> ParamAttrs(ReadOnlyPtrAttrs))
> -__OMP_RTL_ATTRS(__kmpc_omp_taskwait_51, BarrierAttrs, AttributeSet(),
> - ParamAttrs(ReadOnlyPtrAttrs))
> __OMP_RTL_ATTRS(__kmpc_omp_taskyield, InaccessibleArgOnlyAttrs, AttributeSet(),
> ParamAttrs(ReadOnlyPtrAttrs))
> __OMP_RTL_ATTRS(__kmpc_push_num_threads, InaccessibleArgOnlyAttrs,
> @@ -903,9 +898,6 @@ __OMP_RTL_ATTRS(__kmpc_proxy_task_completed_ooo, DefaultAttrs, AttributeSet(),
> __OMP_RTL_ATTRS(__kmpc_omp_wait_deps, BarrierAttrs, AttributeSet(),
> ParamAttrs(ReadOnlyPtrAttrs, AttributeSet(), AttributeSet(),
> ReadOnlyPtrAttrs))
> -__OMP_RTL_ATTRS(__kmpc_omp_taskwait_deps_51, BarrierAttrs, AttributeSet(),
> - ParamAttrs(ReadOnlyPtrAttrs, AttributeSet(), AttributeSet(),
> - ReadOnlyPtrAttrs))
> __OMP_RTL_ATTRS(__kmpc_cancellationpoint, DefaultAttrs, AttributeSet(),
> ParamAttrs(ReadOnlyPtrAttrs))
>
>
> diff --git a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
> index f002644739185..91d235e109ee3 100644
> --- a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
> +++ b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
> @@ -1228,26 +1228,23 @@ void OpenMPIRBuilder::createFlush(const LocationDescription &Loc) {
> emitFlush(Loc);
> }
>
> -void OpenMPIRBuilder::emitTaskwaitImpl(const LocationDescription &Loc,
> - bool HasNowaitClause) {
> +void OpenMPIRBuilder::emitTaskwaitImpl(const LocationDescription &Loc) {
> // Build call kmp_int32 __kmpc_omp_taskwait(ident_t *loc, kmp_int32
> // global_tid);
> uint32_t SrcLocStrSize;
> Constant *SrcLocStr = getOrCreateSrcLocStr(Loc, SrcLocStrSize);
> Value *Ident = getOrCreateIdent(SrcLocStr, SrcLocStrSize);
> - Value *NowaitClauseValue = ConstantInt::get(Int32, HasNowaitClause);
> - Value *Args[] = {Ident, getOrCreateThreadID(Ident), NowaitClauseValue};
> + Value *Args[] = {Ident, getOrCreateThreadID(Ident)};
>
> // Ignore return result until untied tasks are supported.
> - Builder.CreateCall(
> - getOrCreateRuntimeFunctionPtr(OMPRTL___kmpc_omp_taskwait_51), Args);
> + Builder.CreateCall(getOrCreateRuntimeFunctionPtr(OMPRTL___kmpc_omp_taskwait),
> + Args);
> }
>
> -void OpenMPIRBuilder::createTaskwait(const LocationDescription &Loc,
> - bool HasNowaitClause) {
> +void OpenMPIRBuilder::createTaskwait(const LocationDescription &Loc) {
> if (!updateToLocation(Loc))
> return;
> - emitTaskwaitImpl(Loc, HasNowaitClause);
> + emitTaskwaitImpl(Loc);
> }
>
> void OpenMPIRBuilder::emitTaskyieldImpl(const LocationDescription &Loc) {
> @@ -2370,7 +2367,7 @@ OpenMPIRBuilder::InsertPointTy OpenMPIRBuilder::applyWorkshareLoop(
> case OMPScheduleType::BaseRuntimeSimd:
> assert(!ChunkSize &&
> "schedule type does not support user-defined chunk sizes");
> - LLVM_FALLTHROUGH;
> + [[fallthrough]];
> case OMPScheduleType::BaseDynamicChunked:
> case OMPScheduleType::BaseGuidedChunked:
> case OMPScheduleType::BaseGuidedIterativeChunked:
>
> diff --git a/mlir/test/Target/LLVMIR/openmp-llvm.mlir b/mlir/test/Target/LLVMIR/openmp-llvm.mlir
> index 94e37c1e035ff..31009e4a02ea0 100644
> --- a/mlir/test/Target/LLVMIR/openmp-llvm.mlir
> +++ b/mlir/test/Target/LLVMIR/openmp-llvm.mlir
> @@ -7,7 +7,7 @@ llvm.func @test_stand_alone_directives() {
> omp.barrier
>
> // CHECK: [[OMP_THREAD1:%.*]] = call i32 @__kmpc_global_thread_num(ptr @{{[0-9]+}})
> - // CHECK-NEXT: [[RET_VAL:%.*]] = call i32 @__kmpc_omp_taskwait_51(ptr @{{[0-9]+}}, i32 [[OMP_THREAD1]], i32 0)
> + // CHECK-NEXT: [[RET_VAL:%.*]] = call i32 @__kmpc_omp_taskwait(ptr @{{[0-9]+}}, i32 [[OMP_THREAD1]])
> omp.taskwait
>
> // CHECK: [[OMP_THREAD2:%.*]] = call i32 @__kmpc_global_thread_num(ptr @{{[0-9]+}})
>
> diff --git a/openmp/runtime/src/dllexports b/openmp/runtime/src/dllexports
> index 28d8371795ede..0699e75968410 100644
> --- a/openmp/runtime/src/dllexports
> +++ b/openmp/runtime/src/dllexports
> @@ -345,7 +345,6 @@ kmpc_set_defaults 224
> __kmpc_fork_teams 241
> __kmpc_omp_task_with_deps 242
> __kmpc_omp_wait_deps 243
> - __kmpc_omp_taskwait_deps_51 292
> __kmpc_cancel 244
> __kmpc_cancellationpoint 245
> __kmpc_cancel_barrier 246
>
> diff --git a/openmp/runtime/src/kmp.h b/openmp/runtime/src/kmp.h
> index 99bd39b916142..e38ef81c0feb7 100644
> --- a/openmp/runtime/src/kmp.h
> +++ b/openmp/runtime/src/kmp.h
> @@ -3976,10 +3976,6 @@ KMP_EXPORT void __kmpc_omp_task_complete_if0(ident_t *loc_ref, kmp_int32 gtid,
> KMP_EXPORT kmp_int32 __kmpc_omp_task_parts(ident_t *loc_ref, kmp_int32 gtid,
> kmp_task_t *new_task);
> KMP_EXPORT kmp_int32 __kmpc_omp_taskwait(ident_t *loc_ref, kmp_int32 gtid);
> -/* __kmpc_omp_taskwait_51 : Function for OpenMP 5.1 nowait clause.
> - * Placeholder for taskwait with nowait clause.*/
> -KMP_EXPORT kmp_int32 __kmpc_omp_taskwait_51(ident_t *loc_ref, kmp_int32 gtid,
> - kmp_int32 has_no_wait);
>
> KMP_EXPORT kmp_int32 __kmpc_omp_taskyield(ident_t *loc_ref, kmp_int32 gtid,
> int end_part);
> @@ -4004,15 +4000,6 @@ KMP_EXPORT void __kmpc_omp_wait_deps(ident_t *loc_ref, kmp_int32 gtid,
> kmp_depend_info_t *dep_list,
> kmp_int32 ndeps_noalias,
> kmp_depend_info_t *noalias_dep_list);
> -/* __kmpc_omp_taskwait_deps_51 : Function for OpenMP 5.1 nowait clause.
> - * Placeholder for taskwait with nowait clause.*/
> -KMP_EXPORT void __kmpc_omp_taskwait_deps_51(ident_t *loc_ref, kmp_int32 gtid,
> - kmp_int32 ndeps,
> - kmp_depend_info_t *dep_list,
> - kmp_int32 ndeps_noalias,
> - kmp_depend_info_t *noalias_dep_list,
> - kmp_int32 has_no_wait);
> -
> extern kmp_int32 __kmp_omp_task(kmp_int32 gtid, kmp_task_t *new_task,
> bool serialize_immediate);
>
>
> diff --git a/openmp/runtime/src/kmp_taskdeps.cpp b/openmp/runtime/src/kmp_taskdeps.cpp
> index 5fcb84d0befa7..6c1d93a89183c 100644
> --- a/openmp/runtime/src/kmp_taskdeps.cpp
> +++ b/openmp/runtime/src/kmp_taskdeps.cpp
> @@ -744,24 +744,10 @@ Blocks the current task until all specifies dependences have been fulfilled.
> void __kmpc_omp_wait_deps(ident_t *loc_ref, kmp_int32 gtid, kmp_int32 ndeps,
> kmp_depend_info_t *dep_list, kmp_int32 ndeps_noalias,
> kmp_depend_info_t *noalias_dep_list) {
> - __kmpc_omp_taskwait_deps_51(loc_ref, gtid, ndeps, dep_list, ndeps_noalias,
> - noalias_dep_list, false);
> -}
> + KA_TRACE(10, ("__kmpc_omp_wait_deps(enter): T#%d loc=%p\n", gtid, loc_ref));
>
> -/* __kmpc_omp_taskwait_deps_51 : Function for OpenMP 5.1 nowait clause.
> - Placeholder for taskwait with nowait clause.
> - Earlier code of __kmpc_omp_wait_deps() is now
> - in this function.
> -*/
> -void __kmpc_omp_taskwait_deps_51(ident_t *loc_ref, kmp_int32 gtid,
> - kmp_int32 ndeps, kmp_depend_info_t *dep_list,
> - kmp_int32 ndeps_noalias,
> - kmp_depend_info_t *noalias_dep_list,
> - kmp_int32 has_no_wait) {
> - KA_TRACE(10, ("__kmpc_omp_taskwait_deps(enter): T#%d loc=%p nowait#%d\n",
> - gtid, loc_ref, has_no_wait));
> if (ndeps == 0 && ndeps_noalias == 0) {
> - KA_TRACE(10, ("__kmpc_omp_taskwait_deps(exit): T#%d has no dependences to "
> + KA_TRACE(10, ("__kmpc_omp_wait_deps(exit): T#%d has no dependences to "
> "wait upon : loc=%p\n",
> gtid, loc_ref));
> return;
> @@ -853,7 +839,7 @@ void __kmpc_omp_taskwait_deps_51(ident_t *loc_ref, kmp_int32 gtid,
> ignore = ignore || current_task->td_dephash == NULL;
>
> if (ignore) {
> - KA_TRACE(10, ("__kmpc_omp_taskwait_deps(exit): T#%d has no blocking "
> + KA_TRACE(10, ("__kmpc_omp_wait_deps(exit): T#%d has no blocking "
> "dependences : loc=%p\n",
> gtid, loc_ref));
> #if OMPT_SUPPORT
> @@ -868,7 +854,7 @@ void __kmpc_omp_taskwait_deps_51(ident_t *loc_ref, kmp_int32 gtid,
> if (!__kmp_check_deps(gtid, &node, NULL, ¤t_task->td_dephash,
> DEP_BARRIER, ndeps, dep_list, ndeps_noalias,
> noalias_dep_list)) {
> - KA_TRACE(10, ("__kmpc_omp_taskwait_deps(exit): T#%d has no blocking "
> + KA_TRACE(10, ("__kmpc_omp_wait_deps(exit): T#%d has no blocking "
> "dependences : loc=%p\n",
> gtid, loc_ref));
> #if OMPT_SUPPORT
> @@ -889,7 +875,6 @@ void __kmpc_omp_taskwait_deps_51(ident_t *loc_ref, kmp_int32 gtid,
> #if OMPT_SUPPORT
> __ompt_taskwait_dep_finish(current_task, taskwait_task_data);
> #endif /* OMPT_SUPPORT */
> - KA_TRACE(10, ("__kmpc_omp_taskwait_deps(exit): T#%d finished waiting : loc=%p\
> - \n",
> + KA_TRACE(10, ("__kmpc_omp_wait_deps(exit): T#%d finished waiting : loc=%p\n",
> gtid, loc_ref));
> }
>
> diff --git a/openmp/runtime/src/kmp_tasking.cpp b/openmp/runtime/src/kmp_tasking.cpp
> index 90e59b1067339..1622c6aea10d7 100644
> --- a/openmp/runtime/src/kmp_tasking.cpp
> +++ b/openmp/runtime/src/kmp_tasking.cpp
> @@ -2049,8 +2049,7 @@ kmp_int32 __kmp_omp_taskloop_task(ident_t *loc_ref, kmp_int32 gtid,
> template <bool ompt>
> static kmp_int32 __kmpc_omp_taskwait_template(ident_t *loc_ref, kmp_int32 gtid,
> void *frame_address,
> - void *return_address,
> - kmp_int32 has_no_wait) {
> + void *return_address) {
> kmp_taskdata_t *taskdata = nullptr;
> kmp_info_t *thread;
> int thread_finished = FALSE;
> @@ -2163,34 +2162,23 @@ static kmp_int32 __kmpc_omp_taskwait_template(ident_t *loc_ref, kmp_int32 gtid,
> OMPT_NOINLINE
> static kmp_int32 __kmpc_omp_taskwait_ompt(ident_t *loc_ref, kmp_int32 gtid,
> void *frame_address,
> - void *return_address,
> - kmp_int32 has_no_wait) {
> + void *return_address) {
> return __kmpc_omp_taskwait_template<true>(loc_ref, gtid, frame_address,
> - return_address, has_no_wait);
> + return_address);
> }
> #endif // OMPT_SUPPORT && OMPT_OPTIONAL
>
> // __kmpc_omp_taskwait: Wait until all tasks generated by the current task are
> // complete
> kmp_int32 __kmpc_omp_taskwait(ident_t *loc_ref, kmp_int32 gtid) {
> - return __kmpc_omp_taskwait_51(loc_ref, gtid, false);
> -}
> -
> -/* __kmpc_omp_taskwait_51 : Function for OpenMP 5.1 nowait clause.
> - * Placeholder for taskwait with nowait clause.
> - * The code is a copy of __kmpc_omp_taskwait.*/
> -kmp_int32 __kmpc_omp_taskwait_51(ident_t *loc_ref, kmp_int32 gtid,
> - kmp_int32 has_no_wait) {
> #if OMPT_SUPPORT && OMPT_OPTIONAL
> if (UNLIKELY(ompt_enabled.enabled)) {
> OMPT_STORE_RETURN_ADDRESS(gtid);
> return __kmpc_omp_taskwait_ompt(loc_ref, gtid, OMPT_GET_FRAME_ADDRESS(0),
> - OMPT_LOAD_RETURN_ADDRESS(gtid),
> - has_no_wait);
> + OMPT_LOAD_RETURN_ADDRESS(gtid));
> }
> #endif
> - return __kmpc_omp_taskwait_template<false>(loc_ref, gtid, NULL, NULL,
> - has_no_wait);
> + return __kmpc_omp_taskwait_template<false>(loc_ref, gtid, NULL, NULL);
> }
>
> // __kmpc_omp_taskyield: switch to a
> diff erent task
>
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits<https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20221209/43058c3b/attachment-0001.html>
More information about the cfe-commits
mailing list