History

lavu: add AESNI CPU flag

Rodger Combs committed 11 years ago

Commit 1e477a91 parent 057ce759 files · +26 −7Browse files

Unified · Split

9 files
  1. configure +4 −0
  2. doc/APIchanges +3 −0
  3. libavutil/cpu.c +4 −0
  4. libavutil/cpu.h +1 −0
  5. libavutil/version.h +1 −1
  6. libavutil/x86/cpu.c +2 −0
  7. libavutil/x86/cpu.h +3 −0
  8. libavutil/x86/x86inc.asm +7 −6
  9. tests/checkasm/checkasm.c +1 −0
configure+4−0
@@ -368,6 +368,7 @@ Optimization options (experts only): · 367 unmodified lines
368368 --disable-fma3 disable FMA3 optimizations
369369 --disable-fma4 disable FMA4 optimizations
370370 --disable-avx2 disable AVX2 optimizations
371+ --disable-aesni disable AESNI optimizations
371372 --disable-armv5te disable armv5te optimizations
372373 --disable-armv6 disable armv6 optimizations
373374 --disable-armv6t2 disable armv6t2 optimizations
@@ -1635,6 +1636,7 @@ ARCH_EXT_LIST_LOONGSON=" · 1261 unmodified lines
16351636 "
16361637
16371638 ARCH_EXT_LIST_X86_SIMD="
1639+ aesni
16381640 amd3dnow
16391641 amd3dnowext
16401642 avx
@@ -2128,6 +2130,7 @@ sse3_deps="sse2" · 487 unmodified lines
21282130 ssse3_deps="sse3"
21292131 sse4_deps="ssse3"
21302132 sse42_deps="sse4"
2133+aesni_deps="sse42"
21312134 avx_deps="sse42"
21322135 xop_deps="avx"
21332136 fma3_deps="avx"
@@ -6011,6 +6014,7 @@ if enabled x86; then · 3877 unmodified lines
60116014 echo "3DNow! extended enabled ${amd3dnowext-no}"
60126015 echo "SSE enabled ${sse-no}"
60136016 echo "SSSE3 enabled ${ssse3-no}"
6017+ echo "AESNI enabled ${aesni-no}"
60146018 echo "AVX enabled ${avx-no}"
60156019 echo "XOP enabled ${xop-no}"
60166020 echo "FMA3 enabled ${fma3-no}"
doc/APIchanges+3−0
@@ -15,6 +15,9 @@ libavutil: 2015-08-28 · 14 unmodified lines
1515
1616 API changes, most recent first:
1717
18+2015-10-27 - xxxxxxx - lavu 55.5.100 - cpu.h
19+ Add AV_CPU_FLAG_AESNI.
20+
1821 2015-10-27 - xxxxxxx - lavc 57.12.100 / 57.8.0 - avcodec.h
1922 Deprecate av_free_packet(). Use av_packet_unref() as replacement,
2023 it resets the packet in a more consistent way.
libavutil/cpu.c+4−0
@@ -118,6 +118,7 @@ int av_parse_cpu_flags(const char *s) · 117 unmodified lines
118118 #define CPUFLAG_FMA4 (AV_CPU_FLAG_FMA4 | CPUFLAG_AVX)
119119 #define CPUFLAG_AVX2 (AV_CPU_FLAG_AVX2 | CPUFLAG_AVX)
120120 #define CPUFLAG_BMI2 (AV_CPU_FLAG_BMI2 | AV_CPU_FLAG_BMI1)
121+#define CPUFLAG_AESNI (AV_CPU_FLAG_AESNI | CPUFLAG_SSE42)
121122 static const AVOption cpuflags_opts[] = {
122123 { "flags" , NULL, 0, AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT64_MIN, INT64_MAX, .unit = "flags" },
123124 #if ARCH_PPC
@@ -145,6 +146,7 @@ int av_parse_cpu_flags(const char *s) · 21 unmodified lines
145146 { "3dnow" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_3DNOW }, .unit = "flags" },
146147 { "3dnowext", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_3DNOWEXT }, .unit = "flags" },
147148 { "cmov", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_CMOV }, .unit = "flags" },
149+ { "aesni" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_AESNI }, .unit = "flags" },
148150 #elif ARCH_ARM
149151 { "armv5te", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_ARMV5TE }, .unit = "flags" },
150152 { "armv6", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_ARMV6 }, .unit = "flags" },
@@ -205,6 +207,7 @@ int av_parse_cpu_caps(unsigned *flags, const char *s) · 54 unmodified lines
205207 { "3dnow" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_3DNOW }, .unit = "flags" },
206208 { "3dnowext", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_3DNOWEXT }, .unit = "flags" },
207209 { "cmov", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_CMOV }, .unit = "flags" },
210+ { "aesni", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_AESNI }, .unit = "flags" },
208211
209212 #define CPU_FLAG_P2 AV_CPU_FLAG_CMOV | AV_CPU_FLAG_MMX
210213 #define CPU_FLAG_P3 CPU_FLAG_P2 | AV_CPU_FLAG_MMX2 | AV_CPU_FLAG_SSE
@@ -340,6 +343,7 @@ static const struct { · 129 unmodified lines
340343 { AV_CPU_FLAG_AVX2, "avx2" },
341344 { AV_CPU_FLAG_BMI1, "bmi1" },
342345 { AV_CPU_FLAG_BMI2, "bmi2" },
346+ { AV_CPU_FLAG_AESNI, "aesni" },
343347 #endif
344348 { 0 }
345349 };
libavutil/cpu.h+1−0
@@ -42,6 +42,7 @@ · 41 unmodified lines
4242 #define AV_CPU_FLAG_ATOM 0x10000000 ///< Atom processor, some SSSE3 instructions are slower
4343 #define AV_CPU_FLAG_SSE4 0x0100 ///< Penryn SSE4.1 functions
4444 #define AV_CPU_FLAG_SSE42 0x0200 ///< Nehalem SSE4.2 functions
45+#define AV_CPU_FLAG_AESNI 0x80000 ///< Advanced Encryption Standard functions
4546 #define AV_CPU_FLAG_AVX 0x4000 ///< AVX functions: requires OS support even if YMM registers aren't used
4647 #define AV_CPU_FLAG_AVXSLOW 0x8000000 ///< AVX supported, but slow when using YMM registers (e.g. Bulldozer)
4748 #define AV_CPU_FLAG_XOP 0x0400 ///< Bulldozer XOP functions
libavutil/version.h+1−1
@@ -56,7 +56,7 @@ · 55 unmodified lines
5656 */
5757
5858 #define LIBAVUTIL_VERSION_MAJOR 55
59−#define LIBAVUTIL_VERSION_MINOR 4
59+#define LIBAVUTIL_VERSION_MINOR 5
6060 #define LIBAVUTIL_VERSION_MICRO 100
6161
6262 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
libavutil/x86/cpu.c+2−0
@@ -126,6 +126,8 @@ int ff_get_cpu_flags_x86(void) · 125 unmodified lines
126126 rval |= AV_CPU_FLAG_SSE4;
127127 if (ecx & 0x00100000 )
128128 rval |= AV_CPU_FLAG_SSE42;
129+ if (ecx & 0x01000000 )
130+ rval |= AV_CPU_FLAG_AESNI;
129131 #if HAVE_AVX
130132 /* Check OXSAVE and AVX bits */
131133 if ((ecx & 0x18000000) == 0x18000000) {
libavutil/x86/cpu.h+3−0
@@ -47,6 +47,7 @@ · 46 unmodified lines
4747 #define X86_FMA3(flags) CPUEXT(flags, FMA3)
4848 #define X86_FMA4(flags) CPUEXT(flags, FMA4)
4949 #define X86_AVX2(flags) CPUEXT(flags, AVX2)
50+#define X86_AESNI(flags) CPUEXT(flags, AESNI)
5051
5152 #define EXTERNAL_AMD3DNOW(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, AMD3DNOW)
5253 #define EXTERNAL_AMD3DNOWEXT(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, AMD3DNOWEXT)
@@ -69,6 +70,7 @@ · 16 unmodified lines
6970 #define EXTERNAL_FMA3(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, FMA3)
7071 #define EXTERNAL_FMA4(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, FMA4)
7172 #define EXTERNAL_AVX2(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, AVX2)
73+#define EXTERNAL_AESNI(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, AESNI)
7274
7375 #define INLINE_AMD3DNOW(flags) CPUEXT_SUFFIX(flags, _INLINE, AMD3DNOW)
7476 #define INLINE_AMD3DNOWEXT(flags) CPUEXT_SUFFIX(flags, _INLINE, AMD3DNOWEXT)
@@ -91,6 +93,7 @@ · 16 unmodified lines
9193 #define INLINE_FMA3(flags) CPUEXT_SUFFIX(flags, _INLINE, FMA3)
9294 #define INLINE_FMA4(flags) CPUEXT_SUFFIX(flags, _INLINE, FMA4)
9395 #define INLINE_AVX2(flags) CPUEXT_SUFFIX(flags, _INLINE, AVX2)
96+#define INLINE_AESNI(flags) CPUEXT_SUFFIX(flags, _INLINE, AESNI)
9497
9598 void ff_cpu_cpuid(int index, int *eax, int *ebx, int *ecx, int *edx);
9699 void ff_cpu_xgetbv(int op, int *eax, int *edx);
libavutil/x86/x86inc.asm+7−6
@@ -772,6 +772,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae, · 771 unmodified lines
772772 %assign cpuflags_atom (1<<21)
773773 %assign cpuflags_bmi1 (1<<22)|cpuflags_lzcnt
774774 %assign cpuflags_bmi2 (1<<23)|cpuflags_bmi1
775+%assign cpuflags_aesni (1<<24)|cpuflags_sse42
775776
776777 ; Returns a boolean value expressing whether or not the specified cpuflag is enabled.
777778 %define cpuflag(x) (((((cpuflags & (cpuflags_ %+ x)) ^ (cpuflags_ %+ x)) - 1) >> 31) & 1)
@@ -1171,12 +1172,12 @@ AVX_INSTR addsd, sse2, 1, 0, 1 · 393 unmodified lines
11711172 AVX_INSTR addss, sse, 1, 0, 1
11721173 AVX_INSTR addsubpd, sse3, 1, 0, 0
11731174 AVX_INSTR addsubps, sse3, 1, 0, 0
1174−AVX_INSTR aesdec, fnord, 0, 0, 0
1175−AVX_INSTR aesdeclast, fnord, 0, 0, 0
1176−AVX_INSTR aesenc, fnord, 0, 0, 0
1177−AVX_INSTR aesenclast, fnord, 0, 0, 0
1178−AVX_INSTR aesimc
1179−AVX_INSTR aeskeygenassist
1175+AVX_INSTR aesdec, aesni, 0, 0, 0
1176+AVX_INSTR aesdeclast, aesni, 0, 0, 0
1177+AVX_INSTR aesenc, aesni, 0, 0, 0
1178+AVX_INSTR aesenclast, aesni, 0, 0, 0
1179+AVX_INSTR aesimc, aesni
1180+AVX_INSTR aeskeygenassist, aesni
11801181 AVX_INSTR andnpd, sse2, 1, 0, 0
11811182 AVX_INSTR andnps, sse, 1, 0, 0
11821183 AVX_INSTR andpd, sse2, 1, 0, 1
tests/checkasm/checkasm.c+1−0
@@ -117,6 +117,7 @@ static const struct { · 116 unmodified lines
117117 { "SSSE3", "ssse3", AV_CPU_FLAG_SSSE3|AV_CPU_FLAG_ATOM },
118118 { "SSE4.1", "sse4", AV_CPU_FLAG_SSE4 },
119119 { "SSE4.2", "sse42", AV_CPU_FLAG_SSE42 },
120+ { "AES-NI", "aesni", AV_CPU_FLAG_AESNI },
120121 { "AVX", "avx", AV_CPU_FLAG_AVX },
121122 { "XOP", "xop", AV_CPU_FLAG_XOP },
122123 { "FMA3", "fma3", AV_CPU_FLAG_FMA3 },

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