hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-27 11:24:05 +00:00
Code Issues Actions Projects Releases Wiki Activity

Clean up the makefile a bit

Browse source 
Use the existing TARGET_CPU_ARCH and TARGET_CPU_BITS instead of filtering
ARCH over and over again.

Comment some of the more obscure parts.
This commit is contained in:
Ari Koivula 2015-09-18 15:13:13 +03:00
parent eb12fe0d98
commit 63ab4068be
1 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/Makefile
View file

@ -64,30 +64,36 @@ else
endif endif
# ARCH related flags # ARCH related flags
ifeq ($(ARCH), x86_64) ifeq (, $(filter-out i386 i686 x86_64 amd64, $(ARCH)))
TARGET_CPU_BITS := 64 TARGET_CPU_ARCH := x86
TARGET_CPU_ARCH := x86 else ifeq (, $(filter-out ppc ppc64, $(ARCH)))
else ifeq ($(ARCH), ppc64) TARGET_CPU_ARCH := ppc
TARGET_CPU_BITS := 64 else ifeq (, $(filter-out armv7l armv6l, $(ARCH)))
TARGET_CPU_ARCH := ppc TARGET_CPU_ARCH := arm
else else
#safe (?) defaults TARGET_CPU_ARCH := x86
TARGET_CPU_BITS := 32 endif
TARGET_CPU_ARCH := x86
ifeq (, $(filter-out i386 i686 ppc, $(ARCH)))
TARGET_CPU_BITS := 32
else ifeq (, $(filter-out x86_64 amd64 ppc64, $(ARCH)))
TARGET_CPU_BITS := 64
else
TARGET_CPU_BITS := 0
endif endif
# The -m32 and -m64 flags are used for making sure the C files use the same # The -m32 and -m64 flags are used for making sure the C files use the same
# instruction set as the ASM files. They can't be used on ARM processors. # instruction set as the ASM files. They can't be used on ARM processors.
ifneq (,$(filter-out armv7l armv6l,$(ARCH))) ifneq (0, $(TARGET_CPU_BITS))
CFLAGS += -m$(TARGET_CPU_BITS) CFLAGS += -m$(TARGET_CPU_BITS)
LDFLAGS += -m$(TARGET_CPU_BITS) LDFLAGS += -m$(TARGET_CPU_BITS)
endif endif
INSTALL_TARGETS = install-prog install-pc INSTALL_TARGETS = install-prog install-pc
# Windows (cygwin/mingw) specific flags # Windows (cygwin/mingw) specific flags
ifeq ($(SYSTEM), Windows) ifeq ($(SYSTEM), Windows)
ifeq ($(ARCH), x86_64) ifeq ($(TARGET_CPU_BITS), 64)
ASFLAGS += -f win64 ASFLAGS += -f win64
ASFLAGS += -DHAVE_ALIGNED_STACK=1 ASFLAGS += -DHAVE_ALIGNED_STACK=1
else else
@ -101,7 +107,7 @@ ifeq ($(SYSTEM), Windows)
# OS X specific flags # OS X specific flags
else ifeq ($(SYSTEM), Darwin) else ifeq ($(SYSTEM), Darwin)
ifeq ($(ARCH), x86_64) ifeq ($(TARGET_CPU_BITS), 64)
ASFLAGS += -f macho64 ASFLAGS += -f macho64
else else
ASFLAGS += -f macho32 ASFLAGS += -f macho32
@ -114,7 +120,7 @@ else ifeq ($(SYSTEM), Darwin)
else else
LIBS += -lrt LIBS += -lrt
LDFLAGS += -Wl,-z,noexecstack LDFLAGS += -Wl,-z,noexecstack
ifeq ($(ARCH), x86_64) ifeq ($(TARGET_CPU_BITS), 64)
ASFLAGS += -f elf64 ASFLAGS += -f elf64
else else
ASFLAGS += -f elf32 ASFLAGS += -f elf32
@ -124,13 +130,13 @@ else
endif endif
# Flags shared across systems # Flags shared across systems
ifeq ($(ARCH), x86_64) ifeq ($(TARGET_CPU_ARCH) $(TARGET_CPU_BITS), x86 64)
ASFLAGS += -DARCH_X86_64=1 ASFLAGS += -DARCH_X86_64=1
else else
ASFLAGS += -DARCH_X86_64=0 ASFLAGS += -DARCH_X86_64=0
endif endif
# Compile asm files by default if yasm is present. # Disable ASM optimizations if YASM is not found on path.
ifndef KVZ_DISABLE_ASM ifndef KVZ_DISABLE_ASM
has_as := $(shell type $(AS) 2>/dev/null) has_as := $(shell type $(AS) 2>/dev/null)
ifeq ($(has_as),) ifeq ($(has_as),)
@ -142,16 +148,19 @@ ifdef CHECKPOINTS
CFLAGS += -DCHECKPOINTS CFLAGS += -DCHECKPOINTS
endif endif
# Compile files in strategy directories with appropriate flags. # The optimized functions reside in these instruction set specific
ifeq ($(ARCH),ppc64) # directories. If the instruction set is supported by the
# architecture, compile the files in these directories with the
# apropriate flags to cause the intrinsics to work.
ifeq ($(TARGET_CPU_ARCH), ppc)
strategies/altivec/%.o: EXTRA_FLAGS += -maltivec -fno-lto strategies/altivec/%.o: EXTRA_FLAGS += -maltivec -fno-lto
strategies/altivec/%.lo: EXTRA_FLAGS += -maltivec -fno-lto strategies/altivec/%.lo: EXTRA_FLAGS += -maltivec -fno-lto
else ifeq (,$(filter-out i386 i686 x86_64 amd64,$(ARCH))) else ifeq ($(TARGET_CPU_ARCH), x86)
strategies/sse2/%.o: EXTRA_FLAGS += -msse2 -fno-lto strategies/sse2/%.o: EXTRA_FLAGS += -msse2 -fno-lto
strategies/sse41/%.o: EXTRA_FLAGS += -msse4.1 -fno-lto strategies/sse41/%.o: EXTRA_FLAGS += -msse4.1 -fno-lto
strategies/sse2/%.lo: EXTRA_FLAGS += -msse2 -fno-lto strategies/sse2/%.lo: EXTRA_FLAGS += -msse2 -fno-lto
strategies/sse41/%.lo: EXTRA_FLAGS += -msse4.1 -fno-lto strategies/sse41/%.lo: EXTRA_FLAGS += -msse4.1 -fno-lto
# Needs to be defined on Travis # To disable avx2 on old compilers that don't support it.
ifndef KVZ_DISABLE_AVX2 ifndef KVZ_DISABLE_AVX2
strategies/avx2/%.o: EXTRA_FLAGS += -mavx2 -fno-lto strategies/avx2/%.o: EXTRA_FLAGS += -mavx2 -fno-lto
strategies/avx2/%.lo: EXTRA_FLAGS += -mavx2 -fno-lto strategies/avx2/%.lo: EXTRA_FLAGS += -mavx2 -fno-lto
@ -207,8 +216,12 @@ OBJS = \
strategies/avx2/ipol-avx2.o strategies/avx2/ipol-avx2.o
ifndef KVZ_DISABLE_ASM ifndef KVZ_DISABLE_ASM
# Compile C files in x86_asm folder with KVZ_COMPILE_ASM, which will cause
# the registration function to register the function pointers in the ASM
# files.
strategies/x86_asm/%.o: EXTRA_FLAGS += -DKVZ_COMPILE_ASM strategies/x86_asm/%.o: EXTRA_FLAGS += -DKVZ_COMPILE_ASM
# Add ASM files to the list of objects to be compiled.
OBJS += \ OBJS += \
strategies/x86_asm/picture-x86-asm-sad.o \ strategies/x86_asm/picture-x86-asm-sad.o \
strategies/x86_asm/picture-x86-asm-satd.o strategies/x86_asm/picture-x86-asm-satd.o