Skip to content
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.

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

Treat arm64 as aarch64 for Apple M1. #1316

Merged
merged 1 commit into from
Aug 15, 2022
Merged

Conversation

mtl1979
Copy link
Collaborator

@mtl1979 mtl1979 commented Jul 9, 2022

See #1315.

@codecov
Copy link

codecov bot commented Jul 9, 2022

Codecov Report

Merging #1316 (15301cd) into develop (a406284) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           develop    #1316   +/-   ##
========================================
  Coverage    86.51%   86.51%           
========================================
  Files          125      125           
  Lines        10670    10670           
  Branches      2664     2664           
========================================
  Hits          9231     9231           
+ Misses        1081     1079    -2     
- Partials       358      360    +2     
Flag Coverage Δ
macos_clang 32.60% <ø> (ø)
macos_gcc 73.88% <ø> (ø)
ubuntu_clang 85.19% <ø> (+0.13%) ⬆️
ubuntu_clang_debug 84.84% <ø> (ø)
ubuntu_clang_inflate_allow_invalid_dist 84.91% <ø> (ø)
ubuntu_clang_inflate_strict 85.02% <ø> (-0.14%) ⬇️
ubuntu_clang_mmap 85.34% <ø> (ø)
ubuntu_clang_pigz 40.08% <ø> (ø)
ubuntu_clang_pigz_no_optim 41.49% <ø> (ø)
ubuntu_clang_pigz_no_threads 39.67% <ø> (ø)
ubuntu_clang_reduced_mem 85.58% <ø> (ø)
ubuntu_gcc 75.69% <ø> (ø)
ubuntu_gcc_aarch64 77.41% <ø> (ø)
ubuntu_gcc_aarch64_compat_no_opt 75.75% <ø> (ø)
ubuntu_gcc_aarch64_no_acle 76.26% <ø> (ø)
ubuntu_gcc_aarch64_no_neon 76.30% <ø> (ø)
ubuntu_gcc_armhf 77.37% <ø> (ø)
ubuntu_gcc_armhf_compat_no_opt 75.60% <ø> (ø)
ubuntu_gcc_armhf_no_acle 77.37% <ø> (ø)
ubuntu_gcc_armhf_no_neon 77.26% <ø> (ø)
ubuntu_gcc_armsf 77.13% <ø> (ø)
ubuntu_gcc_armsf_compat_no_opt 75.28% <ø> (ø)
ubuntu_gcc_benchmark 74.13% <ø> (ø)
ubuntu_gcc_compat_no_opt 76.93% <ø> (ø)
ubuntu_gcc_compat_sprefix 74.20% <ø> (ø)
ubuntu_gcc_m32 73.57% <ø> (ø)
ubuntu_gcc_mingw_i686 0.00% <ø> (ø)
ubuntu_gcc_mingw_x86_64 0.00% <ø> (ø)
ubuntu_gcc_no_avx2 74.86% <ø> (ø)
ubuntu_gcc_no_ctz 74.95% <ø> (ø)
ubuntu_gcc_no_ctzll 74.98% <ø> (ø)
ubuntu_gcc_no_pclmulqdq 74.14% <ø> (ø)
ubuntu_gcc_no_sse2 75.02% <ø> (ø)
ubuntu_gcc_no_sse4 74.72% <ø> (-0.05%) ⬇️
ubuntu_gcc_o1 74.45% <ø> (ø)
ubuntu_gcc_osb ∅ <ø> (∅)
ubuntu_gcc_pigz 38.07% <ø> (ø)
ubuntu_gcc_pigz_aarch64 39.07% <ø> (-0.03%) ⬇️
ubuntu_gcc_ppc 73.65% <ø> (ø)
ubuntu_gcc_ppc64 74.52% <ø> (ø)
ubuntu_gcc_ppc64le 74.50% <ø> (ø)
ubuntu_gcc_ppc_no_power8 74.58% <ø> (ø)
ubuntu_gcc_s390x 74.91% <ø> (ø)
ubuntu_gcc_s390x_dfltcc 72.15% <ø> (ø)
ubuntu_gcc_s390x_dfltcc_compat 73.69% <ø> (ø)
ubuntu_gcc_s390x_no_crc32 74.70% <ø> (ø)
ubuntu_gcc_sparc64 74.81% <ø> (ø)
ubuntu_gcc_sprefix 73.72% <ø> (ø)
win64_gcc 74.03% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
gzlib.c 70.60% <0.00%> (ø)
test/minideflate.c 58.57% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a406284...15301cd. Read the comment docs.

