Skip to content

Commit 4b3c8b9

Browse files
kevinsalakevinsala
committed
Fix tests
1 parent 446fa26 commit 4b3c8b9

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

‎llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ TEST_F(OpenMPIRBuilderTest, ParallelSimpleGPU) {
750750
CallInst *Parallel51CI = dyn_cast<CallInst>(Usr);
751751
ASSERT_NE(Parallel51CI, nullptr);
752752

753-
EXPECT_EQ(Parallel51CI->getCalledFunction()->getName(), "__kmpc_parallel_51");
753+
EXPECT_EQ(Parallel51CI->getCalledFunction()->getName(), "__kmpc_parallel_60");
754754
EXPECT_EQ(Parallel51CI->arg_size(), 9U);
755755
EXPECT_EQ(Parallel51CI->getArgOperand(5), OutlinedFn);
756756
EXPECT_TRUE(

‎mlir/test/Target/LLVMIR/omptarget-multi-block-reduction.mlir‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ module attributes {dlti.dl_spec = #dlti.dl_spec<"dlti.alloca_memory_space" = 5 :
5151
}
5252
}
5353

54-
// CHECK: call void @__kmpc_parallel_51({{.*}}, i32 1, i32 -1, i32 -1,
55-
// CHECK-SAME: ptr @[[PAR_OUTLINED:.*]], ptr null, ptr %2, i64 1)
54+
// CHECK: call void @__kmpc_parallel_60({{.*}}, i32 1, i32 -1, i32 -1,
55+
// CHECK-SAME: ptr @[[PAR_OUTLINED:.*]], ptr null, ptr %2, i64 1, i32 0)
5656

5757
// CHECK: define internal void @[[PAR_OUTLINED]]{{.*}} {
5858
// CHECK: .omp.reduction.then:

‎mlir/test/Target/LLVMIR/omptarget-parallel-llvm.mlir‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,39 +70,39 @@ module attributes {dlti.dl_spec = #dlti.dl_spec<#dlti.dl_entry<"dlti.alloca_memo
7070
// CHECK: store ptr %[[TMP6]], ptr addrspace(5) %[[GEP_]], align 8
7171
// CHECK: %[[TMP7:.*]] = getelementptr inbounds [1 x ptr], ptr %[[TMP2]], i64 0, i64 0
7272
// CHECK: store ptr %[[STRUCTARG_ASCAST]], ptr %[[TMP7]], align 8
73-
// CHECK: call void @__kmpc_parallel_51(ptr addrspacecast (ptr addrspace(1) @[[GLOB1]] to ptr), i32 %[[OMP_GLOBAL_THREAD_NUM]], i32 1, i32 -1, i32 -1, ptr @[[FUNC1:.*]], ptr null, ptr %[[TMP2]], i64 1)
73+
// CHECK: call void @__kmpc_parallel_60(ptr addrspacecast (ptr addrspace(1) @[[GLOB1]] to ptr), i32 %[[OMP_GLOBAL_THREAD_NUM]], i32 1, i32 -1, i32 -1, ptr @[[FUNC1:.*]], ptr null, ptr %[[TMP2]], i64 1, i32 0)
7474
// CHECK: call void @__kmpc_target_deinit()
7575

7676
// CHECK: define internal void @[[FUNC1]](
7777
// CHECK-SAME: ptr noalias noundef {{.*}}, ptr noalias noundef {{.*}}, ptr {{.*}}) #{{[0-9]+}} {
7878

7979
// Test if num_threads OpenMP clause for target region is correctly lowered
80-
// and passed as a param to kmpc_parallel_51 function
80+
// and passed as a param to kmpc_parallel_60 function
8181

8282
// CHECK: define weak_odr protected amdgpu_kernel void [[FUNC_NUM_THREADS0:@.*]](
8383
// CHECK-NOT: call void @__kmpc_push_num_threads(
84-
// CHECK: call void @__kmpc_parallel_51(ptr addrspacecast (
84+
// CHECK: call void @__kmpc_parallel_60(ptr addrspacecast (
8585
// CHECK-SAME: ptr addrspace(1) @[[NUM_THREADS_GLOB:[0-9]+]] to ptr),
8686
// CHECK-SAME: i32 [[NUM_THREADS_TMP0:%.*]], i32 1, i32 156,
87-
// CHECK-SAME: i32 -1, ptr [[FUNC_NUM_THREADS1:@.*]], ptr null, ptr [[NUM_THREADS_TMP1:%.*]], i64 1)
87+
// CHECK-SAME: i32 -1, ptr [[FUNC_NUM_THREADS1:@.*]], ptr null, ptr [[NUM_THREADS_TMP1:%.*]], i64 1, i32 0)
8888

89-
// One of the arguments of kmpc_parallel_51 function is responsible for handling if clause
89+
// One of the arguments of kmpc_parallel_60 function is responsible for handling if clause
9090
// of omp parallel construct for target region. If this argument is nonzero,
91-
// then kmpc_parallel_51 launches multiple threads for parallel region.
91+
// then kmpc_parallel_60 launches multiple threads for parallel region.
9292
//
9393
// This test checks if MLIR expression:
9494
// %7 = llvm.icmp "ne" %5, %6 : i32
9595
// omp.parallel if(%7)
9696
// is correctly lowered to LLVM IR code and the if condition variable
97-
// is passed as a param to kmpc_parallel_51 function
97+
// is passed as a param to kmpc_parallel_60 function
9898

9999
// CHECK: define weak_odr protected amdgpu_kernel void @{{.*}}(
100100
// CHECK-SAME: ptr {{.*}}, ptr {{.*}}, ptr %[[IFCOND_ARG2:.*]]) #{{[0-9]+}} {
101101
// CHECK: store ptr %[[IFCOND_ARG2]], ptr %[[IFCOND_TMP1:.*]], align 8
102102
// CHECK: %[[IFCOND_TMP2:.*]] = load i32, ptr %[[IFCOND_TMP1]], align 4
103103
// CHECK: %[[IFCOND_TMP3:.*]] = icmp ne i32 %[[IFCOND_TMP2]], 0
104104
// CHECK: %[[IFCOND_TMP4:.*]] = sext i1 %[[IFCOND_TMP3]] to i32
105-
// CHECK: call void @__kmpc_parallel_51(ptr addrspacecast (
105+
// CHECK: call void @__kmpc_parallel_60(ptr addrspacecast (
106106
// CHECK-SAME: ptr addrspace(1) {{.*}} to ptr),
107107
// CHECK-SAME: i32 {{.*}}, i32 %[[IFCOND_TMP4]], i32 -1,
108-
// CHECK-SAME: i32 -1, ptr {{.*}}, ptr null, ptr {{.*}}, i64 1)
108+
// CHECK-SAME: i32 -1, ptr {{.*}}, ptr null, ptr {{.*}}, i64 1, i32 0)

‎mlir/test/Target/LLVMIR/omptarget-parallel-wsloop.mlir‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ module attributes {dlti.dl_spec = #dlti.dl_spec<#dlti.dl_entry<"dlti.alloca_memo
2626
}
2727

2828
}
29-
// CHECK: call void @__kmpc_parallel_51(ptr addrspacecast
29+
// CHECK: call void @__kmpc_parallel_60(ptr addrspacecast
3030
// CHECK-SAME: (ptr addrspace(1) @[[GLOB:[0-9]+]] to ptr),
3131
// CHECK-SAME: i32 %[[THREAD_NUM:.*]], i32 1, i32 -1, i32 -1,
32-
// CHECK-SAME: ptr @[[PARALLEL_FUNC:.*]], ptr null, ptr %[[PARALLEL_ARGS:.*]], i64 1)
32+
// CHECK-SAME: ptr @[[PARALLEL_FUNC:.*]], ptr null, ptr %[[PARALLEL_ARGS:.*]], i64 1, i32 0)
3333

3434
// CHECK: define internal void @[[PARALLEL_FUNC]]
3535
// CHECK-SAME: (ptr noalias noundef %[[TID_ADDR:.*]], ptr noalias noundef %[[ZERO_ADDR:.*]],

‎mlir/test/Target/LLVMIR/openmp-target-generic-spmd.mlir‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ module attributes {dlti.dl_spec = #dlti.dl_spec<#dlti.dl_entry<"dlti.alloca_memo
102102
// DEVICE: call void @__kmpc_distribute_static_loop{{.*}}({{.*}}, ptr @[[DISTRIBUTE_OUTLINE:[^,]*]], {{.*}})
103103

104104
// DEVICE: define internal void @[[DISTRIBUTE_OUTLINE]]({{.*}})
105-
// DEVICE: call void @__kmpc_parallel_51(ptr {{.*}}, i32 {{.*}}, i32 {{.*}}, i32 {{.*}}, i32 {{.*}}, ptr @[[PARALLEL_OUTLINE:.*]], ptr {{.*}}, ptr {{.*}}, i64 {{.*}})
105+
// DEVICE: call void @__kmpc_parallel_60(ptr {{.*}}, i32 {{.*}}, i32 {{.*}}, i32 {{.*}}, i32 {{.*}}, ptr @[[PARALLEL_OUTLINE:.*]], ptr {{.*}}, ptr {{.*}}, i64 {{.*}}, i32 {{.*}})
106106

107107
// DEVICE: define internal void @[[PARALLEL_OUTLINE]]({{.*}})
108108
// DEVICE: call void @__kmpc_for_static_loop{{.*}}({{.*}})

‎mlir/test/Target/LLVMIR/openmp-target-spmd.mlir‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ module attributes {dlti.dl_spec = #dlti.dl_spec<#dlti.dl_entry<"dlti.alloca_memo
8484
// DEVICE: call void @__kmpc_target_deinit()
8585

8686
// DEVICE: define internal void @[[TARGET_OUTLINE]]({{.*}})
87-
// DEVICE: call void @__kmpc_parallel_51(ptr {{.*}}, i32 {{.*}}, i32 {{.*}}, i32 {{.*}}, i32 {{.*}}, ptr @[[PARALLEL_OUTLINE:.*]], ptr {{.*}}, ptr {{.*}}, i64 {{.*}})
87+
// DEVICE: call void @__kmpc_parallel_60(ptr {{.*}}, i32 {{.*}}, i32 {{.*}}, i32 {{.*}}, i32 {{.*}}, ptr @[[PARALLEL_OUTLINE:.*]], ptr {{.*}}, ptr {{.*}}, i64 {{.*}}, i32 {{.*}})
8888

8989
// DEVICE: define internal void @[[PARALLEL_OUTLINE]]({{.*}})
9090
// DEVICE: call void @[[DISTRIBUTE_OUTLINE:.*]]({{.*}})

0 commit comments

Comments
 (0)