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.

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

Jump to bottom

[cmake] Patch tbb for Apple M1 (issue #6903). #7020

Merged
merged 2 commits into from
Jan 13, 2021
Merged

[cmake] Patch tbb for Apple M1 (issue #6903). #7020

merged 2 commits into from
Jan 13, 2021

Conversation

Axel-Naumann
Copy link
Member

Apply patch from uxlfoundation/oneTBB#258

@Axel-Naumann Axel-Naumann requested a review from oshadura January 12, 2021 09:22
@Axel-Naumann Axel-Naumann self-assigned this Jan 12, 2021
@phsft-bot
Copy link
Collaborator

Starting build on ROOT-debian10-i386/cxx14, ROOT-fedora30/cxx14, ROOT-fedora31/noimt, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

@Axel-Naumann Axel-Naumann modified the milestones: 6.24/00, 6.22/08 Jan 12, 2021
@Axel-Naumann Axel-Naumann linked an issue Jan 12, 2021 that may be closed by this pull request
Builtin TBB is broken on MacOS M1 #6903
Closed
1 task
@phsft-bot
Copy link
Collaborator

Starting build on ROOT-debian10-i386/cxx14, ROOT-fedora30/cxx14, ROOT-fedora31/noimt, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

@phsft-bot
Copy link
Collaborator

Build failed on mac11.0/cxx17.
Running on macphsft20.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-ubuntu16/nortcxxmod.
Running on sft-ubuntu-1604-1.cern.ch:/build/workspace/root-pullrequests-build
See console output.

Failing tests:

And 440 more

@oshadura
Copy link
Contributor

@phsft-bot build just on mac11.0/cxx17

@phsft-bot
Copy link
Collaborator

Starting build on mac11.0/cxx17
How to customize builds

@oshadura
Copy link
Contributor

@Axel-Naumann do you know if mac11.0/cxx17 is M1 or I mistaken :)?

@Axel-Naumann
Copy link
Member Author

@phsft-bot build just on mac11arm/cxx17

@phsft-bot
Copy link
Collaborator

Didn't recognize mac11arm/cxx17 aborting build.

@Axel-Naumann
Copy link
Member Author

@phsft-bot build just on mac11arm/cxx17

@phsft-bot
Copy link
Collaborator

Starting build on mac11arm/cxx17
How to customize builds

@phsft-bot
Copy link
Collaborator

Build failed on mac11arm/cxx17.
Running on macphsft24.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Errors:

  • [2021-01-12T17:57:12.631Z] CMake Error at cmake/modules/SearchInstalledSoftware.cmake:1622 (message):
  • [2021-01-12T17:57:12.894Z] CMake Error at /Users/sftnight/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1077 (message):

@Axel-Naumann
Copy link
Member Author

Phew. @oshadura we have mac11.0 and mac11arm. I might rename mac11.0 to mac11intel at some point... After all, "11" from "mac11" corresponds to the "14" from "mac10.14" these days: the next version will be macOS 12...

@Axel-Naumann
Copy link
Member Author

@phsft-bot build just on mac11arm/cxx17

@phsft-bot
Copy link
Collaborator

Starting build on mac11arm/cxx17
How to customize builds

@phsft-bot
Copy link
Collaborator

Build failed on mac11arm/cxx17.
Running on macphsft24.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Errors:

  • [2021-01-12T18:13:49.746Z] FAILED: TBB-prefix/src/TBB-stamp/TBB-patch

@phsft-bot
Copy link
Collaborator

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos8-multicore/default, ROOT-fedora30/cxx14, ROOT-fedora31/noimt, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-fedora31/noimt.
Running on root-fedora-31-1.cern.ch:/build/workspace/root-pullrequests-build
See console output.

Failing tests:

And 6 more

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-fedora30/cxx14.
Running on root-fedora30-1.cern.ch:/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-debian10-i386/cxx14.
Running on pcepsft10.dyndns.cern.ch:/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-ubuntu16/nortcxxmod.
Running on sft-ubuntu-1604-1.cern.ch:/build/workspace/root-pullrequests-build
See console output.

Failing tests:

And 440 more

@phsft-bot
Copy link
Collaborator

Build failed on mac11.0/cxx17.
Running on macphsft20.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

@Axel-Naumann
Copy link
Member Author

@phsft-bot build just on mac11arm/cxx17

@phsft-bot
Copy link
Collaborator

Starting build on mac11arm/cxx17
How to customize builds

@phsft-bot
Copy link
Collaborator

Build failed on mac11arm/cxx17.
Running on macphsft24.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Errors:

  • [2021-01-13T13:52:29.931Z] FAILED: test/CMakeFiles/test-veccore.dir/test-veccore.cxx.o
  • [2021-01-13T13:52:29.931Z] include/VecCore/Backend/Vc.h:21:19: error: no template named 'VcScalarT'; did you mean 'vecCore::backend::VcScalarT'?
  • [2021-01-13T13:52:29.931Z] include/VecCore/Backend/Vc.h:22:19: error: unknown type name 'VcScalar'; did you mean 'vecCore::backend::VcScalar'?

Warnings:

  • [2021-01-13T13:52:30.209Z] include/tbb/machine/macos_common.h:55:13: warning: 'OSAtomicCompareAndSwap64Barrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_compare_exchange_strong() from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T13:52:30.209Z] include/tbb/machine/macos_common.h:59:28: warning: 'OSAtomicAdd64' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_fetch_add_explicit(std::memory_order_relaxed) from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T13:52:30.209Z] include/tbb/machine/macos_common.h:100:13: warning: 'OSAtomicCompareAndSwap32Barrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_compare_exchange_strong() from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T13:52:30.209Z] include/tbb/machine/macos_common.h:110:12: warning: 'OSAtomicAdd32Barrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_fetch_add() from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T13:52:30.209Z] include/tbb/machine/macos_common.h:116:12: warning: 'OSAtomicAdd64Barrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_fetch_add() from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T13:52:30.209Z] include/tbb/tbb_machine.h:339:31: warning: 'OSMemoryBarrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_thread_fence() from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T13:52:30.209Z] include/tbb/tbb_machine.h:608:9: warning: 'OSMemoryBarrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_thread_fence() from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T13:52:30.209Z] include/tbb/tbb_machine.h:612:9: warning: 'OSMemoryBarrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_thread_fence() from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T13:52:30.209Z] include/tbb/tbb_machine.h:635:9: warning: 'OSMemoryBarrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_thread_fence() from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T13:52:30.209Z] include/tbb/tbb_machine.h:645:9: warning: 'OSMemoryBarrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_thread_fence() from <atomic> instead [-Wdeprecated-declarations]

