Skip to content

Commit

Permalink
build: rework gyp files for zlib
Browse files Browse the repository at this point in the history 
Restructure the zlib.gyp file based on the upstream gn file, breaking
out the files with optimizations that need additional compiler flags.

Use a copy of the GN-scraper.py script to reduce the amount of hand
editing when the zlib dependency is updated.

PR-URL: #45589
Fixes: #32856
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Yagiz Nizipli <[email protected]>
  • Loading branch information
@richardlau @danielleadams
richardlau authored and danielleadams committed Dec 30, 2022
1 parent a7099f5 commit 4304674
Show file tree
Hide file tree
Showing 3 changed files with 212 additions and 97 deletions.
28 changes: 28 additions & 0 deletions deps/zlib/GN-scraper.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Copyright (c) 2019 Refael Ackeramnn<[email protected]>. All rights reserved.
# Use of this source code is governed by an MIT-style license.
import re
import os
import sys

PLAIN_SOURCE_RE = re.compile('\s*"([^/$].+)"\s*')
def DoMain(args):
gn_filename, pattern = args
src_root = os.path.dirname(gn_filename)
with open(gn_filename, 'rb') as gn_file:
gn_content = gn_file.read().decode('utf-8')

scraper_re = re.compile(pattern + r'\[([^\]]+)', re.DOTALL)
matches = scraper_re.search(gn_content)
match = matches.group(1)
files = []
for l in match.splitlines():
m2 = PLAIN_SOURCE_RE.match(l)
if not m2:
continue
files.append(m2.group(1))
# always use `/` since GYP will process paths further downstream
rel_files = ['"%s/%s"' % (src_root, f) for f in files]
return ' '.join(rel_files)

if __name__ == '__main__':
print(DoMain(sys.argv[1:]))
277 changes: 182 additions & 95 deletions deps/zlib/zlib.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

