From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by sourceware.org (Postfix) with ESMTPS id 5D630383D5CD for ; Wed, 14 Dec 2022 01:45:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5D630383D5CD Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670982343; x=1702518343; h=from:to:cc:subject:date:message-id; bh=IRGz03Ow11NPudAsr0l7xHrLi0e6PqdQxvZQC3XVy9k=; b=ZuG+Msgf5V7kn5Col9wJh/Qjf+oWnt8gPsFFQ+U8Lw17i87xqfJ66s8M WT7R0urYsSj3HtOnvcm6Ioq6nNCG6TV1QYxsFjRKwqy/DjuzRsontYQKL 9M5Q8D9m0pbKmMprYub78hc7n6oA9rU34VnMSWpBTDb1vjB1iJmkluDPI Ia525JtCwwe9MsOaeAa1Z1unU1/WJYU0Dv+WnH37hmyRPjN1EJJtCsMl8 TEopMfVXcdNWS5p/tEiPyXVpWpnWsiqfBO+B917woHMTsVTtd7sJpgrFQ YdrPN+9kpFpdTJSQ++UIPw7l+UNQq1m7S3VOv5gYdFPGa/tM7CoZHRiGh w==; X-IronPort-AV: E=McAfee;i="6500,9779,10560"; a="315924389" X-IronPort-AV: E=Sophos;i="5.96,243,1665471600"; d="scan'208";a="315924389" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Dec 2022 17:45:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10560"; a="681361729" X-IronPort-AV: E=Sophos;i="5.96,243,1665471600"; d="scan'208";a="681361729" Received: from shvmail03.sh.intel.com ([10.239.245.20]) by orsmga001.jf.intel.com with ESMTP; 13 Dec 2022 17:45:39 -0800 Received: from shliclel320.sh.intel.com (shliclel320.sh.intel.com [10.239.240.127]) by shvmail03.sh.intel.com (Postfix) with ESMTP id BE59B100780A; Wed, 14 Dec 2022 09:45:38 +0800 (CST) From: Haochen Jiang To: gcc-patches@gcc.gnu.org Cc: hongtao.liu@intel.com, ubizjak@gmail.com Subject: [PATCH] Fix intrin name in Intel CMPccXADD Date: Wed, 14 Dec 2022 09:43:38 +0800 Message-Id: <20221214014338.85391-1-haochen.jiang@intel.com> X-Mailer: git-send-email 2.18.1 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Hi all, We usually use only one "_" but not two "__" as prefix in intrin. This patch aims to fix the intrin name for CMPccXADD. Bootstrapped and regtested on x86_64-pc-linux-gnu. Ok for trunk? BRs, Haochen gcc/ChangeLog: * config/i386/cmpccxaddintrin.h (__cmpccxadd_epi32): Rename to _cmpccxadd_epi32. (__cmpccxadd_epi64): Rename to _cmpccxadd_epi64. gcc/testsuite/ChangeLog: * gcc.target/i386/cmpccxadd-1.c: Fix intrin name. * gcc.target/i386/cmpccxadd-2.c: Ditto. --- gcc/config/i386/cmpccxaddintrin.h | 8 +-- gcc/testsuite/gcc.target/i386/cmpccxadd-1.c | 64 ++++++++++----------- gcc/testsuite/gcc.target/i386/cmpccxadd-2.c | 64 ++++++++++----------- 3 files changed, 68 insertions(+), 68 deletions(-) diff --git a/gcc/config/i386/cmpccxaddintrin.h b/gcc/config/i386/cmpccxaddintrin.h index 1afa03bd08a..11fce1f5e50 100644 --- a/gcc/config/i386/cmpccxaddintrin.h +++ b/gcc/config/i386/cmpccxaddintrin.h @@ -58,23 +58,23 @@ typedef enum { #ifdef __OPTIMIZE__ extern __inline int __attribute__ ((__gnu_inline__, __always_inline__, __artificial__)) -__cmpccxadd_epi32 (int *__A, int __B, int __C, const _CMPCCX_ENUM __D) +_cmpccxadd_epi32 (int *__A, int __B, int __C, const _CMPCCX_ENUM __D) { return __builtin_ia32_cmpccxadd (__A, __B, __C, __D); } extern __inline long long __attribute__ ((__gnu_inline__, __always_inline__, __artificial__)) -__cmpccxadd_epi64 (long long *__A, long long __B, long long __C, +_cmpccxadd_epi64 (long long *__A, long long __B, long long __C, const _CMPCCX_ENUM __D) { return __builtin_ia32_cmpccxadd64 (__A, __B, __C, __D); } #else -#define __cmpccxadd_epi32(A,B,C,D) \ +#define _cmpccxadd_epi32(A,B,C,D) \ __builtin_ia32_cmpccxadd ((int *) (A), (int) (B), (int) (C), \ (_CMPCCX_ENUM) (D)) -#define __cmpccxadd_epi64(A,B,C,D) \ +#define _cmpccxadd_epi64(A,B,C,D) \ __builtin_ia32_cmpccxadd64 ((long long *) (A), (long long) (B), \ (long long) (C), (_CMPCCX_ENUM) (D)) #endif diff --git a/gcc/testsuite/gcc.target/i386/cmpccxadd-1.c b/gcc/testsuite/gcc.target/i386/cmpccxadd-1.c index c825717e29e..537b79b8d2d 100644 --- a/gcc/testsuite/gcc.target/i386/cmpccxadd-1.c +++ b/gcc/testsuite/gcc.target/i386/cmpccxadd-1.c @@ -26,36 +26,36 @@ long long e, f; void extern cmpccxadd_test(void) { - b = __cmpccxadd_epi32 (a, b, c, _CMPCCX_O); - e = __cmpccxadd_epi64 (d, e, f, _CMPCCX_O); - b = __cmpccxadd_epi32 (a, b, c, _CMPCCX_NO); - e = __cmpccxadd_epi64 (d, e, f, _CMPCCX_NO); - b = __cmpccxadd_epi32 (a, b, c, _CMPCCX_B); - e = __cmpccxadd_epi64 (d, e, f, _CMPCCX_B); - b = __cmpccxadd_epi32 (a, b, c, _CMPCCX_NB); - e = __cmpccxadd_epi64 (d, e, f, _CMPCCX_NB); - b = __cmpccxadd_epi32 (a, b, c, _CMPCCX_Z); - e = __cmpccxadd_epi64 (d, e, f, _CMPCCX_Z); - b = __cmpccxadd_epi32 (a, b, c, _CMPCCX_NZ); - e = __cmpccxadd_epi64 (d, e, f, _CMPCCX_NZ); - b = __cmpccxadd_epi32 (a, b, c, _CMPCCX_BE); - e = __cmpccxadd_epi64 (d, e, f, _CMPCCX_BE); - b = __cmpccxadd_epi32 (a, b, c, _CMPCCX_NBE); - e = __cmpccxadd_epi64 (d, e, f, _CMPCCX_NBE); - b = __cmpccxadd_epi32 (a, b, c, _CMPCCX_S); - e = __cmpccxadd_epi64 (d, e, f, _CMPCCX_S); - b = __cmpccxadd_epi32 (a, b, c, _CMPCCX_NS); - e = __cmpccxadd_epi64 (d, e, f, _CMPCCX_NS); - b = __cmpccxadd_epi32 (a, b, c, _CMPCCX_P); - e = __cmpccxadd_epi64 (d, e, f, _CMPCCX_P); - b = __cmpccxadd_epi32 (a, b, c, _CMPCCX_NP); - e = __cmpccxadd_epi64 (d, e, f, _CMPCCX_NP); - b = __cmpccxadd_epi32 (a, b, c, _CMPCCX_L); - e = __cmpccxadd_epi64 (d, e, f, _CMPCCX_L); - b = __cmpccxadd_epi32 (a, b, c, _CMPCCX_NL); - e = __cmpccxadd_epi64 (d, e, f, _CMPCCX_NL); - b = __cmpccxadd_epi32 (a, b, c, _CMPCCX_LE); - e = __cmpccxadd_epi64 (d, e, f, _CMPCCX_LE); - b = __cmpccxadd_epi32 (a, b, c, _CMPCCX_NLE); - e = __cmpccxadd_epi64 (d, e, f, _CMPCCX_NLE); + b = _cmpccxadd_epi32 (a, b, c, _CMPCCX_O); + e = _cmpccxadd_epi64 (d, e, f, _CMPCCX_O); + b = _cmpccxadd_epi32 (a, b, c, _CMPCCX_NO); + e = _cmpccxadd_epi64 (d, e, f, _CMPCCX_NO); + b = _cmpccxadd_epi32 (a, b, c, _CMPCCX_B); + e = _cmpccxadd_epi64 (d, e, f, _CMPCCX_B); + b = _cmpccxadd_epi32 (a, b, c, _CMPCCX_NB); + e = _cmpccxadd_epi64 (d, e, f, _CMPCCX_NB); + b = _cmpccxadd_epi32 (a, b, c, _CMPCCX_Z); + e = _cmpccxadd_epi64 (d, e, f, _CMPCCX_Z); + b = _cmpccxadd_epi32 (a, b, c, _CMPCCX_NZ); + e = _cmpccxadd_epi64 (d, e, f, _CMPCCX_NZ); + b = _cmpccxadd_epi32 (a, b, c, _CMPCCX_BE); + e = _cmpccxadd_epi64 (d, e, f, _CMPCCX_BE); + b = _cmpccxadd_epi32 (a, b, c, _CMPCCX_NBE); + e = _cmpccxadd_epi64 (d, e, f, _CMPCCX_NBE); + b = _cmpccxadd_epi32 (a, b, c, _CMPCCX_S); + e = _cmpccxadd_epi64 (d, e, f, _CMPCCX_S); + b = _cmpccxadd_epi32 (a, b, c, _CMPCCX_NS); + e = _cmpccxadd_epi64 (d, e, f, _CMPCCX_NS); + b = _cmpccxadd_epi32 (a, b, c, _CMPCCX_P); + e = _cmpccxadd_epi64 (d, e, f, _CMPCCX_P); + b = _cmpccxadd_epi32 (a, b, c, _CMPCCX_NP); + e = _cmpccxadd_epi64 (d, e, f, _CMPCCX_NP); + b = _cmpccxadd_epi32 (a, b, c, _CMPCCX_L); + e = _cmpccxadd_epi64 (d, e, f, _CMPCCX_L); + b = _cmpccxadd_epi32 (a, b, c, _CMPCCX_NL); + e = _cmpccxadd_epi64 (d, e, f, _CMPCCX_NL); + b = _cmpccxadd_epi32 (a, b, c, _CMPCCX_LE); + e = _cmpccxadd_epi64 (d, e, f, _CMPCCX_LE); + b = _cmpccxadd_epi32 (a, b, c, _CMPCCX_NLE); + e = _cmpccxadd_epi64 (d, e, f, _CMPCCX_NLE); } diff --git a/gcc/testsuite/gcc.target/i386/cmpccxadd-2.c b/gcc/testsuite/gcc.target/i386/cmpccxadd-2.c index e713344a83d..5e897b12c66 100644 --- a/gcc/testsuite/gcc.target/i386/cmpccxadd-2.c +++ b/gcc/testsuite/gcc.target/i386/cmpccxadd-2.c @@ -92,39 +92,39 @@ main() _srcdest2_64[i] = srcdest1_64[i]; } - res[0] = __cmpccxadd_epi32 (&srcdest1[0], srcdest2[0], src3[0], _CMPCCX_O); - res[1] = __cmpccxadd_epi32 (&srcdest1[1], srcdest2[1], src3[1], _CMPCCX_NO); - res[2] = __cmpccxadd_epi32 (&srcdest1[2], srcdest2[2], src3[2], _CMPCCX_B); - res[3] = __cmpccxadd_epi32 (&srcdest1[3], srcdest2[3], src3[3], _CMPCCX_NB); - res[4] = __cmpccxadd_epi32 (&srcdest1[4], srcdest2[4], src3[4], _CMPCCX_Z); - res[5] = __cmpccxadd_epi32 (&srcdest1[5], srcdest2[5], src3[5], _CMPCCX_NZ); - res[6] = __cmpccxadd_epi32 (&srcdest1[6], srcdest2[6], src3[6], _CMPCCX_BE); - res[7] = __cmpccxadd_epi32 (&srcdest1[7], srcdest2[7], src3[7], _CMPCCX_NBE); - res[8] = __cmpccxadd_epi32 (&srcdest1[8], srcdest2[8], src3[8], _CMPCCX_S); - res[9] = __cmpccxadd_epi32 (&srcdest1[9], srcdest2[9], src3[9], _CMPCCX_NS); - res[10] = __cmpccxadd_epi32 (&srcdest1[10], srcdest2[10], src3[10], _CMPCCX_P); - res[11] = __cmpccxadd_epi32 (&srcdest1[11], srcdest2[11], src3[11], _CMPCCX_NP); - res[12] = __cmpccxadd_epi32 (&srcdest1[12], srcdest2[12], src3[12], _CMPCCX_L); - res[13] = __cmpccxadd_epi32 (&srcdest1[13], srcdest2[13], src3[13], _CMPCCX_NL); - res[14] = __cmpccxadd_epi32 (&srcdest1[14], srcdest2[14], src3[14], _CMPCCX_LE); - res[15] = __cmpccxadd_epi32 (&srcdest1[15], srcdest2[15], src3[15], _CMPCCX_NLE); + res[0] = _cmpccxadd_epi32 (&srcdest1[0], srcdest2[0], src3[0], _CMPCCX_O); + res[1] = _cmpccxadd_epi32 (&srcdest1[1], srcdest2[1], src3[1], _CMPCCX_NO); + res[2] = _cmpccxadd_epi32 (&srcdest1[2], srcdest2[2], src3[2], _CMPCCX_B); + res[3] = _cmpccxadd_epi32 (&srcdest1[3], srcdest2[3], src3[3], _CMPCCX_NB); + res[4] = _cmpccxadd_epi32 (&srcdest1[4], srcdest2[4], src3[4], _CMPCCX_Z); + res[5] = _cmpccxadd_epi32 (&srcdest1[5], srcdest2[5], src3[5], _CMPCCX_NZ); + res[6] = _cmpccxadd_epi32 (&srcdest1[6], srcdest2[6], src3[6], _CMPCCX_BE); + res[7] = _cmpccxadd_epi32 (&srcdest1[7], srcdest2[7], src3[7], _CMPCCX_NBE); + res[8] = _cmpccxadd_epi32 (&srcdest1[8], srcdest2[8], src3[8], _CMPCCX_S); + res[9] = _cmpccxadd_epi32 (&srcdest1[9], srcdest2[9], src3[9], _CMPCCX_NS); + res[10] = _cmpccxadd_epi32 (&srcdest1[10], srcdest2[10], src3[10], _CMPCCX_P); + res[11] = _cmpccxadd_epi32 (&srcdest1[11], srcdest2[11], src3[11], _CMPCCX_NP); + res[12] = _cmpccxadd_epi32 (&srcdest1[12], srcdest2[12], src3[12], _CMPCCX_L); + res[13] = _cmpccxadd_epi32 (&srcdest1[13], srcdest2[13], src3[13], _CMPCCX_NL); + res[14] = _cmpccxadd_epi32 (&srcdest1[14], srcdest2[14], src3[14], _CMPCCX_LE); + res[15] = _cmpccxadd_epi32 (&srcdest1[15], srcdest2[15], src3[15], _CMPCCX_NLE); - res_64[0] = __cmpccxadd_epi64 (&srcdest1_64[0], srcdest2_64[0], src3_64[0], _CMPCCX_O); - res_64[1] = __cmpccxadd_epi64 (&srcdest1_64[1], srcdest2_64[1], src3_64[1], _CMPCCX_NO); - res_64[2] = __cmpccxadd_epi64 (&srcdest1_64[2], srcdest2_64[2], src3_64[2], _CMPCCX_B); - res_64[3] = __cmpccxadd_epi64 (&srcdest1_64[3], srcdest2_64[3], src3_64[3], _CMPCCX_NB); - res_64[4] = __cmpccxadd_epi64 (&srcdest1_64[4], srcdest2_64[4], src3_64[4], _CMPCCX_Z); - res_64[5] = __cmpccxadd_epi64 (&srcdest1_64[5], srcdest2_64[5], src3_64[5], _CMPCCX_NZ); - res_64[6] = __cmpccxadd_epi64 (&srcdest1_64[6], srcdest2_64[6], src3_64[6], _CMPCCX_BE); - res_64[7] = __cmpccxadd_epi64 (&srcdest1_64[7], srcdest2_64[7], src3_64[7], _CMPCCX_NBE); - res_64[8] = __cmpccxadd_epi64 (&srcdest1_64[8], srcdest2_64[8], src3_64[8], _CMPCCX_S); - res_64[9] = __cmpccxadd_epi64 (&srcdest1_64[9], srcdest2_64[9], src3_64[9], _CMPCCX_NS); - res_64[10] = __cmpccxadd_epi64 (&srcdest1_64[10], srcdest2_64[10], src3_64[10], _CMPCCX_P); - res_64[11] = __cmpccxadd_epi64 (&srcdest1_64[11], srcdest2_64[11], src3_64[11], _CMPCCX_NP); - res_64[12] = __cmpccxadd_epi64 (&srcdest1_64[12], srcdest2_64[12], src3_64[12], _CMPCCX_L); - res_64[13] = __cmpccxadd_epi64 (&srcdest1_64[13], srcdest2_64[13], src3_64[13], _CMPCCX_NL); - res_64[14] = __cmpccxadd_epi64 (&srcdest1_64[14], srcdest2_64[14], src3_64[14], _CMPCCX_LE); - res_64[15] = __cmpccxadd_epi64 (&srcdest1_64[15], srcdest2_64[15], src3_64[15], _CMPCCX_NLE); + res_64[0] = _cmpccxadd_epi64 (&srcdest1_64[0], srcdest2_64[0], src3_64[0], _CMPCCX_O); + res_64[1] = _cmpccxadd_epi64 (&srcdest1_64[1], srcdest2_64[1], src3_64[1], _CMPCCX_NO); + res_64[2] = _cmpccxadd_epi64 (&srcdest1_64[2], srcdest2_64[2], src3_64[2], _CMPCCX_B); + res_64[3] = _cmpccxadd_epi64 (&srcdest1_64[3], srcdest2_64[3], src3_64[3], _CMPCCX_NB); + res_64[4] = _cmpccxadd_epi64 (&srcdest1_64[4], srcdest2_64[4], src3_64[4], _CMPCCX_Z); + res_64[5] = _cmpccxadd_epi64 (&srcdest1_64[5], srcdest2_64[5], src3_64[5], _CMPCCX_NZ); + res_64[6] = _cmpccxadd_epi64 (&srcdest1_64[6], srcdest2_64[6], src3_64[6], _CMPCCX_BE); + res_64[7] = _cmpccxadd_epi64 (&srcdest1_64[7], srcdest2_64[7], src3_64[7], _CMPCCX_NBE); + res_64[8] = _cmpccxadd_epi64 (&srcdest1_64[8], srcdest2_64[8], src3_64[8], _CMPCCX_S); + res_64[9] = _cmpccxadd_epi64 (&srcdest1_64[9], srcdest2_64[9], src3_64[9], _CMPCCX_NS); + res_64[10] = _cmpccxadd_epi64 (&srcdest1_64[10], srcdest2_64[10], src3_64[10], _CMPCCX_P); + res_64[11] = _cmpccxadd_epi64 (&srcdest1_64[11], srcdest2_64[11], src3_64[11], _CMPCCX_NP); + res_64[12] = _cmpccxadd_epi64 (&srcdest1_64[12], srcdest2_64[12], src3_64[12], _CMPCCX_L); + res_64[13] = _cmpccxadd_epi64 (&srcdest1_64[13], srcdest2_64[13], src3_64[13], _CMPCCX_NL); + res_64[14] = _cmpccxadd_epi64 (&srcdest1_64[14], srcdest2_64[14], src3_64[14], _CMPCCX_LE); + res_64[15] = _cmpccxadd_epi64 (&srcdest1_64[15], srcdest2_64[15], src3_64[15], _CMPCCX_NLE); for (int i = 0; i < 16; i++) { -- 2.18.1