oshadura
oshadura approved these changes Jan 13, 2021
View reviewed changes
Copy link
Contributor

@oshadura oshadura left a comment

Choose a reason for hiding this comment

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

Looks like it is missing one more patch (deprecated warnings from xcode). I think we can merge this PR and resolve warnings in different PR.

@Axel-Naumann
Copy link
Member Author

@phsft-bot build just on mac11arm/cxx17 with flags -DVc=Off -Dbuiltin_vc=Off

@phsft-bot
Copy link
Collaborator

Starting build on mac11arm/cxx17 with flags -DVc=Off -Dbuiltin_vc=Off
How to customize builds

@phsft-bot
Copy link
Collaborator

Build failed on mac11arm/cxx17.
Running on macphsft24.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Errors:

  • [2021-01-13T14:14:38.726Z] FAILED: math/mathcore/CMakeFiles/MathCore.dir/src/MixMaxEngineImpl17.cxx.o
  • [2021-01-13T14:14:38.726Z] /Users/sftnight/build/workspace/root-pullrequests-build/root/math/mathcore/src/mixmax.icc:260:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
  • [2021-01-13T14:14:38.726Z] /Users/sftnight/build/workspace/root-pullrequests-build/root/math/mathcore/src/mixmax.icc:260:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
  • [2021-01-13T14:14:38.726Z] /Users/sftnight/build/workspace/root-pullrequests-build/root/math/mathcore/src/mixmax.icc:260:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
  • [2021-01-13T14:14:38.726Z] /Users/sftnight/build/workspace/root-pullrequests-build/root/math/mathcore/src/mixmax.icc:260:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
  • [2021-01-13T14:14:38.726Z] /Users/sftnight/build/workspace/root-pullrequests-build/root/math/mathcore/src/mixmax.icc:260:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
  • [2021-01-13T14:14:38.726Z] FAILED: math/mathcore/CMakeFiles/MathCore.dir/src/MixMaxEngineImpl240.cxx.o
  • [2021-01-13T14:14:38.727Z] /Users/sftnight/build/workspace/root-pullrequests-build/root/math/mathcore/src/mixmax.icc:260:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
  • [2021-01-13T14:14:38.727Z] /Users/sftnight/build/workspace/root-pullrequests-build/root/math/mathcore/src/mixmax.icc:260:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
  • [2021-01-13T14:14:38.727Z] /Users/sftnight/build/workspace/root-pullrequests-build/root/math/mathcore/src/mixmax.icc:260:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]

