ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 6d9a5ac3: Merge "[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6"

Browse source 
* commit '6d9a5ac394ba7bd813921812988a23d8e9b96ee1':
  [MIPSR6] Skip pixelflinger, memset assembler code on mips32r6
This commit is contained in:
Elliott Hughes 2014-08-05 18:34:46 +00:00 • committed by Android Git Automerger
commit e07a6e6337
5 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/private/pixelflinger/ggl_fixed.h
View file

@ -190,7 +190,7 @@ inline int64_t gglMulii(int32_t x, int32_t y)
); );
return res; return res;
} }
#elif defined(__mips__) #elif defined(__mips__) && __mips_isa_rev < 6
/*inline MIPS implementations*/ /*inline MIPS implementations*/
inline GGLfixed gglMulx(GGLfixed a, GGLfixed b, int shift) CONST; inline GGLfixed gglMulx(GGLfixed a, GGLfixed b, int shift) CONST;

10
libcutils/Android.mk
View file

@ -124,9 +124,17 @@ LOCAL_SRC_FILES_arm += \
LOCAL_SRC_FILES_arm64 += \ LOCAL_SRC_FILES_arm64 += \
arch-arm64/android_memset.S \ arch-arm64/android_memset.S \
ifndef ARCH_MIPS_REV6
LOCAL_SRC_FILES_mips += \ LOCAL_SRC_FILES_mips += \
arch-mips/android_memset.c \ arch-mips/android_memset.c \
LOCAL_CFLAGS_mips += -DHAVE_MEMSET16 -DHAVE_MEMSET32
endif
# TODO: switch mips64 back to using arch-mips/android_memset.c
LOCAL_SRC_FILES_mips64 += \
# arch-mips/android_memset.c \
LOCAL_SRC_FILES_x86 += \ LOCAL_SRC_FILES_x86 += \
arch-x86/android_memset16.S \ arch-x86/android_memset16.S \
arch-x86/android_memset32.S \ arch-x86/android_memset32.S \
@ -137,7 +145,7 @@ LOCAL_SRC_FILES_x86_64 += \
LOCAL_CFLAGS_arm += -DHAVE_MEMSET16 -DHAVE_MEMSET32 LOCAL_CFLAGS_arm += -DHAVE_MEMSET16 -DHAVE_MEMSET32
LOCAL_CFLAGS_arm64 += -DHAVE_MEMSET16 -DHAVE_MEMSET32 LOCAL_CFLAGS_arm64 += -DHAVE_MEMSET16 -DHAVE_MEMSET32
LOCAL_CFLAGS_mips += -DHAVE_MEMSET16 -DHAVE_MEMSET32 #LOCAL_CFLAGS_mips64 += -DHAVE_MEMSET16 -DHAVE_MEMSET32
LOCAL_CFLAGS_x86 += -DHAVE_MEMSET16 -DHAVE_MEMSET32 LOCAL_CFLAGS_x86 += -DHAVE_MEMSET16 -DHAVE_MEMSET32
LOCAL_CFLAGS_x86_64 += -DHAVE_MEMSET16 -DHAVE_MEMSET32 LOCAL_CFLAGS_x86_64 += -DHAVE_MEMSET16 -DHAVE_MEMSET32

2
libpixelflinger/Android.mk
View file

@ -44,11 +44,13 @@ PIXELFLINGER_SRC_FILES_arm64 := \
arch-arm64/col32cb16blend.S \ arch-arm64/col32cb16blend.S \
arch-arm64/t32cb16blend.S \ arch-arm64/t32cb16blend.S \
ifndef ARCH_MIPS_REV6
PIXELFLINGER_SRC_FILES_mips := \ PIXELFLINGER_SRC_FILES_mips := \
codeflinger/MIPSAssembler.cpp \ codeflinger/MIPSAssembler.cpp \
codeflinger/mips_disassem.c \ codeflinger/mips_disassem.c \
arch-mips/t32cb16blend.S \ arch-mips/t32cb16blend.S \
endif
# #
# Shared library # Shared library
# #

12
libpixelflinger/scanline.cpp
View file

