Skip to content

Commit 269d5c1

Browse files
jhuber6jhuber6
committed
[Libomptarget][NFC] Move legacy functions to a separate file
This patch moves the old legacy interfaces into `libomptarget` to a separate file. These do not need to be included anywhere and are simply provided for backwards compatibility with the ABI. This cleans up the interface greatly. Depends on D128817 Reviewed By: JonChesterfield Differential Revision: https://reviews.llvm.org/D128818
1 parent c9353eb commit 269d5c1

File tree

4 files changed

+185
-200
lines changed

4 files changed

+185
-200
lines changed

‎openmp/libomptarget/include/omptarget.h

-44
Original file line numberDiff line numberDiff line change
@@ -325,45 +325,6 @@ void __tgt_target_data_update_nowait_mapper(
325325
// same action as data_end above. The following types are used; this
326326
// function returns 0 if it was able to transfer the execution to a
327327
// target and an int different from zero otherwise.
328-
int __tgt_target(int64_t DeviceId, void *HostPtr, int32_t ArgNum,
329-
void **ArgsBase, void **Args, int64_t *ArgSizes,
330-
int64_t *ArgTypes);
331-
int __tgt_target_nowait(int64_t DeviceId, void *HostPtr, int32_t ArgNum,
332-
void **ArgsBase, void **Args, int64_t *ArgSizes,
333-
int64_t *ArgTypes, int32_t DepNum, void *DepList,
334-
int32_t NoAliasDepNum, void *NoAliasDepList);
335-
int __tgt_target_mapper(ident_t *Loc, int64_t DeviceId, void *HostPtr,
336-
int32_t ArgNum, void **ArgsBase, void **Args,
337-
int64_t *ArgSizes, int64_t *ArgTypes,
338-
map_var_info_t *ArgNames, void **ArgMappers);
339-
int __tgt_target_nowait_mapper(ident_t *Loc, int64_t DeviceId, void *HostPtr,
340-
int32_t ArgNum, void **ArgsBase, void **Args,
341-
int64_t *ArgSizes, int64_t *ArgTypes,
342-
map_var_info_t *ArgNames, void **ArgMappers,
343-
int32_t DepNum, void *DepList,
344-
int32_t NoAliasDepNum, void *NoAliasDepList);
345-
346-
int __tgt_target_teams(int64_t DeviceId, void *HostPtr, int32_t ArgNum,
347-
void **ArgsBase, void **Args, int64_t *ArgSizes,
348-
int64_t *ArgTypes, int32_t NumTeams,
349-
int32_t ThreadLimit);
350-
int __tgt_target_teams_nowait(int64_t DeviceId, void *HostPtr, int32_t ArgNum,
351-
void **ArgsBase, void **Args, int64_t *ArgSizes,
352-
int64_t *ArgTypes, int32_t NumTeams,
353-
int32_t ThreadLimit, int32_t DepNum,
354-
void *DepList, int32_t NoAliasDepNum,
355-
void *NoAliasDepList);
356-
int __tgt_target_teams_mapper(ident_t *Loc, int64_t DeviceId, void *HostPtr,
357-
int32_t ArgNum, void **ArgsBase, void **Args,
358-
int64_t *ArgSizes, int64_t *ArgTypes,
359-
map_var_info_t *ArgNames, void **ArgMappers,
360-
int32_t NumTeams, int32_t ThreadLimit);
361-
int __tgt_target_teams_nowait_mapper(
362-
ident_t *loc, int64_t device_id, void *host_ptr, int32_t arg_num,
363-
void **args_base, void **args, int64_t *arg_sizes, int64_t *arg_types,
364-
map_var_info_t *arg_names, void **arg_mappers, int32_t num_teams,
365-
int32_t thread_limit, int32_t depNum, void *depList, int32_t noAliasDepNum,
366-
void *noAliasDepList);
367328
int __tgt_target_kernel(ident_t *Loc, int64_t DeviceId, int32_t NumTeams,
368329
int32_t ThreadLimit, void *HostPtr,
369330
__tgt_kernel_arguments *Args);
@@ -373,11 +334,6 @@ int __tgt_target_kernel_nowait(ident_t *Loc, int64_t DeviceId, int32_t NumTeams,
373334
void *DepList, int32_t NoAliasDepNum,
374335
void *NoAliasDepList);
375336

376-
void __kmpc_push_target_tripcount(int64_t DeviceId, uint64_t LoopTripcount);
377-
378-
void __kmpc_push_target_tripcount_mapper(ident_t *Loc, int64_t DeviceId,
379-
uint64_t LoopTripcount);
380-
381337
void __tgt_set_info_flag(uint32_t);
382338

383339
int __tgt_print_device_info(int64_t DeviceId);

‎openmp/libomptarget/src/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ set(LIBOMPTARGET_SRC_FILES
1919
${CMAKE_CURRENT_SOURCE_DIR}/interop.cpp
2020
${CMAKE_CURRENT_SOURCE_DIR}/omptarget.cpp
2121
${CMAKE_CURRENT_SOURCE_DIR}/rtl.cpp
22+
${CMAKE_CURRENT_SOURCE_DIR}/LegacyAPI.cpp
2223
)
2324

2425
set(LIBOMPTARGET_SRC_FILES ${LIBOMPTARGET_SRC_FILES} PARENT_SCOPE)

‎openmp/libomptarget/src/LegacyAPI.cpp

+184
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
//===-------- LegacyAPI.cpp - Target independent OpenMP target RTL --------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
//
9+
// Legacy interfaces for libomptarget used to maintain backwards-compatibility.
10+
//
11+
//===----------------------------------------------------------------------===//
12+
13+
#include "omptarget.h"
14+
#include "private.h"
15+
16+
EXTERN void __tgt_target_data_begin(int64_t DeviceId, int32_t ArgNum,
17+
void **ArgsBase, void **Args,
18+
int64_t *ArgSizes, int64_t *ArgTypes) {
19+
TIMESCOPE();
20+
__tgt_target_data_begin_mapper(nullptr, DeviceId, ArgNum, ArgsBase, Args,
21+
ArgSizes, ArgTypes, nullptr, nullptr);
22+
}
23+
24+
EXTERN void __tgt_target_data_begin_nowait(int64_t DeviceId, int32_t ArgNum,
25+
void **ArgsBase, void **Args,
26+
int64_t *ArgSizes, int64_t *ArgTypes,
27+
int32_t DepNum, void *DepList,
28+
int32_t NoAliasDepNum,
29+
void *NoAliasDepList) {
30+
TIMESCOPE();
31+
32+
__tgt_target_data_begin_mapper(nullptr, DeviceId, ArgNum, ArgsBase, Args,
33+
ArgSizes, ArgTypes, nullptr, nullptr);
34+
}
35+
36+
EXTERN void __tgt_target_data_end(int64_t DeviceId, int32_t ArgNum,
37+
void **ArgsBase, void **Args,
38+
int64_t *ArgSizes, int64_t *ArgTypes) {
39+
TIMESCOPE();
40+
__tgt_target_data_end_mapper(nullptr, DeviceId, ArgNum, ArgsBase, Args,
41+
ArgSizes, ArgTypes, nullptr, nullptr);
42+
}
43+
44+
EXTERN void __tgt_target_data_update(int64_t DeviceId, int32_t ArgNum,
45+
void **ArgsBase, void **Args,
46+
int64_t *ArgSizes, int64_t *ArgTypes) {
47+
TIMESCOPE();
48+
__tgt_target_data_update_mapper(nullptr, DeviceId, ArgNum, ArgsBase, Args,
49+
ArgSizes, ArgTypes, nullptr, nullptr);
50+
}
51+
52+
EXTERN void __tgt_target_data_update_nowait(
53+
int64_t DeviceId, int32_t ArgNum, void **ArgsBase, void **Args,
54+
int64_t *ArgSizes, int64_t *ArgTypes, int32_t DepNum, void *DepList,
55+
int32_t NoAliasDepNum, void *NoAliasDepList) {
56+
TIMESCOPE();
57+
58+
__tgt_target_data_update_mapper(nullptr, DeviceId, ArgNum, ArgsBase, Args,
59+
ArgSizes, ArgTypes, nullptr, nullptr);
60+
}
61+
62+
EXTERN void __tgt_target_data_end_nowait(int64_t DeviceId, int32_t ArgNum,
63+
void **ArgsBase, void **Args,
64+
int64_t *ArgSizes, int64_t *ArgTypes,
65+
int32_t DepNum, void *DepList,
66+
int32_t NoAliasDepNum,
67+
void *NoAliasDepList) {
68+
TIMESCOPE();
69+
70+
__tgt_target_data_end_mapper(nullptr, DeviceId, ArgNum, ArgsBase, Args,
71+
ArgSizes, ArgTypes, nullptr, nullptr);
72+
}
73+
74+
EXTERN int __tgt_target_mapper(ident_t *Loc, int64_t DeviceId, void *HostPtr,
75+
int32_t ArgNum, void **ArgsBase, void **Args,
76+
int64_t *ArgSizes, int64_t *ArgTypes,
77+
map_var_info_t *ArgNames, void **ArgMappers) {
78+
TIMESCOPE_WITH_IDENT(Loc);
79+
__tgt_kernel_arguments KernelArgs{
80+
1, ArgNum, ArgsBase, Args, ArgSizes, ArgTypes, ArgNames, ArgMappers, -1};
81+
return __tgt_target_kernel(Loc, DeviceId, -1, -1, HostPtr, &KernelArgs);
82+
}
83+
84+
EXTERN int __tgt_target(int64_t DeviceId, void *HostPtr, int32_t ArgNum,
85+
void **ArgsBase, void **Args, int64_t *ArgSizes,
86+
int64_t *ArgTypes) {
87+
TIMESCOPE();
88+
return __tgt_target_mapper(nullptr, DeviceId, HostPtr, ArgNum, ArgsBase, Args,
89+
ArgSizes, ArgTypes, nullptr, nullptr);
90+
}
91+
92+
EXTERN int __tgt_target_nowait(int64_t DeviceId, void *HostPtr, int32_t ArgNum,
93+
void **ArgsBase, void **Args, int64_t *ArgSizes,
94+
int64_t *ArgTypes, int32_t DepNum, void *DepList,
95+
int32_t NoAliasDepNum, void *NoAliasDepList) {
96+
TIMESCOPE();
97+
98+
return __tgt_target_mapper(nullptr, DeviceId, HostPtr, ArgNum, ArgsBase, Args,
99+
ArgSizes, ArgTypes, nullptr, nullptr);
100+
}
101+
102+
EXTERN int __tgt_target_nowait_mapper(
103+
ident_t *Loc, int64_t DeviceId, void *HostPtr, int32_t ArgNum,
104+
void **ArgsBase, void **Args, int64_t *ArgSizes, int64_t *ArgTypes,
105+
map_var_info_t *ArgNames, void **ArgMappers, int32_t DepNum, void *DepList,
106+
int32_t NoAliasDepNum, void *NoAliasDepList) {
107+
TIMESCOPE_WITH_IDENT(Loc);
108+
109+
return __tgt_target_mapper(Loc, DeviceId, HostPtr, ArgNum, ArgsBase, Args,
110+
ArgSizes, ArgTypes, ArgNames, ArgMappers);
111+
}
112+
113+
EXTERN int __tgt_target_teams_mapper(ident_t *Loc, int64_t DeviceId,
114+
void *HostPtr, int32_t ArgNum,
115+
void **ArgsBase, void **Args,
116+
int64_t *ArgSizes, int64_t *ArgTypes,
117+
map_var_info_t *ArgNames,
118+
void **ArgMappers, int32_t NumTeams,
119+
int32_t ThreadLimit) {
120+
TIMESCOPE_WITH_IDENT(Loc);
121+
122+
__tgt_kernel_arguments KernelArgs{
123+
1, ArgNum, ArgsBase, Args, ArgSizes, ArgTypes, ArgNames, ArgMappers, -1};
124+
return __tgt_target_kernel(Loc, DeviceId, NumTeams, ThreadLimit, HostPtr,
125+
&KernelArgs);
126+
}
127+
128+
EXTERN int __tgt_target_teams(int64_t DeviceId, void *HostPtr, int32_t ArgNum,
129+
void **ArgsBase, void **Args, int64_t *ArgSizes,
130+
int64_t *ArgTypes, int32_t NumTeams,
131+
int32_t ThreadLimit) {
132+
TIMESCOPE();
133+
return __tgt_target_teams_mapper(nullptr, DeviceId, HostPtr, ArgNum, ArgsBase,
134+
Args, ArgSizes, ArgTypes, nullptr, nullptr,
135+
NumTeams, ThreadLimit);
136+
}
137+
138+
EXTERN int __tgt_target_teams_nowait(int64_t DeviceId, void *HostPtr,
139+
int32_t ArgNum, void **ArgsBase,
140+
void **Args, int64_t *ArgSizes,
141+
int64_t *ArgTypes, int32_t NumTeams,
142+
int32_t ThreadLimit, int32_t DepNum,
143+
void *DepList, int32_t NoAliasDepNum,
144+
void *NoAliasDepList) {
145+
TIMESCOPE();
146+
147+
return __tgt_target_teams_mapper(nullptr, DeviceId, HostPtr, ArgNum, ArgsBase,
148+
Args, ArgSizes, ArgTypes, nullptr, nullptr,
149+
NumTeams, ThreadLimit);
150+
}
151+
152+
EXTERN int __tgt_target_teams_nowait_mapper(
153+
ident_t *Loc, int64_t DeviceId, void *HostPtr, int32_t ArgNum,
154+
void **ArgsBase, void **Args, int64_t *ArgSizes, int64_t *ArgTypes,
155+
map_var_info_t *ArgNames, void **ArgMappers, int32_t NumTeams,
156+
int32_t ThreadLimit, int32_t DepNum, void *DepList, int32_t NoAliasDepNum,
157+
void *NoAliasDepList) {
158+
TIMESCOPE_WITH_IDENT(Loc);
159+
160+
return __tgt_target_teams_mapper(Loc, DeviceId, HostPtr, ArgNum, ArgsBase,
161+
Args, ArgSizes, ArgTypes, ArgNames,
162+
ArgMappers, NumTeams, ThreadLimit);
163+
}
164+
165+
EXTERN void __kmpc_push_target_tripcount_mapper(ident_t *Loc, int64_t DeviceId,
166+
uint64_t LoopTripcount) {
167+
TIMESCOPE_WITH_IDENT(Loc);
168+
if (checkDeviceAndCtors(DeviceId, Loc)) {
169+
DP("Not offloading to device %" PRId64 "\n", DeviceId);
170+
return;
171+
}
172+
173+
DP("__kmpc_push_target_tripcount(%" PRId64 ", %" PRIu64 ")\n", DeviceId,
174+
LoopTripcount);
175+
PM->TblMapMtx.lock();
176+
PM->Devices[DeviceId]->LoopTripCnt.emplace(__kmpc_global_thread_num(NULL),
177+
LoopTripcount);
178+
PM->TblMapMtx.unlock();
179+
}
180+
181+
EXTERN void __kmpc_push_target_tripcount(int64_t DeviceId,
182+
uint64_t LoopTripcount) {
183+
__kmpc_push_target_tripcount_mapper(nullptr, DeviceId, LoopTripcount);
184+
}

0 commit comments

Comments
 (0)