Skip to content

Commit 5af83a2

Browse files
committed
Revert "inline: setup pragma to inline only perf-critical path"
This reverts commit 5347f86.
1 parent b18d685 commit 5af83a2

File tree

4 files changed

+0
-11
lines changed

4 files changed

+0
-11
lines changed

src/include/oshmpi_impl.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,6 @@ OSHMPI_STATIC_INLINE_PREFIX void ctx_local_complete_impl(shmem_ctx_t ctx
492492
OSHMPI_ATTRIBUTE((unused)), int pe,
493493
MPI_Win win)
494494
{
495-
#pragma forceinline
496495
OSHMPI_CALLMPI(MPI_Win_flush_local(pe, win));
497496
}
498497

src/internal/rma_impl.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ OSHMPI_STATIC_INLINE_PREFIX void ctx_put_nbi_impl(shmem_ctx_t ctx OSHMPI_ATTRIBU
2323

2424
/* TODO: check non-int inputs exceeds int limit */
2525

26-
#pragma forceinline
2726
OSHMPI_CALLMPI(MPI_Put(origin_addr, (int) origin_count, origin_type, pe,
2827
target_disp, (int) target_count, target_type, win));
2928
OSHMPI_SET_OUTSTANDING_OP(win, OSHMPI_OP_OUTSTANDING); /* PUT is always outstanding */
@@ -48,7 +47,6 @@ OSHMPI_STATIC_INLINE_PREFIX void ctx_get_nbi_impl(shmem_ctx_t ctx OSHMPI_ATTRIBU
4847

4948
/* TODO: check non-int inputs exceeds int limit */
5049

51-
#pragma forceinline
5250
OSHMPI_CALLMPI(MPI_Get(origin_addr, (int) origin_count, origin_type, pe,
5351
target_disp, (int) target_count, target_type, win));
5452
OSHMPI_SET_OUTSTANDING_OP(win, completion); /* GET can be outstanding or completed */

src/shmem/mem.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,28 @@
99

1010
void *shmem_malloc(size_t size)
1111
{
12-
#pragma noinline recursive
1312
return OSHMPI_malloc(size);
1413
}
1514

1615
void shmem_free(void *ptr)
1716
{
18-
#pragma noinline recursive
1917
OSHMPI_free(ptr);
2018
}
2119

2220
void *shmem_realloc(void *ptr, size_t size)
2321
{
24-
#pragma noinline recursive
2522
return OSHMPI_realloc(ptr, size);
2623
}
2724

2825
void *shmem_align(size_t alignment, size_t size)
2926
{
30-
#pragma noinline recursive
3127
return OSHMPI_align(alignment, size);
3228
}
3329

3430
void *shmem_calloc(size_t count, size_t size)
3531
{
3632
void *ptr = NULL;
3733

38-
#pragma noinline recursive
3934
ptr = OSHMPI_malloc(size);
4035
memset(ptr, 0, count * size);
4136

src/shmem/setup.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
void shmem_init(void)
1111
{
12-
#pragma noinline recursive
1312
OSHMPI_initialize_thread(OSHMPI_DEFAULT_THREAD_SAFETY, NULL);
1413
if (OSHMPI_env.version && OSHMPI_global.world_rank == 0)
1514
OSHMPI_PRINTF("SHMEM library version:\n"
@@ -31,7 +30,6 @@ int shmem_n_pes(void)
3130

3231
void shmem_finalize(void)
3332
{
34-
#pragma noinline recursive
3533
OSHMPI_finalize();
3634
}
3735

@@ -43,7 +41,6 @@ void shmem_global_exit(int status)
4341
int shmem_init_thread(int requested, int *provided)
4442
{
4543
int mpi_errno = MPI_SUCCESS;
46-
#pragma noinline recursive
4744
mpi_errno = OSHMPI_initialize_thread(requested, provided);
4845

4946
if (OSHMPI_env.version && OSHMPI_global.world_rank == 0)

0 commit comments

Comments
 (0)