@ -39,7 +39,7 @@
#include "codeflinger/ARMAssembler.h" #include "codeflinger/ARMAssembler.h"
#elif defined(__aarch64__) #elif defined(__aarch64__)
#include "codeflinger/Arm64Assembler.h" #include "codeflinger/Arm64Assembler.h"
#elif defined(__mips__) && !defined(__LP64__) #elif defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6
#include "codeflinger/MIPSAssembler.h" #include "codeflinger/MIPSAssembler.h"
#endif #endif
//#include "codeflinger/ARMAssemblerOptimizer.h" //#include "codeflinger/ARMAssemblerOptimizer.h"
@ -59,7 +59,7 @@
# define ANDROID_CODEGEN ANDROID_CODEGEN_GENERATED # define ANDROID_CODEGEN ANDROID_CODEGEN_GENERATED
#endif #endif
#if defined(__arm__) || (defined(__mips__) && !defined(__LP64__)) || defined(__aarch64__) #if defined(__arm__) || (defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6) || defined(__aarch64__)
# define ANDROID_ARM_CODEGEN 1 # define ANDROID_ARM_CODEGEN 1
#else #else
# define ANDROID_ARM_CODEGEN 0 # define ANDROID_ARM_CODEGEN 0
@ -73,7 +73,7 @@
*/ */
#define DEBUG_NEEDS 0 #define DEBUG_NEEDS 0
#if defined( __mips__) && !defined(__LP64__) #if defined( __mips__) && !defined(__LP64__) && __mips_isa_rev < 6
#define ASSEMBLY_SCRATCH_SIZE 4096 #define ASSEMBLY_SCRATCH_SIZE 4096
#elif defined(__aarch64__) #elif defined(__aarch64__)
#define ASSEMBLY_SCRATCH_SIZE 8192 #define ASSEMBLY_SCRATCH_SIZE 8192
@ -134,7 +134,7 @@ extern "C" void scanline_col32cb16blend_arm(uint16_t *dst, uint32_t col, size_t
#elif defined(__aarch64__) #elif defined(__aarch64__)
extern "C" void scanline_t32cb16blend_arm64(uint16_t*, uint32_t*, size_t); extern "C" void scanline_t32cb16blend_arm64(uint16_t*, uint32_t*, size_t);
extern "C" void scanline_col32cb16blend_arm64(uint16_t *dst, uint32_t col, size_t ct); extern "C" void scanline_col32cb16blend_arm64(uint16_t *dst, uint32_t col, size_t ct);
#elif defined(__mips__) && !defined(__LP64__) #elif defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6
extern "C" void scanline_t32cb16blend_mips(uint16_t*, uint32_t*, size_t); extern "C" void scanline_t32cb16blend_mips(uint16_t*, uint32_t*, size_t);
#endif #endif
@ -286,7 +286,7 @@ static const needs_filter_t fill16noblend = {
#if ANDROID_ARM_CODEGEN #if ANDROID_ARM_CODEGEN
#if defined(__mips__) #if defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6
static CodeCache gCodeCache(32 * 1024); static CodeCache gCodeCache(32 * 1024);
#elif defined(__aarch64__) #elif defined(__aarch64__)
static CodeCache gCodeCache(48 * 1024); static CodeCache gCodeCache(48 * 1024);
@ -2175,7 +2175,7 @@ last_one:
void scanline_t32cb16blend(context_t* c) void scanline_t32cb16blend(context_t* c)
{ {
#if ((ANDROID_CODEGEN >= ANDROID_CODEGEN_ASM) && (defined(__arm__) || (defined(__mips__) && !defined(__LP64__)) || defined(__aarch64__))) #if ((ANDROID_CODEGEN >= ANDROID_CODEGEN_ASM) && (defined(__arm__) || (defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6) || defined(__aarch64__)))
int32_t x = c->iterators.xl; int32_t x = c->iterators.xl;
size_t ct = c->iterators.xr - x; size_t ct = c->iterators.xr - x;
int32_t y = c->iterators.y; int32_t y = c->iterators.y;

8
libpixelflinger/tests/codegen/codegen.cpp
View file

@ -9,16 +9,18 @@
#include "codeflinger/CodeCache.h" #include "codeflinger/CodeCache.h"
#include "codeflinger/GGLAssembler.h" #include "codeflinger/GGLAssembler.h"
#include "codeflinger/ARMAssembler.h" #include "codeflinger/ARMAssembler.h"
#if defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6
#include "codeflinger/MIPSAssembler.h" #include "codeflinger/MIPSAssembler.h"
#endif
#include "codeflinger/Arm64Assembler.h" #include "codeflinger/Arm64Assembler.h"
#if defined(__arm__) || defined(__mips__) || defined(__aarch64__) #if defined(__arm__) || (defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6) || defined(__aarch64__)
# define ANDROID_ARM_CODEGEN 1 # define ANDROID_ARM_CODEGEN 1
#else #else
# define ANDROID_ARM_CODEGEN 0 # define ANDROID_ARM_CODEGEN 0
#endif #endif
#if defined (__mips__) #if defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6
#define ASSEMBLY_SCRATCH_SIZE 4096 #define ASSEMBLY_SCRATCH_SIZE 4096
#elif defined(__aarch64__) #elif defined(__aarch64__)
#define ASSEMBLY_SCRATCH_SIZE 8192 #define ASSEMBLY_SCRATCH_SIZE 8192
@ -52,7 +54,7 @@ static void ggl_test_codegen(uint32_t n, uint32_t p, uint32_t t0, uint32_t t1)
GGLAssembler assembler( new ARMAssembler(a) ); GGLAssembler assembler( new ARMAssembler(a) );
#endif #endif
#if defined(__mips__) && !defined(__LP64__) #if defined(__mips__) && !defined(__LP64__) && __mips_isa_rev < 6
GGLAssembler assembler( new ArmToMipsAssembler(a) ); GGLAssembler assembler( new ArmToMipsAssembler(a) );
#endif #endif