[med-svn] [Git][med-team/simde][debian/experimental] 2 commits: Standalone test: fix for i386; use pkg-config

[Michael R. Crusoe (@crusoe)]

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


Commits:
658708b5 by Michael R. Crusoe at 2023-05-19T10:28:25+02:00
Standalone test: fix for i386; use pkg-config

pkg-config: add -Wno-psabi, remove -O3

- - - - -
dca8b7aa by Michael R. Crusoe at 2023-05-19T10:44:12+02:00
ready for upload to experimental

- - - - -


5 changed files:

- debian/changelog
- debian/patches/pkgconfig
- debian/tests/control
- debian/tests/run-unit-test
- debian/tests/standalone


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+simde (0.7.6-0~0exp1) experimental; urgency=medium
+
+  * Standalone test: use pkg-config
+  * pkg-config: Add "-Wno-psabi" (fixes standalone test for i386)
+                Don't pass "-O3" (even though we really recommend it)
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Fri, 19 May 2023 00:23:30 +0200
+
 simde (0.7.6-0~0exp0) experimental; urgency=medium
 
   * New upstream version


=====================================
debian/patches/pkgconfig
=====================================
@@ -9,7 +9,7 @@ These are supported by both GCC 4.9+ and Clang 6+
      version : meson.project_version(),
      name : 'SIMDe',
      filebase : 'simde',
-+    extra_cflags: ['-DSIMDE_ENABLE_OPENMP', '-fopenmp-simd', '-O3'],
++    extra_cflags: ['-DSIMDE_ENABLE_OPENMP', '-fopenmp-simd', '-Wno-psabi'],
      description : 'Portable SIMD wrapper library')
  endif
- 
+


=====================================
debian/tests/control
=====================================
@@ -1,5 +1,5 @@
 Tests: standalone
-Depends: libsimde-dev, gcc, g++
+Depends: libsimde-dev, gcc, g++, pkgconf
 
 Tests: run-unit-test
 Depends: libsimde-dev, gcc, g++, meson, ninja-build, dpkg-dev


=====================================
debian/tests/run-unit-test
=====================================
@@ -20,41 +20,41 @@ cp -r /usr/include/simde ./
 cp -r ${SOURCE}/test ./
 cp -r ${SOURCE}/meson* ./
 
-if [ "$(dpkg-architecture -qDEB_HOST_ARCH)" = "i386" ] ; then
-  # https://github.com/simd-everywhere/simde/issues/867
-  sed -i "/'dbsad'/d" meson.build
-  rm -f test/x86/avx512/dbsad.c
-fi
-
-if [ "$(dpkg-architecture -qDEB_HOST_ARCH)" = "s390x" ] ; then
-  # https://github.com/simd-everywhere/simde/issues/641
-  sed -i "/'madd'/d" meson.build
-  sed -i "/'qdmulh'/d" meson.build
-  sed -i "/'qdmulh_lane'/d" meson.build
-  sed -i "/'qdmulh_n'/d" meson.build
-  rm -f test/x86/avx512/madd.c
-  rm -f test/arm/neon/qdmulh.c
-  rm -f test/arm/neon/qdmulh_lane.c
-  rm -f test/arm/neon/qdmulh_n.c
-fi
-
-if [ "$(dpkg-architecture -qDEB_HOST_ARCH)" = "ppc64el" ] ; then
-  #https://github.com/simd-everywhere/simde/issues/986
-  sed -i "/'mul'/d" test/wasm/simd128/meson.build
-  sed -i "/'shr'/d" test/wasm/simd128/meson.build
-  sed -i "/'trunc_sat'/d" test/wasm/simd128/meson.build
-  rm -f test/wasm/simd128/mul.c
-  rm -f test/wasm/simd128/shr.c
-  rm -f test/wasm/simd128/trunc_sat.c
-  export CFLAGS=-O2
-  export CXXFLAGS=-O2
-fi
+# if [ "$(dpkg-architecture -qDEB_HOST_ARCH)" = "i386" ] ; then
+#   # https://github.com/simd-everywhere/simde/issues/867
+#   sed -i "/'dbsad'/d" meson.build
+#   rm -f test/x86/avx512/dbsad.c
+# fi
+#
+# if [ "$(dpkg-architecture -qDEB_HOST_ARCH)" = "s390x" ] ; then
+#   # https://github.com/simd-everywhere/simde/issues/641
+#   sed -i "/'madd'/d" meson.build
+#   sed -i "/'qdmulh'/d" meson.build
+#   sed -i "/'qdmulh_lane'/d" meson.build
+#   sed -i "/'qdmulh_n'/d" meson.build
+#   rm -f test/x86/avx512/madd.c
+#   rm -f test/arm/neon/qdmulh.c
+#   rm -f test/arm/neon/qdmulh_lane.c
+#   rm -f test/arm/neon/qdmulh_n.c
+# fi
+#
+# if [ "$(dpkg-architecture -qDEB_HOST_ARCH)" = "ppc64el" ] ; then
+#   #https://github.com/simd-everywhere/simde/issues/986
+#   sed -i "/'mul'/d" test/wasm/simd128/meson.build
+#   sed -i "/'shr'/d" test/wasm/simd128/meson.build
+#   sed -i "/'trunc_sat'/d" test/wasm/simd128/meson.build
+#   rm -f test/wasm/simd128/mul.c
+#   rm -f test/wasm/simd128/shr.c
+#   rm -f test/wasm/simd128/trunc_sat.c
+#   export CFLAGS=-O2
+#   export CXXFLAGS=-O2
+# fi
 
 mkdir build-gcc build-clang
 
 cd build-gcc
 CC=gcc CXX=g++ meson ..
-meson test -v --print-errorlogs $(meson test --list | grep -v emul)
+meson test --print-errorlogs
 
 # cd ../build-clang
 # CC=clang CXX=clang++ meson ..


=====================================
debian/tests/standalone
=====================================
@@ -3,6 +3,8 @@ set -e
 
 pkg=simde
 
+PKG_CONFIG="${PKG_CONFIG:-pkg-config}"
+
 export LC_ALL=C.UTF-8
 if [ "${AUTOPKGTEST_TMP}" = "" ] ; then
   AUTOPKGTEST_TMP=$(mktemp -d /tmp/${pkg}-test.XXXXXX)
@@ -12,7 +14,7 @@ if [ "${AUTOPKGTEST_TMP}" = "" ] ; then
   trap "rm -rf ${AUTOPKGTEST_TMP}" 0 INT QUIT ABRT PIPE TERM
 fi
 
-cd ${AUTOPKGTEST_TMP}
+cd "${AUTOPKGTEST_TMP}"
 
 cat > test.c <<EOM
       #include <assert.h>
@@ -29,5 +31,5 @@ cat > test.c <<EOM
       }
 EOM
 
-cc test.c -o test
+cc $("${PKG_CONFIG}" simde --cflags) test.c -o test
 ./test



View it on GitLab: https://salsa.debian.org/med-team/simde/-/compare/e64c71ec1bb6da4c8844874f9b2be6b014dabb47...dca8b7aadc4e897e1b8cdf8337f894286f59f485

-- 
View it on GitLab: https://salsa.debian.org/med-team/simde/-/compare/e64c71ec1bb6da4c8844874f9b2be6b014dabb47...dca8b7aadc4e897e1b8cdf8337f894286f59f485
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/20230519/12fcbd3b/attachment-0001.htm>