e31bfae2ba
We're going to modify the __atomic_xxx implementation to provide full memory barriers, to avoid problems for NDK machine code that link to these functions. First step is to remove their usage from our platform code. We now use inlined versions of the same functions for a slight performance boost. + remove obsolete atomics_x86.c (was never compiled) NOTE: This improvement was benchmarked on various devices. Comparing a pthread mutex lock + atomic increment + unlock we get: - ARMv7 emulator, running on a 2.4 GHz Xeon: before: 396 ns after: 288 ns - x86 emulator in KVM mode on same machine: before: 27 ns after: 27 ns - Google Nexus S, in ARMv7 mode (single-core): before: 82 ns after: 76 ns - Motorola Xoom, in ARMv7 mode (multi-core): before: 121 ns after: 120 ns The code has also been rebuilt in ARMv5TE mode for correctness. Change-Id: Ic1dc72b173d59b2e7af901dd70d6a72fb2f64b17
66 lines
1.9 KiB
C
66 lines
1.9 KiB
C
/*
|
|
* Copyright (C) 2010 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef BIONIC_ATOMIC_INLINE_H
|
|
#define BIONIC_ATOMIC_INLINE_H
|
|
|
|
/*
|
|
* Inline declarations and macros for some special-purpose atomic
|
|
* operations. These are intended for rare circumstances where a
|
|
* memory barrier needs to be issued inline rather than as a function
|
|
* call.
|
|
*
|
|
* Most code should not use these.
|
|
*
|
|
* Anything that does include this file must set ANDROID_SMP to either
|
|
* 0 or 1, indicating compilation for UP or SMP, respectively.
|
|
*
|
|
* Macros defined in this header:
|
|
*
|
|
* void ANDROID_MEMBAR_FULL(void)
|
|
* Full memory barrier. Provides a compiler reordering barrier, and
|
|
* on SMP systems emits an appropriate instruction.
|
|
*/
|
|
|
|
#if !defined(ANDROID_SMP)
|
|
# error "Must define ANDROID_SMP before including atomic-inline.h"
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* Define __ATOMIC_INLINE__ to control the inlining of all atomics
|
|
* functions declared here. For a slight performance boost, we want
|
|
* all of them to be always_inline
|
|
*/
|
|
#define __ATOMIC_INLINE__ static __inline__ __attribute__((always_inline))
|
|
|
|
#ifdef __arm__
|
|
# include <bionic_atomic_arm.h>
|
|
#elif defined(__i386__)
|
|
# include <bionic_atomic_x86.h>
|
|
#else
|
|
# include <bionic_atomic_gcc_builtin.h>
|
|
#endif
|
|
|
|
#define ANDROID_MEMBAR_FULL __bionic_memory_barrier
|
|
|
|
#ifdef __cplusplus
|
|
} // extern "C"
|
|
#endif
|
|
|
|
#endif // BIONIC_ATOMIC_INLINE_H
|