Skip to content

gh-91349: Replace zlib with zlib-ng in Windows build #131438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 19, 2025
Merged

gh-91349: Replace zlib with zlib-ng in Windows build #131438

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
de56164
gh-91349: Replace zlib with zlib-ng in Windows build
zooba Mar 19, 2025
1347c50
Updated readme.txt
zooba Mar 19, 2025
7fd8f26
Fix includes for PGO build
zooba Mar 19, 2025
f919749
Use correct include dirs
zooba Mar 19, 2025
fb6500d
Add NEWS
zooba Mar 19, 2025
89d44a1
Fix debug reference and some warnings
zooba Mar 19, 2025
08eecb1
Exclude Intel optimizations better on ARM64
zooba Mar 19, 2025
548daa7
Update docs and whatsnew
zooba Mar 19, 2025
f108044
Remove unresolved reference from docs
zooba Mar 19, 2025
085fa10
Include ZLIBNG_VERSION in pythoninfo
zooba Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Exclude Intel optimizations better on ARM64
  • Loading branch information
@zooba
zooba committed Mar 19, 2025
commit 08eecb1540b55a8da6074c53a2f2d0e01e9844bd
11 changes: 8 additions & 3 deletions PCbuild/zlib-ng.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,10 @@
<LanguageStandard_C>stdc11</LanguageStandard_C>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<AdditionalIncludeDirectories>$(zlibNgDir);$(PySourceDir)PC;$(GeneratedZlibNgDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions);ZLIB_COMPAT;WITH_GZFILEOP;NO_FSEEKO;HAVE_BUILTIN_ASSUME_ALIGNED;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;X86_FEATURES;X86_HAVE_XSAVE_INTRIN;X86_SSE2;X86_SSSE3;X86_SSE42;X86_PCLMULQDQ_CRC;X86_AVX2;X86_AVX512;X86_AVX512VNNI;X86_VPCLMULQDQ_CRC</PreprocessorDefinitions>
<PreprocessorDefinitions>%(PreprocessorDefinitions);ZLIB_COMPAT;WITH_GZFILEOP;NO_FSEEKO;HAVE_BUILTIN_ASSUME_ALIGNED;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="$(Platform) == 'Win32' or $(Platform) == 'x64'">%(PreprocessorDefinitions);X86_FEATURES;X86_HAVE_XSAVE_INTRIN;X86_SSE2;X86_SSSE3;X86_SSE42;X86_PCLMULQDQ_CRC;X86_AVX2;X86_AVX512;X86_AVX512VNNI;X86_VPCLMULQDQ_CRC</PreprocessorDefinitions>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this mean that for all executables X86_AVX512 code will be emitted and used?
See e.g. adler32_avx512.c, where the whole file is guarded with X86_AVX512 and there is code like __m512i in it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it's detected and called dynamically based on availability, but it's all compiled at compile time.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I hope so, too.

<PreprocessorDefinitions Condition="$(Configuration) == 'Debug'">%(PreprocessorDefinitions);ZLIB_DEBUG</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<EnableEnhancedInstructionSet Condition="$(Platform) == 'Win32' or $(Platform) == 'x64'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unconditionally letting the compiler generate code up to AVX2 for all *.c files here might result in the binary not running on all CPUs?

</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down Expand Up @@ -130,9 +131,11 @@
<ClCompile Include="$(zlibNgDir)\zutil.c" />
<ClCompile Include="$(zlibNgDir)\cpu_features.c" />
<ClInclude Include="$(zlibNgDir)\arch\generic\generic_functions.h" />
<ClInclude Include="$(zlibNgDir)\fallback_builtins.h" />
</ItemGroup>
<ItemGroup Condition="$(Platform) == 'Win32' or $(Platform) == 'x64'">
<ClInclude Include="$(zlibNgDir)\arch\x86\x86_functions.h" />
<ClInclude Include="$(zlibNgDir)\arch\x86\x86_features.h" />
<ClInclude Include="$(zlibNgDir)\fallback_builtins.h" />
<ClInclude Include="$(zlibNgDir)\arch\x86\adler32_avx512_p.h" />
<ClCompile Include="$(zlibNgDir)\arch\x86\x86_features.c" />
<ClCompile Include="$(zlibNgDir)\arch\x86\chunkset_sse2.c" />
Expand All @@ -150,6 +153,8 @@
<ClCompile Include="$(zlibNgDir)\arch\x86\chunkset_avx512.c" />
<ClCompile Include="$(zlibNgDir)\arch\x86\adler32_avx512_vnni.c" />
<ClCompile Include="$(zlibNgDir)\arch\x86\crc32_vpclmulqdq.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\PC\zconf.h" />
<ClInclude Include="..\PC\zlib.h" />
<ClInclude Include="$(zlibNgDir)\arch\generic\chunk_permute_table.h" />
Expand Down
Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy