[med-svn] [Git][med-team/simde][debian/experimental] 5 commits: Tweak -maltivec setting on ppc64

Mon Nov 23 09:00:33 GMT 2020


Michael R. Crusoe pushed to branch debian/experimental at Debian Med / simde


Commits:
2ddbe7c8 by Michael R. Crusoe at 2020-11-22T10:00:47+01:00
Tweak -maltivec setting on ppc64

- - - - -
38ce4677 by Michael R. Crusoe at 2020-11-22T10:01:31+01:00
debian/rules: Adjust compiler version loops to require all of them to pass

- - - - -
295ec982 by Michael R. Crusoe at 2020-11-22T13:17:04+01:00
debian/{rules,control}: switch to meson+ninja from cmake

- - - - -
08f5d935 by Michael R. Crusoe at 2020-11-23T09:26:04+01:00
Try patch from upstream to fix ppc64el test failure

- - - - -
ac666564 by Michael R. Crusoe at 2020-11-23T09:59:38+01:00
release 0.7.0~rc-1-2 to experimental

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/patches/series
- + debian/patches/simde_mm_cvtps_epi32_rounding_power_clang.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+simde (0.7.0~rc-1-2) experimental; urgency=medium
+
+  * debian/rules: Tweak -maltivec setting on ppc64
+  * debian/rules: Adjust compiler version loops to require all of them to pass
+                  and not just the last invocation.
+  * debian/{rules,control}: switch to meson+ninja from cmake
+  * Try patch from upstream to fix ppc64el test failure
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Mon, 23 Nov 2020 09:59:23 +0100
+
 simde (0.7.0~rc-1-1) experimental; urgency=medium
 
   * debian/watch: only find release candidates.


=====================================
debian/control
=====================================
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Michael R. Crusoe <crusoe at debian.org>
 Build-Depends: debhelper-compat (= 13),
-               cmake,
+               meson,
+               ninja-build,
                gcc-8,
                g++-8,
                gcc-9,


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 munit
+simde_mm_cvtps_epi32_rounding_power_clang.patch