@nmoinvaz
Copy link
Member

nmoinvaz commented Jul 9, 2022

Can you add " for Apple M1" to the commit message?

@mtl1979
Copy link
Collaborator Author

mtl1979 commented Jul 9, 2022

Can you add " for Apple M1" to the commit message?

Done.

@mtl1979 mtl1979 changed the title Treat arm64 as aarch64. Treat arm64 as aarch64 for Apple M1. Jul 9, 2022
@mtl1979
Copy link
Collaborator Author

mtl1979 commented Jul 9, 2022

I added __arm64__ to the cmake detection code for completeness... Some Apple compilers use __aarch64__ and some compilers use __arm64__.

@Dead2 Dead2 merged commit b18c815 into zlib-ng:develop Aug 15, 2022
@Dead2
Copy link
Member

Dead2 commented Aug 15, 2022

Should arm64 be added to feature checks around the code as well perhaps?

@mtl1979
Copy link
Collaborator Author

mtl1979 commented Aug 15, 2022

Should arm64 be added to feature checks around the code as well perhaps?

I don't have Apple M1 hardware, so testing where changes are really needed isn't easy and as such was best to leave as separate PR. I don't like to clutter the code with extraneous preprocessor checks just for the sake of being consistent.

@Dead2 Dead2 mentioned this pull request Dec 27, 2022
Dead2 added a commit that referenced this pull request Mar 7, 2023
Changes since 2.0.6:
- Fix CVE-2022-37434 #1328
- Fix chunkmemset #1196
- Fix deflateBound too small #1236
- Fix Z_SOLO #1263
- Fix ACLE variant of crc32 #1274
- Fix inflateBack #1311
- Fix deflate_quick windowsize #1431
- Fix DFLTCC bugs related to adler32 #1349 and #1390
- Fix warnings #1194 #1312 #1362
- MacOS build fix #1198
- Add invalid windowBits handling #1293
- Support for Force TZCNT #1186
- Support for aligned_alloc() #1360
- Minideflate improvements #1175 #1238
- Dont use unaligned access for memcpy #1309
- Build system #1209 #1233 #1267 #1273 #1278 #1292 #1316 #1318 #1365
- Test improvements #1208 #1227 #1241 #1353
- Cleanup #1266
- Documentation #1205 #1359
- Misc improvements #1294 #1297 #1306 #1344 #1348
- Backported zlib fixes
- Backported CI workflows from Develop branch
Dead2 added a commit that referenced this pull request Mar 17, 2023
Changes since 2.0.6:
- Fix CVE-2022-37434 #1328
- Fix chunkmemset #1196
- Fix deflateBound too small #1236
- Fix Z_SOLO #1263
- Fix ACLE variant of crc32 #1274
- Fix inflateBack #1311
- Fix deflate_quick windowsize #1431
- Fix DFLTCC bugs related to adler32 #1349 and #1390
- Fix warnings #1194 #1312 #1362
- MacOS build fix #1198
- Add invalid windowBits handling #1293
- Support for Force TZCNT #1186
- Support for aligned_alloc() #1360
- Minideflate improvements #1175 #1238
- Dont use unaligned access for memcpy #1309
- Build system #1209 #1233 #1267 #1273 #1278 #1292 #1316 #1318 #1365
- Test improvements #1208 #1227 #1241 #1353
- Cleanup #1266
- Documentation #1205 #1359
- Misc improvements #1294 #1297 #1306 #1344 #1348
- Backported zlib fixes
- Backported CI workflows from Develop branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants