From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by sourceware.org (Postfix) with ESMTPS id C83683858C20 for ; Fri, 9 Jun 2023 06:23:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C83683858C20 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=1686291804; x=1717827804; h=from:to:cc:subject:date:message-id:references: in-reply-to:mime-version; bh=N2r+Kn6tMeDuJnqC/2+wXeKsH8G0SIAChBU8S5u8v5s=; b=mIGXtbB1A4HyuBdaHFMpkXZNvaMDWepM5X8+TAToUUpFNyO/EoY4vkvd mFKQVqkcBLt4ddw8MrezZ8nuGHH16b+4jhGc2Gu3f+k26piCLL9ilOghD KJavmPLcRJAeUHYv6vy4/mAZ4w0UVbpnjk4EOFloyUW2uCc2XgCT9AzrE hOSgcyrwg8YiEVTLs7ojntVGftmOKB4AYPFiZ/gSJysDb0bYV3AY9p4rW ENbsOmMqi0WYQn9OTnoK+tw7oUuPUn8E3uJlhIzXpZuYd8Gw9fA54/P/O W/N+IIjOTwnTFOhN2k9c5zM5kC7tlw7H7B2Ow5iPmz61qFtt4CpLn5HFC g==; X-IronPort-AV: E=McAfee;i="6600,9927,10735"; a="347178449" X-IronPort-AV: E=Sophos;i="6.00,228,1681196400"; d="scan'208,217";a="347178449" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2023 23:23:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10735"; a="800097216" X-IronPort-AV: E=Sophos;i="6.00,228,1681196400"; d="scan'208,217";a="800097216" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by FMSMGA003.fm.intel.com with ESMTP; 08 Jun 2023 23:23:18 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 8 Jun 2023 23:23:17 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Thu, 8 Jun 2023 23:23:17 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.104) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Thu, 8 Jun 2023 23:23:16 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D9Q0BjJ82QsxL0mRnIk1VD5/pfLYCehsVGvYuC7I5/wDEY9PDwI8VyQlvChz+L4x3xP4rbXZLI00FHySCyHYwx9nbQP67sOM4GKDox0KzOVkElgtRz5NXXkhJBvgTE3Qa+tGNMDQNEgcKFIlitPdmyvuP3V6BjpCsftVU0FOFldMkDXpcc/Qc82G8cgKqipG2iF3iihbEypQ9Kwt9XF5RIANPoW9a6uzP3m+Dtvuf40p+79V28u6406qPIa+ovp3fAavVBCM9jiAVjfhNedw3JZnlHgWpSElgR48obRb6DcniKlZ2SSobtFnuuqFE0FlhyPClOwxFWa7BOI1F15uxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cg8eWNJPNygYMpSb+xvf1dHyOCCKeK2yaVGSqWnQoL4=; b=l2Fxc91TIgcmsqkpLxMbatF7Zg+YZtnP2rl/B21if/SmLgp4PreiCc9HMnND0tGUvObIf82VzyjrxLOKhfv2Kdp/CVMRrgmRYQFKR/bSDfsQGaQ0cGnpBFALklOfn46/f1tZ9i0XFk1FobLZmlk+M2nV6NOLNzXjcBzxbJreqN3TzbKWKQ2DYOu9IRDOiKOaWc6fASx+BwoJrLdjJ6Qtpp+qXB/tPgNl2QDreK+mBEfmlS2cjCjxzbEpLcwOX/Z43N/tNProKZhiEXOJlPRpBooWGv4YXDT0OdDDIjE7fKD/TrnVB/nhSPNlLgEen0yfUsDl3vtus3scp9+cY8X+Fg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from MW5PR11MB5908.namprd11.prod.outlook.com (2603:10b6:303:194::10) by DS0PR11MB7192.namprd11.prod.outlook.com (2603:10b6:8:13a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.33; Fri, 9 Jun 2023 06:23:16 +0000 Received: from MW5PR11MB5908.namprd11.prod.outlook.com ([fe80::127c:f4cc:e699:8f73]) by MW5PR11MB5908.namprd11.prod.outlook.com ([fe80::127c:f4cc:e699:8f73%5]) with mapi id 15.20.6455.030; Fri, 9 Jun 2023 06:23:15 +0000 From: "Li, Pan2" To: "juzhe.zhong@rivai.ai" , gcc-patches CC: Robin Dapp , jeffreyalaw , "Wang, Yanzhang" , kito.cheng Subject: RE: [PATCH v9] RISC-V: Refactor requirement of ZVFH and ZVFHMIN. Thread-Topic: [PATCH v9] RISC-V: Refactor requirement of ZVFH and ZVFHMIN. Thread-Index: AQHZmpere8sgx6FfY06UHEynfKge/q+B/hzWgAAAH4A= Date: Fri, 9 Jun 2023 06:23:15 +0000 Message-ID: References: <20230606123646.1553843-1-pan2.li@intel.com>, <20230609055948.1744603-1-pan2.li@intel.com> <33EBD978CB5D8100+20230609141332256774139@rivai.ai> In-Reply-To: <33EBD978CB5D8100+20230609141332256774139@rivai.ai> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MW5PR11MB5908:EE_|DS0PR11MB7192:EE_ x-ms-office365-filtering-correlation-id: 125b7720-fc8f-427f-ac19-08db68b20241 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: GWW8qc9HylopASlUvhcMTrZeFunbPdW1ELfJh4j/MEkZNsKRSrf71EjapMOKVCsg6FYscEswbZCXTOjHWHC/mhUljD5FqLsaibEI0kPxgQiqza7muSapR9j6kaumIocCcjMGBfAHfRpNP8KL2rz3x1wUkFG9+9WT/8IO13G6uUcFCNxVkK9YIUQ29tagciTlrEbNJV7gBjj9VgmQrqhrxIJ7sMWdZa273pdP91PQ6H6bJd5qSebajJX0lFhLGh+tOjvaHW9A43lqB4vbfQuIAfdAwMeccM3SbHwMmfBuELLu7c8meJUxkV4pKVzAdNguXQL/KgfJWDUoy0FfFWJFGclj/BLSPcNfm8DUs00wLInmN1RxvrmBdzZ8kGTKotz+3zdB06rIGQkKO4h6IbBD81dN5UF+JhKzNTegvhUBSDB4JHQzgSw7gOWi4LV5QC1VIkZvgEau7q/GLvprXHaLuYVJoDr33tTnLgYmqcvkf1xq/3fb9hIZa6RA6elLyHf5A5uBPNdlxKYGr+n9nk4A9qoaGJyJOQjIwNznudEThy2+6itsZuIyCeS9W5+eNQMp1255fv4NaH6+TcHFzQ/rR+SmfScrJ1IxdsC6910dWTk= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW5PR11MB5908.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(396003)(136003)(376002)(366004)(346002)(451199021)(66556008)(66476007)(64756008)(66946007)(66446008)(76116006)(110136005)(54906003)(478600001)(8676002)(5660300002)(8936002)(52536014)(71200400001)(4326008)(84970400001)(316002)(41300700001)(7696005)(38100700002)(55016003)(82960400001)(122000001)(53546011)(38070700005)(6506007)(186003)(9686003)(83380400001)(26005)(86362001)(30864003)(2906002)(33656002)(559001)(579004);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?zDVeAWXLLyZOwV5T2wAm7dQPUKkzO3CPMLw4yOykmEfQkNEdM5ht7YV+FhMo?= =?us-ascii?Q?vAbF6/Q816S7V1gmxhtGP2wtndmXtaW6Tk/W74yI5dMJS+uVlnXmrd/UZhlA?= =?us-ascii?Q?X3i5QCjIO53CH6GygyXQG/DRGYGYup1fFHIOV1YJxpd4OQd/fGxmSf6ZDFxL?= =?us-ascii?Q?KB94r0No2kpGnhCYeJX+s9mV+otHP5HHwFoB93sGiu7Zk5B1iH+Lg1fQ7OTc?= =?us-ascii?Q?dvFHXL98Ydy0ynnLNVKjWxQYsQdHmPP/OYdCpTeewTcxKgXkjZkWwXmsb0LA?= =?us-ascii?Q?6IQNfS2lqszt6Yd6e6GeDjn7wzoJbyTXKNaCu8Wb8y9UXRZ5qPCpvsHxrZ4l?= =?us-ascii?Q?j6NkIaIeftRjpegrgib6a5lrrlsTFddfs49jrNU10byfl+2dskivYK/s6dxi?= =?us-ascii?Q?T+hrrV+hxcj5f/Wouag7/BULkq4UXKBj5a0P/P23RHn8aklrm9UglSUWrQw1?= =?us-ascii?Q?PUO5GLqqoEFgOdktMJ53TjwzQGKGQ3s6eNGgkJNyF8ejnqWg+cDhfGQ6VqCP?= =?us-ascii?Q?vBt+autOPwRA5lKDbQ/hL9gf/VVtM2vjfneAgRBnoWnJCb4rPV8ssLFsGPSf?= =?us-ascii?Q?aoWO83gYa8U1HaidGO+ktamwYgyyBZYUAafmA3CyYK9diza9kmBKyLO8MI+z?= =?us-ascii?Q?ccgWNwqQyT36TCJtqp+lP61LNfcu0iKoMaku8jAYVxmeunhnlTZX6L1mQu3V?= =?us-ascii?Q?eSc0iKxJysk95izKj97GKD3I/KvdXs7tkJYccc8GAYFlq1l7lsHu0praPDDG?= =?us-ascii?Q?RIHrlvfqjyl4dYEIYJpTP7gu0VndmDjX8mQ3qu88EGbZ37Xykg4Xc9CICI80?= =?us-ascii?Q?07TpZ7Y+fshLuawaDQ/nSc2vu4E3ZzKt8ym5BXmxZrDfCvJSEYImTC1mP4rV?= =?us-ascii?Q?RkECEW2ey4LOn5LBj83D28Np9cy8ZZOz1xGRlRBLKYEOeextY5N8sUeQS0ec?= =?us-ascii?Q?Zq9/6FbGQ3sTSwoNX6oZtkNjivqwBOkNWfz0/l+77sxLD18ntppO8i15H8rq?= =?us-ascii?Q?ZucTErV3qP4mLMtkuS9xx6TpK334jC/Ac+prQHvVd4iFxou4tHxDeHJLtTvs?= =?us-ascii?Q?OEnBCKlxuZbgA/3lVr9+OEzsYQrUvOeCBvEQtmjPgALdDGB95OtTAE88g/MF?= =?us-ascii?Q?AhcqYprkXSWmTP1wJFwQjd/x6/cE0pr8wE4pb0xICK+JEs/Du+ilY6wHKGon?= =?us-ascii?Q?ihqomm0QKKjQaaZzPSNR6Pyc0DiyPRs4jbJHpDCHt6wG+QsOI8MUTpmtObFU?= =?us-ascii?Q?SYb2v1eWzsLJB7fPTvQlaNzHAxuqhbkiaypbEnVs4o1J+OSKoTU5RAg/oo3X?= =?us-ascii?Q?lKJ4JuD9VDTPjJS2Bvyb9zxfhPJ8rOm4qqXmgxdBoM+3IqKvhDqFYLVHnGXl?= =?us-ascii?Q?RN+p6xw2sq5E3fNBFOxq/fjfuzBGdf3670kNWIDHUnRkGffoOnWwnkFIeQz5?= =?us-ascii?Q?1OBD16DCa6NdBvwHc6EAYxlccChMfb96G0ioriRnruSapnIBkF8D4frtPbAx?= =?us-ascii?Q?45Am0Su7J4ydbnVAwEBoD25P0NXEE53rUYrhCooYN5V7/7xJitlKbi/zQr7J?= =?us-ascii?Q?ptetGUOzN8T3qJyd+Cs=3D?= Content-Type: multipart/alternative; boundary="_000_MW5PR11MB5908F2E03ED49B7B64D677C5A951AMW5PR11MB5908namp_" MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW5PR11MB5908.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 125b7720-fc8f-427f-ac19-08db68b20241 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jun 2023 06:23:15.4248 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: J3yOERTtKavcO1kKOCubzVmwvTQWAf1K8nHEHvpGJZL/do0az/v+kXkTnNiXKp+Pe3fh/109CjI35Z2LAVetTQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB7192 X-OriginatorOrg: intel.com X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,HTML_MESSAGE,KAM_SHORT,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE 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: --_000_MW5PR11MB5908F2E03ED49B7B64D677C5A951AMW5PR11MB5908namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable -;; ISA attributes. -(define_attr "ext" "base,f,d,vector" - (const_string "base")) - -;; True if the extension is enabled. -(define_attr "ext_enabled" "no,yes" - (cond [(eq_attr "ext" "base") - (const_string "yes") - - (and (eq_attr "ext" "f") - (match_test "TARGET_HARD_FLOAT")) - (const_string "yes") - - (and (eq_attr "ext" "d") - (match_test "TARGET_DOUBLE_FLOAT")) - (const_string "yes") - - (and (eq_attr "ext" "vector") - (match_test "TARGET_VECTOR")) - (const_string "yes") - ] - (const_string "no"))) >> Why change this ? As the fp will reference the type attr, we should move this part after the = type attr definition. -;; Attribute to control enable or disable instructions. -(define_attr "enabled" "no,yes" - (cond [(eq_attr "ext_enabled" "no") - (const_string "no")] - (const_string "yes"))) >> I think it should only add fp16_vector_disable. However, it seems the wh= ole thing is removed? The same as above, move to the place after than type attr definition and on= ly add fp_vector_disable here. >> This should be in vector.md instead of riscv.md It will trigger "unknown attribute `fp_vector_disabled' in definition of at= tribute `enabled'", because riscv.md include the vector.md at the end of fi= le. Pan From: juzhe.zhong@rivai.ai Sent: Friday, June 9, 2023 2:14 PM To: Li, Pan2 ; gcc-patches Cc: Robin Dapp ; jeffreyalaw ; = Li, Pan2 ; Wang, Yanzhang ; kit= o.cheng Subject: Re: [PATCH v9] RISC-V: Refactor requirement of ZVFH and ZVFHMIN. -;; ISA attributes. -(define_attr "ext" "base,f,d,vector" - (const_string "base")) - -;; True if the extension is enabled. -(define_attr "ext_enabled" "no,yes" - (cond [(eq_attr "ext" "base") - (const_string "yes") - - (and (eq_attr "ext" "f") - (match_test "TARGET_HARD_FLOAT")) - (const_string "yes") - - (and (eq_attr "ext" "d") - (match_test "TARGET_DOUBLE_FLOAT")) - (const_string "yes") - - (and (eq_attr "ext" "vector") - (match_test "TARGET_VECTOR")) - (const_string "yes") - ] - (const_string "no"))) Why change this ? -;; Attribute to control enable or disable instructions. -(define_attr "enabled" "no,yes" - (cond [(eq_attr "ext_enabled" "no") - (const_string "no")] - (const_string "yes"))) I think it should only add fp16_vector_disable. However, it seems the whole= thing is removed? +;; True if the float point vector is disabled. +(define_attr "fp_vector_disabled" "no,yes" + (cond [ + (and (eq_attr "type" "vfmov,vfalu,vfmul,vfdiv, + vfwalu,vfwmul,vfmuladd,vfwmuladd, + vfsqrt,vfrecp,vfminmax,vfsgnj,vfcmp, + vfclass,vfmerge, + vfncvtitof,vfwcvtftoi,vfcvtftoi,vfcvtitof, + vfredo,vfredu,vfwredo,vfwredu, + vfslide1up,vfslide1down") + (and (eq_attr "mode" "VNx1HF,VNx2HF,VNx4HF,VNx8HF,VNx16HF,VNx32HF,VNx64HF= ") + (match_test "!TARGET_ZVFH"))) + (const_string "yes") + + (and (eq_attr "type" "vfncvtftoi,vfwcvtitof") + (and (eq_attr "mode" "VNx1QI,VNx2QI,VNx4QI,VNx8QI,VNx16QI,VNx32QI,VNx64QI= ") + (match_test "!TARGET_ZVFH"))) + (const_string "yes") + ] + (const_string "no"))) This should be in vector.md instead of riscv.md ________________________________ juzhe.zhong@rivai.ai From: pan2.li Date: 2023-06-09 13:59 To: gcc-patches CC: juzhe.zhong; rdapp.gcc; jeffreyalaw; pan2.li; yanzhang.wang; kito.cheng Subject: [PATCH v9] RISC-V: Refactor requirement of ZVFH and ZVFHMIN. From: Pan Li > This patch would like to refactor the requirement of both the ZVFH and ZVFHMIN. By default, the ZVFHMIN will enable FP16 for all the iterators of RVV. And then the ZVFH will leverage one define attr the gate for FP16 supported or not. Please note the ZVFH will cover the ZVFHMIN instructions. This patch add one test for this. Signed-off-by: Pan Li > Co-Authored by: Juzhe-Zhong > Co-Authored by: Kito Cheng > gcc/ChangeLog: * config/riscv/riscv.md (ext): Move to another place. (ext_enabled): Ditto. (fp_vector_disabled): New define attr. (enabled): Add fp_vector_disabled to the cond. * config/riscv/vector-iterators.md: Fix V_WHOLE and V_FRACT. gcc/testsuite/ChangeLog: * gcc.target/riscv/rvv/base/zvfhmin-intrinsic.c: Add vle16 test for ZVFHMIN. --- gcc/config/riscv/riscv.md | 84 ++++++++++++------- gcc/config/riscv/vector-iterators.md | 23 ++--- .../riscv/rvv/base/zvfhmin-intrinsic.c | 15 +++- 3 files changed, 81 insertions(+), 41 deletions(-) diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md index 38b8fba2a53..d1c7c3a3008 100644 --- a/gcc/config/riscv/riscv.md +++ b/gcc/config/riscv/riscv.md @@ -216,35 +216,6 @@ (define_attr "dword_mode" "no,yes" (const_string "yes")] (const_string "no"))) -;; ISA attributes. -(define_attr "ext" "base,f,d,vector" - (const_string "base")) - -;; True if the extension is enabled. -(define_attr "ext_enabled" "no,yes" - (cond [(eq_attr "ext" "base") - (const_string "yes") - - (and (eq_attr "ext" "f") - (match_test "TARGET_HARD_FLOAT")) - (const_string "yes") - - (and (eq_attr "ext" "d") - (match_test "TARGET_DOUBLE_FLOAT")) - (const_string "yes") - - (and (eq_attr "ext" "vector") - (match_test "TARGET_VECTOR")) - (const_string "yes") - ] - (const_string "no"))) - -;; Attribute to control enable or disable instructions. -(define_attr "enabled" "no,yes" - (cond [(eq_attr "ext_enabled" "no") - (const_string "no")] - (const_string "yes"))) - ;; Classification of each insn. ;; branch conditional branch ;; jump unconditional jump @@ -434,6 +405,61 @@ (define_attr "type" (eq_attr "move_type" "rdvlenb") (const_string "rdvlenb")] (const_string "unknown"))) +;; ISA attributes. +(define_attr "ext" "base,f,d,vector" + (const_string "base")) + +;; True if the extension is enabled. +(define_attr "ext_enabled" "no,yes" + (cond [(eq_attr "ext" "base") + (const_string "yes") + + (and (eq_attr "ext" "f") + (match_test "TARGET_HARD_FLOAT")) + (const_string "yes") + + (and (eq_attr "ext" "d") + (match_test "TARGET_DOUBLE_FLOAT")) + (const_string "yes") + + (and (eq_attr "ext" "vector") + (match_test "TARGET_VECTOR")) + (const_string "yes") + ] + (const_string "no"))) + +;; True if the float point vector is disabled. +(define_attr "fp_vector_disabled" "no,yes" + (cond [ + (and (eq_attr "type" "vfmov,vfalu,vfmul,vfdiv, + vfwalu,vfwmul,vfmuladd,vfwmuladd, + vfsqrt,vfrecp,vfminmax,vfsgnj,vfcmp, + vfclass,vfmerge, + vfncvtitof,vfwcvtftoi,vfcvtftoi,vfcvtitof, + vfredo,vfredu,vfwredo,vfwredu, + vfslide1up,vfslide1down") + (and (eq_attr "mode" "VNx1HF,VNx2HF,VNx4HF,VNx8HF,VNx16HF,VNx32HF,VNx64HF= ") + (match_test "!TARGET_ZVFH"))) + (const_string "yes") + + (and (eq_attr "type" "vfncvtftoi,vfwcvtitof") + (and (eq_attr "mode" "VNx1QI,VNx2QI,VNx4QI,VNx8QI,VNx16QI,VNx32QI,VNx64QI= ") + (match_test "!TARGET_ZVFH"))) + (const_string "yes") + ] + (const_string "no"))) + +;; Attribute to control enable or disable instructions. +(define_attr "enabled" "no,yes" + (cond [ + (eq_attr "ext_enabled" "no") + (const_string "no") + + (eq_attr "fp_vector_disabled" "yes") + (const_string "no") + ] + (const_string "yes"))) + ;; Length of instruction in bytes. (define_attr "length" "" (cond [ diff --git a/gcc/config/riscv/vector-iterators.md b/gcc/config/riscv/vector= -iterators.md index f4946d84449..234b712bc9d 100644 --- a/gcc/config/riscv/vector-iterators.md +++ b/gcc/config/riscv/vector-iterators.md @@ -453,9 +453,8 @@ (define_mode_iterator V_WHOLE [ (VNx1DI "TARGET_VECTOR_ELEN_64 && TARGET_MIN_VLEN < 128") (VNx2DI "TARGE= T_VECTOR_ELEN_64") (VNx4DI "TARGET_VECTOR_ELEN_64") (VNx8DI "TARGET_VECTOR_ELEN_64") (VNx16= DI "TARGET_VECTOR_ELEN_64 && TARGET_MIN_VLEN >=3D 128") - (VNx1HF "TARGET_VECTOR_ELEN_FP_16 && TARGET_MIN_VLEN < 128") - (VNx2HF "TARGET_VECTOR_ELEN_FP_16") - (VNx4HF "TARGET_VECTOR_ELEN_FP_16") + (VNx2HF "TARGET_VECTOR_ELEN_FP_16 && TARGET_MIN_VLEN =3D=3D 32") + (VNx4HF "TARGET_VECTOR_ELEN_FP_16 && TARGET_MIN_VLEN =3D=3D 64") (VNx8HF "TARGET_VECTOR_ELEN_FP_16") (VNx16HF "TARGET_VECTOR_ELEN_FP_16") (VNx32HF "TARGET_VECTOR_ELEN_FP_16 && TARGET_MIN_VLEN > 32") @@ -477,7 +476,11 @@ (define_mode_iterator V_WHOLE [ (define_mode_iterator V_FRACT [ (VNx1QI "TARGET_MIN_VLEN < 128") VNx2QI (VNx4QI "TARGET_MIN_VLEN > 32") = (VNx8QI "TARGET_MIN_VLEN >=3D 128") (VNx1HI "TARGET_MIN_VLEN < 128") (VNx2HI "TARGET_MIN_VLEN > 32") (VNx4HI= "TARGET_MIN_VLEN >=3D 128") - (VNx1HF "TARGET_MIN_VLEN < 128") (VNx2HF "TARGET_MIN_VLEN > 32") (VNx4HF= "TARGET_MIN_VLEN >=3D 128") + + (VNx1HF "TARGET_VECTOR_ELEN_FP_16 && TARGET_MIN_VLEN < 128") + (VNx2HF "TARGET_VECTOR_ELEN_FP_16 && TARGET_MIN_VLEN > 32") + (VNx4HF "TARGET_VECTOR_ELEN_FP_16 && TARGET_MIN_VLEN >=3D 128") + (VNx1SI "TARGET_MIN_VLEN > 32 && TARGET_MIN_VLEN < 128") (VNx2SI "TARGET= _MIN_VLEN >=3D 128") (VNx1SF "TARGET_VECTOR_ELEN_FP_32 && TARGET_MIN_VLEN > 32 && TARGET_MIN_= VLEN < 128") (VNx2SF "TARGET_VECTOR_ELEN_FP_32 && TARGET_MIN_VLEN >=3D 128") @@ -497,12 +500,12 @@ (define_mode_iterator VWEXTI [ ]) (define_mode_iterator VWEXTF [ - (VNx1SF "TARGET_VECTOR_ELEN_FP_32 && TARGET_MIN_VLEN < 128") - (VNx2SF "TARGET_VECTOR_ELEN_FP_32") - (VNx4SF "TARGET_VECTOR_ELEN_FP_32") - (VNx8SF "TARGET_VECTOR_ELEN_FP_32") - (VNx16SF "TARGET_VECTOR_ELEN_FP_32 && TARGET_MIN_VLEN > 32") - (VNx32SF "TARGET_VECTOR_ELEN_FP_32 && TARGET_MIN_VLEN >=3D 128") + (VNx1SF "TARGET_VECTOR_ELEN_FP_16 && TARGET_VECTOR_ELEN_FP_32 && TARGET_= MIN_VLEN < 128") + (VNx2SF "TARGET_VECTOR_ELEN_FP_16 && TARGET_VECTOR_ELEN_FP_32") + (VNx4SF "TARGET_VECTOR_ELEN_FP_16 && TARGET_VECTOR_ELEN_FP_32") + (VNx8SF "TARGET_VECTOR_ELEN_FP_16 && TARGET_VECTOR_ELEN_FP_32") + (VNx16SF "TARGET_VECTOR_ELEN_FP_16 && TARGET_VECTOR_ELEN_FP_32 && TARGET= _MIN_VLEN > 32") + (VNx32SF "TARGET_VECTOR_ELEN_FP_16 && TARGET_VECTOR_ELEN_FP_32 && TARGET= _MIN_VLEN >=3D 128") (VNx1DF "TARGET_VECTOR_ELEN_FP_64 && TARGET_MIN_VLEN < 128") (VNx2DF "TARGET_VECTOR_ELEN_FP_64") diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/zvfhmin-intrinsic.c b/= gcc/testsuite/gcc.target/riscv/rvv/base/zvfhmin-intrinsic.c index 0923b6bc4d2..f1a29b639e0 100644 --- a/gcc/testsuite/gcc.target/riscv/rvv/base/zvfhmin-intrinsic.c +++ b/gcc/testsuite/gcc.target/riscv/rvv/base/zvfhmin-intrinsic.c @@ -3,6 +3,8 @@ #include "riscv_vector.h" +typedef _Float16 float16_t; + vfloat16mf4_t test_vfncvt_f_f_w_f16mf4(vfloat32mf2_t src, size_t vl) { return __riscv_vfncvt_f_f_w_f16mf4(src, vl); } @@ -43,11 +45,20 @@ vfloat32m8_t test_vfwcvt_f_f_v_f32m8(vfloat16m4_t src, = size_t vl) { return __riscv_vfwcvt_f_f_v_f32m8(src, vl); } -/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\= s*mf4,\s*t[au],\s*m[au]} 2 } } */ +vfloat16mf4_t test_vle16_v_f16mf4(const float16_t *base, size_t vl) { + return __riscv_vle16_v_f16mf4(base, vl); +} + +vfloat16m8_t test_vle16_v_f16m8(const float16_t *base, size_t vl) { + return __riscv_vle16_v_f16m8(base, vl); +} + +/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\= s*mf4,\s*t[au],\s*m[au]} 3 } } */ /* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s= *mf2,\s*t[au],\s*m[au]} 2 } } */ /* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s= *m1,\s*t[au],\s*m[au]} 2 } } */ /* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s= *m2,\s*t[au],\s*m[au]} 2 } } */ /* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s= *m4,\s*t[au],\s*m[au]} 2 } } */ +/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\= s*m8,\s*t[au],\s*m[au]} 1 } } */ /* { dg-final { scan-assembler-times {vfwcvt\.f\.f\.v\s+v[0-9]+,\s*v[0-9]+}= 5 } } */ /* { dg-final { scan-assembler-times {vfncvt\.f\.f\.w\s+v[0-9]+,\s*v[0-9]+}= 5 } } */ - +/* { dg-final { scan-assembler-times {vle16\.v\s+v[0-9]+,\s*0\([0-9ax]+\)}= 4 } } */ -- 2.34.1 --_000_MW5PR11MB5908F2E03ED49B7B64D677C5A951AMW5PR11MB5908namp_--