History

build: Add explanatory comments to (optimization) blocks in the Makefiles

Diego Biurrun committed 12 years ago

Commit efd26be1 parent 835f7984 files · +31 −1Browse files

Unified · Split

4 files
  1. libavcodec/Makefile +1 −1
  2. libavcodec/arm/Makefile +18 −0
  3. libavcodec/ppc/Makefile +2 −0
  4. libavcodec/x86/Makefile +10 −0
libavcodec/Makefile+1−1
@@ -26,7 +26,7 @@ OBJS = allcodecs.o \ · 25 unmodified lines
26 raw.o \26 raw.o \
27 utils.o \27 utils.o \
28 28
29# parts needed for many different codecs29# subsystems
30OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o30OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o
31OBJS-$(CONFIG_AC3DSP) += ac3dsp.o31OBJS-$(CONFIG_AC3DSP) += ac3dsp.o
32OBJS-$(CONFIG_AUDIO_FRAME_QUEUE) += audio_frame_queue.o32OBJS-$(CONFIG_AUDIO_FRAME_QUEUE) += audio_frame_queue.o
libavcodec/arm/Makefile+18−0
@@ -2,6 +2,7 @@ ARCH_HEADERS = mathops.h · 1 unmodified line
2 2
3OBJS += arm/fmtconvert_init_arm.o3OBJS += arm/fmtconvert_init_arm.o
4 4
5# subsystems
5OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_init_arm.o \6OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_init_arm.o \
6 arm/ac3dsp_arm.o7 arm/ac3dsp_arm.o
7OBJS-$(CONFIG_AUDIODSP) += arm/audiodsp_init_arm.o8OBJS-$(CONFIG_AUDIODSP) += arm/audiodsp_init_arm.o
@@ -27,6 +28,7 @@ OBJS-$(CONFIG_PIXBLOCKDSP) += arm/pixblockdsp_init_arm.o · 19 unmodified lines
27OBJS-$(CONFIG_VIDEODSP) += arm/videodsp_init_arm.o28OBJS-$(CONFIG_VIDEODSP) += arm/videodsp_init_arm.o
28OBJS-$(CONFIG_VP3DSP) += arm/vp3dsp_init_arm.o29OBJS-$(CONFIG_VP3DSP) += arm/vp3dsp_init_arm.o
29 30
31# decoders/encoders
30OBJS-$(CONFIG_AAC_DECODER) += arm/aacpsdsp_init_arm.o \32OBJS-$(CONFIG_AAC_DECODER) += arm/aacpsdsp_init_arm.o \
31 arm/sbrdsp_init_arm.o33 arm/sbrdsp_init_arm.o
32OBJS-$(CONFIG_APE_DECODER) += arm/apedsp_init_arm.o34OBJS-$(CONFIG_APE_DECODER) += arm/apedsp_init_arm.o
@@ -43,6 +45,9 @@ OBJS-$(CONFIG_RV30_DECODER) += arm/rv34dsp_init_arm.o · 10 unmodified lines
43OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_init_arm.o \45OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_init_arm.o \
44 arm/rv40dsp_init_arm.o46 arm/rv40dsp_init_arm.o
45 47
48
49# ARMv5 optimizations
50# subsystems
46ARMV5TE-OBJS-$(CONFIG_IDCTDSP) += arm/idctdsp_init_armv5te.o \51ARMV5TE-OBJS-$(CONFIG_IDCTDSP) += arm/idctdsp_init_armv5te.o \
47 arm/simple_idct_armv5te.o52 arm/simple_idct_armv5te.o
48ARMV5TE-OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_armv5te.o \53ARMV5TE-OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_armv5te.o \
@@ -50,8 +55,12 @@ ARMV5TE-OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_armv5te.o \ · 1 unmodified line
50ARMV5TE-OBJS-$(CONFIG_VIDEODSP) += arm/videodsp_init_armv5te.o \55ARMV5TE-OBJS-$(CONFIG_VIDEODSP) += arm/videodsp_init_armv5te.o \
51 arm/videodsp_armv5te.o56 arm/videodsp_armv5te.o
52 57
58# decoders/encoders
53ARMV5TE-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_armv5te.o59ARMV5TE-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_armv5te.o
54 60
61
62# ARMv6 optimizations
63# subsystems
55ARMV6-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_armv6.o64ARMV6-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_armv6.o
56ARMV6-OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_armv6.o \65ARMV6-OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_armv6.o \
57 arm/hpeldsp_armv6.o66 arm/hpeldsp_armv6.o
@@ -63,6 +72,7 @@ ARMV6-OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_fixed_armv6.o · 5 unmodified lines
63ARMV6-OBJS-$(CONFIG_MPEGVIDEOENC) += arm/mpegvideoencdsp_armv6.o72ARMV6-OBJS-$(CONFIG_MPEGVIDEOENC) += arm/mpegvideoencdsp_armv6.o
64ARMV6-OBJS-$(CONFIG_PIXBLOCKDSP) += arm/pixblockdsp_armv6.o73ARMV6-OBJS-$(CONFIG_PIXBLOCKDSP) += arm/pixblockdsp_armv6.o
65 74
75# decoders/encoders
66ARMV6-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_armv6.o76ARMV6-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_armv6.o
67ARMV6-OBJS-$(CONFIG_STARTCODE) += arm/startcode_armv6.o77ARMV6-OBJS-$(CONFIG_STARTCODE) += arm/startcode_armv6.o
68ARMV6-OBJS-$(CONFIG_VP7_DECODER) += arm/vp8_armv6.o \78ARMV6-OBJS-$(CONFIG_VP7_DECODER) += arm/vp8_armv6.o \
@@ -72,17 +82,24 @@ ARMV6-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8_armv6.o \ · 3 unmodified lines
72 arm/vp8dsp_init_armv6.o \82 arm/vp8dsp_init_armv6.o \
73 arm/vp8dsp_armv6.o83 arm/vp8dsp_armv6.o
74 84
85
86# VFP optimizations
75VFP-OBJS += arm/fmtconvert_vfp.o87VFP-OBJS += arm/fmtconvert_vfp.o
76 88
89# subsystems
77VFP-OBJS-$(CONFIG_FFT) += arm/fft_vfp.o90VFP-OBJS-$(CONFIG_FFT) += arm/fft_vfp.o
78VFP-OBJS-$(CONFIG_MDCT) += arm/mdct_vfp.o91VFP-OBJS-$(CONFIG_MDCT) += arm/mdct_vfp.o
79VFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp_armv6.o92VFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp_armv6.o
80 93
94# decoders/encoders
81VFP-OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_vfp.o \95VFP-OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_vfp.o \
82 arm/synth_filter_vfp.o96 arm/synth_filter_vfp.o
83 97
98
99# NEON optimizations
84NEON-OBJS += arm/fmtconvert_neon.o100NEON-OBJS += arm/fmtconvert_neon.o
85 101
102# subsystems
86NEON-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_neon.o103NEON-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_neon.o
87NEON-OBJS-$(CONFIG_AUDIODSP) += arm/audiodsp_init_neon.o \104NEON-OBJS-$(CONFIG_AUDIODSP) += arm/audiodsp_init_neon.o \
88 arm/audiodsp_neon.o \105 arm/audiodsp_neon.o \
@@ -108,6 +125,7 @@ NEON-OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_neon.o · 19 unmodified lines
108NEON-OBJS-$(CONFIG_RDFT) += arm/rdft_neon.o125NEON-OBJS-$(CONFIG_RDFT) += arm/rdft_neon.o
109NEON-OBJS-$(CONFIG_VP3DSP) += arm/vp3dsp_neon.o126NEON-OBJS-$(CONFIG_VP3DSP) += arm/vp3dsp_neon.o
110 127
128# decoders/encoders
111NEON-OBJS-$(CONFIG_AAC_DECODER) += arm/aacpsdsp_neon.o \129NEON-OBJS-$(CONFIG_AAC_DECODER) += arm/aacpsdsp_neon.o \
112 arm/sbrdsp_neon.o130 arm/sbrdsp_neon.o
113NEON-OBJS-$(CONFIG_APE_DECODER) += arm/apedsp_neon.o131NEON-OBJS-$(CONFIG_APE_DECODER) += arm/apedsp_neon.o
libavcodec/ppc/Makefile+2−0
@@ -1,5 +1,6 @@
1OBJS += ppc/fmtconvert_altivec.o \1OBJS += ppc/fmtconvert_altivec.o \
2 2
3# subsystems
3OBJS-$(CONFIG_AUDIODSP) += ppc/audiodsp.o4OBJS-$(CONFIG_AUDIODSP) += ppc/audiodsp.o
4OBJS-$(CONFIG_BLOCKDSP) += ppc/blockdsp.o5OBJS-$(CONFIG_BLOCKDSP) += ppc/blockdsp.o
5OBJS-$(CONFIG_FFT) += ppc/fft_init.o \6OBJS-$(CONFIG_FFT) += ppc/fft_init.o \
@@ -20,6 +21,7 @@ OBJS-$(CONFIG_PIXBLOCKDSP) += ppc/pixblockdsp.o · 14 unmodified lines
20OBJS-$(CONFIG_VIDEODSP) += ppc/videodsp_ppc.o21OBJS-$(CONFIG_VIDEODSP) += ppc/videodsp_ppc.o
21OBJS-$(CONFIG_VP3DSP) += ppc/vp3dsp_altivec.o22OBJS-$(CONFIG_VP3DSP) += ppc/vp3dsp_altivec.o
22 23
24# decoders/encoders
23OBJS-$(CONFIG_APE_DECODER) += ppc/apedsp_altivec.o25OBJS-$(CONFIG_APE_DECODER) += ppc/apedsp_altivec.o
24OBJS-$(CONFIG_SVQ1_ENCODER) += ppc/svq1enc_altivec.o26OBJS-$(CONFIG_SVQ1_ENCODER) += ppc/svq1enc_altivec.o
25OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o27OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o
libavcodec/x86/Makefile+10−0
@@ -1,6 +1,7 @@
1OBJS += x86/constants.o \1OBJS += x86/constants.o \
2 x86/fmtconvert_init.o \2 x86/fmtconvert_init.o \
3 3
4# subsystems
4OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o5OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o
5OBJS-$(CONFIG_AUDIODSP) += x86/audiodsp_init.o6OBJS-$(CONFIG_AUDIODSP) += x86/audiodsp_init.o
6OBJS-$(CONFIG_BLOCKDSP) += x86/blockdsp.o7OBJS-$(CONFIG_BLOCKDSP) += x86/blockdsp.o
@@ -30,6 +31,7 @@ OBJS-$(CONFIG_VIDEODSP) += x86/videodsp_init.o · 23 unmodified lines
30OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp_init.o31OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp_init.o
31OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o32OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
32 33
34# decoders/encoders
33OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o35OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o
34OBJS-$(CONFIG_APE_DECODER) += x86/apedsp_init.o36OBJS-$(CONFIG_APE_DECODER) += x86/apedsp_init.o
35OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o37OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o
@@ -52,6 +54,9 @@ OBJS-$(CONFIG_VP7_DECODER) += x86/vp8dsp_init.o · 16 unmodified lines
52OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp_init.o54OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp_init.o
53OBJS-$(CONFIG_VP9_DECODER) += x86/vp9dsp_init.o55OBJS-$(CONFIG_VP9_DECODER) += x86/vp9dsp_init.o
54 56
57
58# GCC inline assembly optimizations
59# subsystems
55MMX-OBJS-$(CONFIG_AUDIODSP) += x86/audiodsp_mmx.o60MMX-OBJS-$(CONFIG_AUDIODSP) += x86/audiodsp_mmx.o
56MMX-OBJS-$(CONFIG_HPELDSP) += x86/fpel_mmx.o \61MMX-OBJS-$(CONFIG_HPELDSP) += x86/fpel_mmx.o \
57 x86/hpeldsp_mmx.o62 x86/hpeldsp_mmx.o
@@ -60,13 +65,17 @@ MMX-OBJS-$(CONFIG_IDCTDSP) += x86/idctdsp_mmx.o \ · 2 unmodified lines
60 x86/simple_idct.o65 x86/simple_idct.o
61MMX-OBJS-$(CONFIG_QPELDSP) += x86/fpel_mmx.o66MMX-OBJS-$(CONFIG_QPELDSP) += x86/fpel_mmx.o
62 67
68# decoders/encoders
63MMX-OBJS-$(CONFIG_MPEG4_DECODER) += x86/idct_mmx_xvid.o \69MMX-OBJS-$(CONFIG_MPEG4_DECODER) += x86/idct_mmx_xvid.o \
64 x86/idct_sse2_xvid.o70 x86/idct_sse2_xvid.o
65MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o71MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o
66 72
73
74# YASM optimizations
67YASM-OBJS += x86/deinterlace.o \75YASM-OBJS += x86/deinterlace.o \
68 x86/fmtconvert.o \76 x86/fmtconvert.o \
69 77
78# subsystems
70YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o79YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o
71YASM-OBJS-$(CONFIG_AUDIODSP) += x86/audiodsp.o80YASM-OBJS-$(CONFIG_AUDIODSP) += x86/audiodsp.o
72YASM-OBJS-$(CONFIG_BSWAPDSP) += x86/bswapdsp.o81YASM-OBJS-$(CONFIG_BSWAPDSP) += x86/bswapdsp.o
@@ -101,6 +110,7 @@ YASM-OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp.o \ · 28 unmodified lines
101YASM-OBJS-$(CONFIG_VIDEODSP) += x86/videodsp.o110YASM-OBJS-$(CONFIG_VIDEODSP) += x86/videodsp.o
102YASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o111YASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o
103 112
113# decoders/encoders
104YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o114YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o
105YASM-OBJS-$(CONFIG_APE_DECODER) += x86/apedsp.o115YASM-OBJS-$(CONFIG_APE_DECODER) += x86/apedsp.o
106YASM-OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp.o116YASM-OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp.o

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t