From 20204588ea38f51a99c62beea362106795dd0e19 Mon Sep 17 00:00:00 2001 From: Alexey Bataev Date: Tue, 17 Sep 2019 15:11:52 +0000 Subject: [PATCH] [OPENMP]Try to rework the test to pacify the buildbots, NFC. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@372130 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/OpenMP/parallel_for_codegen.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/test/OpenMP/parallel_for_codegen.cpp b/test/OpenMP/parallel_for_codegen.cpp index 7c2da30574..0f8f77cd09 100644 --- a/test/OpenMP/parallel_for_codegen.cpp +++ b/test/OpenMP/parallel_for_codegen.cpp @@ -387,15 +387,14 @@ void parallel_for(float *a, const int n) { // TERM_DEBUG-DAG: [[DBG_LOC_END]] = !DILocation(line: [[@LINE-18]], #else // OMP5 -// OMP5: [[IDENT_T_TY:%.+]] = type { i32, i32, i32, i32, i8* } -// OMP5: [[LOOP_LOC:@.+]] = private unnamed_addr global [[IDENT_T_TY]] { i32 0, i32 514, i32 0, i32 0, i8* +// OMP5: [[LOOP_LOC:@.+]] = private unnamed_addr global %struct.ident_t { i32 0, i32 514, i32 0, i32 0, i8* // OMP5-LABEL: increment int increment () { -// OMP5: [[GTID:%.+]] = call i32 @__kmpc_global_thread_num([[IDENT_T_TY]]* [[DEFAULT_LOC:[@%].+]]) +// OMP5: [[GTID:%.+]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* [[DEFAULT_LOC:[@%].+]]) #pragma omp for // Determine UB = min(UB, GlobalUB) -// OMP5: call void @__kmpc_for_static_init_4([[IDENT_T_TY]]* [[LOOP_LOC]], i32 [[GTID]], i32 34, i32* [[IS_LAST:%[^,]+]], i32* [[OMP_LB:%[^,]+]], i32* [[OMP_UB:%[^,]+]], i32* [[OMP_ST:%[^,]+]], i32 1, i32 1) +// OMP5: call void @__kmpc_for_static_init_4(%struct.ident_t* [[LOOP_LOC]], i32 [[GTID]], i32 34, i32* [[IS_LAST:%[^,]+]], i32* [[OMP_LB:%[^,]+]], i32* [[OMP_UB:%[^,]+]], i32* [[OMP_ST:%[^,]+]], i32 1, i32 1) // OMP5-NEXT: [[UB:%.+]] = load i32, i32* [[OMP_UB]] // OMP5-NEXT: [[UBCMP:%.+]] = icmp sgt i32 [[UB]], 4 // OMP5-NEXT: br i1 [[UBCMP]], label [[UB_TRUE:%[^,]+]], label [[UB_FALSE:%[^,]+]] @@ -425,7 +424,7 @@ int increment () { // OMP5-NEXT: br label %[[LOOP1_HEAD]] ; // OMP5: [[LOOP1_END]] -// OMP5: call void @__kmpc_for_static_fini([[IDENT_T_TY]]* [[LOOP_LOC]], i32 [[GTID]]) +// OMP5: call void @__kmpc_for_static_fini(%struct.ident_t* [[LOOP_LOC]], i32 [[GTID]]) // OMP5: __kmpc_barrier return 0; // OMP5: ret i32 0 @@ -433,10 +432,10 @@ int increment () { // OMP5-LABEL: decrement_nowait int decrement_nowait () { -// OMP5: [[GTID:%.+]] = call i32 @__kmpc_global_thread_num([[IDENT_T_TY]]* [[DEFAULT_LOC:[@%].+]]) +// OMP5: [[GTID:%.+]] = call i32 @__kmpc_global_thread_num(%struct.ident_t* [[DEFAULT_LOC:[@%].+]]) #pragma omp for nowait // Determine UB = min(UB, GlobalUB) -// OMP5: call void @__kmpc_for_static_init_4([[IDENT_T_TY]]* [[LOOP_LOC]], i32 [[GTID]], i32 34, i32* [[IS_LAST:%[^,]+]], i32* [[OMP_LB:%[^,]+]], i32* [[OMP_UB:%[^,]+]], i32* [[OMP_ST:%[^,]+]], i32 1, i32 1) +// OMP5: call void @__kmpc_for_static_init_4(%struct.ident_t* [[LOOP_LOC]], i32 [[GTID]], i32 34, i32* [[IS_LAST:%[^,]+]], i32* [[OMP_LB:%[^,]+]], i32* [[OMP_UB:%[^,]+]], i32* [[OMP_ST:%[^,]+]], i32 1, i32 1) // OMP5-NEXT: [[UB:%.+]] = load i32, i32* [[OMP_UB]] // OMP5-NEXT: [[UBCMP:%.+]] = icmp sgt i32 [[UB]], 4 // OMP5-NEXT: br i1 [[UBCMP]], label [[UB_TRUE:%[^,]+]], label [[UB_FALSE:%[^,]+]] @@ -465,7 +464,7 @@ int decrement_nowait () { // OMP5-NEXT: br label %[[LOOP1_HEAD]] ; // OMP5: [[LOOP1_END]] -// OMP5: call void @__kmpc_for_static_fini([[IDENT_T_TY]]* [[LOOP_LOC]], i32 [[GTID]]) +// OMP5: call void @__kmpc_for_static_fini(%struct.ident_t* [[LOOP_LOC]], i32 [[GTID]]) // OMP5-NOT: __kmpc_barrier return 0; // OMP5: ret i32 0 -- 2.40.0