| Message ID | BLU0-SMTP37762C5CD6B3E076E490852D9CB0@phx.gbl |
|---|---|
| State | Accepted |
| Commit | 0e8e3c2879c55ee9552a6f4161ea2d28aff62543 |
| Headers | show |
>>>>> "Bernd" == Bernd Kuhls <berndkuhls@hotmail.com> writes: > Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> Committed, thanks.
On 02/01/14 18:59, Bernd Kuhls wrote: > > Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> > --- > arch/Config.in.x86 | 4 ++++ > package/ffmpeg/ffmpeg.mk | 14 +++++++++++++- > 2 files changed, 17 insertions(+), 1 deletion(-) > > diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 > index ce30605..15d5c16 100644 > --- a/arch/Config.in.x86 > +++ b/arch/Config.in.x86 > @@ -9,6 +9,10 @@ config BR2_X86_CPU_HAS_SSE3 > bool > config BR2_X86_CPU_HAS_SSSE3 > bool > +config BR2_X86_CPU_HAS_SSE4 > + bool > +config BR2_X86_CPU_HAS_SSE42 > + bool Since nobody selects these symbols, this patch just adds dead code, right? Regards, Arnout > > choice > prompt "Target Architecture Variant" > diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk > index ea7b20d..6b5060d 100644 > --- a/package/ffmpeg/ffmpeg.mk > +++ b/package/ffmpeg/ffmpeg.mk > @@ -244,6 +244,18 @@ else > FFMPEG_CONF_OPT += --disable-ssse3 > endif > > +ifeq ($(BR2_X86_CPU_HAS_SSE4),y) > +FFMPEG_CONF_OPT += --enable-sse4 > +else > +FFMPEG_CONF_OPT += --disable-sse4 > +endif > + > +ifeq ($(BR2_X86_CPU_HAS_SSE42),y) > +FFMPEG_CONF_OPT += --enable-sse42 > +else > +FFMPEG_CONF_OPT += --disable-sse42 > +endif > + > # Explicitly disable everything that doesn't match for ARM > # FFMPEG "autodetects" by compiling an extended instruction via AS > # This works on compilers that aren't built for generic by default >
Arnout, all, 2014/1/14 Arnout Vandecappelle <arnout@mind.be> > On 02/01/14 18:59, Bernd Kuhls wrote: > >> >> Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> >> --- >> arch/Config.in.x86 | 4 ++++ >> package/ffmpeg/ffmpeg.mk | 14 +++++++++++++- >> 2 files changed, 17 insertions(+), 1 deletion(-) >> >> diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 >> index ce30605..15d5c16 100644 >> --- a/arch/Config.in.x86 >> +++ b/arch/Config.in.x86 >> @@ -9,6 +9,10 @@ config BR2_X86_CPU_HAS_SSE3 >> bool >> config BR2_X86_CPU_HAS_SSSE3 >> bool >> +config BR2_X86_CPU_HAS_SSE4 >> + bool >> +config BR2_X86_CPU_HAS_SSE42 >> + bool >> > > Since nobody selects these symbols, this patch just adds dead code, right? > Well, I have a bump of opencv in the pipe that can use these new symbols too. Regards,
>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes: > On 02/01/14 18:59, Bernd Kuhls wrote: >> >> Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> >> --- >> arch/Config.in.x86 | 4 ++++ >> package/ffmpeg/ffmpeg.mk | 14 +++++++++++++- >> 2 files changed, 17 insertions(+), 1 deletion(-) >> >> diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 >> index ce30605..15d5c16 100644 >> --- a/arch/Config.in.x86 >> +++ b/arch/Config.in.x86 >> @@ -9,6 +9,10 @@ config BR2_X86_CPU_HAS_SSE3 >> bool >> config BR2_X86_CPU_HAS_SSSE3 >> bool >> +config BR2_X86_CPU_HAS_SSE4 >> + bool >> +config BR2_X86_CPU_HAS_SSE42 >> + bool > Since nobody selects these symbols, this patch just adds dead code, > right? Yes, for now it does. I was expecting to see a followup patch adding new CPUs. I have sse4 on my laptop atleast: egrep 'name|sse4' /proc/cpuinfo|head -n 2 model name : Intel(R) Core(TM) i5-3320M CPU @ 2.60GHz flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm ida arat epb xsaveopt pln pts dtherm tpr_shadow vnmi flexpriority ept vpid fsgsbase smep erms
diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index ce30605..15d5c16 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -9,6 +9,10 @@ config BR2_X86_CPU_HAS_SSE3 bool config BR2_X86_CPU_HAS_SSSE3 bool +config BR2_X86_CPU_HAS_SSE4 + bool +config BR2_X86_CPU_HAS_SSE42 + bool choice prompt "Target Architecture Variant" diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index ea7b20d..6b5060d 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -244,6 +244,18 @@ else FFMPEG_CONF_OPT += --disable-ssse3 endif +ifeq ($(BR2_X86_CPU_HAS_SSE4),y) +FFMPEG_CONF_OPT += --enable-sse4 +else +FFMPEG_CONF_OPT += --disable-sse4 +endif + +ifeq ($(BR2_X86_CPU_HAS_SSE42),y) +FFMPEG_CONF_OPT += --enable-sse42 +else +FFMPEG_CONF_OPT += --disable-sse42 +endif + # Explicitly disable everything that doesn't match for ARM # FFMPEG "autodetects" by compiling an extended instruction via AS # This works on compilers that aren't built for generic by default
Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> --- arch/Config.in.x86 | 4 ++++ package/ffmpeg/ffmpeg.mk | 14 +++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-)