[med-svn] [Git][med-team/vg][master] Build all SIMD variants on i386, even those "higher" than ssse3

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / vg


Commits:
bc3d18ce by Michael R. Crusoe at 2020-05-23T10:31:42+02:00
Build all SIMD variants on i386, even those "higher" than ssse3

- - - - -


3 changed files:

- debian/bin/simd-dispatch
- debian/changelog
- debian/rules


Changes:

=====================================
debian/bin/simd-dispatch
=====================================
@@ -14,7 +14,7 @@ function test_and_run () {
 	fi
 }
 
-for SIMD in avx2 avx sse4.1 ssse3 sse3 sse2 sse mmx ; do test_and_run ${SIMD} "$@" ; done
+for SIMD in avx2 avx sse4.1 ssse3 sse3 sse2 sse ; do test_and_run ${SIMD} "$@" ; done
 
 # fallback to plain option
 $BASE-plain "$@"


=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+vg (1.23.0+ds-3) UNRELEASED; urgency=medium
+
+  * Build all SIMD variants on i386, even those "higher" than ssse3
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Sun, 17 May 2020 10:55:42 +0200
+
 vg (1.23.0+ds-2) unstable; urgency=medium
 
   * Switch to libsimde-dev from code copy


=====================================
debian/rules
=====================================
@@ -29,25 +29,23 @@ override_dh_auto_clean:
 
 override_dh_auto_build-arch:
 	mkdir -p $(CURDIR)/debian/help
-ifeq (amd64,$(DEB_HOST_ARCH))
+ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386))
 	mkdir -p $(prefix)
 	mkdir -p $(libexecdir)
-	for SIMD in avx2 avx sse4.1 ssse3 sse3 sse2 ; do \
+	for SIMD in avx2 avx sse4.1 ssse3 sse3 ; do \
 		export CXXFLAGS="$(CXXFLAGS) -m$${SIMD}" && export CFLAGS="$(CFLAGS) -m$${SIMD}" && \
 		make clean ; \
 		dh_auto_build -- SFX=-$${SIMD} all test/build_graph bin/shuf ; \
 	done
-	cp bin/vg-sse2 debian/help/vg
-else ifeq (i386,$(DEB_HOST_ARCH))
-	mkdir -p $(prefix)
-	mkdir -p $(libexecdir)
-	for SIMD in ssse3 sse3 sse2 sse mmx; do \
+	CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" dh_auto_build -- SFX=-plain all test/build_graph bin/shuf
+	cp bin/vg-plain debian/help/vg
+ifeq (i386,$(DEB_HOST_ARCH))
+	for SIMD in sse2 sse ; do \
 		export CXXFLAGS="$(CXXFLAGS) -m$${SIMD}" && export CFLAGS="$(CFLAGS) -m$${SIMD}" && \
 		make clean ; \
 		dh_auto_build -- SFX=-$${SIMD} ; \
 	done
-	dh_auto_build -- SFX=-plain all test/build_graph bin/shuf
-	cp bin/vg-plain debian/help/vg
+endif
 else
 	dh_auto_build -- all test/build_graph bin/shuf
 	cp bin/vg debian/help/
@@ -72,14 +70,7 @@ ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
 endif
 
 override_dh_auto_install-arch:
-ifeq (amd64,$(DEB_HOST_ARCH))
-	dh_install debian/bin/simd-dispatch /usr/lib/$(DEB_SOURCE)/
-	dh_install bin/vg* usr/lib/$(DEB_SOURCE)/
-	mkdir -p $(prefix)/bin
-	cd $(prefix)/bin \
-		&& for prog in vg ; do \
-		ln -s ../lib/$(DEB_SOURCE)/simd-dispatch $${prog} ; done
-else ifeq (i386,$(DEB_HOST_ARCH))
+ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386))
 	dh_install debian/bin/simd-dispatch /usr/lib/$(DEB_SOURCE)/
 	dh_install bin/vg* usr/lib/$(DEB_SOURCE)/
 	mkdir -p $(prefix)/bin



View it on GitLab: https://salsa.debian.org/med-team/vg/-/commit/bc3d18ce90daab042045b5ebdecc0fe52790d819

-- 
View it on GitLab: https://salsa.debian.org/med-team/vg/-/commit/bc3d18ce90daab042045b5ebdecc0fe52790d819
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200523/4be4fc19/attachment-0001.html>