From 414666aa2047ece9b92fd77e4edf4848bf036efb Mon Sep 17 00:00:00 2001 From: Jan-Pascal van Best Date: Mon, 28 Jan 2013 12:40:57 +0100 Subject: [PATCH] More specific cpu optimisations --- debian/changelog | 6 ++++++ debian/config.mak-athlon64 | 4 ++++ debian/config.mak-atom | 4 ++++ debian/{config.mak-sse2 => config.mak-core2} | 4 ++-- debian/control.source | 2 +- debian/rules | 8 +++++--- debian/rules.defs | 4 ++-- 7 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 debian/config.mak-athlon64 create mode 100644 debian/config.mak-atom rename debian/{config.mak-sse2 => config.mak-core2} (58%) diff --git a/debian/changelog b/debian/changelog index 429ff3a..07eaee8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sasc-ng (620-6) local; urgency=low + + * More specific CPU optimisations: atom, core2, athlon64 + + -- Jan-Pascal van Best Mon, 28 Jan 2013 12:40:04 +0100 + sasc-ng (620-5) local; urgency=low * Added example configuration files diff --git a/debian/config.mak-athlon64 b/debian/config.mak-athlon64 new file mode 100644 index 0000000..8f290c3 --- /dev/null +++ b/debian/config.mak-athlon64 @@ -0,0 +1,4 @@ +# Automatically generated by configure - do not modify +FFDECSA_OPTS = "FLAGS=-O3 -fexpensive-optimizations -funroll-loops -mmmx -msse -msse2 -march=athlon64" PARALLEL_MODE=PARALLEL_128_SSE2 COMPILER=g++-4.6 +DVB_DIR=#DVB_DIR# +CXX=g++-4.6 diff --git a/debian/config.mak-atom b/debian/config.mak-atom new file mode 100644 index 0000000..e49685e --- /dev/null +++ b/debian/config.mak-atom @@ -0,0 +1,4 @@ +# FFdecsa configuration for Intel Atom cpus +FFDECSA_OPTS = "FLAGS=-O3 -fexpensive-optimizations -funroll-loops -mmmx -msse -msse2 -march=atom" PARALLEL_MODE=PARALLEL_128_SSE2 COMPILER=g++-4.6 +DVB_DIR=#DVB_DIR# +CXX=g++-4.6 diff --git a/debian/config.mak-sse2 b/debian/config.mak-core2 similarity index 58% rename from debian/config.mak-sse2 rename to debian/config.mak-core2 index 68e8257..73f0dcd 100644 --- a/debian/config.mak-sse2 +++ b/debian/config.mak-core2 @@ -1,4 +1,4 @@ # Automatically generated by configure - do not modify -FFDECSA_OPTS = "FLAGS=-O3 -fexpensive-optimizations -funroll-loops -mmmx -msse -msse2 -march=native" PARALLEL_MODE=PARALLEL_128_SSE2 COMPILER=g++ +FFDECSA_OPTS = "FLAGS=-O3 -fexpensive-optimizations -funroll-loops -mmmx -msse -msse2 -march=core2" PARALLEL_MODE=PARALLEL_128_SSE2 COMPILER=g++-4.6 DVB_DIR=#DVB_DIR# -CXX=g++ +CXX=g++-4.6 diff --git a/debian/control.source b/debian/control.source index 72295eb..083bbc9 100644 --- a/debian/control.source +++ b/debian/control.source @@ -3,7 +3,7 @@ Section: devel Priority: extra Maintainer: Jan-Pascal van Best Standards-Version: 3.9.4 -Build-Depends: debhelper (>= 8), libssl-dev (>= 1.0), +Build-Depends: debhelper (>= 8), libssl-dev (>= 1.0), gcc-4.6, g++-4.6, #LINUX_HEADERS# Package: sasc-ng-common diff --git a/debian/rules b/debian/rules index e726f49..7309040 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,8 @@ override_dh_auto_configure: override_dh_auto_clean: cd contrib/sasc-ng; if [ -r config.mak ]; then make clean module_clean; fi + rm -f contrib/sasc-ng/dvbloopback.o + rm -f contrib/sasc-ng/config.mak override_dh_auto_build: #cd contrib/sasc-ng; make module; make @@ -34,8 +36,8 @@ build_%: sed -e "s|#DVB_DIR#|$(CURDIR)/debian/includes/$$KERNEL/|" < debian/config.mak-$$FLAVOR > contrib/sasc-ng/config.mak; \ echo "Building $$VERSION - $$FLAVOR"; \ cd contrib/sasc-ng; \ - make module; \ - make; \ + make module CC=gcc-4.6 CXX=g++-4.6; \ + make CC=gcc-4.6 CXX=g++-4.6; \ mkdir -p $(CURDIR)/debian/tmp/$$KERNEL-$$FLAVOR/bin; \ mkdir -p $(CURDIR)/debian/tmp/$$KERNEL-$$FLAVOR/modules; \ mkdir -p $(CURDIR)/debian/tmp/$$KERNEL-$$FLAVOR/lib; \ @@ -83,7 +85,7 @@ debian/control-real: $(CONTROL_FILES) sed \ -e 's/#LINUX_HEADERS#/$(LINUX_HEADERS)/g' \ debian/control.source > debian/control.tmp - $(foreach f,$(KERNELS),$(call append-flavor-entries,$(f),$(KERNEL_VERSION_$(f)),sse2)) + $(foreach kernel,$(KERNELS),$(foreach flav,$(FFDECSA_FLAVORS),$(call append-flavor-entries,$(kernel),$(KERNEL_VERSION_$(kernel)),$(flav)))) mv debian/control.tmp debian/control $(foreach kernel,$(KERNELS),$(foreach flav,$(FFDECSA_FLAVORS),$(call create-flavor-install,$(kernel),$(flav)))) md5sum debian/control $^ > debian/control.md5sum diff --git a/debian/rules.defs b/debian/rules.defs index 5557168..f1dcbbc 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -1,7 +1,7 @@ KERNELS = 3.7-trunk-amd64 KERNEL_VERSION_3.7-trunk-amd64 = 3.7.1-1~experimental.2.sasc1 -# Even Atoms do sse2 -FFDECSA_FLAVORS = sse2 #sse +FFDECSA_FLAVORS = core2 athlon64 atom #sse # For the moment we just support amd64 +# .. so pentium4 is useless? -- 2.39.5