=====================================
debian/patches/simde_mm_cvtps_epi32_rounding_power_clang.patch
=====================================
@@ -0,0 +1,31 @@
+From: Evan Nemerson <evan at nemerson.com>
+Date: Sun, 22 Nov 2020 00:03:39 -0800
+Subject: [PATCH] sse2: fix rounding of simde_mm_cvtps_epi32 on POWER on clang
+Origin: upstream, https://github.com/simd-everywhere/simde/commit/919b692079c392b840e509d5b4e77ff57d84eb7d
+
+---
+ simde/x86/sse2.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/simde/x86/sse2.h b/simde/x86/sse2.h
+index 8ac94c1d..098617ed 100644
+--- a/simde/x86/sse2.h
++++ b/simde/x86/sse2.h
+@@ -2615,14 +2615,14 @@ simde_mm_cvtps_epi32 (simde__m128 a) {
+       r_.neon_i32 = vcvtnq_s32_f32(a_.neon_f32);
+     #elif defined(SIMDE_ARM_NEON_A32V7_NATIVE) && defined(SIMDE_FAST_ROUND_TIES)
+       r_.neon_i32 = vcvtnq_s32_f32(a_.neon_f32);
+-    #elif defined(SIMDE_POWER_ALTIVEC_P6_NATIVE)
++    #elif defined(SIMDE_POWER_ALTIVEC_P6_NATIVE) && defined(SIMDE_FAST_ROUND_TIES)
+       HEDLEY_DIAGNOSTIC_PUSH
+       SIMDE_DIAGNOSTIC_DISABLE_C11_EXTENSIONS_
+       SIMDE_DIAGNOSTIC_DISABLE_VECTOR_CONVERSION_
+-      r_.altivec_i32 = vec_cts(vec_round(a_.altivec_f32), 0);
++      r_.altivec_i32 = vec_cts(a_.altivec_f32, 1);
+       HEDLEY_DIAGNOSTIC_POP
+     #else
+-      a_ = simde__m128_to_private(simde_mm_round_ps(simde__m128_from_private(a_), SIMDE_MM_FROUND_TO_NEAREST_INT));
++      a_ = simde__m128_to_private(simde_x_mm_round_ps(simde__m128_from_private(a_), SIMDE_MM_FROUND_TO_NEAREST_INT, 1));
+       SIMDE_VECTORIZE
+       for (size_t i = 0 ; i < (sizeof(r_.i32) / sizeof(r_.i32[0])) ; i++) {
+         r_.i32[i] = HEDLEY_STATIC_CAST(int32_t, a_.f32[i]);


=====================================
debian/rules
=====================================
@@ -17,40 +17,40 @@ GCC_VERS = 8 9 10
 CLANG_VERS = 9 10 11
 
 %:
-	dh $@ --sourcedirectory=test --builddirectory=gcc10_test
+	dh $@ --buildsystem=meson+ninja --builddirectory=gcc10_test
 
 override_dh_auto_configure:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
   ifeq (,$(filter $(DEB_HOST_ARCH),$(CLANG_SKIP)))
-	$(foreach VER,$(CLANG_VERS),CC=clang-$(VER) CXX=clang++-$(VER) dh_auto_configure --builddirectory=clang$(VER)_test --sourcedirectory=test; )
+	$(foreach VER,$(CLANG_VERS),CC=clang-$(VER) CXX=clang++-$(VER) dh_auto_configure --builddirectory=clang$(VER)_test --buildsystem=meson+ninja && ) true ;
   endif
 # According to https://wiki.debian.org/ArchitectureSpecificsMemo#Architecture_baselines
 # It is odd that gcc doesn't include this automatically, but clang does
 ifneq (,$(filter $(DEB_BUILD_ARCH),ppc64))
-	export DEB_CFLAGS_MAINT_APPEND+=-maltivec
-	export DEB_CXXFLAGS_MAINT_APPEND+=-maltivec
+export DEB_CFLAGS_MAINT_APPEND += -maltivec
+export DEB_CXXFLAGS_MAINT_APPEND += -maltivec
 endif
-	$(foreach VER,$(GCC_VERS),CC=gcc-$(VER) CXX=g++-$(VER) dh_auto_configure --builddirectory=gcc$(VER)_test --sourcedirectory=test; )
+	$(foreach VER,$(GCC_VERS),CC=gcc-$(VER) CXX=g++-$(VER) dh_auto_configure --builddirectory=gcc$(VER)_test --buildsystem=meson+ninja && ) true ;
 endif
 
 override_dh_auto_build:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	$(foreach VER,$(GCC_VERS),dh_auto_build --builddirectory=gcc$(VER)_test --sourcedirectory=test; )
+	$(foreach VER,$(GCC_VERS),dh_auto_build --builddirectory=gcc$(VER)_test --buildsystem=meson+ninja && ) true ;
   ifeq (,$(filter $(DEB_HOST_ARCH),$(CLANG_SKIP)))
-	$(foreach VER,$(CLANG_VERS),dh_auto_build --builddirectory=clang$(VER)_test --sourcedirectory=test; )
+	$(foreach VER,$(CLANG_VERS),dh_auto_build --builddirectory=clang$(VER)_test --buildsystem=meson+ninja && ) true ;
   endif
 endif
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	$(foreach VER,$(GCC_VERS),dh_auto_test --builddirectory=gcc$(VER)_test --sourcedirectory=test; )
+	$(foreach VER,$(GCC_VERS),dh_auto_test --builddirectory=gcc$(VER)_test --buildsystem=meson+ninja && ) true ;
   ifeq (,$(filter $(DEB_HOST_ARCH),$(CLANG_SKIP)))
-	$(foreach VER,$(CLANG_VERS),dh_auto_test --builddirectory=clang$(VER)_test --sourcedirectory=test; )
+	$(foreach VER,$(CLANG_VERS),dh_auto_test --builddirectory=clang$(VER)_test --buildsystem=meson+ninja && ) true ;
   endif
 endif
 
 override_dh_auto_clean:
-	$(foreach VER,$(GCC_VERS),dh_auto_clean --builddirectory=gcc$(VER)_test --sourcedirectory=test; )
+	$(foreach VER,$(GCC_VERS),dh_auto_clean --builddirectory=gcc$(VER)_test --buildsystem=meson+ninja ; )
 ifeq (,$(filter $(DEB_HOST_ARCH),$(CLANG_SKIP)))
-	$(foreach VER,$(CLANG_VERS),dh_auto_clean --builddirectory=clang$(VER)_test --sourcedirectory=test; )
+	$(foreach VER,$(CLANG_VERS),dh_auto_clean --builddirectory=clang$(VER)_test --buildsystem=meson+ninja ; )
 endif



View it on GitLab: https://salsa.debian.org/med-team/simde/-/compare/3ef1d9d0df92fafb89a68d1aad338ac665aae5c6...ac666564b6e55d2e26dadbf51c8306aa71b80654

-- 
View it on GitLab: https://salsa.debian.org/med-team/simde/-/compare/3ef1d9d0df92fafb89a68d1aad338ac665aae5c6...ac666564b6e55d2e26dadbf51c8306aa71b80654
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/20201123/be5f56c4/attachment-0001.html>
