<div dir="ltr">Fixed in r270169.<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, May 19, 2016 at 2:13 PM, Richard Smith <span dir="ltr"><<a href="mailto:richard@metafoo.co.uk" target="_blank">richard@metafoo.co.uk</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">The modules buildbot has been broken since this commit landed:<div><br></div><div><a href="http://lab.llvm.org:8011/builders/clang-x86_64-linux-selfhost-modules/builds/15761/steps/compile.llvm.stage2/logs/stdio" target="_blank">http://lab.llvm.org:8011/builders/clang-x86_64-linux-selfhost-modules/builds/15761/steps/compile.llvm.stage2/logs/stdio</a><br></div><div><br></div><div>Please fix or revert.</div></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Wed, May 18, 2016 at 4:56 AM, Ashutosh Nema via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ashutosh<br>
Date: Wed May 18 06:56:23 2016<br>
New Revision: 269907<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=269907&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=269907&view=rev</a><br>
Log:<br>
Add new intrinsic support for MONITORX and MWAITX instructions<br>
<br>
Summary:<br>
MONITORX/MWAITX instructions provide similar capability to the MONITOR/MWAIT<br>
pair while adding a timer function, such that another termination of the MWAITX<br>
instruction occurs when the timer expires. The presence of the MONITORX and<br>
MWAITX instructions is indicated by CPUID 8000_0001, ECX, bit 29.<br>
<br>
The MONITORX and MWAITX instructions are intercepted by the same bits that<br>
intercept MONITOR and MWAIT. MONITORX instruction establishes a range to be<br>
monitored. MWAITX instruction causes the processor to stop instruction<br>
execution and enter an implementation-dependent optimized state until<br>
occurrence of a class of events.<br>
<br>
Opcode of MONITORX instruction is "0F 01 FA". Opcode of MWAITX instruction is<br>
"0F 01 FB". These opcode information is used in adding tests for the<br>
disassembler.<br>
<br>
These instructions are enabled for AMD's bdver4 architecture.<br>
<br>
Patch by Ganesh Gopalasubramanian!<br>
<br>
Reviewers: echristo, craig.topper<br>
<br>
Subscribers: RKSimon, joker.eph, llvm-commits, cfe-commits<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D19796" rel="noreferrer" target="_blank">http://reviews.llvm.org/D19796</a><br>
<br>
Added:<br>
cfe/trunk/lib/Headers/mwaitxintrin.h<br>
Modified:<br>
cfe/trunk/include/clang/Basic/BuiltinsX86.def<br>
cfe/trunk/include/clang/Driver/Options.td<br>
cfe/trunk/lib/Basic/Targets.cpp<br>
cfe/trunk/lib/Headers/CMakeLists.txt<br>
cfe/trunk/lib/Headers/module.modulemap<br>
cfe/trunk/lib/Headers/x86intrin.h<br>
cfe/trunk/test/CodeGen/builtins-x86.c<br>
<br>
Modified: cfe/trunk/include/clang/Basic/BuiltinsX86.def<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/BuiltinsX86.def?rev=269907&r1=269906&r2=269907&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/BuiltinsX86.def?rev=269907&r1=269906&r2=269907&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/BuiltinsX86.def (original)<br>
+++ cfe/trunk/include/clang/Basic/BuiltinsX86.def Wed May 18 06:56:23 2016<br>
@@ -2272,5 +2272,9 @@ TARGET_BUILTIN(__builtin_ia32_cvtusi2sd6<br>
TARGET_BUILTIN(__builtin_ia32_cvtusi2ss32, "V4fV4fUiIi","","avx512f")<br>
TARGET_BUILTIN(__builtin_ia32_cvtusi2ss64, "V4fV4fULLiIi","","avx512f")<br>
<br>
+// MONITORX/MWAITX<br>
+TARGET_BUILTIN(__builtin_ia32_monitorx, "vv*UiUi", "", "mwaitx")<br>
+TARGET_BUILTIN(__builtin_ia32_mwaitx, "vUiUiUi", "", "mwaitx")<br>
+<br>
#undef BUILTIN<br>
#undef TARGET_BUILTIN<br>
<br>
Modified: cfe/trunk/include/clang/Driver/Options.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=269907&r1=269906&r2=269907&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=269907&r1=269906&r2=269907&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Driver/Options.td (original)<br>
+++ cfe/trunk/include/clang/Driver/Options.td Wed May 18 06:56:23 2016<br>
@@ -1425,6 +1425,7 @@ def mno_xsave : Flag<["-"], "mno-xsave"><br>
def mno_xsaveopt : Flag<["-"], "mno-xsaveopt">, Group<m_x86_Features_Group>;<br>
def mno_xsavec : Flag<["-"], "mno-xsavec">, Group<m_x86_Features_Group>;<br>
def mno_xsaves : Flag<["-"], "mno-xsaves">, Group<m_x86_Features_Group>;<br>
+def mno_mwaitx : Flag<["-"], "mno-mwaitx">, Group<m_x86_Features_Group>;<br>
def mno_pku : Flag<["-"], "mno-pku">, Group<m_x86_Features_Group>;<br>
<br>
def munaligned_access : Flag<["-"], "munaligned-access">, Group<m_arm_Features_Group>,<br>
@@ -1610,6 +1611,7 @@ def mxsave : Flag<["-"], "mxsave">, Grou<br>
def mxsaveopt : Flag<["-"], "mxsaveopt">, Group<m_x86_Features_Group>;<br>
def mxsavec : Flag<["-"], "mxsavec">, Group<m_x86_Features_Group>;<br>
def mxsaves : Flag<["-"], "mxsaves">, Group<m_x86_Features_Group>;<br>
+def mmwaitx : Flag<["-"], "mmwaitx">, Group<m_x86_Features_Group>;<br>
def mips16 : Flag<["-"], "mips16">, Group<m_Group>;<br>
def mno_mips16 : Flag<["-"], "mno-mips16">, Group<m_Group>;<br>
def mmicromips : Flag<["-"], "mmicromips">, Group<m_Group>;<br>
<br>
Modified: cfe/trunk/lib/Basic/Targets.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=269907&r1=269906&r2=269907&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=269907&r1=269906&r2=269907&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Basic/Targets.cpp (original)<br>
+++ cfe/trunk/lib/Basic/Targets.cpp Wed May 18 06:56:23 2016<br>
@@ -2273,6 +2273,7 @@ class X86TargetInfo : public TargetInfo<br>
bool HasXSAVEOPT = false;<br>
bool HasXSAVEC = false;<br>
bool HasXSAVES = false;<br>
+ bool HasMWAITX = false;<br>
bool HasPKU = false;<br>
bool HasCLFLUSHOPT = false;<br>
bool HasPCOMMIT = false;<br>
@@ -2947,6 +2948,7 @@ bool X86TargetInfo::initFeatureMap(<br>
case CK_BDVER4:<br>
setFeatureEnabledImpl(Features, "avx2", true);<br>
setFeatureEnabledImpl(Features, "bmi2", true);<br>
+ setFeatureEnabledImpl(Features, "mwaitx", true);<br>
// FALLTHROUGH<br>
case CK_BDVER3:<br>
setFeatureEnabledImpl(Features, "fsgsbase", true);<br>
@@ -3266,6 +3268,8 @@ bool X86TargetInfo::handleTargetFeatures<br>
HasXSAVEC = true;<br>
} else if (Feature == "+xsaves") {<br>
HasXSAVES = true;<br>
+ } else if (Feature == "+mwaitx") {<br>
+ HasMWAITX = true;<br>
} else if (Feature == "+pku") {<br>
HasPKU = true;<br>
} else if (Feature == "+clflushopt") {<br>
@@ -3538,6 +3542,9 @@ void X86TargetInfo::getTargetDefines(con<br>
if (HasTBM)<br>
Builder.defineMacro("__TBM__");<br>
<br>
+ if (HasMWAITX)<br>
+ Builder.defineMacro("__MWAITX__");<br>
+<br>
switch (XOPLevel) {<br>
case XOP:<br>
Builder.defineMacro("__XOP__");<br>
<br>
Modified: cfe/trunk/lib/Headers/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/CMakeLists.txt?rev=269907&r1=269906&r2=269907&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/CMakeLists.txt?rev=269907&r1=269906&r2=269907&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Headers/CMakeLists.txt (original)<br>
+++ cfe/trunk/lib/Headers/CMakeLists.txt Wed May 18 06:56:23 2016<br>
@@ -78,6 +78,7 @@ set(files<br>
xsaveoptintrin.h<br>
xsavecintrin.h<br>
xsavesintrin.h<br>
+ mwaitxintrin.h<br>
xtestintrin.h<br>
avx512ifmaintrin.h<br>
avx512ifmavlintrin.h<br>
<br>
Modified: cfe/trunk/lib/Headers/module.modulemap<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/module.modulemap?rev=269907&r1=269906&r2=269907&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/module.modulemap?rev=269907&r1=269906&r2=269907&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Headers/module.modulemap (original)<br>
+++ cfe/trunk/lib/Headers/module.modulemap Wed May 18 06:56:23 2016<br>
@@ -125,6 +125,10 @@ module _Builtin_intrinsics [system] [ext<br>
export pclmul<br>
}<br>
<br>
+ explicit module mwaitx {<br>
+ header "mwaitxintrin.h"<br>
+ }<br>
+<br>
explicit module aes {<br>
header "__wmmintrin_aes.h"<br>
}<br>
<br>
Added: cfe/trunk/lib/Headers/mwaitxintrin.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/mwaitxintrin.h?rev=269907&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/mwaitxintrin.h?rev=269907&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Headers/mwaitxintrin.h (added)<br>
+++ cfe/trunk/lib/Headers/mwaitxintrin.h Wed May 18 06:56:23 2016<br>
@@ -0,0 +1,47 @@<br>
+/*===---- mwaitxintrin.h - MONITORX/MWAITX intrinsics ----------------------===<br>
+ *<br>
+ * Permission is hereby granted, free of charge, to any person obtaining a copy<br>
+ * of this software and associated documentation files (the "Software"), to deal<br>
+ * in the Software without restriction, including without limitation the rights<br>
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell<br>
+ * copies of the Software, and to permit persons to whom the Software is<br>
+ * furnished to do so, subject to the following conditions:<br>
+ *<br>
+ * The above copyright notice and this permission notice shall be included in<br>
+ * all copies or substantial portions of the Software.<br>
+ *<br>
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR<br>
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,<br>
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE<br>
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER<br>
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,<br>
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN<br>
+ * THE SOFTWARE.<br>
+ *<br>
+ *===-----------------------------------------------------------------------===<br>
+ */<br>
+<br>
+#ifndef __X86INTRIN_H<br>
+#error "Never use <mwaitxintrin.h> directly; include <x86intrin.h> instead."<br>
+#endif<br>
+<br>
+#ifndef _MWAITXINTRIN_H<br>
+#define _MWAITXINTRIN_H<br>
+<br>
+/* Define the default attributes for the functions in this file. */<br>
+#define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__, __target__("mwaitx")))<br>
+static __inline__ void __DEFAULT_FN_ATTRS<br>
+_mm_monitorx(void const * __p, unsigned __extensions, unsigned __hints)<br>
+{<br>
+ __builtin_ia32_monitorx((void *)__p, __extensions, __hints);<br>
+}<br>
+<br>
+static __inline__ void __DEFAULT_FN_ATTRS<br>
+_mm_mwaitx(unsigned __extensions, unsigned __hints, unsigned __clock)<br>
+{<br>
+ __builtin_ia32_mwaitx(__extensions, __hints, __clock);<br>
+}<br>
+<br>
+#undef __DEFAULT_FN_ATTRS<br>
+<br>
+#endif /* _MWAITXINTRIN_H */<br>
<br>
Modified: cfe/trunk/lib/Headers/x86intrin.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/x86intrin.h?rev=269907&r1=269906&r2=269907&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/x86intrin.h?rev=269907&r1=269906&r2=269907&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Headers/x86intrin.h (original)<br>
+++ cfe/trunk/lib/Headers/x86intrin.h Wed May 18 06:56:23 2016<br>
@@ -76,6 +76,10 @@<br>
#include <f16cintrin.h><br>
#endif<br>
<br>
+#if !defined(_MSC_VER) || __has_feature(modules) || defined(__MWAITX__)<br>
+#include <mwaitxintrin.h><br>
+#endif<br>
+<br>
/* FIXME: LWP */<br>
<br>
#endif /* __X86INTRIN_H */<br>
<br>
Modified: cfe/trunk/test/CodeGen/builtins-x86.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/builtins-x86.c?rev=269907&r1=269906&r2=269907&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/builtins-x86.c?rev=269907&r1=269906&r2=269907&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGen/builtins-x86.c (original)<br>
+++ cfe/trunk/test/CodeGen/builtins-x86.c Wed May 18 06:56:23 2016<br>
@@ -1,5 +1,5 @@<br>
-// RUN: %clang_cc1 -DUSE_64 -triple x86_64-unknown-unknown -target-feature +fxsr -target-feature +avx -target-feature +xsaveopt -target-feature +xsaves -target-feature +xsavec -emit-llvm -o %t %s<br>
-// RUN: %clang_cc1 -DUSE_ALL -triple x86_64-unknown-unknown -target-feature +fxsr -target-feature +avx -target-feature +xsaveopt -target-feature +xsaves -target-feature +xsavec -fsyntax-only -o %t %s<br>
+// RUN: %clang_cc1 -DUSE_64 -triple x86_64-unknown-unknown -target-feature +fxsr -target-feature +avx -target-feature +xsaveopt -target-feature +xsaves -target-feature +xsavec -target-feature +mwaitx -emit-llvm -o %t %s<br>
+// RUN: %clang_cc1 -DUSE_ALL -triple x86_64-unknown-unknown -target-feature +fxsr -target-feature +avx -target-feature +xsaveopt -target-feature +xsaves -target-feature +xsavec -target-feature +mwaitx -fsyntax-only -o %t %s<br>
<br>
#ifdef USE_ALL<br>
#define USE_3DNOW<br>
@@ -281,6 +281,9 @@ void f0() {<br>
(void)__builtin_ia32_xsaves(tmp_vp, tmp_ULLi);<br>
(void)__builtin_ia32_xsaves64(tmp_vp, tmp_ULLi);<br>
<br>
+ (void) __builtin_ia32_monitorx(tmp_vp, tmp_Ui, tmp_Ui);<br>
+ (void) __builtin_ia32_mwaitx(tmp_Ui, tmp_Ui, tmp_Ui);<br>
+<br>
tmp_V4f = __builtin_ia32_cvtpi2ps(tmp_V4f, tmp_V2i);<br>
tmp_V2i = __builtin_ia32_cvtps2pi(tmp_V4f);<br>
tmp_i = __builtin_ia32_cvtss2si(tmp_V4f);<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>
</div></div></blockquote></div><br></div>