Merge pull request #39 from intel/kai/fix-cmake-and-ci

cmake build and CI fixes
intel · Dec 1, 2022 · d9c2508 · d9c2508
2 parents 6160a8f + 9593726
commit d9c2508
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 63 deletions.
diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml
@@ -21,67 +21,67 @@ jobs:
             build-dir: ../build
             src-dir: ../zlib
 
-          - name: Ubuntu GCC ARM SF
-            os: ubuntu-latest
-            compiler: arm-linux-gnueabi-gcc
-            configure-args: --warn
-            chost: arm-linux-gnueabi
-            packages: qemu qemu-user gcc-arm-linux-gnueabi libc-dev-armel-cross
-            qemu-run: qemu-arm -L /usr/arm-linux-gnueabi
-
-          - name: Ubuntu GCC ARM HF
-            os: ubuntu-latest
-            compiler: arm-linux-gnueabihf-gcc
-            configure-args: --warn
-            chost: arm-linux-gnueabihf
-            packages: qemu qemu-user gcc-arm-linux-gnueabihf libc-dev-armhf-cross
-            qemu-run: qemu-arm -L /usr/arm-linux-gnueabihf
-
-          - name: Ubuntu GCC AARCH64
-            os: ubuntu-latest
-            compiler: aarch64-linux-gnu-gcc
-            configure-args: --warn
-            chost: aarch64-linux-gnu
-            packages: qemu qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross
-            qemu-run: qemu-aarch64 -L /usr/aarch64-linux-gnu
-
-          - name: Ubuntu GCC PPC
-            os: ubuntu-latest
-            compiler: powerpc-linux-gnu-gcc
-            configure-args: --warn --static
-            chost: powerpc-linux-gnu
-            packages: qemu qemu-user gcc-powerpc-linux-gnu libc-dev-powerpc-cross
-            qemu-run: qemu-ppc -L /usr/powerpc-linux-gnu
-            cflags: -static
-            ldflags: -static
-
-          - name: Ubuntu GCC PPC64
-            os: ubuntu-latest
-            compiler: powerpc64-linux-gnu-gcc
-            configure-args: --warn --static
-            chost: powerpc-linux-gnu
-            packages: qemu qemu-user gcc-powerpc64-linux-gnu libc-dev-ppc64-cross
-            qemu-run: qemu-ppc64 -L /usr/powerpc64-linux-gnu
-            cflags: -static
-            ldflags: -static
-
-          - name: Ubuntu GCC PPC64LE
-            os: ubuntu-latest
-            compiler: powerpc64le-linux-gnu-gcc
-            configure-args: --warn
-            chost: powerpc64le-linux-gnu
-            packages: qemu qemu-user gcc-powerpc64le-linux-gnu libc-dev-ppc64el-cross
-            qemu-run: qemu-ppc64le -L /usr/powerpc64le-linux-gnu
-
-          - name: Ubuntu GCC S390X
-            os: ubuntu-latest
-            compiler: s390x-linux-gnu-gcc
-            configure-args: --warn --static
-            chost: s390x-linux-gnu
-            packages: qemu qemu-user gcc-s390x-linux-gnu libc-dev-s390x-cross
-            qemu-run: qemu-s390x -L /usr/s390x-linux-gnu
-            cflags: -static
-            ldflags: -static
+#          - name: Ubuntu GCC ARM SF
+#            os: ubuntu-latest
+#            compiler: arm-linux-gnueabi-gcc
+#            configure-args: --warn
+#            chost: arm-linux-gnueabi
+#            packages: qemu qemu-user gcc-arm-linux-gnueabi libc-dev-armel-cross
+#            qemu-run: qemu-arm -L /usr/arm-linux-gnueabi
+#
+#          - name: Ubuntu GCC ARM HF
+#            os: ubuntu-latest
+#            compiler: arm-linux-gnueabihf-gcc
+#            configure-args: --warn
+#            chost: arm-linux-gnueabihf
+#            packages: qemu qemu-user gcc-arm-linux-gnueabihf libc-dev-armhf-cross
+#            qemu-run: qemu-arm -L /usr/arm-linux-gnueabihf
+#
+#          - name: Ubuntu GCC AARCH64
+#            os: ubuntu-latest
+#            compiler: aarch64-linux-gnu-gcc
+#            configure-args: --warn
+#            chost: aarch64-linux-gnu
+#            packages: qemu qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross
+#            qemu-run: qemu-aarch64 -L /usr/aarch64-linux-gnu
+#
+#          - name: Ubuntu GCC PPC
+#            os: ubuntu-latest
+#            compiler: powerpc-linux-gnu-gcc
+#            configure-args: --warn --static
+#            chost: powerpc-linux-gnu
+#            packages: qemu qemu-user gcc-powerpc-linux-gnu libc-dev-powerpc-cross
+#            qemu-run: qemu-ppc -L /usr/powerpc-linux-gnu
+#            cflags: -static
+#            ldflags: -static
+#
+#          - name: Ubuntu GCC PPC64
+#            os: ubuntu-latest
+#            compiler: powerpc64-linux-gnu-gcc
+#            configure-args: --warn --static
+#            chost: powerpc-linux-gnu
+#            packages: qemu qemu-user gcc-powerpc64-linux-gnu libc-dev-ppc64-cross
+#            qemu-run: qemu-ppc64 -L /usr/powerpc64-linux-gnu
+#            cflags: -static
+#            ldflags: -static
+#
+#          - name: Ubuntu GCC PPC64LE
+#            os: ubuntu-latest
+#            compiler: powerpc64le-linux-gnu-gcc
+#            configure-args: --warn
+#            chost: powerpc64le-linux-gnu
+#            packages: qemu qemu-user gcc-powerpc64le-linux-gnu libc-dev-ppc64el-cross
+#            qemu-run: qemu-ppc64le -L /usr/powerpc64le-linux-gnu
+#
+#          - name: Ubuntu GCC S390X
+#            os: ubuntu-latest
+#            compiler: s390x-linux-gnu-gcc
+#            configure-args: --warn --static
+#            chost: s390x-linux-gnu
+#            packages: qemu qemu-user gcc-s390x-linux-gnu libc-dev-s390x-cross
+#            qemu-run: qemu-s390x -L /usr/s390x-linux-gnu
+#            cflags: -static
+#            ldflags: -static
 
           - name: macOS GCC
             os: macos-latest

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -107,21 +107,32 @@ set(ZLIB_SRCS
     adler32.c
     compress.c
     crc32.c
+    crc_folding.c
     deflate.c
+    deflate_medium.c
+    deflate_quick.c
     gzclose.c
     gzlib.c
     gzread.c
     gzwrite.c
-    inflate.c
     infback.c
-    inftrees.c
     inffast.c
+    inflate.c
+    inftrees.c
+    match.c
+    slide_sse.c
     trees.c
     uncompr.c
     x86.c
     zutil.c
 )
 
+if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
+    set_source_files_properties(crc_folding.c PROPERTIES COMPILE_OPTIONS "-mpclmul;-msse4")
+    set_source_files_properties(slide_sse.c PROPERTIES COMPILE_OPTIONS -msse2)
+    set_source_files_properties(deflate_quick.c PROPERTIES COMPILE_OPTIONS -msse4)
+endif()
+
 if(NOT MINGW)
     set(ZLIB_DLL_SRCS
         win32/zlib1.rc # If present will override custom build rule below.