Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-04-01 12:43:47 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[OMPX] Change thread_dim to block_dim and the original block_dim to grid_dim

Browse Source 
There is no `threadDim` in CUDA. Instead, it is `blockDim`. Then the current
`blockDim` is `gridDim` in CUDA.

Reviewed By: jhuber6

Differential Revision: https://reviews.llvm.org/D157051
This commit is contained in:
Shilei Tian 2023-08-03 21:50:58 -04:00
parent c171ed4693
commit fcf1a1022a
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openmp/libomptarget/DeviceRTL/src/Mapping.cpp
View File

@ -373,8 +373,8 @@ __attribute__((noinline)) uint32_t __kmpc_get_warp_size() {
extern "C" int ompx_##NAME(int Dim) { return mapping::MAPPER_NAME(Dim); }
_TGT_KERNEL_LANGUAGE(thread_id, getThreadIdInBlock)
_TGT_KERNEL_LANGUAGE(thread_dim, getNumberOfThreadsInBlock)
_TGT_KERNEL_LANGUAGE(block_id, getBlockIdInKernel)
_TGT_KERNEL_LANGUAGE(block_dim, getNumberOfBlocksInKernel)
_TGT_KERNEL_LANGUAGE(block_dim, getNumberOfThreadsInBlock)
_TGT_KERNEL_LANGUAGE(grid_dim, getNumberOfBlocksInKernel)
#pragma omp end declare target

4
openmp/libomptarget/test/api/ompx_3d.c
View File

@ -11,9 +11,9 @@ void foo(int device) {
device(device) thread_limit(2) num_teams(5)
for (int i = 0; i < 1000; ++i) {
if (i == 42) {
tid = ompx_thread_dim_x();
tid = ompx_block_dim_x();
bid = ompx_block_id_x();
bdim = ompx_block_dim_x();
bdim = ompx_grid_dim_x();
}
}
// CHECK: tid: 2, bid: 1, bdim: 5

4
openmp/libomptarget/test/api/ompx_3d.cpp
View File

@ -11,9 +11,9 @@ void foo(int device) {
device(device) thread_limit(2) num_teams(5)
for (int i = 0; i < 1000; ++i) {
if (i == 42) {
tid = ompx::thread_dim_x();
tid = ompx::block_dim_x();
bid = ompx::block_id_x();
bdim = ompx::block_dim_x();
bdim = ompx::grid_dim_x();
}
}
// CHECK: tid: 2, bid: 1, bdim: 5

2
openmp/libomptarget/test/offloading/ompx_coords.c
View File

@ -31,7 +31,7 @@ int main(int argc, char **argv) {
{
int tid = ompx_thread_id_x();
int bid = ompx_block_id_x();
int tdim = ompx_thread_dim_x();
int tdim = ompx_block_dim_x();
int gid = tid + bid * tdim;
if (gid < N) {
X[gid].tid = tid;

2
openmp/libomptarget/test/offloading/ompx_saxpy_mixed.c
View File

@ -33,7 +33,7 @@ int main(int argc, char **argv) {
{
int tid = ompx_thread_id_x();
int bid = ompx_block_id_x();
int tdim = ompx_thread_dim_x();
int tdim = ompx_block_dim_x();
int gid = tid + bid * tdim;
if (gid < N)
Y[gid] = a * X[gid] + Y[gid];

12
openmp/runtime/src/include/ompx.h.var
View File

@ -58,9 +58,9 @@ enum {
_TGT_KERNEL_LANGUAGE_HOST_IMPL_GRID_C(thread_id,
omp_get_ancestor_thread_num(Dim + 1))
_TGT_KERNEL_LANGUAGE_HOST_IMPL_GRID_C(thread_dim, omp_get_team_size(Dim + 1))
_TGT_KERNEL_LANGUAGE_HOST_IMPL_GRID_C(block_dim, omp_get_team_size(Dim + 1))
_TGT_KERNEL_LANGUAGE_HOST_IMPL_GRID_C(block_id, 0)
_TGT_KERNEL_LANGUAGE_HOST_IMPL_GRID_C(block_dim, 1)
_TGT_KERNEL_LANGUAGE_HOST_IMPL_GRID_C(grid_dim, 1)
#undef _TGT_KERNEL_LANGUAGE_HOST_IMPL_GRID_C
///}
@ -100,9 +100,9 @@ _TGT_KERNEL_LANGUAGE_DECL_SYNC_C(void, sync_block_divergent, int Ordering);
static inline int ompx_##NAME##_z() { return ompx_##NAME(ompx_dim_z); }
_TGT_KERNEL_LANGUAGE_DECL_GRID_C(thread_id)
_TGT_KERNEL_LANGUAGE_DECL_GRID_C(thread_dim)
_TGT_KERNEL_LANGUAGE_DECL_GRID_C(block_id)
_TGT_KERNEL_LANGUAGE_DECL_GRID_C(block_dim)
_TGT_KERNEL_LANGUAGE_DECL_GRID_C(block_id)
_TGT_KERNEL_LANGUAGE_DECL_GRID_C(grid_dim)
#undef _TGT_KERNEL_LANGUAGE_DECL_GRID_C
///}
@ -137,9 +137,9 @@ enum {
static inline int NAME##_z() noexcept { return NAME(ompx_dim_z); }
_TGT_KERNEL_LANGUAGE_HOST_IMPL_GRID_CXX(thread_id)
_TGT_KERNEL_LANGUAGE_HOST_IMPL_GRID_CXX(thread_dim)
_TGT_KERNEL_LANGUAGE_HOST_IMPL_GRID_CXX(block_id)
_TGT_KERNEL_LANGUAGE_HOST_IMPL_GRID_CXX(block_dim)
_TGT_KERNEL_LANGUAGE_HOST_IMPL_GRID_CXX(block_id)
_TGT_KERNEL_LANGUAGE_HOST_IMPL_GRID_CXX(grid_dim)
#undef _TGT_KERNEL_LANGUAGE_HOST_IMPL_GRID_CXX
///}