And 8 more

Warnings:

  • [2021-01-13T14:13:03.727Z] include/tbb/machine/macos_common.h:55:13: warning: 'OSAtomicCompareAndSwap64Barrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_compare_exchange_strong() from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T14:13:03.727Z] include/tbb/machine/macos_common.h:59:28: warning: 'OSAtomicAdd64' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_fetch_add_explicit(std::memory_order_relaxed) from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T14:13:03.727Z] include/tbb/machine/macos_common.h:100:13: warning: 'OSAtomicCompareAndSwap32Barrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_compare_exchange_strong() from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T14:13:03.727Z] include/tbb/machine/macos_common.h:110:12: warning: 'OSAtomicAdd32Barrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_fetch_add() from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T14:13:03.727Z] include/tbb/machine/macos_common.h:116:12: warning: 'OSAtomicAdd64Barrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_fetch_add() from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T14:13:03.727Z] include/tbb/tbb_machine.h:339:31: warning: 'OSMemoryBarrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_thread_fence() from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T14:13:03.727Z] include/tbb/tbb_machine.h:608:9: warning: 'OSMemoryBarrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_thread_fence() from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T14:13:03.727Z] include/tbb/tbb_machine.h:612:9: warning: 'OSMemoryBarrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_thread_fence() from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T14:13:03.727Z] include/tbb/tbb_machine.h:635:9: warning: 'OSMemoryBarrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_thread_fence() from <atomic> instead [-Wdeprecated-declarations]
  • [2021-01-13T14:13:03.727Z] include/tbb/tbb_machine.h:645:9: warning: 'OSMemoryBarrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_thread_fence() from <atomic> instead [-Wdeprecated-declarations]

And 49 more

@Axel-Naumann
Copy link
Member Author

All non-M1 errors are pre-existing.
All M1-errors are independent of the PR (I notified @lmoneta )
tbb seems to build, at least, so it's a step into the right direction: merging.

@Axel-Naumann Axel-Naumann merged commit 53acf06 into root-project:master Jan 13, 2021
@Axel-Naumann Axel-Naumann deleted the macarm-tbb branch January 13, 2021 16:59
@Axel-Naumann Axel-Naumann removed this from the 6.22/08 milestone Jan 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oshadura oshadura oshadura approved these changes

Assignees

@Axel-Naumann Axel-Naumann

Labels
pr:squash on merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Builtin TBB is broken on MacOS M1
3 participants
@Axel-Naumann @phsft-bot @oshadura