Skip to content

Commit 904b1a8

Browse files
authored
[Offload] Remove remaining __tgt_register_requires references (#90198)
Summary: This call was removed a few months ago to allow the runtime to actually init / deinit in a correct order. However that patch forgot to remove a few leftover uses.
1 parent 405c018 commit 904b1a8

File tree

5 files changed

+0
-38
lines changed

5 files changed

+0
-38
lines changed

llvm/include/llvm/Frontend/OpenMP/OMPKinds.def

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,6 @@ __OMP_RTL(__tgt_target_kernel, false, Int32, IdentPtr, Int64, Int32, Int32,
436436
VoidPtr, KernelArgsPtr)
437437
__OMP_RTL(__tgt_target_kernel_nowait, false, Int32, IdentPtr, Int64, Int32,
438438
Int32, VoidPtr, KernelArgsPtr, Int32, VoidPtr, Int32, VoidPtr)
439-
__OMP_RTL(__tgt_register_requires, false, Void, Int64)
440439
__OMP_RTL(__tgt_target_data_begin_mapper, false, Void, IdentPtr, Int64, Int32, VoidPtrPtr,
441440
VoidPtrPtr, Int64Ptr, Int64Ptr, VoidPtrPtr, VoidPtrPtr)
442441
__OMP_RTL(__tgt_target_data_begin_nowait_mapper, false, Void, IdentPtr, Int64, Int32,
@@ -1025,8 +1024,6 @@ __OMP_RTL_ATTRS(__tgt_target_kernel_nowait, ForkAttrs, SExt,
10251024
ParamAttrs(AttributeSet(), AttributeSet(), SExt, SExt,
10261025
AttributeSet(), AttributeSet(), SExt, AttributeSet(),
10271026
SExt))
1028-
__OMP_RTL_ATTRS(__tgt_register_requires, ForkAttrs, AttributeSet(),
1029-
ParamAttrs())
10301027
__OMP_RTL_ATTRS(__tgt_target_data_begin_mapper, ForkAttrs, AttributeSet(),
10311028
ParamAttrs(AttributeSet(), AttributeSet(), SExt))
10321029
__OMP_RTL_ATTRS(__tgt_target_data_begin_nowait_mapper, ForkAttrs, AttributeSet(),

llvm/test/Transforms/OpenMP/add_attributes.ll

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -641,8 +641,6 @@ declare i32 @__tgt_target_teams_mapper(ptr, i64, ptr, i32, ptr, ptr, ptr, ptr, p
641641

642642
declare i32 @__tgt_target_teams_nowait_mapper(ptr, i64, ptr, i32, ptr, ptr, ptr, ptr, ptr, ptr, i32, i32, i32, ptr, i32, ptr)
643643

644-
declare void @__tgt_register_requires(i64)
645-
646644
declare void @__tgt_target_data_begin_mapper(ptr, i64, i32, ptr, ptr, ptr, ptr, ptr, ptr)
647645

648646
declare void @__tgt_target_data_begin_nowait_mapper(ptr, i64, i32, ptr, ptr, ptr, ptr, ptr, ptr)
@@ -1248,9 +1246,6 @@ declare i32 @__tgt_target_kernel_nowait(ptr, i64, i32, i32, ptr, ptr, i32, ptr,
12481246
; CHECK: ; Function Attrs: nounwind
12491247
; CHECK-NEXT: declare i32 @__tgt_target_teams_nowait_mapper(ptr, i64, ptr, i32, ptr, ptr, ptr, ptr, ptr, ptr, i32, i32, i32, ptr, i32, ptr)
12501248

1251-
; CHECK: ; Function Attrs: nounwind
1252-
; CHECK-NEXT: declare void @__tgt_register_requires(i64)
1253-
12541249
; CHECK: ; Function Attrs: nounwind
12551250
; CHECK-NEXT: declare void @__tgt_target_data_begin_mapper(ptr, i64, i32, ptr, ptr, ptr, ptr, ptr, ptr)
12561251

@@ -1893,9 +1888,6 @@ declare i32 @__tgt_target_kernel_nowait(ptr, i64, i32, i32, ptr, ptr, i32, ptr,
18931888
; OPTIMISTIC: ; Function Attrs: nounwind
18941889
; OPTIMISTIC-NEXT: declare i32 @__tgt_target_teams_nowait_mapper(ptr, i64, ptr, i32, ptr, ptr, ptr, ptr, ptr, ptr, i32, i32, i32, ptr, i32, ptr)
18951890

1896-
; OPTIMISTIC: ; Function Attrs: nounwind
1897-
; OPTIMISTIC-NEXT: declare void @__tgt_register_requires(i64)
1898-
18991891
; OPTIMISTIC: ; Function Attrs: nounwind
19001892
; OPTIMISTIC-NEXT: declare void @__tgt_target_data_begin_mapper(ptr, i64, i32, ptr, ptr, ptr, ptr, ptr, ptr)
19011893

@@ -2551,9 +2543,6 @@ declare i32 @__tgt_target_kernel_nowait(ptr, i64, i32, i32, ptr, ptr, i32, ptr,
25512543
; EXT: ; Function Attrs: nounwind
25522544
; EXT-NEXT: declare signext i32 @__tgt_target_teams_nowait_mapper(ptr, i64, ptr, i32 signext, ptr, ptr, ptr, ptr, ptr, ptr, i32 signext, i32 signext, i32 signext, ptr, i32 signext, ptr)
25532545

2554-
; EXT: ; Function Attrs: nounwind
2555-
; EXT-NEXT: declare void @__tgt_register_requires(i64)
2556-
25572546
; EXT: ; Function Attrs: nounwind
25582547
; EXT-NEXT: declare void @__tgt_target_data_begin_mapper(ptr, i64, i32 signext, ptr, ptr, ptr, ptr, ptr, ptr)
25592548

offload/test/unified_shared_memory/api.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
#include <omp.h>
1010
#include <stdio.h>
1111

12-
// ---------------------------------------------------------------------------
13-
// Various definitions copied from OpenMP RTL
14-
15-
extern void __tgt_register_requires(int64_t);
16-
1712
// End of definitions copied from OpenMP RTL.
1813
// ---------------------------------------------------------------------------
1914

@@ -32,10 +27,6 @@ void init(int A[], int B[], int C[]) {
3227
int main(int argc, char *argv[]) {
3328
const int device = omp_get_default_device();
3429

35-
// Manual registration of requires flags for Clang versions
36-
// that do not support requires.
37-
__tgt_register_requires(8);
38-
3930
// CHECK: Initial device: [[INITIAL_DEVICE:[0-9]+]]
4031
printf("Initial device: %d\n", omp_get_initial_device());
4132
// CHECK: Num devices: [[INITIAL_DEVICE]]

offload/test/unified_shared_memory/close_manual.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// ---------------------------------------------------------------------------
99
// Various definitions copied from OpenMP RTL
1010

11-
extern void __tgt_register_requires(int64_t);
12-
1311
extern void __tgt_target_data_begin(int64_t device_id, int32_t arg_num,
1412
void **args_base, void **args,
1513
int64_t *arg_sizes, int64_t *arg_types);
@@ -30,10 +28,6 @@ int main(int argc, char *argv[]) {
3028
void *host_alloc = 0, *device_alloc = 0;
3129
int *a = (int *)malloc(N * sizeof(int));
3230

33-
// Manual registration of requires flags for Clang versions
34-
// that do not support requires.
35-
__tgt_register_requires(8);
36-
3731
// Init
3832
for (int i = 0; i < N; ++i) {
3933
a[i] = 10;

offload/test/unified_shared_memory/shared_update.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@
1111
#include <omp.h>
1212
#include <stdio.h>
1313

14-
// ---------------------------------------------------------------------------
15-
// Various definitions copied from OpenMP RTL
16-
17-
extern void __tgt_register_requires(int64_t);
18-
1914
// End of definitions copied from OpenMP RTL.
2015
// ---------------------------------------------------------------------------
2116

@@ -30,10 +25,6 @@ int main(int argc, char *argv[]) {
3025
int *alloc = (int *)malloc(N * sizeof(int));
3126
int data[N];
3227

33-
// Manual registration of requires flags for Clang versions
34-
// that do not support requires.
35-
__tgt_register_requires(8);
36-
3728
for (int i = 0; i < N; ++i) {
3829
alloc[i] = 10;
3930
data[i] = 1;

0 commit comments

Comments
 (0)