From nobody Wed May 15 20:40:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass header.i=@quicinc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=quicinc.com); dmarc=pass(p=none dis=none) header.from=quicinc.com ARC-Seal: i=2; a=rsa-sha256; t=1586828864; cv=pass; d=zohomail.com; s=zohoarc; b=QlyWdyythB2BVUeu0UlJeL1fjZZSvO+lwzCvUHGGwSkaamUmKmgPxlYg8lfC6jLYk7vyARGfeg5eNlM9xEiC/VLZsFE9nlo0tc1QzSMsS8KlHO/KLjtutzXzAX37TQIdF8mC9ny3xh12h61Q1N/xvP0ejMmWi+eGAgOC7Rte2KI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586828864; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=AujULiLCuy1Y4FFraRpaCnyofTOmUPXKml1UznKfbhU=; b=fDRfqVBVf/DMQn0AN/9lqcwTnBLDLSApo4FYNxd6kxwX6wlwwju/WQxj6GQ+m+qKC9OX6eO79TO4fOTv4V5RgrRVEdMp7RGFkWzVoiEktEx9uj8nvFi7xCpiYEaXSIhSZYD5ftRJY5dNW91iFJWW1eZDP+d4hBGcaC6UK0RDakY= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=@quicinc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=quicinc.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586828864721337.4690624582893; Mon, 13 Apr 2020 18:47:44 -0700 (PDT) Received: from localhost ([::1]:51392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOAfu-0003TE-Qo for importer@patchew.org; Mon, 13 Apr 2020 21:47:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56103) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jO8j4-0004Qu-49 for qemu-devel@nongnu.org; Mon, 13 Apr 2020 19:42:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jO8j1-0002HW-FO for qemu-devel@nongnu.org; Mon, 13 Apr 2020 19:42:48 -0400 Received: from alexa-out-sd-02.qualcomm.com ([199.106.114.39]:5754) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jO8j1-0002HE-0i; Mon, 13 Apr 2020 19:42:47 -0400 Received: from unknown (HELO ironmsg03-sd.qualcomm.com) ([10.53.140.143]) by alexa-out-sd-02.qualcomm.com with ESMTP; 13 Apr 2020 16:42:44 -0700 Received: from nasanexm03d.na.qualcomm.com ([10.85.0.91]) by ironmsg03-sd.qualcomm.com with ESMTP/TLS/AES256-SHA; 13 Apr 2020 16:42:44 -0700 Received: from APSANEXR01F.ap.qualcomm.com (10.85.0.39) by nasanexm03d.na.qualcomm.com (10.85.0.91) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 13 Apr 2020 16:42:43 -0700 Received: from nasanexm03b.na.qualcomm.com (10.85.0.98) by APSANEXR01F.ap.qualcomm.com (10.85.0.39) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 13 Apr 2020 16:42:40 -0700 Received: from NAM04-BN3-obe.outbound.protection.outlook.com (199.106.107.6) by nasanexm03b.na.qualcomm.com (10.85.0.98) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Mon, 13 Apr 2020 16:42:40 -0700 Received: from MWHPR0201MB3547.namprd02.prod.outlook.com (2603:10b6:301:7b::24) by MWHPR0201MB3401.namprd02.prod.outlook.com (2603:10b6:301:76::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.28; Mon, 13 Apr 2020 23:42:37 +0000 Received: from MWHPR0201MB3547.namprd02.prod.outlook.com ([fe80::10ad:5df5:d575:1f37]) by MWHPR0201MB3547.namprd02.prod.outlook.com ([fe80::10ad:5df5:d575:1f37%3]) with mapi id 15.20.2900.028; Mon, 13 Apr 2020 23:42:37 +0000 Received: from DESKTOP-L2LA14H.localdomain (108.176.222.2) by BL0PR0102CA0059.prod.exchangelabs.com (2603:10b6:208:25::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.15 via Frontend Transport; Mon, 13 Apr 2020 23:42:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=quicinc.com; i=@quicinc.com; q=dns/txt; s=qcdkim; t=1586821367; x=1618357367; h=from:to:cc:subject:date:message-id:mime-version; bh=zoAQle0OQNxd8a9btzyc7t7iEJafwg/QH5hhL10ocQg=; b=jkFUZz9cgtIO9VmS7UP6V0JkKGnyGJ6GrDL+Au4VgNsJIBZQoeXEOQlz ECmno49GhVxB2WUIYsFLrqHRROTOjTiVaRNul736soja/Ae0QUmQ9Ki93 vzPPmcdfO6/XUBUIC+iygaib5FU/Y4bZfRPk46O0W2t4WAuB9m39wIamB s=; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BfhbbTEjbh6oUbWR5kqebra3WhPWQ677VOz1V8+b9poN5Uzs+YG7mZ7regLuiu5m/TKmxaPYV4k9p+9ZXBchCrcLhf9m//2n9BnUub8kwZSgTvuT32LkMBd089lmwx+q/uyOezvwiGMC5drPJOn21BDsiC2o1C1w9fbIstBT2yB2VH8KDTS6aalQ6ykr39kirqRTiefshSJXi/vPhrINCYITkZ5C9EudAnRAgoekuxa07yGAE7fGBLjJQy0jei/0nz3d9l/F5NMHA95wJDpmG3pOxAvJ5BAOsNHPUgUih5M+GHtSW1H9REzRfV4XXNUuInMBqsJ1D2PeyEJOpOc62w== 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-SenderADCheck; bh=AujULiLCuy1Y4FFraRpaCnyofTOmUPXKml1UznKfbhU=; b=LYkQHhKCFCS0Tr9C8Qpz/0NyEHzJ6JzWdpIDB2rgrrzyeF/385ofJM04lPHvJKsXJzC8tGhaOGx2AZxxU0jSIPuIuOw8quTmpsYbJZiy6QvOS1bzo4l6QsbcxHWG7jlRnI+vN3bdM+o8y9o/wLjdJORd+Ba4GsgjpOzQJOsLWkOtyB6PelwLaB47WN2mg00T6MH2PnT727MdyvhF6vQWYq8WdTW2BjsYxgYS6os2cXAniPXBoBqGLhaWhUrsDhaEZGFOtgLj8LfmMtZFGIX76D/SRmiLzR3YbZ/HvHJw5UVAxk7ugpGcaY0yovQSKRNVV0coaCKMunKmXuT6067cvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=quicinc.com; dmarc=pass action=none header.from=quicinc.com; dkim=pass header.d=quicinc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.onmicrosoft.com; s=selector1-qualcomm-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AujULiLCuy1Y4FFraRpaCnyofTOmUPXKml1UznKfbhU=; b=DlJRNJIteNKUZjgpXhZFMlCbGur00b3hncaaO8hbDp4pP6Wac04faVKhnnNSFcoQ2g/xlGRxM3TTPmEecIZA5vF/aRRDVxljIZZgGBujWfy96Dtdd66bWCkBqdFLsdhIcude7ojgiqlG+Piwd4Vg8Nrq1SxyhcJOpnS/2Vt4IRQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=steplong@quicinc.com; From: Stephen Long To: Subject: [PATCH RFC] target/arm: Implement SVE2 MATCH, NMATCH Date: Mon, 13 Apr 2020 19:42:24 -0400 Message-ID: <20200413234224.12005-1-steplong@quicinc.com> X-ClientProxiedBy: BL0PR0102CA0059.prod.exchangelabs.com (2603:10b6:208:25::36) To MWHPR0201MB3547.namprd02.prod.outlook.com (2603:10b6:301:7b::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Originating-IP: [108.176.222.2] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ecd90d01-9b4d-4aab-fab0-08d7e004592e X-MS-TrafficTypeDiagnostic: MWHPR0201MB3401: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:486; X-Forefront-PRVS: 037291602B X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR0201MB3547.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10019020)(366004)(396003)(346002)(376002)(136003)(39860400002)(66476007)(478600001)(2616005)(66556008)(8676002)(966005)(66946007)(8936002)(81156014)(956004)(5660300002)(6666004)(1076003)(6506007)(4326008)(6512007)(316002)(2906002)(26005)(186003)(86362001)(6916009)(16526019)(52116002)(36756003)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3il58ynNJEM01poONz1KQrd8513WnJwSZr3C9IuhDyVrOXl345bJA2jUYQNqqTJshvDXcAj7Qe5n8jrAxB1GZh5yzUqrQz3dHqYbPi3Y6AmZmiqZ2aPWsVLPyXtAa1p9ZYXbwjT0L6qop0phtYtyvXUZzRpzWjjlUxcHx7Kzmm8GuKYhjBhbl0f2ETh0c+4oaekpkYpSdhjUiavO3odUjs2fAihyhRVDbTJq9EsaCOyBKmBaE5tICAjVj9VUhm/9pAOB4fz2UT4dtzLWxKbLM0g6sTPxmTu9pk4/RtQ3AEculnrZE3bKMPXjbI9P8jwV5tvSHvvdm2uc6swy7hwnsRgR7KhFWs5xUVoRFh7k2vlf85ZsSceAu2cpcYeZd6Td3uJFIVgWNZV+TJPbPvi+J2CmYETfRFlIqqi15rwf9svnWs3gTfaDLc1YPZLBjHAnV8NR6Tniwe08rln3Q7U8iA9MtoC/VJCys1yXBOA5H4tMUyZZpFoxliZGN0nTzU2TXve/VgRLar+n7+hZyPPUEQ== X-MS-Exchange-AntiSpam-MessageData: F1YULWYBO4ANlKul/kLtlqyAk++GJeZ9y4J9hmVue28ut0rrPvtvENFnMshXzBU3lAY/MXBiVUzoE00fGxyrrTtEA7q981yik4njVaDWqW0WdipchVBph4lziK5gxxPhHDSsvxbpQ6cexfbhRJJFoQ== X-MS-Exchange-CrossTenant-Network-Message-Id: ecd90d01-9b4d-4aab-fab0-08d7e004592e X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2020 23:42:37.8835 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 98e9ba89-e1a1-4e38-9007-8bdabc25de1d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1UmOOoB2j/oCnE5dpWRKVfcH3o8KgwoOluyJBrPRamrsc+1RecSBfEt9jElUozr79bnJKlo3Jv2hW7J6cDGt+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR0201MB3401 X-OriginatorOrg: quicinc.com X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 199.106.114.39 X-Mailman-Approved-At: Mon, 13 Apr 2020 21:41:11 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: apazos@quicinc.org, qemu-arm@nongnu.org, richard.henderson@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @qualcomm.onmicrosoft.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Stephen Long --- Submitting this for early review. I'm working with Richard on SVE2 support = for qemu. I'll be attempting to tackle the insns in the 'SVE2 integer add/subtr= act narrow high part' category next [1]. [1] ISA manual: https://static.docs.arm.com/ddi0602/d/ISA_A64_xml_futureA-2= 019-12_OPT.pdf (page 2950) target/arm/helper-sve.h | 10 +++++++++ target/arm/sve.decode | 5 +++++ target/arm/sve_helper.c | 29 +++++++++++++++++++++++++ target/arm/translate-sve.c | 43 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+) diff --git a/target/arm/helper-sve.h b/target/arm/helper-sve.h index 5dd880cf6d..2077df9a95 100644 --- a/target/arm/helper-sve.h +++ b/target/arm/helper-sve.h @@ -2516,6 +2516,16 @@ DEF_HELPER_FLAGS_3(sve2_uqrshrnt_h, TCG_CALL_NO_RWG,= void, ptr, ptr, i32) DEF_HELPER_FLAGS_3(sve2_uqrshrnt_s, TCG_CALL_NO_RWG, void, ptr, ptr, i32) DEF_HELPER_FLAGS_3(sve2_uqrshrnt_d, TCG_CALL_NO_RWG, void, ptr, ptr, i32) =20 +DEF_HELPER_FLAGS_5(sve2_match_zpzz_b, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(sve2_match_zpzz_h, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, i32) + +DEF_HELPER_FLAGS_5(sve2_nmatch_zpzz_b, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(sve2_nmatch_zpzz_h, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, i32) + DEF_HELPER_FLAGS_6(sve2_faddp_zpzz_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, ptr, i32) DEF_HELPER_FLAGS_6(sve2_faddp_zpzz_s, TCG_CALL_NO_RWG, diff --git a/target/arm/sve.decode b/target/arm/sve.decode index 374e47fb05..652668df02 100644 --- a/target/arm/sve.decode +++ b/target/arm/sve.decode @@ -1305,6 +1305,11 @@ UQSHRNT 01000101 .. 1 ..... 00 1101 ..... ..= ... @rd_rn_tszimm_shr UQRSHRNB 01000101 .. 1 ..... 00 1110 ..... ..... @rd_rn_tszimm_shr UQRSHRNT 01000101 .. 1 ..... 00 1111 ..... ..... @rd_rn_tszimm_shr =20 +### SVE2 Character Match + +MATCH 01000101 .. 1 ..... 100 ... ..... 0 .... @pd_pg_rn_rm +NMATCH 01000101 .. 1 ..... 100 ... ..... 1 .... @pd_pg_rn_rm + ## SVE2 floating-point pairwise operations =20 FADDP 01100100 .. 010 00 0 100 ... ..... ..... @rdn_pg_rm diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c index b68f62cd7f..c75258b56d 100644 --- a/target/arm/sve_helper.c +++ b/target/arm/sve_helper.c @@ -6890,3 +6890,32 @@ DO_ST1_ZPZ_D(dd_be, zd, MO_64) =20 #undef DO_ST1_ZPZ_S #undef DO_ST1_ZPZ_D + +#define DO_ZPZZ_CHAR_MATCH(NAME, TYPE, H, EQUALS) = \ +void HELPER(NAME)(void *vd, void *vn, void *vm, void *vg, uint32_t desc) = \ +{ = \ + intptr_t i, opr_sz =3D simd_oprsz(desc); = \ + for (i =3D 0; i < opr_sz; i +=3D sizeof(TYPE)) { = \ + uint16_t pg =3D *(uint16_t *)(vg + H1_2(i >> 3)); = \ + uint16_t *pd =3D (uint16_t *)(vd + H1_2(i >> 3)); = \ + *pd =3D (*pd & ~1) | ((0 & EQUALS) | (1 & !EQUALS)); = \ + if (pg & 1) { = \ + TYPE nn =3D *(TYPE *)(vn + H(i)); = \ + for (intptr_t j =3D 0; j < 16; j +=3D sizeof(TYPE)) { = \ + TYPE mm =3D *(TYPE *)(vm + H(i * 16 + j)); = \ + bool eq =3D nn =3D=3D mm; = \ + if ((eq && EQUALS) || (!eq && !EQUALS)) { = \ + *pd =3D (*pd & ~1) | ((1 & EQUALS) | (0 & !EQUALS)); = \ + } = \ + } = \ + } = \ + } = \ +} + +DO_ZPZZ_CHAR_MATCH(sve2_match_zpzz_b, uint8_t, H1, true) +DO_ZPZZ_CHAR_MATCH(sve2_match_zpzz_h, uint16_t, H1_2, true) + +DO_ZPZZ_CHAR_MATCH(sve2_nmatch_zpzz_b, uint8_t, H1, false) +DO_ZPZZ_CHAR_MATCH(sve2_nmatch_zpzz_h, uint16_t, H1_2, false) + +#undef DO_ZPZZ_CHAR_MATCH diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 07a2040208..7175148bfd 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -7246,6 +7246,49 @@ static bool trans_UQRSHRNT(DisasContext *s, arg_rri_= esz *a) return do_sve2_shr_narrow(s, a, ops); } =20 +static bool do_sve2_zpzz_char_match(DisasContext *s, arg_rprr_esz *a, + gen_helper_gvec_4 *fn) +{ + if (!dc_isar_feature(aa64_sve2, s)) { + return false; + } + if (fn =3D=3D NULL) { + return false; + } + if (sve_access_check(s)) { + unsigned vsz =3D vec_full_reg_size(s); + unsigned psz =3D pred_full_reg_size(s); + int dofs =3D pred_full_reg_offset(s, a->rd); + int nofs =3D vec_full_reg_offset(s, a->rn); + int mofs =3D vec_full_reg_offset(s, a->rm); + int gofs =3D pred_full_reg_offset(s, a->pg); + + /* Save a copy if the destination overwrites the guarding predicat= e */ + int tofs =3D gofs; + if (a->rd =3D=3D a->pg) { + tofs =3D offsetof(CPUARMState, vfp.preg_tmp); + tcg_gen_gvec_mov(0, tofs, gofs, psz, psz); + } + + tcg_gen_gvec_4_ool(dofs, nofs, mofs, gofs, vsz, vsz, 0, fn); + do_predtest(s, dofs, tofs, psz / 8); + } + return true; +} + +#define DO_SVE2_ZPZZ_CHAR_MATCH(NAME, name) = \ +static bool trans_##NAME(DisasContext *s, arg_rprr_esz *a) = \ +{ = \ + static gen_helper_gvec_4 * const fns[4] =3D { = \ + gen_helper_sve2_##name##_zpzz_b, gen_helper_sve2_##name##_zpzz_h, = \ + NULL, NULL = \ + }; = \ + return do_sve2_zpzz_char_match(s, a, fns[a->esz]); = \ +} + +DO_SVE2_ZPZZ_CHAR_MATCH(MATCH, match) +DO_SVE2_ZPZZ_CHAR_MATCH(NMATCH, nmatch) + static bool do_sve2_zpzz_fp(DisasContext *s, arg_rprr_esz *a, gen_helper_gvec_4_ptr *fn) { --=20 2.17.1