Author: gbuella Date: Thu May 10 00:28:54 2018 New Revision: 331962 URL: http://llvm.org/viewvc/llvm-project?rev=331962&view=rev Log: [X86] ptwrite intrinsic
Reviewers: craig.topper, RKSimon Reviewed By: craig.topper Differential Revision: https://reviews.llvm.org/D46540 Added: cfe/trunk/lib/Headers/ptwriteintrin.h (with props) cfe/trunk/test/CodeGen/ptwrite.c (with props) Modified: cfe/trunk/include/clang/Basic/BuiltinsX86.def cfe/trunk/include/clang/Basic/BuiltinsX86_64.def cfe/trunk/include/clang/Driver/Options.td cfe/trunk/lib/Basic/Targets/X86.cpp cfe/trunk/lib/Basic/Targets/X86.h cfe/trunk/lib/Headers/CMakeLists.txt cfe/trunk/lib/Headers/cpuid.h cfe/trunk/lib/Headers/module.modulemap cfe/trunk/lib/Headers/x86intrin.h cfe/trunk/test/Driver/x86-target-features.c cfe/trunk/test/Preprocessor/predefined-arch-macros.c Modified: cfe/trunk/include/clang/Basic/BuiltinsX86.def URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/BuiltinsX86.def?rev=331962&r1=331961&r2=331962&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/BuiltinsX86.def (original) +++ cfe/trunk/include/clang/Basic/BuiltinsX86.def Thu May 10 00:28:54 2018 @@ -1885,6 +1885,9 @@ TARGET_BUILTIN(__builtin_ia32_cldemote, TARGET_BUILTIN(__builtin_ia32_directstore_u32, "vUi*Ui", "n", "movdiri") TARGET_BUILTIN(__builtin_ia32_movdir64b, "vv*vC*", "n", "movdir64b") +// PTWRITE +TARGET_BUILTIN(__builtin_ia32_ptwrite32, "vUi", "n", "ptwrite") + // MSVC TARGET_HEADER_BUILTIN(_BitScanForward, "UcUNi*UNi", "nh", "intrin.h", ALL_MS_LANGUAGES, "") TARGET_HEADER_BUILTIN(_BitScanReverse, "UcUNi*UNi", "nh", "intrin.h", ALL_MS_LANGUAGES, "") Modified: cfe/trunk/include/clang/Basic/BuiltinsX86_64.def URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/BuiltinsX86_64.def?rev=331962&r1=331961&r2=331962&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/BuiltinsX86_64.def (original) +++ cfe/trunk/include/clang/Basic/BuiltinsX86_64.def Thu May 10 00:28:54 2018 @@ -95,6 +95,7 @@ TARGET_BUILTIN(__builtin_ia32_cvtsi2ss64 TARGET_BUILTIN(__builtin_ia32_cvtusi2sd64, "V2dV2dULLiIi", "nc", "avx512f") TARGET_BUILTIN(__builtin_ia32_cvtusi2ss64, "V4fV4fULLiIi", "nc", "avx512f") TARGET_BUILTIN(__builtin_ia32_directstore_u64, "vULi*ULi", "n", "movdiri") +TARGET_BUILTIN(__builtin_ia32_ptwrite64, "vULLi", "n", "ptwrite") #undef BUILTIN #undef TARGET_BUILTIN Modified: cfe/trunk/include/clang/Driver/Options.td URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=331962&r1=331961&r2=331962&view=diff ============================================================================== --- cfe/trunk/include/clang/Driver/Options.td (original) +++ cfe/trunk/include/clang/Driver/Options.td Thu May 10 00:28:54 2018 @@ -2697,6 +2697,8 @@ def mprefetchwt1 : Flag<["-"], "mprefetc def mno_prefetchwt1 : Flag<["-"], "mno-prefetchwt1">, Group<m_x86_Features_Group>; def mprfchw : Flag<["-"], "mprfchw">, Group<m_x86_Features_Group>; def mno_prfchw : Flag<["-"], "mno-prfchw">, Group<m_x86_Features_Group>; +def mptwrite : Flag<["-"], "mptwrite">, Group<m_x86_Features_Group>; +def mno_ptwrite : Flag<["-"], "mno-ptwrite">, Group<m_x86_Features_Group>; def mrdpid : Flag<["-"], "mrdpid">, Group<m_x86_Features_Group>; def mno_rdpid : Flag<["-"], "mno-rdpid">, Group<m_x86_Features_Group>; def mrdrnd : Flag<["-"], "mrdrnd">, Group<m_x86_Features_Group>; Modified: cfe/trunk/lib/Basic/Targets/X86.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets/X86.cpp?rev=331962&r1=331961&r2=331962&view=diff ============================================================================== --- cfe/trunk/lib/Basic/Targets/X86.cpp (original) +++ cfe/trunk/lib/Basic/Targets/X86.cpp Thu May 10 00:28:54 2018 @@ -253,6 +253,7 @@ bool X86TargetInfo::initFeatureMap( setFeatureEnabledImpl(Features, "waitpkg", true); LLVM_FALLTHROUGH; case CK_GoldmontPlus: + setFeatureEnabledImpl(Features, "ptwrite", true); setFeatureEnabledImpl(Features, "rdpid", true); setFeatureEnabledImpl(Features, "sgx", true); LLVM_FALLTHROUGH; @@ -830,6 +831,8 @@ bool X86TargetInfo::handleTargetFeatures HasMOVDIR64B = true; } else if (Feature == "+pconfig") { HasPCONFIG = true; + } else if (Feature == "+ptwrite") { + HasPTWRITE = true; } X86SSEEnum Level = llvm::StringSwitch<X86SSEEnum>(Feature) @@ -1192,6 +1195,8 @@ void X86TargetInfo::getTargetDefines(con Builder.defineMacro("__MOVDIR64B__"); if (HasPCONFIG) Builder.defineMacro("__PCONFIG__"); + if (HasPTWRITE) + Builder.defineMacro("__PTWRITE__"); // Each case falls through to the previous one here. switch (SSELevel) { @@ -1326,6 +1331,7 @@ bool X86TargetInfo::isValidFeatureName(S .Case("popcnt", true) .Case("prefetchwt1", true) .Case("prfchw", true) + .Case("ptwrite", true) .Case("rdpid", true) .Case("rdrnd", true) .Case("rdseed", true) @@ -1405,6 +1411,7 @@ bool X86TargetInfo::hasFeature(StringRef .Case("popcnt", HasPOPCNT) .Case("prefetchwt1", HasPREFETCHWT1) .Case("prfchw", HasPRFCHW) + .Case("ptwrite", HasPTWRITE) .Case("rdpid", HasRDPID) .Case("rdrnd", HasRDRND) .Case("rdseed", HasRDSEED) Modified: cfe/trunk/lib/Basic/Targets/X86.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets/X86.h?rev=331962&r1=331961&r2=331962&view=diff ============================================================================== --- cfe/trunk/lib/Basic/Targets/X86.h (original) +++ cfe/trunk/lib/Basic/Targets/X86.h Thu May 10 00:28:54 2018 @@ -106,6 +106,7 @@ class LLVM_LIBRARY_VISIBILITY X86TargetI bool HasWAITPKG = false; bool HasMOVDIRI = false; bool HasMOVDIR64B = false; + bool HasPTWRITE = false; protected: /// Enumeration of all of the X86 CPUs supported by Clang. Modified: cfe/trunk/lib/Headers/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/CMakeLists.txt?rev=331962&r1=331961&r2=331962&view=diff ============================================================================== --- cfe/trunk/lib/Headers/CMakeLists.txt (original) +++ cfe/trunk/lib/Headers/CMakeLists.txt Thu May 10 00:28:54 2018 @@ -76,6 +76,7 @@ set(files pconfigintrin.h popcntintrin.h prfchwintrin.h + ptwriteintrin.h rdseedintrin.h rtmintrin.h sgxintrin.h Modified: cfe/trunk/lib/Headers/cpuid.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/cpuid.h?rev=331962&r1=331961&r2=331962&view=diff ============================================================================== --- cfe/trunk/lib/Headers/cpuid.h (original) +++ cfe/trunk/lib/Headers/cpuid.h Thu May 10 00:28:54 2018 @@ -202,6 +202,9 @@ #define bit_XSAVEC 0x00000002 #define bit_XSAVES 0x00000008 +/* Features in %eax for leaf 0x14 sub-leaf 0 */ +#define bit_PTWRITE 0x00000010 + /* Features in %ecx for leaf 0x80000001 */ #define bit_LAHF_LM 0x00000001 #define bit_ABM 0x00000020 Modified: cfe/trunk/lib/Headers/module.modulemap URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/module.modulemap?rev=331962&r1=331961&r2=331962&view=diff ============================================================================== --- cfe/trunk/lib/Headers/module.modulemap (original) +++ cfe/trunk/lib/Headers/module.modulemap Thu May 10 00:28:54 2018 @@ -69,6 +69,7 @@ module _Builtin_intrinsics [system] [ext textual header "movdirintrin.h" textual header "pconfigintrin.h" textual header "sgxintrin.h" + textual header "ptwriteintrin.h" explicit module mm_malloc { requires !freestanding Added: cfe/trunk/lib/Headers/ptwriteintrin.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/ptwriteintrin.h?rev=331962&view=auto ============================================================================== --- cfe/trunk/lib/Headers/ptwriteintrin.h (added) +++ cfe/trunk/lib/Headers/ptwriteintrin.h Thu May 10 00:28:54 2018 @@ -0,0 +1,51 @@ +/*===------------ ptwriteintrin.h - PTWRITE intrinsic --------------------=== + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + *===-----------------------------------------------------------------------=== + */ + +#ifndef __X86INTRIN_H +#error "Never use <ptwriteintrin.h> directly; include <x86intrin.h> instead." +#endif + +#ifndef __PTWRITEINTRIN_H +#define __PTWRITEINTRIN_H + +/* Define the default attributes for the functions in this file. */ +#define __DEFAULT_FN_ATTRS \ + __attribute__((__always_inline__, __nodebug__, __target__("ptwrite"))) + +static __inline__ void __DEFAULT_FN_ATTRS +_ptwrite32(unsigned int __value) { + __builtin_ia32_ptwrite32(__value); +} + +#ifdef __x86_64__ + +static __inline__ void __DEFAULT_FN_ATTRS +_ptwrite64(unsigned long long __value) { + __builtin_ia32_ptwrite64(__value); +} + +#endif /* __x86_64__ */ + +#undef __DEFAULT_FN_ATTRS + +#endif /* __PTWRITEINTRIN_H */ Propchange: cfe/trunk/lib/Headers/ptwriteintrin.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cfe/trunk/lib/Headers/ptwriteintrin.h ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL Propchange: cfe/trunk/lib/Headers/ptwriteintrin.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: cfe/trunk/lib/Headers/x86intrin.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/x86intrin.h?rev=331962&r1=331961&r2=331962&view=diff ============================================================================== --- cfe/trunk/lib/Headers/x86intrin.h (original) +++ cfe/trunk/lib/Headers/x86intrin.h Thu May 10 00:28:54 2018 @@ -113,4 +113,8 @@ #include <sgxintrin.h> #endif +#if !defined(_MSC_VER) || __has_feature(modules) || defined(__PTWRITE__) +#include <ptwriteintrin.h> +#endif + #endif /* __X86INTRIN_H */ Added: cfe/trunk/test/CodeGen/ptwrite.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/ptwrite.c?rev=331962&view=auto ============================================================================== --- cfe/trunk/test/CodeGen/ptwrite.c (added) +++ cfe/trunk/test/CodeGen/ptwrite.c Thu May 10 00:28:54 2018 @@ -0,0 +1,22 @@ +// RUN: %clang_cc1 %s -ffreestanding -triple=x86_64-unknown-unknown -target-feature +ptwrite -emit-llvm -o - -Wall -Werror -pedantic | FileCheck %s --check-prefix=X86 --check-prefix=X86_64 +// RUN: %clang_cc1 %s -ffreestanding -triple=i386-unknown-unknown -target-feature +ptwrite -emit-llvm -o - -Wall -Werror -pedantic | FileCheck %s --check-prefix=X86 + +#include <x86intrin.h> + +#include <stdint.h> + +void test_ptwrite32(uint32_t value) { + //X86-LABEL: @test_ptwrite32 + //X86: call void @llvm.x86.ptwrite32(i32 %{{.*}}) + _ptwrite32(value); +} + +#ifdef __x86_64__ + +void test_ptwrite64(uint64_t value) { + //X86_64-LABEL: @test_ptwrite64 + //X86_64: call void @llvm.x86.ptwrite64(i64 %{{.*}}) + _ptwrite64(value); +} + +#endif /* __x86_64__ */ Propchange: cfe/trunk/test/CodeGen/ptwrite.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cfe/trunk/test/CodeGen/ptwrite.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL Propchange: cfe/trunk/test/CodeGen/ptwrite.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: cfe/trunk/test/Driver/x86-target-features.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/x86-target-features.c?rev=331962&r1=331961&r2=331962&view=diff ============================================================================== --- cfe/trunk/test/Driver/x86-target-features.c (original) +++ cfe/trunk/test/Driver/x86-target-features.c Thu May 10 00:28:54 2018 @@ -164,3 +164,8 @@ // RUN: %clang -target i386-unknown-linux-gnu -march=i386 -mno-pconfig %s -### -o %t.o 2>&1 | FileCheck -check-prefix=NO-PCONFIG %s // PCONFIG: "-target-feature" "+pconfig" // NO-PCONFIG: "-target-feature" "-pconfig" + +// RUN: %clang -target i386-unknown-linux-gnu -march=i386 -mptwrite %s -### -o %t.o 2>&1 | FileCheck -check-prefix=PTWRITE %s +// RUN: %clang -target i386-unknown-linux-gnu -march=i386 -mno-ptwrite %s -### -o %t.o 2>&1 | FileCheck -check-prefix=NO-PTWRITE %s +// PTWRITE: "-target-feature" "+ptwrite" +// NO-PTWRITE: "-target-feature" "-ptwrite" Modified: cfe/trunk/test/Preprocessor/predefined-arch-macros.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/predefined-arch-macros.c?rev=331962&r1=331961&r2=331962&view=diff ============================================================================== --- cfe/trunk/test/Preprocessor/predefined-arch-macros.c (original) +++ cfe/trunk/test/Preprocessor/predefined-arch-macros.c Thu May 10 00:28:54 2018 @@ -1402,6 +1402,7 @@ // CHECK_GLMP_M32: #define __PCLMUL__ 1 // CHECK_GLMP_M32: #define __POPCNT__ 1 // CHECK_GLMP_M32: #define __PRFCHW__ 1 +// CHECK_GLMP_M32: #define __PTWRITE__ 1 // CHECK_GLMP_M32: #define __RDPID__ 1 // CHECK_GLMP_M32: #define __RDRND__ 1 // CHECK_GLMP_M32: #define __RDSEED__ 1 @@ -1437,6 +1438,7 @@ // CHECK_GLMP_M64: #define __PCLMUL__ 1 // CHECK_GLMP_M64: #define __POPCNT__ 1 // CHECK_GLMP_M64: #define __PRFCHW__ 1 +// CHECK_GLMP_M64: #define __PTWRITE__ 1 // CHECK_GLMP_M64: #define __RDPID__ 1 // CHECK_GLMP_M64: #define __RDRND__ 1 // CHECK_GLMP_M64: #define __RDSEED__ 1 @@ -1474,6 +1476,7 @@ // CHECK_TRM_M32: #define __PCLMUL__ 1 // CHECK_TRM_M32: #define __POPCNT__ 1 // CHECK_TRM_M32: #define __PRFCHW__ 1 +// CHECK_TRM_M32: #define __PTWRITE__ 1 // CHECK_TRM_M32: #define __RDPID__ 1 // CHECK_TRM_M32: #define __RDRND__ 1 // CHECK_TRM_M32: #define __RDSEED__ 1 @@ -1514,6 +1517,7 @@ // CHECK_TRM_M64: #define __PCLMUL__ 1 // CHECK_TRM_M64: #define __POPCNT__ 1 // CHECK_TRM_M64: #define __PRFCHW__ 1 +// CHECK_TRM_M64: #define __PTWRITE__ 1 // CHECK_TRM_M64: #define __RDPID__ 1 // CHECK_TRM_M64: #define __RDRND__ 1 // CHECK_TRM_M64: #define __RDSEED__ 1 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
