From 0190c65571ffdd551398ea228328d79801cbcdb5 Mon Sep 17 00:00:00 2001 From: Michael Zuckerman Date: Mon, 7 Mar 2016 09:55:55 +0000 Subject: [PATCH] [CLANG][AVX512][BUILTIN] Adding new feature flag header file and new builtin vpmadd52{h|l}uq{128|256|512}{mask|maskz} Differential Revision: http://reviews.llvm.org/D17915 llvm-svn: 262820 --- clang/include/clang/Basic/BuiltinsX86.def | 12 ++ clang/lib/Headers/CMakeLists.txt | 2 + clang/lib/Headers/avx512ifmaintrin.h | 92 +++++++++++++ clang/lib/Headers/avx512ifmavlintrin.h | 149 +++++++++++++++++++++ clang/lib/Headers/immintrin.h | 4 + clang/test/CodeGen/avx512ifma-builtins.c | 42 ++++++ clang/test/CodeGen/avx512ifmavl-builtins.c | 77 +++++++++++ 7 files changed, 378 insertions(+) create mode 100644 clang/lib/Headers/avx512ifmaintrin.h create mode 100644 clang/lib/Headers/avx512ifmavlintrin.h create mode 100644 clang/test/CodeGen/avx512ifma-builtins.c create mode 100644 clang/test/CodeGen/avx512ifmavl-builtins.c diff --git a/clang/include/clang/Basic/BuiltinsX86.def b/clang/include/clang/Basic/BuiltinsX86.def index f0b7ad73aaf0..e005c58e3f1d 100644 --- a/clang/include/clang/Basic/BuiltinsX86.def +++ b/clang/include/clang/Basic/BuiltinsX86.def @@ -1726,6 +1726,18 @@ TARGET_BUILTIN(__builtin_ia32_pbroadcastd128_gpr_mask, "V4iiV4iUc","","avx512vl" TARGET_BUILTIN(__builtin_ia32_pbroadcastd256_gpr_mask, "V8iiV8iUc","","avx512vl") TARGET_BUILTIN(__builtin_ia32_pbroadcastq128_gpr_mask, "V2LLiULLiV2LLiUc","","avx512vl") TARGET_BUILTIN(__builtin_ia32_pbroadcastq256_gpr_mask, "V4LLiULLiV4LLiUc","","avx512vl") +TARGET_BUILTIN(__builtin_ia32_vpmadd52huq512_mask, "V8LLiV8LLiV8LLiV8LLiUc","","avx512ifma") +TARGET_BUILTIN(__builtin_ia32_vpmadd52huq512_maskz, "V8LLiV8LLiV8LLiV8LLiUc","","avx512ifma") +TARGET_BUILTIN(__builtin_ia32_vpmadd52luq512_mask, "V8LLiV8LLiV8LLiV8LLiUc","","avx512ifma") +TARGET_BUILTIN(__builtin_ia32_vpmadd52luq512_maskz, "V8LLiV8LLiV8LLiV8LLiUc","","avx512ifma") +TARGET_BUILTIN(__builtin_ia32_vpmadd52huq128_mask, "V2LLiV2LLiV2LLiV2LLiUc","","avx512ifma,avx512vl") +TARGET_BUILTIN(__builtin_ia32_vpmadd52huq128_maskz, "V2LLiV2LLiV2LLiV2LLiUc","","avx512ifma,avx512vl") +TARGET_BUILTIN(__builtin_ia32_vpmadd52huq256_mask, "V4LLiV4LLiV4LLiV4LLiUc","","avx512ifma,avx512vl") +TARGET_BUILTIN(__builtin_ia32_vpmadd52huq256_maskz, "V4LLiV4LLiV4LLiV4LLiUc","","avx512ifma,avx512vl") +TARGET_BUILTIN(__builtin_ia32_vpmadd52luq128_mask, "V2LLiV2LLiV2LLiV2LLiUc","","avx512ifma,avx512vl") +TARGET_BUILTIN(__builtin_ia32_vpmadd52luq128_maskz, "V2LLiV2LLiV2LLiV2LLiUc","","avx512ifma,avx512vl") +TARGET_BUILTIN(__builtin_ia32_vpmadd52luq256_mask, "V4LLiV4LLiV4LLiV4LLiUc","","avx512ifma,avx512vl") +TARGET_BUILTIN(__builtin_ia32_vpmadd52luq256_maskz, "V4LLiV4LLiV4LLiV4LLiUc","","avx512ifma,avx512vl") #undef BUILTIN #undef TARGET_BUILTIN diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt index 4c313dadc515..f4e5e494c59f 100644 --- a/clang/lib/Headers/CMakeLists.txt +++ b/clang/lib/Headers/CMakeLists.txt @@ -74,6 +74,8 @@ set(files xsavecintrin.h xsavesintrin.h xtestintrin.h + avx512ifmaintrin.h + avx512ifmavlintrin.h ) set(output_dir ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}/include) diff --git a/clang/lib/Headers/avx512ifmaintrin.h b/clang/lib/Headers/avx512ifmaintrin.h new file mode 100644 index 000000000000..fca2f00755d9 --- /dev/null +++ b/clang/lib/Headers/avx512ifmaintrin.h @@ -0,0 +1,92 @@ +/*===------------- avx512ifmaintrin.h - IFMA intrinsics ------------------=== + * + * + * 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 __IMMINTRIN_H +#error "Never use directly; include instead." +#endif + +#ifndef __IFMAINTRIN_H +#define __IFMAINTRIN_H + +/* Define the default attributes for the functions in this file. */ +#define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__, __target__("avx512ifma"))) + +static __inline__ __m512i __DEFAULT_FN_ATTRS +_mm512_madd52hi_epu64 (__m512i __X, __m512i __Y, __m512i __Z) +{ + return (__m512i) __builtin_ia32_vpmadd52huq512_mask ((__v8di) __X, + (__v8di) __Y, + (__v8di) __Z, + (__mmask8) - 1); +} + +static __inline__ __m512i __DEFAULT_FN_ATTRS +_mm512_mask_madd52hi_epu64 (__m512i __W, __mmask8 __M, __m512i __X, + __m512i __Y) +{ + return (__m512i) __builtin_ia32_vpmadd52huq512_mask ((__v8di) __W, + (__v8di) __X, + (__v8di) __Y, + (__mmask8) __M); +} + +static __inline__ __m512i __DEFAULT_FN_ATTRS +_mm512_maskz_madd52hi_epu64 (__mmask8 __M, __m512i __X, __m512i __Y, __m512i __Z) +{ + return (__m512i) __builtin_ia32_vpmadd52huq512_maskz ((__v8di) __X, + (__v8di) __Y, + (__v8di) __Z, + (__mmask8) __M); +} + +static __inline__ __m512i __DEFAULT_FN_ATTRS +_mm512_madd52lo_epu64 (__m512i __X, __m512i __Y, __m512i __Z) +{ + return (__m512i) __builtin_ia32_vpmadd52luq512_mask ((__v8di) __X, + (__v8di) __Y, + (__v8di) __Z, + (__mmask8) - 1); +} + +static __inline__ __m512i __DEFAULT_FN_ATTRS +_mm512_mask_madd52lo_epu64 (__m512i __W, __mmask8 __M, __m512i __X, + __m512i __Y) +{ + return (__m512i) __builtin_ia32_vpmadd52luq512_mask ((__v8di) __W, + (__v8di) __X, + (__v8di) __Y, + (__mmask8) __M); +} + +static __inline__ __m512i __DEFAULT_FN_ATTRS +_mm512_maskz_madd52lo_epu64 (__mmask8 __M, __m512i __X, __m512i __Y, __m512i __Z) +{ + return (__m512i) __builtin_ia32_vpmadd52luq512_maskz ((__v8di) __X, + (__v8di) __Y, + (__v8di) __Z, + (__mmask8) __M); +} + +#undef __DEFAULT_FN_ATTRS + +#endif diff --git a/clang/lib/Headers/avx512ifmavlintrin.h b/clang/lib/Headers/avx512ifmavlintrin.h new file mode 100644 index 000000000000..9ed8e777ba3e --- /dev/null +++ b/clang/lib/Headers/avx512ifmavlintrin.h @@ -0,0 +1,149 @@ +/*===------------- avx512ifmavlintrin.h - IFMA intrinsics ------------------=== + * + * + * 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 __IMMINTRIN_H +#error "Never use directly; include instead." +#endif + +#ifndef __IFMAVLINTRIN_H +#define __IFMAVLINTRIN_H + +/* Define the default attributes for the functions in this file. */ +#define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__, __target__("avx512ifma,avx512vl"))) + + + +static __inline__ __m128i __DEFAULT_FN_ATTRS +_mm_madd52hi_epu64 (__m128i __X, __m128i __Y, __m128i __Z) +{ + return (__m128i) __builtin_ia32_vpmadd52huq128_mask ((__v2di) __X, + (__v2di) __Y, + (__v2di) __Z, + (__mmask8) - 1); +} + +static __inline__ __m128i __DEFAULT_FN_ATTRS +_mm_mask_madd52hi_epu64 (__m128i __W, __mmask8 __M, __m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_vpmadd52huq128_mask ((__v2di) __W, + (__v2di) __X, + (__v2di) __Y, + (__mmask8) __M); +} + +static __inline__ __m128i __DEFAULT_FN_ATTRS +_mm_maskz_madd52hi_epu64 (__mmask8 __M, __m128i __X, __m128i __Y, __m128i __Z) +{ + return (__m128i) __builtin_ia32_vpmadd52huq128_maskz ((__v2di) __X, + (__v2di) __Y, + (__v2di) __Z, + (__mmask8) __M); +} + +static __inline__ __m256i __DEFAULT_FN_ATTRS +_mm256_madd52hi_epu64 (__m256i __X, __m256i __Y, __m256i __Z) +{ + return (__m256i) __builtin_ia32_vpmadd52huq256_mask ((__v4di) __X, + (__v4di) __Y, + (__v4di) __Z, + (__mmask8) - 1); +} + +static __inline__ __m256i __DEFAULT_FN_ATTRS +_mm256_mask_madd52hi_epu64 (__m256i __W, __mmask8 __M, __m256i __X, + __m256i __Y) +{ + return (__m256i) __builtin_ia32_vpmadd52huq256_mask ((__v4di) __W, + (__v4di) __X, + (__v4di) __Y, + (__mmask8) __M); +} + +static __inline__ __m256i __DEFAULT_FN_ATTRS +_mm256_maskz_madd52hi_epu64 (__mmask8 __M, __m256i __X, __m256i __Y, __m256i __Z) +{ + return (__m256i) __builtin_ia32_vpmadd52huq256_maskz ((__v4di) __X, + (__v4di) __Y, + (__v4di) __Z, + (__mmask8) __M); +} + +static __inline__ __m128i __DEFAULT_FN_ATTRS +_mm_madd52lo_epu64 (__m128i __X, __m128i __Y, __m128i __Z) +{ + return (__m128i) __builtin_ia32_vpmadd52luq128_mask ((__v2di) __X, + (__v2di) __Y, + (__v2di) __Z, + (__mmask8) - 1); +} + +static __inline__ __m128i __DEFAULT_FN_ATTRS +_mm_mask_madd52lo_epu64 (__m128i __W, __mmask8 __M, __m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_vpmadd52luq128_mask ((__v2di) __W, + (__v2di) __X, + (__v2di) __Y, + (__mmask8) __M); +} + +static __inline__ __m128i __DEFAULT_FN_ATTRS +_mm_maskz_madd52lo_epu64 (__mmask8 __M, __m128i __X, __m128i __Y, __m128i __Z) +{ + return (__m128i) __builtin_ia32_vpmadd52luq128_maskz ((__v2di) __X, + (__v2di) __Y, + (__v2di) __Z, + (__mmask8) __M); +} + +static __inline__ __m256i __DEFAULT_FN_ATTRS +_mm256_madd52lo_epu64 (__m256i __X, __m256i __Y, __m256i __Z) +{ + return (__m256i) __builtin_ia32_vpmadd52luq256_mask ((__v4di) __X, + (__v4di) __Y, + (__v4di) __Z, + (__mmask8) - 1); +} + +static __inline__ __m256i __DEFAULT_FN_ATTRS +_mm256_mask_madd52lo_epu64 (__m256i __W, __mmask8 __M, __m256i __X, + __m256i __Y) +{ + return (__m256i) __builtin_ia32_vpmadd52luq256_mask ((__v4di) __W, + (__v4di) __X, + (__v4di) __Y, + (__mmask8) __M); +} + +static __inline__ __m256i __DEFAULT_FN_ATTRS +_mm256_maskz_madd52lo_epu64 (__mmask8 __M, __m256i __X, __m256i __Y, __m256i __Z) +{ + return (__m256i) __builtin_ia32_vpmadd52luq256_maskz ((__v4di) __X, + (__v4di) __Y, + (__v4di) __Z, + (__mmask8) __M); +} + + +#undef __DEFAULT_FN_ATTRS + +#endif diff --git a/clang/lib/Headers/immintrin.h b/clang/lib/Headers/immintrin.h index 637646122653..927213909820 100644 --- a/clang/lib/Headers/immintrin.h +++ b/clang/lib/Headers/immintrin.h @@ -79,6 +79,10 @@ _mm256_cvtph_ps(__m128i __a) #include +#include + +#include + #include static __inline__ int __attribute__((__always_inline__, __nodebug__, __target__("rdrnd"))) diff --git a/clang/test/CodeGen/avx512ifma-builtins.c b/clang/test/CodeGen/avx512ifma-builtins.c new file mode 100644 index 000000000000..366d3bec319b --- /dev/null +++ b/clang/test/CodeGen/avx512ifma-builtins.c @@ -0,0 +1,42 @@ +// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin -target-feature +avx512ifma -emit-llvm -o - -Werror | FileCheck %s + +// Don't include mm_malloc.h, it's system specific. +#define __MM_MALLOC_H + +#include + +__m512i test_mm512_madd52hi_epu64(__m512i __X, __m512i __Y, __m512i __Z) { + // CHECK-LABEL: @test_mm512_madd52hi_epu64 + // CHECK: @llvm.x86.avx512.mask.vpmadd52h.uq.512 + return _mm512_madd52hi_epu64(__X, __Y, __Z); +} + +__m512i test_mm512_mask_madd52hi_epu64(__m512i __W, __mmask8 __M, __m512i __X, __m512i __Y) { + // CHECK-LABEL: @test_mm512_mask_madd52hi_epu64 + // CHECK: @llvm.x86.avx512.mask.vpmadd52h.uq.512 + return _mm512_mask_madd52hi_epu64(__W, __M, __X, __Y); +} + +__m512i test_mm512_maskz_madd52hi_epu64(__mmask8 __M, __m512i __X, __m512i __Y, __m512i __Z) { + // CHECK-LABEL: @test_mm512_maskz_madd52hi_epu64 + // CHECK: @llvm.x86.avx512.maskz.vpmadd52h.uq.512 + return _mm512_maskz_madd52hi_epu64(__M, __X, __Y, __Z); +} + +__m512i test_mm512_madd52lo_epu64(__m512i __X, __m512i __Y, __m512i __Z) { + // CHECK-LABEL: @test_mm512_madd52lo_epu64 + // CHECK: @llvm.x86.avx512.mask.vpmadd52l.uq.512 + return _mm512_madd52lo_epu64(__X, __Y, __Z); +} + +__m512i test_mm512_mask_madd52lo_epu64(__m512i __W, __mmask8 __M, __m512i __X, __m512i __Y) { + // CHECK-LABEL: @test_mm512_mask_madd52lo_epu64 + // CHECK: @llvm.x86.avx512.mask.vpmadd52l.uq.512 + return _mm512_mask_madd52lo_epu64(__W, __M, __X, __Y); +} + +__m512i test_mm512_maskz_madd52lo_epu64(__mmask8 __M, __m512i __X, __m512i __Y, __m512i __Z) { + // CHECK-LABEL: @test_mm512_maskz_madd52lo_epu64 + // CHECK: @llvm.x86.avx512.mask.vpmadd52l.uq.512 + return _mm512_maskz_madd52lo_epu64(__M, __X, __Y, __Z); +} diff --git a/clang/test/CodeGen/avx512ifmavl-builtins.c b/clang/test/CodeGen/avx512ifmavl-builtins.c new file mode 100644 index 000000000000..b38c1a8953ad --- /dev/null +++ b/clang/test/CodeGen/avx512ifmavl-builtins.c @@ -0,0 +1,77 @@ +// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin -target-feature +avx512ifma -target-feature +avx512vl -emit-llvm -o - -Werror | FileCheck %s + +#define __MM_MALLOC_H + +#include + +__m128i test_mm_madd52hi_epu64(__m128i __X, __m128i __Y, __m128i __Z) { + // CHECK-LABEL: @test_mm_madd52hi_epu64 + // CHECK: @llvm.x86.avx512.mask.vpmadd52h.uq.128 + return _mm_madd52hi_epu64(__X, __Y, __Z); +} + +__m128i test_mm_mask_madd52hi_epu64(__m128i __W, __mmask8 __M, __m128i __X, __m128i __Y) { + // CHECK-LABEL: @test_mm_mask_madd52hi_epu64 + // CHECK: @llvm.x86.avx512.mask.vpmadd52h.uq.128 + return _mm_mask_madd52hi_epu64(__W, __M, __X, __Y); +} + +__m128i test_mm_maskz_madd52hi_epu64(__mmask8 __M, __m128i __X, __m128i __Y, __m128i __Z) { + // CHECK-LABEL: @test_mm_maskz_madd52hi_epu64 + // CHECK: @llvm.x86.avx512.maskz.vpmadd52h.uq.128 + return _mm_maskz_madd52hi_epu64(__M, __X, __Y, __Z); +} + +__m256i test_mm256_madd52hi_epu64(__m256i __X, __m256i __Y, __m256i __Z) { + // CHECK-LABEL: @test_mm256_madd52hi_epu64 + // CHECK: @llvm.x86.avx512.mask.vpmadd52h.uq.256 + return _mm256_madd52hi_epu64(__X, __Y, __Z); +} + +__m256i test_mm256_mask_madd52hi_epu64(__m256i __W, __mmask8 __M, __m256i __X, __m256i __Y) { + // CHECK-LABEL: @test_mm256_mask_madd52hi_epu64 + // CHECK: @llvm.x86.avx512.mask.vpmadd52h.uq.256 + return _mm256_mask_madd52hi_epu64(__W, __M, __X, __Y); +} + +__m256i test_mm256_maskz_madd52hi_epu64(__mmask8 __M, __m256i __X, __m256i __Y, __m256i __Z) { + // CHECK-LABEL: @test_mm256_maskz_madd52hi_epu64 + // CHECK: @llvm.x86.avx512.maskz.vpmadd52h.uq.256 + return _mm256_maskz_madd52hi_epu64(__M, __X, __Y, __Z); +} + +__m128i test_mm_madd52lo_epu64(__m128i __X, __m128i __Y, __m128i __Z) { + // CHECK-LABEL: @test_mm_madd52lo_epu64 + // CHECK: @llvm.x86.avx512.mask.vpmadd52l.uq.128 + return _mm_madd52lo_epu64(__X, __Y, __Z); +} + +__m128i test_mm_mask_madd52lo_epu64(__m128i __W, __mmask8 __M, __m128i __X, __m128i __Y) { + // CHECK-LABEL: @test_mm_mask_madd52lo_epu64 + // CHECK: @llvm.x86.avx512.mask.vpmadd52l.uq.128 + return _mm_mask_madd52lo_epu64(__W, __M, __X, __Y); +} + +__m128i test_mm_maskz_madd52lo_epu64(__mmask8 __M, __m128i __X, __m128i __Y, __m128i __Z) { + // CHECK-LABEL: @test_mm_maskz_madd52lo_epu64 + // CHECK: @llvm.x86.avx512.maskz.vpmadd52l.uq.128 + return _mm_maskz_madd52lo_epu64(__M, __X, __Y, __Z); +} + +__m256i test_mm256_madd52lo_epu64(__m256i __X, __m256i __Y, __m256i __Z) { + // CHECK-LABEL: @test_mm256_madd52lo_epu64 + // CHECK: @llvm.x86.avx512.mask.vpmadd52l.uq.256 + return _mm256_madd52lo_epu64(__X, __Y, __Z); +} + +__m256i test_mm256_mask_madd52lo_epu64(__m256i __W, __mmask8 __M, __m256i __X, __m256i __Y) { + // CHECK-LABEL: @test_mm256_mask_madd52lo_epu64 + // CHECK: @llvm.x86.avx512.mask.vpmadd52l.uq.256 + return _mm256_mask_madd52lo_epu64(__W, __M, __X, __Y); +} + +__m256i test_mm256_maskz_madd52lo_epu64(__mmask8 __M, __m256i __X, __m256i __Y, __m256i __Z) { + // CHECK-LABEL: @test_mm256_maskz_madd52lo_epu64 + // CHECK: @llvm.x86.avx512.mask.vpmadd52l.uq.256 + return _mm256_maskz_madd52lo_epu64(__M, __X, __Y, __Z); +}