From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 62281 invoked by alias); 15 Nov 2016 21:50:57 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 62260 invoked by uid 89); 15 Nov 2016 21:50:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.6 required=5.0 tests=AWL,BAYES_50,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy=28,8, test_avx512er, __target__, avx512er X-HELO: mail-vk0-f47.google.com Received: from mail-vk0-f47.google.com (HELO mail-vk0-f47.google.com) (209.85.213.47) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 15 Nov 2016 21:50:55 +0000 Received: by mail-vk0-f47.google.com with SMTP id p9so100251916vkd.3 for ; Tue, 15 Nov 2016 13:50:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=AWhHN9hYQ2EadWcf0i5AHvh9yMzY9T18h3McDCqoUio=; b=QTbIYHG5jtSzONiarsOyF31npyfPClKQPSz1duMvEvv6SxBKJ2ImBLxnMe/jnn5Lrt Kgfb4dF0885hGhWUsWz0ctejz144w3/kIxf990yvQsVbbl9WNPEuan33wL94jonS7WpE mtjBIMzu5vZ7KkoAQIxbvfmMer9/hRdCaZWtkKsreVdXyR14zVBLMTB6UjGXhT3UgLXE xx6EupVMTYaeX+3NYk2zgvQrC1HYIxEBeZ8p6wccEAn6+jgzqIKyIjMPMkkZdIZ03N5h 1A9LB2Wv/VzGfqthnbKBD6aT93UJEc/gIPxmtIXNFqbRXEOj2V2DneL4yPm4pDBWHl1a JbIA== X-Gm-Message-State: ABUngvfFrAvBRIR6fdLRXWBGjnywWw7kEpq8kFpj75SPhUSfJ2O55SsAxyLypSBpKO2iiGeOKidfqHxY4SZ9jQ== X-Received: by 10.31.171.196 with SMTP id u187mr1795025vke.22.1479246653286; Tue, 15 Nov 2016 13:50:53 -0800 (PST) MIME-Version: 1.0 Received: by 10.103.126.9 with HTTP; Tue, 15 Nov 2016 13:50:22 -0800 (PST) From: Andrew Senkevich Date: Tue, 15 Nov 2016 21:50:00 -0000 Message-ID: Subject: [PATCH] Follow-up patch on enabling new AVX512 instructions To: gcc-patches@gcc.gnu.org, Uros Bizjak Content-Type: multipart/mixed; boundary=001a11467c6e4e3a4905415df361 X-SW-Source: 2016-11/txt/msg01557.txt.bz2 --001a11467c6e4e3a4905415df361 Content-Type: text/plain; charset=UTF-8 Content-length: 4462 Hi, this is follow-up with tests for new __target__ attributes and __builtin_cpu_supports update. gcc/ * config/i386/i386.c (processor_features): Add F_AVX5124VNNIW, F_AVX5124FMAPS. (isa_names_table): Handle new features. libgcc/ * config/i386/cpuinfo.c (processor_features): Add FEATURE_AVX5124VNNIW, FEATURE_AVX5124FMAPS. gcc/testsuite/ * gcc.target/i386/builtin_target.c: Handle new "avx5124vnniw", "avx5124fmaps". * gcc.target/i386/funcspec-56.inc: Test new attributes. diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 1da1abc..823930d --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -33205,6 +33205,8 @@ fold_builtin_cpu (tree fndecl, tree *args) F_AVX512PF, F_AVX512VBMI, F_AVX512IFMA, + F_AVX5124VNNIW, + F_AVX5124FMAPS, F_MAX }; @@ -33317,6 +33319,8 @@ fold_builtin_cpu (tree fndecl, tree *args) {"avx512pf",F_AVX512PF}, {"avx512vbmi",F_AVX512VBMI}, {"avx512ifma",F_AVX512IFMA}, + {"avx5124vnniw",F_AVX5124VNNIW}, + {"avx5124fmaps",F_AVX5124FMAPS}, }; tree __processor_model_type = build_processor_model_struct (); diff --git a/gcc/testsuite/gcc.target/i386/builtin_target.c b/gcc/testsuite/gcc.target/i386/builtin_target.c index 8d45d83..c620a74 --- a/gcc/testsuite/gcc.target/i386/builtin_target.c +++ b/gcc/testsuite/gcc.target/i386/builtin_target.c @@ -213,6 +213,10 @@ check_features (unsigned int ecx, unsigned int edx, assert (__builtin_cpu_supports ("avx512ifma")); if (ecx & bit_AVX512VBMI) assert (__builtin_cpu_supports ("avx512vbmi")); + if (edx & bit_AVX5124VNNIW) + assert (__builtin_cpu_supports ("avx5124vnniw")); + if (edx & bit_AVX5124FMAPS) + assert (__builtin_cpu_supports ("avx5124fmaps")); } } @@ -311,6 +315,10 @@ quick_check () assert (__builtin_cpu_supports ("avx512f") >= 0); + assert (__builtin_cpu_supports ("avx5124vnniw") >= 0); + + assert (__builtin_cpu_supports ("avx5124fmaps") >= 0); + /* Check CPU type. */ assert (__builtin_cpu_is ("amd") >= 0); diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c index af203f2..4a0ad25 --- a/libgcc/config/i386/cpuinfo.c +++ b/libgcc/config/i386/cpuinfo.c @@ -115,7 +115,9 @@ enum processor_features FEATURE_AVX512ER, FEATURE_AVX512PF, FEATURE_AVX512VBMI, - FEATURE_AVX512IFMA + FEATURE_AVX512IFMA, + FEATURE_AVX5124VNNIW, + FEATURE_AVX5124FMAPS }; struct __processor_model @@ -359,6 +361,10 @@ get_available_features (unsigned int ecx, unsigned int edx, features |= (1 << FEATURE_AVX512IFMA); if (ecx & bit_AVX512VBMI) features |= (1 << FEATURE_AVX512VBMI); + if (edx & bit_AVX5124VNNIW) + features |= (1 << FEATURE_AVX5124VNNIW); + if (edx & bit_AVX5124FMAPS) + features |= (1 << FEATURE_AVX5124FMAPS); } unsigned int ext_level; diff --git a/gcc/testsuite/gcc.target/i386/funcspec-56.inc b/gcc/testsuite/gcc.target/i386/funcspec-56.inc index 521ac8a..9334e9e 100644 --- a/gcc/testsuite/gcc.target/i386/funcspec-56.inc +++ b/gcc/testsuite/gcc.target/i386/funcspec-56.inc @@ -28,6 +28,8 @@ extern void test_avx512dq(void) __attribute__((__target__("avx512dq"))); extern void test_avx512er(void) __attribute__((__target__("avx512er"))); extern void test_avx512pf(void) __attribute__((__target__("avx512pf"))); extern void test_avx512cd(void) __attribute__((__target__("avx512cd"))); +extern void test_avx5124fmaps(void) __attribute__((__target__("avx5124fmaps"))); +extern void test_avx5124vnniw(void) __attribute__((__target__("avx5124vnniw"))); extern void test_bmi (void) __attribute__((__target__("bmi"))); extern void test_bmi2 (void) __attribute__((__target__("bmi2"))); @@ -59,6 +61,8 @@ extern void test_no_avx512dq(void) __attribute__((__target__("no-avx512dq"))); extern void test_no_avx512er(void) __attribute__((__target__("no-avx512er"))); extern void test_bo_avx512pf(void) __attribute__((__target__("no-avx512pf"))); extern void test_no_avx512cd(void) __attribute__((__target__("no-avx512cd"))); +extern void test_no_avx5124fmaps(void) __attribute__((__target__("no-avx5124fmaps"))); +extern void test_no_avx5124vnniw(void) __attribute__((__target__("no-avx5124vnniw"))); extern void test_no_bmi (void) __attribute__((__target__("no-bmi"))); extern void test_no_bmi2 (void) __attribute__((__target__("no-bmi2"))); -- WBR, Andrew --001a11467c6e4e3a4905415df361 Content-Type: application/octet-stream; name="followup_tests.patch" Content-Disposition: attachment; filename="followup_tests.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ivjzyh380 Content-length: 5328 ZGlmZiAtLWdpdCBhL2djYy9jb25maWcvaTM4Ni9pMzg2LmMgYi9nY2MvY29u ZmlnL2kzODYvaTM4Ni5jCmluZGV4IDFkYTFhYmMuLjgyMzkzMGQKLS0tIGEv Z2NjL2NvbmZpZy9pMzg2L2kzODYuYworKysgYi9nY2MvY29uZmlnL2kzODYv aTM4Ni5jCkBAIC0zMzIwNSw2ICszMzIwNSw4IEBAIGZvbGRfYnVpbHRpbl9j cHUgKHRyZWUgZm5kZWNsLCB0cmVlICphcmdzKQogICAgIEZfQVZYNTEyUEYs CiAgICAgRl9BVlg1MTJWQk1JLAogICAgIEZfQVZYNTEySUZNQSwKKyAgICBG X0FWWDUxMjRWTk5JVywKKyAgICBGX0FWWDUxMjRGTUFQUywKICAgICBGX01B WAogICB9OwogCkBAIC0zMzMxNyw2ICszMzMxOSw4IEBAIGZvbGRfYnVpbHRp bl9jcHUgKHRyZWUgZm5kZWNsLCB0cmVlICphcmdzKQogICAgICAgeyJhdng1 MTJwZiIsRl9BVlg1MTJQRn0sCiAgICAgICB7ImF2eDUxMnZibWkiLEZfQVZY NTEyVkJNSX0sCiAgICAgICB7ImF2eDUxMmlmbWEiLEZfQVZYNTEySUZNQX0s CisgICAgICB7ImF2eDUxMjR2bm5pdyIsRl9BVlg1MTI0Vk5OSVd9LAorICAg ICAgeyJhdng1MTI0Zm1hcHMiLEZfQVZYNTEyNEZNQVBTfSwKICAgICB9Owog CiAgIHRyZWUgX19wcm9jZXNzb3JfbW9kZWxfdHlwZSA9IGJ1aWxkX3Byb2Nl c3Nvcl9tb2RlbF9zdHJ1Y3QgKCk7CmRpZmYgLS1naXQgYS9nY2MvdGVzdHN1 aXRlL2djYy50YXJnZXQvaTM4Ni9idWlsdGluX3RhcmdldC5jIGIvZ2NjL3Rl c3RzdWl0ZS9nY2MudGFyZ2V0L2kzODYvYnVpbHRpbl90YXJnZXQuYwppbmRl eCA4ZDQ1ZDgzLi5jNjIwYTc0Ci0tLSBhL2djYy90ZXN0c3VpdGUvZ2NjLnRh cmdldC9pMzg2L2J1aWx0aW5fdGFyZ2V0LmMKKysrIGIvZ2NjL3Rlc3RzdWl0 ZS9nY2MudGFyZ2V0L2kzODYvYnVpbHRpbl90YXJnZXQuYwpAQCAtMjEzLDYg KzIxMywxMCBAQCBjaGVja19mZWF0dXJlcyAodW5zaWduZWQgaW50IGVjeCwg dW5zaWduZWQgaW50IGVkeCwKIAlhc3NlcnQgKF9fYnVpbHRpbl9jcHVfc3Vw cG9ydHMgKCJhdng1MTJpZm1hIikpOwogICAgICAgaWYgKGVjeCAmIGJpdF9B Vlg1MTJWQk1JKQogCWFzc2VydCAoX19idWlsdGluX2NwdV9zdXBwb3J0cyAo ImF2eDUxMnZibWkiKSk7CisgICAgICBpZiAoZWR4ICYgYml0X0FWWDUxMjRW Tk5JVykKKwlhc3NlcnQgKF9fYnVpbHRpbl9jcHVfc3VwcG9ydHMgKCJhdng1 MTI0dm5uaXciKSk7CisgICAgICBpZiAoZWR4ICYgYml0X0FWWDUxMjRGTUFQ UykKKwlhc3NlcnQgKF9fYnVpbHRpbl9jcHVfc3VwcG9ydHMgKCJhdng1MTI0 Zm1hcHMiKSk7CiAgICAgfQogfQogCkBAIC0zMTEsNiArMzE1LDEwIEBAIHF1 aWNrX2NoZWNrICgpCiAKICAgYXNzZXJ0IChfX2J1aWx0aW5fY3B1X3N1cHBv cnRzICgiYXZ4NTEyZiIpID49IDApOwogCisgIGFzc2VydCAoX19idWlsdGlu X2NwdV9zdXBwb3J0cyAoImF2eDUxMjR2bm5pdyIpID49IDApOworCisgIGFz c2VydCAoX19idWlsdGluX2NwdV9zdXBwb3J0cyAoImF2eDUxMjRmbWFwcyIp ID49IDApOworCiAgIC8qIENoZWNrIENQVSB0eXBlLiAgKi8KICAgYXNzZXJ0 IChfX2J1aWx0aW5fY3B1X2lzICgiYW1kIikgPj0gMCk7CiAKZGlmZiAtLWdp dCBhL2xpYmdjYy9jb25maWcvaTM4Ni9jcHVpbmZvLmMgYi9saWJnY2MvY29u ZmlnL2kzODYvY3B1aW5mby5jCmluZGV4IGFmMjAzZjIuLjRhMGFkMjUKLS0t IGEvbGliZ2NjL2NvbmZpZy9pMzg2L2NwdWluZm8uYworKysgYi9saWJnY2Mv Y29uZmlnL2kzODYvY3B1aW5mby5jCkBAIC0xMTUsNyArMTE1LDkgQEAgZW51 bSBwcm9jZXNzb3JfZmVhdHVyZXMKICAgRkVBVFVSRV9BVlg1MTJFUiwKICAg RkVBVFVSRV9BVlg1MTJQRiwKICAgRkVBVFVSRV9BVlg1MTJWQk1JLAotICBG RUFUVVJFX0FWWDUxMklGTUEKKyAgRkVBVFVSRV9BVlg1MTJJRk1BLAorICBG RUFUVVJFX0FWWDUxMjRWTk5JVywKKyAgRkVBVFVSRV9BVlg1MTI0Rk1BUFMK IH07CiAKIHN0cnVjdCBfX3Byb2Nlc3Nvcl9tb2RlbApAQCAtMzU5LDYgKzM2 MSwxMCBAQCBnZXRfYXZhaWxhYmxlX2ZlYXR1cmVzICh1bnNpZ25lZCBpbnQg ZWN4LCB1bnNpZ25lZCBpbnQgZWR4LAogCWZlYXR1cmVzIHw9ICgxIDw8IEZF QVRVUkVfQVZYNTEySUZNQSk7CiAgICAgICBpZiAoZWN4ICYgYml0X0FWWDUx MlZCTUkpCiAJZmVhdHVyZXMgfD0gKDEgPDwgRkVBVFVSRV9BVlg1MTJWQk1J KTsKKyAgICAgIGlmIChlZHggJiBiaXRfQVZYNTEyNFZOTklXKQorCWZlYXR1 cmVzIHw9ICgxIDw8IEZFQVRVUkVfQVZYNTEyNFZOTklXKTsKKyAgICAgIGlm IChlZHggJiBiaXRfQVZYNTEyNEZNQVBTKQorCWZlYXR1cmVzIHw9ICgxIDw8 IEZFQVRVUkVfQVZYNTEyNEZNQVBTKTsKICAgICB9CiAKICAgdW5zaWduZWQg aW50IGV4dF9sZXZlbDsKZGlmZiAtLWdpdCBhL2djYy90ZXN0c3VpdGUvZ2Nj LnRhcmdldC9pMzg2L2Z1bmNzcGVjLTU2LmluYyBiL2djYy90ZXN0c3VpdGUv Z2NjLnRhcmdldC9pMzg2L2Z1bmNzcGVjLTU2LmluYwppbmRleCA1MjFhYzhh Li45MzM0ZTllIDEwMDY0NAotLS0gYS9nY2MvdGVzdHN1aXRlL2djYy50YXJn ZXQvaTM4Ni9mdW5jc3BlYy01Ni5pbmMKKysrIGIvZ2NjL3Rlc3RzdWl0ZS9n Y2MudGFyZ2V0L2kzODYvZnVuY3NwZWMtNTYuaW5jCkBAIC0yOCw2ICsyOCw4 IEBAIGV4dGVybiB2b2lkIHRlc3RfYXZ4NTEyZHEodm9pZCkJCQlfX2F0dHJp YnV0ZV9fKChfX3RhcmdldF9fKCJhdng1MTJkcSIpKSk7CiBleHRlcm4gdm9p ZCB0ZXN0X2F2eDUxMmVyKHZvaWQpCQkJX19hdHRyaWJ1dGVfXygoX190YXJn ZXRfXygiYXZ4NTEyZXIiKSkpOwogZXh0ZXJuIHZvaWQgdGVzdF9hdng1MTJw Zih2b2lkKQkJCV9fYXR0cmlidXRlX18oKF9fdGFyZ2V0X18oImF2eDUxMnBm IikpKTsKIGV4dGVybiB2b2lkIHRlc3RfYXZ4NTEyY2Qodm9pZCkJCQlfX2F0 dHJpYnV0ZV9fKChfX3RhcmdldF9fKCJhdng1MTJjZCIpKSk7CitleHRlcm4g dm9pZCB0ZXN0X2F2eDUxMjRmbWFwcyh2b2lkKSAgICAgICAgICAgICBfX2F0 dHJpYnV0ZV9fKChfX3RhcmdldF9fKCJhdng1MTI0Zm1hcHMiKSkpOworZXh0 ZXJuIHZvaWQgdGVzdF9hdng1MTI0dm5uaXcodm9pZCkgICAgICAgICAgICAg X19hdHRyaWJ1dGVfXygoX190YXJnZXRfXygiYXZ4NTEyNHZubml3IikpKTsK IGV4dGVybiB2b2lkIHRlc3RfYm1pICh2b2lkKQkJCV9fYXR0cmlidXRlX18o KF9fdGFyZ2V0X18oImJtaSIpKSk7CiBleHRlcm4gdm9pZCB0ZXN0X2JtaTIg KHZvaWQpCQkJX19hdHRyaWJ1dGVfXygoX190YXJnZXRfXygiYm1pMiIpKSk7 CiAKQEAgLTU5LDYgKzYxLDggQEAgZXh0ZXJuIHZvaWQgdGVzdF9ub19hdng1 MTJkcSh2b2lkKQkJX19hdHRyaWJ1dGVfXygoX190YXJnZXRfXygibm8tYXZ4 NTEyZHEiKSkpOwogZXh0ZXJuIHZvaWQgdGVzdF9ub19hdng1MTJlcih2b2lk KQkJX19hdHRyaWJ1dGVfXygoX190YXJnZXRfXygibm8tYXZ4NTEyZXIiKSkp OwogZXh0ZXJuIHZvaWQgdGVzdF9ib19hdng1MTJwZih2b2lkKQkJX19hdHRy aWJ1dGVfXygoX190YXJnZXRfXygibm8tYXZ4NTEycGYiKSkpOwogZXh0ZXJu IHZvaWQgdGVzdF9ub19hdng1MTJjZCh2b2lkKQkJX19hdHRyaWJ1dGVfXygo X190YXJnZXRfXygibm8tYXZ4NTEyY2QiKSkpOworZXh0ZXJuIHZvaWQgdGVz dF9ub19hdng1MTI0Zm1hcHModm9pZCkgICAgICAgICAgX19hdHRyaWJ1dGVf XygoX190YXJnZXRfXygibm8tYXZ4NTEyNGZtYXBzIikpKTsKK2V4dGVybiB2 b2lkIHRlc3Rfbm9fYXZ4NTEyNHZubml3KHZvaWQpICAgICAgICAgIF9fYXR0 cmlidXRlX18oKF9fdGFyZ2V0X18oIm5vLWF2eDUxMjR2bm5pdyIpKSk7CiBl eHRlcm4gdm9pZCB0ZXN0X25vX2JtaSAodm9pZCkJCQlfX2F0dHJpYnV0ZV9f KChfX3RhcmdldF9fKCJuby1ibWkiKSkpOwogZXh0ZXJuIHZvaWQgdGVzdF9u b19ibWkyICh2b2lkKQkJCV9fYXR0cmlidXRlX18oKF9fdGFyZ2V0X18oIm5v LWJtaTIiKSkpOwogCg== --001a11467c6e4e3a4905415df361--