From patchwork Tue Oct 18 18:42:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taylor Simpson X-Patchwork-Id: 13010949 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DE38EC433FE for ; Tue, 18 Oct 2022 18:51:06 +0000 (UTC) Received: from localhost ([::1]:41370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okrg9-00038D-HD for qemu-devel@archiver.kernel.org; Tue, 18 Oct 2022 14:51:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okrXt-0000bi-LY for qemu-devel@nongnu.org; Tue, 18 Oct 2022 14:42:36 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]:31598) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okrXr-0005mi-2Q for qemu-devel@nongnu.org; Tue, 18 Oct 2022 14:42:33 -0400 Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 29IB0fKh008361; Tue, 18 Oct 2022 18:42:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : mime-version : content-type : content-transfer-encoding; s=qcppdkim1; bh=VL9lrD6XL5sbFE0Yo+mKiApzqluzoJ+hICN0N+c5O6A=; b=jWlg4u04CKDg2gbwLOXLgGi4AsHBvRYsiRCuCUjP3UpE7W5Bu8+n38U7TZeYJXwMR9jF rmYWZ90c5ki92TbKFbMekQl3biglzRnJef8X++LKYakL8XPHDKpioPmm/OTrYZQklY5F 0KvLYPkHGL/feVyT5hpUVo5nFEJWb2ch9YMfYRLif6+0vfllIg9podRs48b9s0sVgTHn DvilzkI26frwZyDK00puLLvCjCaH/3rjTSzfhg7zJOh8O8DXOSzMHzMdayYxFg7wLy6F AW8uh+ct2SmuND5ifVabxAXagaN3BRVpYpYNFs5qu/tKAQZhuCyKpi7iJRhT+z+F7ttu Ew== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3k9n2p2k6w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 18 Oct 2022 18:42:25 +0000 Received: from pps.filterd (NALASPPMTA05.qualcomm.com [127.0.0.1]) by NALASPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTP id 29IIgNu9013272; Tue, 18 Oct 2022 18:42:25 GMT Received: from pps.reinject (localhost [127.0.0.1]) by NALASPPMTA05.qualcomm.com (PPS) with ESMTPS id 3k7nxkq8jw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 18 Oct 2022 18:42:25 +0000 Received: from NALASPPMTA05.qualcomm.com (NALASPPMTA05.qualcomm.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 29IIgMV5013264; Tue, 18 Oct 2022 18:42:24 GMT Received: from hu-devc-lv-u18-c.qualcomm.com (hu-tsimpson-lv.qualcomm.com [10.47.235.220]) by NALASPPMTA05.qualcomm.com (PPS) with ESMTP id 29IIgOfi013275; Tue, 18 Oct 2022 18:42:24 +0000 Received: by hu-devc-lv-u18-c.qualcomm.com (Postfix, from userid 47164) id 224BA5000A7; Tue, 18 Oct 2022 11:42:24 -0700 (PDT) From: Taylor Simpson To: qemu-devel@nongnu.org Cc: tsimpson@quicinc.com, richard.henderson@linaro.org, f4bug@amsat.org, ale@rev.ng, anjo@rev.ng, bcain@quicinc.com, quic_mathbern@quicinc.com Subject: [PATCH] Hexagon (target/hexagon) Add overrides for S2_asr_r_r_sat/S2_asl_r_r_sat Date: Tue, 18 Oct 2022 11:42:17 -0700 Message-Id: <20221018184218.32056-1-tsimpson@quicinc.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-QCInternal: smtphost X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: hA-wzZva_XpGj98Tyfl-N-KFDGGQludg X-Proofpoint-GUID: hA-wzZva_XpGj98Tyfl-N-KFDGGQludg X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-10-18_07,2022-10-18_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 mlxscore=0 lowpriorityscore=0 suspectscore=0 bulkscore=0 malwarescore=0 priorityscore=1501 phishscore=0 mlxlogscore=999 adultscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2210180105 Received-SPF: pass client-ip=205.220.168.131; envelope-from=tsimpson@qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" These instructions will not be generated by idef-parser, so we override them manually. Test cases added to tests/tcg/hexagon/usr.c Co-authored-by: Matheus Tavares Bernardino Signed-off-by: Matheus Tavares Bernardino Signed-off-by: Taylor Simpson --- target/hexagon/gen_tcg.h | 10 ++- target/hexagon/genptr.c | 173 +++++++++++++++++++++++++++++++++++++++ tests/tcg/hexagon/usr.c | 30 +++++-- 3 files changed, 206 insertions(+), 7 deletions(-) diff --git a/target/hexagon/gen_tcg.h b/target/hexagon/gen_tcg.h index 50634ac459..b5fe22a07a 100644 --- a/target/hexagon/gen_tcg.h +++ b/target/hexagon/gen_tcg.h @@ -1,5 +1,5 @@ /* - * Copyright(c) 2019-2021 Qualcomm Innovation Center, Inc. All Rights Reserved. + * Copyright(c) 2019-2022 Qualcomm Innovation Center, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -612,6 +612,14 @@ tcg_temp_free(tmp); \ } while (0) +/* r0 = asr(r1, r2):sat */ +#define fGEN_TCG_S2_asr_r_r_sat(SHORTCODE) \ + gen_asr_r_r_sat(RdV, RsV, RtV) + +/* r0 = asl(r1, r2):sat */ +#define fGEN_TCG_S2_asl_r_r_sat(SHORTCODE) \ + gen_asl_r_r_sat(RdV, RsV, RtV) + /* Floating point */ #define fGEN_TCG_F2_conv_sf2df(SHORTCODE) \ gen_helper_conv_sf2df(RddV, cpu_env, RsV) diff --git a/target/hexagon/genptr.c b/target/hexagon/genptr.c index 806d0974ff..74adbf5944 100644 --- a/target/hexagon/genptr.c +++ b/target/hexagon/genptr.c @@ -456,6 +456,179 @@ static TCGv gen_8bitsof(TCGv result, TCGv value) return result; } +static void gen_set_usr_field(int field, TCGv val) +{ + tcg_gen_deposit_tl(hex_new_value[HEX_REG_USR], hex_new_value[HEX_REG_USR], + val, + reg_field_info[field].offset, + reg_field_info[field].width); +} + +static void gen_set_usr_fieldi(int field, int x) +{ + TCGv val = tcg_constant_tl(x); + gen_set_usr_field(field, val); +} + +static void gen_sat_i64(TCGv_i64 dst, TCGv_i64 src, uint32_t bits) +{ + TCGLabel *label = gen_new_label(); + + tcg_gen_sextract_i64(dst, src, 0, bits); + tcg_gen_brcond_i64(TCG_COND_EQ, dst, src, label); + { + TCGv_i64 min = tcg_constant_i64(-(1LL << (bits - 1))); + TCGv_i64 max = tcg_constant_i64((1LL << (bits - 1)) - 1); + tcg_gen_movcond_i64(TCG_COND_LT, dst, src, tcg_constant_i64(0), + min, max); + gen_set_usr_fieldi(USR_OVF, 1); + } + gen_set_label(label); +} + +static void gen_satval(TCGv_i64 dest, TCGv_i64 source, uint32_t bits) +{ + TCGv_i64 min = tcg_constant_i64(-(1LL << (bits - 1))); + TCGv_i64 max = tcg_constant_i64((1LL << (bits - 1)) - 1); + + gen_set_usr_fieldi(USR_OVF, 1); + tcg_gen_movcond_i64(TCG_COND_LT, dest, source, tcg_constant_i64(0), + min, max); +} + +/* Shift left with saturation */ +static void gen_shl_sat(TCGv RdV, TCGv RsV, TCGv shift_amt) +{ + /* + * int64_t A = (fCAST4_8s(RsV) << shift_amt; + * if (((int32_t)((fSAT(A)) ^ ((int32_t)(RsV)))) < 0) { + * RdV = fSATVALN(32, ((int32_t)(RsV))) + * } else if (((RsV) > 0) && ((A) == 0)) { + * RdV = fSATVALN(32, (RsV)); + * } else { + * RdV = fSAT(A); + * } + */ + TCGv_i64 RsV_i64 = tcg_temp_local_new_i64(); + TCGv_i64 shift_amt_i64 = tcg_temp_local_new_i64(); + TCGv_i64 A = tcg_temp_local_new_i64(); + TCGv_i64 A_sat_i64 = tcg_temp_local_new_i64(); + TCGv A_sat = tcg_temp_local_new(); + TCGv_i64 RdV_i64 = tcg_temp_local_new_i64(); + TCGv tmp = tcg_temp_new(); + TCGLabel *label1 = gen_new_label(); + TCGLabel *label2 = gen_new_label(); + TCGLabel *done = gen_new_label(); + + tcg_gen_ext_i32_i64(RsV_i64, RsV); + tcg_gen_ext_i32_i64(shift_amt_i64, shift_amt); + tcg_gen_shl_i64(A, RsV_i64, shift_amt_i64); + + /* Check for saturation */ + gen_sat_i64(A_sat_i64, A, 32); + tcg_gen_extrl_i64_i32(A_sat, A_sat_i64); + tcg_gen_xor_tl(tmp, A_sat, RsV); + tcg_gen_brcondi_tl(TCG_COND_GE, tmp, 0, label1); + gen_satval(RdV_i64, RsV_i64, 32); + tcg_gen_extrl_i64_i32(RdV, RdV_i64); + tcg_gen_br(done); + + gen_set_label(label1); + tcg_gen_brcondi_tl(TCG_COND_LE, RsV, 0, label2); + tcg_gen_brcondi_i64(TCG_COND_NE, A, 0, label2); + gen_satval(RdV_i64, RsV_i64, 32); + tcg_gen_extrl_i64_i32(RdV, RdV_i64); + tcg_gen_br(done); + + gen_set_label(label2); + tcg_gen_mov_tl(RdV, A_sat); + + gen_set_label(done); + + tcg_temp_free_i64(RsV_i64); + tcg_temp_free_i64(shift_amt_i64); + tcg_temp_free_i64(A); + tcg_temp_free_i64(A_sat_i64); + tcg_temp_free(A_sat); + tcg_temp_free_i64(RdV_i64); + tcg_temp_free(tmp); +} + +static void gen_sar(TCGv RdV, TCGv RsV, TCGv shift_amt) +{ + /* + * if (shift_amt < 32) { + * RdV = sar(RsV, shift_amt); + * } else { + * if (RsV > 0) { + * RdV = 0; + * } else { + * RdV = ~0; + * } + * } + */ + TCGLabel *shift_ge_32 = gen_new_label(); + TCGLabel *done = gen_new_label(); + + tcg_gen_brcondi_tl(TCG_COND_GE, shift_amt, 32, shift_ge_32); + tcg_gen_sar_tl(RdV, RsV, shift_amt); + tcg_gen_br(done); + + gen_set_label(shift_ge_32); + tcg_gen_movcond_tl(TCG_COND_LT, RdV, RsV, tcg_constant_tl(0), + tcg_constant_tl(~0), tcg_constant_tl(0)); + + gen_set_label(done); +} + +/* Bidirectional shift right with saturation */ +static void gen_asr_r_r_sat(TCGv RdV, TCGv RsV, TCGv RtV) +{ + TCGv shift_amt = tcg_temp_local_new(); + TCGLabel *positive = gen_new_label(); + TCGLabel *done = gen_new_label(); + + tcg_gen_sextract_i32(shift_amt, RtV, 0, 7); + tcg_gen_brcondi_tl(TCG_COND_GE, shift_amt, 0, positive); + + /* Negative shift amount => shift left */ + tcg_gen_neg_tl(shift_amt, shift_amt); + gen_shl_sat(RdV, RsV, shift_amt); + tcg_gen_br(done); + + gen_set_label(positive); + /* Positive shift amount => shift right */ + gen_sar(RdV, RsV, shift_amt); + + gen_set_label(done); + + tcg_temp_free(shift_amt); +} + +/* Bidirectional shift left with saturation */ +static void gen_asl_r_r_sat(TCGv RdV, TCGv RsV, TCGv RtV) +{ + TCGv shift_amt = tcg_temp_local_new(); + TCGLabel *positive = gen_new_label(); + TCGLabel *done = gen_new_label(); + + tcg_gen_sextract_i32(shift_amt, RtV, 0, 7); + tcg_gen_brcondi_tl(TCG_COND_GE, shift_amt, 0, positive); + + /* Negative shift amount => shift right */ + tcg_gen_neg_tl(shift_amt, shift_amt); + gen_sar(RdV, RsV, shift_amt); + tcg_gen_br(done); + + gen_set_label(positive); + /* Positive shift amount => shift left */ + gen_shl_sat(RdV, RsV, shift_amt); + + gen_set_label(done); + + tcg_temp_free(shift_amt); +} + static intptr_t vreg_src_off(DisasContext *ctx, int num) { intptr_t offset = offsetof(CPUHexagonState, VRegs[num]); diff --git a/tests/tcg/hexagon/usr.c b/tests/tcg/hexagon/usr.c index fb4514989c..63c7d2700f 100644 --- a/tests/tcg/hexagon/usr.c +++ b/tests/tcg/hexagon/usr.c @@ -429,6 +429,7 @@ FUNC_P_OP_P(vabshsat, "%0 = vabsh(%2):sat") FUNC_P_OP_PP(vnavgwr, "%0 = vnavgw(%2, %3):rnd:sat") FUNC_R_OP_RI(round_ri_sat, "%0 = round(%2, #%3):sat") FUNC_R_OP_RR(asr_r_r_sat, "%0 = asr(%2, %3):sat") +FUNC_R_OP_RR(asl_r_r_sat, "%0 = asl(%2, %3):sat") FUNC_XPp_OP_PP(ACS, "%0, p2 = vacsh(%3, %4)") @@ -907,12 +908,29 @@ int main() TEST_R_OP_RI(round_ri_sat, 0x0000ffff, 2, 0x00004000, USR_CLEAR); TEST_R_OP_RI(round_ri_sat, 0x7fffffff, 2, 0x1fffffff, USR_OVF); - TEST_R_OP_RR(asr_r_r_sat, 0x0000ffff, 0x00000002, 0x00003fff, - USR_CLEAR); - TEST_R_OP_RR(asr_r_r_sat, 0x00ffffff, 0xfffffff5, 0x7fffffff, - USR_OVF); - TEST_R_OP_RR(asr_r_r_sat, 0x80000000, 0xfffffff5, 0x80000000, - USR_OVF); + TEST_R_OP_RR(asr_r_r_sat, 0x0000ffff, 0x02, 0x00003fff, USR_CLEAR); + TEST_R_OP_RR(asr_r_r_sat, 0x80000000, 0x01, 0xc0000000, USR_CLEAR); + TEST_R_OP_RR(asr_r_r_sat, 0xffffffff, 0x01, 0xffffffff, USR_CLEAR); + TEST_R_OP_RR(asr_r_r_sat, 0x00ffffff, 0xf5, 0x7fffffff, USR_OVF); + TEST_R_OP_RR(asr_r_r_sat, 0x80000000, 0xf5, 0x80000000, USR_OVF); + TEST_R_OP_RR(asr_r_r_sat, 0x7fff0000, 0x42, 0x7fffffff, USR_OVF); + TEST_R_OP_RR(asr_r_r_sat, 0xff000000, 0x42, 0x80000000, USR_OVF); + TEST_R_OP_RR(asr_r_r_sat, 4096, 32, 0x00000000, USR_CLEAR); + TEST_R_OP_RR(asr_r_r_sat, 4096, -32, 0x7fffffff, USR_OVF); + TEST_R_OP_RR(asr_r_r_sat, -4096, 32, 0xffffffff, USR_CLEAR); + TEST_R_OP_RR(asr_r_r_sat, -4096, -32, 0x80000000, USR_OVF); + + TEST_R_OP_RR(asl_r_r_sat, 0x00000000, 0x40, 0x00000000, USR_CLEAR); + TEST_R_OP_RR(asl_r_r_sat, 0x80000000, 0xff, 0xc0000000, USR_CLEAR); + TEST_R_OP_RR(asl_r_r_sat, 0xffffffff, 0xff, 0xffffffff, USR_CLEAR); + TEST_R_OP_RR(asl_r_r_sat, 0x00ffffff, 0x0b, 0x7fffffff, USR_OVF); + TEST_R_OP_RR(asl_r_r_sat, 0x80000000, 0x0b, 0x80000000, USR_OVF); + TEST_R_OP_RR(asl_r_r_sat, 0x7fff0000, 0xbe, 0x7fffffff, USR_OVF); + TEST_R_OP_RR(asl_r_r_sat, 0xff000000, 0xbe, 0x80000000, USR_OVF); + TEST_R_OP_RR(asl_r_r_sat, 4096, 32, 0x7fffffff, USR_OVF); + TEST_R_OP_RR(asl_r_r_sat, 4096, -32, 0x00000000, USR_CLEAR); + TEST_R_OP_RR(asl_r_r_sat, -4096, 32, 0x80000000, USR_OVF); + TEST_R_OP_RR(asl_r_r_sat, -4096, -32, 0xffffffff, USR_CLEAR); TEST_XPp_OP_PP(ACS, 0x0004000300020001ULL, 0x0001000200030004ULL, 0x0000000000000000ULL, 0x0004000300030004ULL, 0xf0,