{
'variables': {
'ZLIB_ROOT': '.',
'use_system_zlib%': 0,
'arm_fpu%': '',
'llvm_version%': '0.0',
Expand All @@ -12,139 +13,225 @@
['use_system_zlib==0', {
'targets': [
{
'target_name': 'zlib',
'target_name': 'zlib_adler32_simd',
'type': 'static_library',
'conditions': [
['target_arch in "ia32 x64" and OS!="ios"', {
'defines': [ 'ADLER32_SIMD_SSSE3' ],
'conditions': [
['OS=="win"', {
'defines': [ 'X86_WINDOWS' ],
},{
'defines': [ 'X86_NOT_WINDOWS' ],
}],
['OS!="win" or llvm_version!="0.0"', {
'cflags': [ '-mssse3' ],
'xcode_settings': {
'OTHER_CFLAGS': [ '-mssse3' ],
},
}],
],
}],
['arm_fpu=="neon"', {
'defines': [ 'ADLER32_SIMD_NEON' ],
}],
],
'include_dirs': [ '<(ZLIB_ROOT)' ],
'direct_dependent_settings': {
'conditions': [
['target_arch in "ia32 x64" and OS!="ios"', {
'defines': [ 'ADLER32_SIMD_SSSE3' ],
'conditions': [
['OS=="win"', {
'defines': [ 'X86_WINDOWS' ],
},{
'defines': [ 'X86_NOT_WINDOWS' ],
}],
],
}],
['arm_fpu=="neon"', {
'defines': [ 'ADLER32_SIMD_NEON' ],
}],
],
'include_dirs': [ '<(ZLIB_ROOT)' ],
},
'sources': [
'<!@pymod_do_main(GN-scraper "<(ZLIB_ROOT)/BUILD.gn" "\\"zlib_adler32_simd\\".*?sources = ")',
],
}, # zlib_adler32_simd
{
'target_name': 'zlib_arm_crc32',
'type': 'static_library',
'conditions': [
['OS!="ios"', {
'conditions': [
['OS!="win" and llvm_version=="0.0"', {
'cflags': [ '-march=armv8-a+aes+crc' ],
}],
['OS=="android"', {
'defines': [ 'ARMV8_OS_ANDROID' ],
}],
['OS=="linux"', {
'defines': [ 'ARMV8_OS_LINUX' ],
}],
['OS=="mac"', {
'defines': [ 'ARMV8_OS_MACOS' ],
}],
['OS=="win"', {
'defines': [ 'ARMV8_OS_WINDOWS' ],
}],
],
'defines': [ 'CRC32_ARMV8_CRC32' ],
'include_dirs': [ '<(ZLIB_ROOT)' ],
'direct_dependent_settings': {
'defines': [ 'CRC32_ARMV8_CRC32' ],
'conditions': [
['OS=="android"', {
'defines': [ 'ARMV8_OS_ANDROID' ],
}],
['OS=="linux"', {
'defines': [ 'ARMV8_OS_LINUX' ],
}],
['OS=="mac"', {
'defines': [ 'ARMV8_OS_MACOS' ],
}],
['OS=="win"', {
'defines': [ 'ARMV8_OS_WINDOWS' ],
}],
],
'include_dirs': [ '<(ZLIB_ROOT)' ],
},
'sources': [
'<!@pymod_do_main(GN-scraper "<(ZLIB_ROOT)/BUILD.gn" "\\"zlib_arm_crc32\\".*?sources = ")',
],
}],
],
}, # zlib_arm_crc32
{
'target_name': 'zlib_crc32_simd',
'type': 'static_library',
'conditions': [
['OS!="win" or llvm_version!="0.0"', {
'cflags': [
'-msse4.2',
'-mpclmul',
],
'xcode_settings': {
'OTHER_CFLAGS': [
'-msse4.2',
'-mpclmul',
],
},
}]
],
'defines': [ 'CRC32_SIMD_SSE42_PCLMUL' ],
'include_dirs': [ '<(ZLIB_ROOT)' ],
'direct_dependent_settings': {
'defines': [ 'CRC32_SIMD_SSE42_PCLMUL' ],
'include_dirs': [ '<(ZLIB_ROOT)' ],
},
'sources': [
'adler32.c',
'compress.c',
'contrib/optimizations/insert_string.h',
'cpu_features.c',
'cpu_features.h',
'crc32.c',
'crc32.h',
'deflate.c',
'deflate.h',
'gzclose.c',
'gzguts.h',
'gzlib.c',
'gzread.c',
'gzwrite.c',
'infback.c',
'inffast.c',
'inffast.h',
'inffixed.h',
'inflate.h',
'inftrees.c',
'inftrees.h',
'trees.c',
'trees.h',
'uncompr.c',
'zconf.h',
'zlib.h',
'zutil.c',
'zutil.h',
'<!@pymod_do_main(GN-scraper "<(ZLIB_ROOT)/BUILD.gn" "\\"zlib_crc32_simd\\".*?sources = ")',
],
'include_dirs': [
'.',
}, # zlib_crc32_simd
{
'target_name': 'zlib_inflate_chunk_simd',
'type': 'static_library',
'conditions': [
['target_arch in "ia32 x64" and OS!="ios"', {
'defines': [ 'INFLATE_CHUNK_SIMD_SSE2' ],
'conditions': [
['target_arch=="x64"', {
'defines': [ 'INFLATE_CHUNK_READ_64LE' ],
}],
],
}],
['arm_fpu=="neon"', {
'defines': [ 'INFLATE_CHUNK_SIMD_NEON' ],
'conditions': [
['target_arch=="arm64"', {
'defines': [ 'INFLATE_CHUNK_READ_64LE' ],
}],
],
}],
],
'include_dirs': [ '<(ZLIB_ROOT)' ],
'direct_dependent_settings': {
'include_dirs': [
'.',
'conditions': [
['target_arch in "ia32 x64" and OS!="ios"', {
'defines': [ 'INFLATE_CHUNK_SIMD_SSE2' ],
}],
['arm_fpu=="neon"', {
'defines': [ 'INFLATE_CHUNK_SIMD_NEON' ],
}],
],
'include_dirs': [ '<(ZLIB_ROOT)' ],
},
'sources': [
'<!@pymod_do_main(GN-scraper "<(ZLIB_ROOT)/BUILD.gn" "\\"zlib_inflate_chunk_simd\\".*?sources = ")',
],
}, # zlib_inflate_chunk_simd
{
'target_name': 'zlib',
'type': 'static_library',
'sources': [
'<!@pymod_do_main(GN-scraper "<(ZLIB_ROOT)/BUILD.gn" "\\"zlib\\".*?sources = ")',
],
'include_dirs': [ '<(ZLIB_ROOT)' ],
'direct_dependent_settings': {
'include_dirs': [ '<(ZLIB_ROOT)' ],
},
'conditions': [
['OS!="win"', {
'cflags!': [ '-ansi' ],
'cflags': [ '-Wno-implicit-fallthrough' ],
'defines': [ 'HAVE_HIDDEN' ],
}],
['OS=="mac" or OS=="freebsd" or OS=="android"', {
['OS=="mac" or OS=="ios" or OS=="freebsd" or OS=="android"', {
# Mac, Android and the BSDs don't have fopen64, ftello64, or
# fseeko64. We use fopen, ftell, and fseek instead on these
# systems.
'defines': [
'USE_FILE32API'
],
}],
# Incorporate optimizations where possible.
['(target_arch in "ia32 x64" and OS!="ios") or arm_fpu=="neon"', {
'sources': [
'contrib/optimizations/chunkcopy.h',
'contrib/optimizations/inffast_chunk.c',
'contrib/optimizations/inffast_chunk.h',
'contrib/optimizations/inflate.c',
'slide_hash_simd.h'
],
'dependencies': [ 'zlib_inflate_chunk_simd' ],
'sources': [ '<(ZLIB_ROOT)/slide_hash_simd.h' ]
}, {
'sources': [ 'inflate.c', ],
'defines': [ 'CPU_NO_SIMD' ],
'sources': [ '<(ZLIB_ROOT)/inflate.c' ],
}],
# Incorporate optimizations where possible
['target_arch in "ia32 x64" and OS!="ios"', {
'defines': [
'ADLER32_SIMD_SSSE3',
'INFLATE_CHUNK_SIMD_SSE2',
'CRC32_SIMD_SSE42_PCLMUL',
'DEFLATE_SLIDE_HASH_SSE2'
],
'sources': [
'adler32_simd.c',
'adler32_simd.h',
'crc32_simd.c',
'crc32_simd.h',
'crc_folding.c'
'dependencies': [
'zlib_adler32_simd',
'zlib_crc32_simd',
],
'defines': [ 'DEFLATE_SLIDE_HASH_SSE2' ],
'conditions': [
['target_arch=="x64"', {
'defines': [ 'INFLATE_CHUNK_READ_64LE' ],
}],
['OS=="win"', {
'defines': [ 'X86_WINDOWS' ]
}, {
'defines': [ 'X86_NOT_WINDOWS' ]
}]
],
}],
['arm_fpu=="neon"', {
'defines': [ '__ARM_NEON__' ],
'defines': [
'__ARM_NEON__',
'DEFLATE_SLIDE_HASH_NEON',
],
'conditions': [
['OS=="win"', {
'defines': [
'ARMV8_OS_WINDOWS',
'DEFLATE_SLIDE_HASH_NEON',
'INFLATE_CHUNK_SIMD_NEON'
]
'defines': [ 'ARMV8_OS_WINDOWS' ],
}, {
'conditions': [
['OS!="ios"', {
'defines': [
'ADLER32_SIMD_NEON',
'CRC32_ARMV8_CRC32',
'DEFLATE_SLIDE_HASH_NEON',
'INFLATE_CHUNK_SIMD_NEON'
],
'sources': [
'adler32_simd.c',
'adler32_simd.h',
'crc32_simd.c',
'crc32_simd.h',
],
'conditions': [
['OS=="android"', {
'defines': [ 'ARMV8_OS_ANDROID' ],
}],
['OS=="linux"', {
'defines': [ 'ARMV8_OS_LINUX' ],
}],
['OS=="mac"', {
'defines': [ 'ARMV8_OS_MACOS' ],
}],
['llvm_version=="0.0"', {
'cflags': [
'-march=armv8-a+aes+crc',
],
}],
'dependencies': [
'zlib_adler32_simd',
'zlib_arm_crc32',
],
}]
]
}],
],
}],
['target_arch=="arm64"', {
'defines': [ 'INFLATE_CHUNK_READ_64LE' ],
Expand Down
4 changes: 2 additions & 2 deletions doc/contributing/maintaining-zlib.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ Update zlib:

```bash
git clone https://chromium.googlesource.com/chromium/src/third_party/zlib
cp deps/zlib/zlib.gyp deps/zlib/win32/zlib.def deps
cp deps/zlib/zlib.gyp deps/zlib/GN-scraper.py deps/zlib/win32/zlib.def deps
rm -rf deps/zlib zlib/.git
mv zlib deps/
mv deps/zlib.gyp deps/zlib/
mv deps/zlib.gyp deps/GN-scraper.py deps/zlib/
mkdir deps/zlib/win32
mv deps/zlib.def deps/zlib/win32
sed -i -- 's_^#include "chromeconf.h"_//#include "chromeconf.h"_' deps/zlib/zconf.h
Expand Down

0 comments on commit 4304674

Please sign in to comment.