len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 13:15:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change alignment macros to allow further performance optimization. Define the CACHEALIGN macros for all ARM CPUs, the used alignment size is derived from CACHEALIGN_BITS which has been defined for each supported ARM CPU with r28619. The default alignment size for ARM is set to 32 bytes as new -- not yet supported -- ARM CPUs will most probably need this alignment. To be able to differ between ARM and other CPUs a new macro called MEM_ALIGN_ATTR is introduced. This equals CACHEALIGN_ATTR for ARM, 16 byte alignment for Coldfire and is kept empty for other CPUs. MEM_ALIGN_ATTR is available system wide. From measurements it is expected that the usage of MEM_ALIGN_ATTR can give significant performance gain on ARM11 CPUs.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28625 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2010-11-21 12:27:01 +00:00
parent f54cbfa164
commit eef21cb18a
2 changed files with 64 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

109
firmware/export/system.h
View file

@ -309,58 +309,77 @@ static inline void cpucache_flush(void)
} }
#endif #endif
#ifndef CACHEALIGN_SIZE /* could be elsewhere for a particular reason */ /* Define this, if the CPU may take advantage of cache aligment. Is enabled
#ifdef CACHEALIGN_BITS * for all ARM CPUs. */
/* 2^CACHEALIGN_BITS = the byte size */ #ifdef CPU_ARM
#define CACHEALIGN_SIZE (1u << CACHEALIGN_BITS) #define HAVE_CPU_CACHE_ALIGN
#else
#define CACHEALIGN_SIZE 16 /* FIXME */
#endif #endif
#endif /* CACHEALIGN_SIZE */
#ifdef PROC_NEEDS_CACHEALIGN /* Calculate CACHEALIGN_SIZE from CACHEALIGN_BITS */
/* Cache alignment attributes and sizes are enabled */ #ifdef CACHEALIGN_SIZE
/* undefine, if defined. always calculate from CACHEALIGN_BITS */
#undef CACHEALIGN_SIZE
#endif
#ifdef CACHEALIGN_BITS
/* CACHEALIGN_BITS = 2 ^ CACHEALIGN_BITS */
#define CACHEALIGN_SIZE (1u << CACHEALIGN_BITS)
#else
/* FIXME: set to maximum known cache alignment of supported CPUs */
#define CACHEALIGN_BITS 5
#define CACHEALIGN_SIZE 32
#endif
#define CACHEALIGN_ATTR __attribute__((aligned(CACHEALIGN_SIZE))) #ifdef HAVE_CPU_CACHE_ALIGN
/* Aligns x up to a CACHEALIGN_SIZE boundary */ /* Cache alignment attributes and sizes are enabled */
#define CACHEALIGN_UP(x) \ #define CACHEALIGN_ATTR __attribute__((aligned(CACHEALIGN_SIZE)))
((typeof (x))ALIGN_UP_P2((uintptr_t)(x), CACHEALIGN_BITS)) /* Aligns x up to a CACHEALIGN_SIZE boundary */
/* Aligns x down to a CACHEALIGN_SIZE boundary */ #define CACHEALIGN_UP(x) \
#define CACHEALIGN_DOWN(x) \ ((typeof (x))ALIGN_UP_P2((uintptr_t)(x), CACHEALIGN_BITS))
((typeof (x))ALIGN_DOWN_P2((uintptr_t)(x), CACHEALIGN_BITS)) /* Aligns x down to a CACHEALIGN_SIZE boundary */
/* Aligns at least to the greater of size x or CACHEALIGN_SIZE */ #define CACHEALIGN_DOWN(x) \
#define CACHEALIGN_AT_LEAST_ATTR(x) \ ((typeof (x))ALIGN_DOWN_P2((uintptr_t)(x), CACHEALIGN_BITS))
__attribute__((aligned(CACHEALIGN_UP(x)))) /* Aligns at least to the greater of size x or CACHEALIGN_SIZE */
/* Aligns a buffer pointer and size to proper boundaries */ #define CACHEALIGN_AT_LEAST_ATTR(x) \
#define CACHEALIGN_BUFFER(start, size) \ __attribute__((aligned(CACHEALIGN_UP(x))))
ALIGN_BUFFER((start), (size), CACHEALIGN_SIZE) /* Aligns a buffer pointer and size to proper boundaries */
#define CACHEALIGN_BUFFER(start, size) \
ALIGN_BUFFER((start), (size), CACHEALIGN_SIZE)
#else
/* Cache alignment attributes and sizes are not enabled */
#define CACHEALIGN_ATTR
#define CACHEALIGN_AT_LEAST_ATTR(x) __attribute__((aligned(x)))
#define CACHEALIGN_UP(x) (x)
#define CACHEALIGN_DOWN(x) (x)
/* Make no adjustments */
#define CACHEALIGN_BUFFER(start, size)
#endif
#else /* ndef PROC_NEEDS_CACHEALIGN */ /* Define MEM_ALIGN_ATTR which may be used to align e.g. buffers for faster
* access. */
/* Cache alignment attributes and sizes are not enabled */ #if defined(CPU_ARM)
#define CACHEALIGN_ATTR /* Use ARMs cache alignment. */
#define CACHEALIGN_AT_LEAST_ATTR(x) \ #define MEM_ALIGN_ATTR CACHEALIGN_ATTR
__attribute__((aligned(x))) #elif defined(CPU_COLDFIRE)
#define CACHEALIGN_UP(x) (x) /* Use fixed alignment of 16 bytes. Speed up only for 'movem' in DRAM. */
#define CACHEALIGN_DOWN(x) (x) #define MEM_ALIGN_ATTR __attribute__((aligned(16)))
/* Make no adjustments */ #else
#define CACHEALIGN_BUFFER(start, size) /* Do nothing. */
#define MEM_ALIGN_ATTR
#endif /* PROC_NEEDS_CACHEALIGN */ #endif
#ifdef STORAGE_WANTS_ALIGN #ifdef STORAGE_WANTS_ALIGN
#define STORAGE_ALIGN_ATTR __attribute__((aligned(CACHEALIGN_SIZE))) #define STORAGE_ALIGN_ATTR __attribute__((aligned(CACHEALIGN_SIZE)))
#define STORAGE_ALIGN_DOWN(x) \ #define STORAGE_ALIGN_DOWN(x) \
((typeof (x))ALIGN_DOWN_P2((uintptr_t)(x), CACHEALIGN_BITS)) ((typeof (x))ALIGN_DOWN_P2((uintptr_t)(x), CACHEALIGN_BITS))
/* Pad a size so the buffer can be aligned later */ /* Pad a size so the buffer can be aligned later */
#define STORAGE_PAD(x) ((x) + CACHEALIGN_SIZE - 1) #define STORAGE_PAD(x) ((x) + CACHEALIGN_SIZE - 1)
/* Number of bytes in the last cacheline assuming buffer of size x is aligned */ /* Number of bytes in the last cacheline assuming buffer of size x is aligned */
#define STORAGE_OVERLAP(x) ((x) & (CACHEALIGN_SIZE - 1)) #define STORAGE_OVERLAP(x) ((x) & (CACHEALIGN_SIZE - 1))
#else #else
#define STORAGE_ALIGN_ATTR #define STORAGE_ALIGN_ATTR
#define STORAGE_ALIGN_DOWN(x) (x) #define STORAGE_ALIGN_DOWN(x) (x)
#define STORAGE_PAD(x) (x) #define STORAGE_PAD(x) (x)
#define STORAGE_OVERLAP(x) 0 #define STORAGE_OVERLAP(x) 0
#endif #endif
/* Double-cast to avoid 'dereferencing type-punned pointer will /* Double-cast to avoid 'dereferencing type-punned pointer will

4
firmware/target/arm/system-target.h
View file

@ -158,10 +158,6 @@ static inline void wake_core(int core)
((typeof (a))((uintptr_t)(a) | UNCACHED_BASE_ADDR)) ((typeof (a))((uintptr_t)(a) | UNCACHED_BASE_ADDR))
#endif /* BOOTLOADER */ #endif /* BOOTLOADER */
/* Certain data needs to be out of the way of cache line interference
* such as data for COP use or for use with UNCACHED_ADDR */
#define PROC_NEEDS_CACHEALIGN
#if defined(CPU_PP502x) && defined(HAVE_ATA_DMA) #if defined(CPU_PP502x) && defined(HAVE_ATA_DMA)
#define STORAGE_WANTS_ALIGN #define STORAGE_WANTS_ALIGN
#endif #endif