This is an archive of the discontinued LLVM Phabricator instance.

Differential D81776

[OpenMP] support build on msys2/mingw with clang or gcc
ClosedPublic

Authored by adrpo on Jun 12 2020, 4:33 PM.

Details

Reviewers
openmp-commits
jdoerfert
AndreyChurbanov
Hahnfeld
grokos
mstorsjo
Commits
rGbf2aa74e5199: [OpenMP] support build on msys2/mingw with clang or gcc
Summary

RTM Adaptive Locks are supported on msys2/mingw for clang and gcc.

Diff Detail

Event Timeline

adrpo created this revision.Jun 12 2020, 4:33 PM
Herald added a reviewer: jdoerfert. · View Herald TranscriptJun 12 2020, 4:33 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: sstefan1, mstorsjo, guansong, yaxunl. · View Herald Transcript
Harbormaster completed remote builds in B60189: Diff 270544.Jun 12 2020, 6:15 PM
longnguyen2004 added a subscriber: longnguyen2004.Jun 12 2020, 7:23 PM
mati865 added a subscriber: mati865.Jun 13 2020, 5:34 AM
jdoerfert added reviewers: AndreyChurbanov, Hahnfeld, grokos.Jun 13 2020, 9:22 AM

Can we test this somehow? Otherwise it looks straight forward.

adrpo added a comment.Jun 13 2020, 11:36 AM
In D81776#2091441, @jdoerfert wrote:

Can we test this somehow? Otherwise it looks straight forward.

This was tested for some time now in the msys2/mingw llvm package to build openmp:
https://github.com/adrpo/MINGW-packages/commit/9633f096361d575f7de4891a5d485fec2888311e
If there is a CI with msys2/mingw available we could test on that.

jdoerfert accepted this revision.Jun 15 2020, 1:56 PM

LGTM

This revision is now accepted and ready to land.Jun 15 2020, 1:56 PM
longnguyen2004 added a comment.Jul 19 2020, 9:16 PM

Are there any estimates on when this will be merged?

mati865 added a reviewer: mstorsjo.Aug 4 2020, 7:19 AM
Closed by commit rGbf2aa74e5199: [OpenMP] support build on msys2/mingw with clang or gcc (authored by adrpo, committed by mstorsjo). · Explain WhyAug 4 2020, 1:16 PM
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rGbf2aa74e5199: [OpenMP] support build on msys2/mingw with clang or gcc.
mstorsjo added a subscriber: hans.Aug 4 2020, 1:17 PM

@hans - I think this one might be cherrypick-worthy as well

hans added a comment.Aug 5 2020, 10:35 AM
In D81776#2194429, @mstorsjo wrote:

@hans - I think this one might be cherrypick-worthy as well

Pushed to 11.x as 280653d2ea4a40f2968b3f4662aa7c6d254c6cb9. Thanks!

Revision Contents

PathSize
openmp/
runtime/
src/
3 lines

Diff 283011

openmp/runtime/src/kmp_lock.cpp

Show First 20 Lines • Show All 1,700 Lines • ▼ Show 20 Lines
} }
#if KMP_USE_ADAPTIVE_LOCKS #if KMP_USE_ADAPTIVE_LOCKS
/* RTM Adaptive locks */ /* RTM Adaptive locks */
#if (KMP_COMPILER_ICC && __INTEL_COMPILER >= 1300) || \ #if (KMP_COMPILER_ICC && __INTEL_COMPILER >= 1300) || \
(KMP_COMPILER_MSVC && _MSC_VER >= 1700) || \ (KMP_COMPILER_MSVC && _MSC_VER >= 1700) || \
(KMP_COMPILER_CLANG && KMP_MSVC_COMPAT) (KMP_COMPILER_CLANG && (KMP_MSVC_COMPAT || __MINGW32__)) || \
(KMP_COMPILER_GCC && __MINGW32__)
#include <immintrin.h> #include <immintrin.h>
#define SOFT_ABORT_MASK (_XABORT_RETRY | _XABORT_CONFLICT | _XABORT_EXPLICIT) #define SOFT_ABORT_MASK (_XABORT_RETRY | _XABORT_CONFLICT | _XABORT_EXPLICIT)
#else #else
// Values from the status register after failed speculation. // Values from the status register after failed speculation.
#define _XBEGIN_STARTED (~0u) #define _XBEGIN_STARTED (~0u)
▲ Show 20 Lines • Show All 2,228 Lines • Show Last 20 Lines