From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619894797; cv=none; d=zohomail.com; s=zohoarc; b=J+ECUxr2BvSUJTGJFqG+/KSwTjR50lirktwLps+zqQAjjQA9oKv5DX8QqSzlxRdy29xToqtYBNh0HBxnr3w3Ijl5EYSM54MmG9hU8+kV6ZjN3Q/0Ienum0sK2ZWBXN4oeKswPqs114WbAsZlPypqyOpzXdD05zZgq1jQuR+ZbV4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619894797; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=V94i6w/myBpItKh/9Jz7ZoRAcgrkNfo+3GJKBYP/4N8=; b=mqxzQRr0npcyh7PPaDkaHJOX6WEia6R8JQr4w4MeQirxEbpF2TqJKXf4JAU/uWVIaebswlGsEXITXXNGNgJrfCxa6JQ0DZz/T2AUeQ7PmagwVc4QPaXHiyCDXIMCL2FKZS4NyKyZWZUOufsVtCROyJN0bd+CupQqByUTGPUHl9k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619894797893190.7488896162747; Sat, 1 May 2021 11:46:37 -0700 (PDT) Received: from localhost ([::1]:60222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcudP-0001Pr-VS for importer@patchew.org; Sat, 01 May 2021 14:46:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuaS-00086e-Dw for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:32 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:52754) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaN-0008Sb-TO for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:32 -0400 Received: by mail-pj1-x1031.google.com with SMTP id ge1so793751pjb.2 for ; Sat, 01 May 2021 11:43:27 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V94i6w/myBpItKh/9Jz7ZoRAcgrkNfo+3GJKBYP/4N8=; b=qE89eXTNGOq92xEdjQ25mk8xecpQxIEkboEaYHtvIvCAr8s5P+/8Apfbyvjc+v99sB J2aMRoAkYXwB6lHKCX72yu/EaW7Yj4IzQqM8eLNRwSrV2cdlwbPv7KcjWPy8l7mT65c/ +zc3o5ZrhIVJE6E7szBXycGXZlW66tzSrqNTE5WGrGkBl+TAqFAkkrzrnJR1kcg9mLv/ SsYgiygVBUKZXYj5UKkTI1kot+SF3BNQm4qI7Xaass6XE/BzIaPpxsGmLvjMLCtQD50y zMvB+YWdISzLyezMdh2SdkgkmR6Tcj3CBWzLUVrJtYAaGvRXhyYYzycOcM3skwZGgEyw k/Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=V94i6w/myBpItKh/9Jz7ZoRAcgrkNfo+3GJKBYP/4N8=; b=ZlUynZTAmVv6rtrdxvojiAWHNU6p+WRj/eiPvzd+v6jy7TIi0FDh6EZR4Gw6CaHKsW s5xkLTeaQ8kNDd85i/OYNOfQwb5YLkX7t1q7SSHTRyQh04x5LI8KH7/4iXJtET5pT3KH 5DuQ58zi/obqTv1eBIhvzc+aCDMptGnFzEUJQfZ2SQMffC9tl8UXkWKYYgCG7kBsT1TZ M1+cqpRYRrnkcGkzEN9AJF5Op36bysIepq/jhaH2agZqepSAE8QswR/yNIo7r97O+5JC TViikuw5LAFVj3fqkdPkgof3BahmlV5vVSbBDk9t3KmZZA1IGx3CYMiRtR1EsL4GhSOl KcUQ== X-Gm-Message-State: AOAM530ZonLB0+hchC6Hn5CKGnWelKPK7Um035TlpupVDvsrcBb2DvCT Tty48SSl2mJob7MxgGv5MbCuRahjWRuZDw== X-Google-Smtp-Source: ABdhPJyOrirr3Yg4DVagc6ygDGmjMqIGEBmmbSb4mGRhxnq5gnYTrUpW+/BFfu0ExdTnFRaDhpCy3A== X-Received: by 2002:a17:90b:360f:: with SMTP id ml15mr4274034pjb.26.1619894606133; Sat, 01 May 2021 11:43:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 01/31] target/hexagon: translation changes Date: Sat, 1 May 2021 11:42:54 -0700 Message-Id: <20210501184324.1338186-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1031.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Change cpu_ldl_code to translator_ldl. Don't end the TB after every packet when HEX_DEBUG is on. Make gen_check_store_width a simple call. Reported-by: Richard Henderson < Signed-off-by: Taylor Simpson Message-Id: <1615783984-25918-1-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/translate.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index eeaad5f8ba..2317508fa5 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -88,8 +88,8 @@ static int read_packet_words(CPUHexagonState *env, DisasC= ontext *ctx, =20 memset(words, 0, PACKET_WORDS_MAX * sizeof(uint32_t)); for (nwords =3D 0; !found_end && nwords < PACKET_WORDS_MAX; nwords++) { - words[nwords] =3D cpu_ldl_code(env, - ctx->base.pc_next + nwords * sizeof(uint32= _t)); + words[nwords] =3D + translator_ldl(env, ctx->base.pc_next + nwords * sizeof(uint32= _t)); found_end =3D is_packet_end(words[nwords]); } if (!found_end) { @@ -292,20 +292,16 @@ static void gen_pred_writes(DisasContext *ctx, Packet= *pkt) tcg_temp_free(pval); } =20 -#if HEX_DEBUG -static inline void gen_check_store_width(DisasContext *ctx, int slot_num) +static void gen_check_store_width(DisasContext *ctx, int slot_num) { +#if HEX_DEBUG TCGv slot =3D tcg_const_tl(slot_num); TCGv check =3D tcg_const_tl(ctx->store_width[slot_num]); gen_helper_debug_check_store_width(cpu_env, slot, check); tcg_temp_free(slot); tcg_temp_free(check); -} -#define HEX_DEBUG_GEN_CHECK_STORE_WIDTH(ctx, slot_num) \ - gen_check_store_width(ctx, slot_num) -#else -#define HEX_DEBUG_GEN_CHECK_STORE_WIDTH(ctx, slot_num) /* nothing */ #endif +} =20 static bool slot_is_predicated(Packet *pkt, int slot_num) { @@ -355,25 +351,25 @@ void process_store(DisasContext *ctx, Packet *pkt, in= t slot_num) */ switch (ctx->store_width[slot_num]) { case 1: - HEX_DEBUG_GEN_CHECK_STORE_WIDTH(ctx, slot_num); + gen_check_store_width(ctx, slot_num); tcg_gen_qemu_st8(hex_store_val32[slot_num], hex_store_addr[slot_num], ctx->mem_idx); break; case 2: - HEX_DEBUG_GEN_CHECK_STORE_WIDTH(ctx, slot_num); + gen_check_store_width(ctx, slot_num); tcg_gen_qemu_st16(hex_store_val32[slot_num], hex_store_addr[slot_num], ctx->mem_idx); break; case 4: - HEX_DEBUG_GEN_CHECK_STORE_WIDTH(ctx, slot_num); + gen_check_store_width(ctx, slot_num); tcg_gen_qemu_st32(hex_store_val32[slot_num], hex_store_addr[slot_num], ctx->mem_idx); break; case 8: - HEX_DEBUG_GEN_CHECK_STORE_WIDTH(ctx, slot_num); + gen_check_store_width(ctx, slot_num); tcg_gen_qemu_st64(hex_store_val64[slot_num], hex_store_addr[slot_num], ctx->mem_idx); @@ -593,10 +589,6 @@ static void hexagon_tr_translate_packet(DisasContextBa= se *dcbase, CPUState *cpu) if (hex_cpu->lldb_compat && qemu_loglevel_mask(CPU_LOG_TB_CPU)) { ctx->base.is_jmp =3D DISAS_TOO_MANY; } -#if HEX_DEBUG - /* When debugging, only put one packet per TB */ - ctx->base.is_jmp =3D DISAS_TOO_MANY; -#endif } } =20 --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895050; cv=none; d=zohomail.com; s=zohoarc; b=Zsa5aTZOwq01XEuoBspAY81CihmAP0Qwve8w+LLKWXB5LpZ7IiBq0xb+CScIlw4xxBYNyRfVDOoZrJzVxCHVEh4FPl+ARACWNulJpLqNAN0CycoVUrIeWwTj6z3nW2dh+TD0N1dxKBg+Hge5UiHvNrJ3S8KXD5D9G2SVkDnm7nU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895050; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fqEgUgqz02Z8sn33fRQv9yX+A8s/JtIeF1usXc7oQj8=; b=TAYzy2zJmoQSMj2PW+3NqMjpZj2YqfjMjVL/ph5xGSnvhbQnDpCqRHTMUUM7XV38MoYi/j0lr2kuEcgbtl/Tgt+RK+ZHQg4JDhUQOUU2LFx2URLH9z8aSDkpausmQYm0iz2dzWp7VSHXklvBSMoGFU3pq4/0MdUf52uNmjEJtHs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619895050522304.72476291557723; Sat, 1 May 2021 11:50:50 -0700 (PDT) Received: from localhost ([::1]:40766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcuhV-00059s-FM for importer@patchew.org; Sat, 01 May 2021 14:50:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuaT-00088T-Tz for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:33 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:35501) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaO-0008Sy-2p for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:33 -0400 Received: by mail-pf1-x434.google.com with SMTP id i13so1346719pfu.2 for ; Sat, 01 May 2021 11:43:27 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fqEgUgqz02Z8sn33fRQv9yX+A8s/JtIeF1usXc7oQj8=; b=YVSjGecjtV+2Tq3LH75qDpT1NRZ1MyOMVOVE+GCnE3Nkf5GjRsH78lvOHjYJfMTe/+ Yn4PgeXmaleKCW/xSva4kQr1Bc1qvh+s+gWDqZGyMNb9G+FcHEXX2TP/H6FMjLHzYzG8 COWWytY/fFTg0cFiFzhHSdmLCRZxEYz1yh0Ty2Z+fOZGbzKa+7MFv6+gANmBMSAYKbAA sHhpXAcHbO2c6SnVOrwjV6iEPMZDUxM2WxMqdzgYyK5FImsqOsh4G/BmU50dnOrnfitY 6X6hvf/NK1SljVtlE7leCNQDlUdJjch1wAJ2klQUBG9AzNBwenN49ZVik0eidmtTvoeP DKnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fqEgUgqz02Z8sn33fRQv9yX+A8s/JtIeF1usXc7oQj8=; b=b5neMQYPFIfT1R6Gd2dEBQ9/pUzSfpf98Lbmg8lNoCr8xA6hRjmmB5wGTaFTdtd+Jl cbbH9KiXHkT5jYuuJTCAHcFCl7WGC46LcSPZX3UHmnnqibir0kqcRKoT+NMujZZXDtT6 hRfYoD5S1cMSGgv19+ur58hNafvZOGYGA51FBBSMwstE6T0uByO5Tk+hNdDuQUWAcjhq mcWz4uhhUiQwwnrAczEM2wAvE5WUn13xV/GkILNGdnmWGwUMnRQYjAom9yoSOmWTALYK xjkRTCZVae4i//SFFmq0LOkGt+lFgf/vDuxbz/uFpzqnvS2uxdmtb3EJfp3OvY39ebmj 3YKw== X-Gm-Message-State: AOAM5303sjwDSTqSmyGvJpQq8Dbtq79/1UdswYZ1f1tQfBIchUfg/k5V Yjvs/gIYi0325mceAkIITAwYxwStttQwEw== X-Google-Smtp-Source: ABdhPJye7xMdU+iqsoz2PqcXDKac1S/LmfIMKXzUEUAZaP40uHCqIgnQklECD9Xajh3EIcz3h9PYqQ== X-Received: by 2002:a63:4559:: with SMTP id u25mr10633605pgk.93.1619894606760; Sat, 01 May 2021 11:43:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 02/31] target/hexagon: remove unnecessary checks in find_iclass_slots Date: Sat, 1 May 2021 11:42:55 -0700 Message-Id: <20210501184324.1338186-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Reported-by: Richard Henderson < Signed-off-by: Taylor Simpson Message-Id: <1615784037-26129-1-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/iclass.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/target/hexagon/iclass.c b/target/hexagon/iclass.c index 378d8a6a75..6091286993 100644 --- a/target/hexagon/iclass.c +++ b/target/hexagon/iclass.c @@ -53,10 +53,6 @@ SlotMask find_iclass_slots(Opcode opcode, int itype) (opcode =3D=3D Y2_isync) || (opcode =3D=3D J2_pause) || (opcode =3D=3D J4_hintjumpr)) { return SLOTS_2; - } else if ((itype =3D=3D ICLASS_V2LDST) && (GET_ATTRIB(opcode, A_STORE= ))) { - return SLOTS_01; - } else if ((itype =3D=3D ICLASS_V2LDST) && (!GET_ATTRIB(opcode, A_STOR= E))) { - return SLOTS_01; } else if (GET_ATTRIB(opcode, A_CRSLOT23)) { return SLOTS_23; } else if (GET_ATTRIB(opcode, A_RESTRICT_PREFERSLOT0)) { --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895049; cv=none; d=zohomail.com; s=zohoarc; b=S/u0435xGWySRGYmFWo2I4GhKH3JZifLbMCpxh2HG4A4ECSX/6MVuxMhbsb3Nw+uYB8E+2B5W5rR4sAzhczwVVWfXgxq1HAKMA6iCueNQNuTwlkJtj5Mbus2AZcfOd/MWeRHTxVPLVY3ExEtHz6H21reeh4JXkxfgfabfI0CkuE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895049; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=X8Pf8ZpwZ1pQBiqGaJFMNS/iHJ5hjxHqBDOnzStfgWc=; b=ZEF3St959OlgIOwoFj+bRNm0CflFRS+zN1hCIeBQGBnUMLjMXoWLclqSuiAAzj7wPYQX+/YZsg+xBU5ZHbIgB6sFkLONIMdbJIzH2/kWc4GKQCoSZnDcu2yXRCGb1UbOTJlWPEr007A+JLJfiX26cE8MhsxwhXTAXz0k0khXOe0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619895049290607.8172298673122; Sat, 1 May 2021 11:50:49 -0700 (PDT) Received: from localhost ([::1]:40698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcuhU-00058G-5h for importer@patchew.org; Sat, 01 May 2021 14:50:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuaU-00089h-Hx for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:34 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]:42578) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaS-0008Tb-1Z for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:34 -0400 Received: by mail-pg1-x52b.google.com with SMTP id m12so829260pgr.9 for ; Sat, 01 May 2021 11:43:28 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X8Pf8ZpwZ1pQBiqGaJFMNS/iHJ5hjxHqBDOnzStfgWc=; b=a31CRwzHcGzJucsrEQHVfXsEkH5jgPorvOlr5Mk5aGLZLmM6bRuChn0sPGx/ODfO1q XYq6DWBav878a3ye8YRrYp1WBwhZzSEgLVqfVior/bTVCXQqQlu9gZ1EqTvEYdZbISt5 VfQg17gwAdh9ykXtJ5g24l/sQ4dO4rQ/DUawpXYC/W4Dl6RewNypkfuY7/ra3fFTyxRw NMDHibZhb6x+7+nhMnScITXn/8U9gCnliWGcoeB9XgMe37ynJFd9YBgGtvUlg9uE1mQs L0OY1W+v7EAlj0UMbdjQYyVU3k0AXLO7xahvGOnb+1MoyBE7LV2WyQSwq6F/nf4SQObj s6Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X8Pf8ZpwZ1pQBiqGaJFMNS/iHJ5hjxHqBDOnzStfgWc=; b=QyIroQDR+OUYtBX4WwvU0j95lSKxMSoK2xTDaWEfuoIhRT9OXuyjI/ytr/iMQqqpRr 8Z8XnItnYP3zbMvOnZ5X8jPuKnSLLUk8Y23/4qUI/jGCCpBTTcZ7ALxZFxFEpFY7f/QA M6F2scedeSK2d5m/tRPmvATai3ZclvBD+4s4iC7v5yydBtGkywFHVXbukSBnEcgSy6Pq 37j+CsTQpjVVw1fnETsJY13cSolmkS9py7Yd/ak6y43OtoIW/479nJWGbvyaWI9nUWcr OiZwz2DMrRc7ZUMh9heZreJmPJjdPxiUrkAuDxGhFkrxE10eLOYf2zms/LeFssnjm3Cm Qd1g== X-Gm-Message-State: AOAM533YKbwzfrGyaSa6luogG2RdNQCOucQrzusWJpI/agzSRNkmrtgd 9ZUqPBL+3yTg5xg4B31KZLXEZ2fSQaOwFQ== X-Google-Smtp-Source: ABdhPJzKp/ltA1N2XlE0JcxQq9D/PLGXFuP/wTxpbXVmGbGFfWPuuVcdHsmk2K/DSkCbguqb2y3cgg== X-Received: by 2002:a65:6705:: with SMTP id u5mr4093621pgf.418.1619894607394; Sat, 01 May 2021 11:43:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 03/31] target/hexagon: Change DECODE_MAPPED_REG operand name to OPNUM Date: Sat, 1 May 2021 11:42:56 -0700 Message-Id: <20210501184324.1338186-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::52b; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Reported-by: Richard Henderson < Signed-off-by: Taylor Simpson Message-Id: <1615784049-26215-1-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/decode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/hexagon/decode.c b/target/hexagon/decode.c index c9bacaa1ee..1c9c07412a 100644 --- a/target/hexagon/decode.c +++ b/target/hexagon/decode.c @@ -48,8 +48,8 @@ enum { DEF_REGMAP(R_16, 16, 0, 1, 2, 3, 4, 5, 6, 7, 16, 17, 18, 19, 20, 21, 22, = 23) DEF_REGMAP(R__8, 8, 0, 2, 4, 6, 16, 18, 20, 22) =20 -#define DECODE_MAPPED_REG(REGNO, NAME) \ - insn->regno[REGNO] =3D DECODE_REGISTER_##NAME[insn->regno[REGNO]]; +#define DECODE_MAPPED_REG(OPNUM, NAME) \ + insn->regno[OPNUM] =3D DECODE_REGISTER_##NAME[insn->regno[OPNUM]]; =20 typedef struct { const struct DectreeTable *table_link; --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895203; cv=none; d=zohomail.com; s=zohoarc; b=Sw3TofaoiDllAQEv8AQqYncBfFyfIegOba8gMpkYksLVX5M6GLujWZ9jCMPDphzc9jP2VAPpfrDylstthTPBgd90OqZINYbavRpPYNWjAPK+tuKpNkGwiltHBSBbSRTCeushr7mg8wScrVRxIFN5I5LEJ2BVe4rVkfus7I+KAJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895203; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Lhfa+4fc39/8zQCjA36z3jMbuqMJRs1LoYZWUgZZB5w=; b=FseMrdQOk9YPG1L8Lx7xM24e7hTaFS7OkEzaukmy7w0f6mipLvNuubdylS88WXOcaSZeshPBTGaz5HGSBRcAw6nQ5wRsiB/Y+x2bi0e9N7srPGobHn4UN8GDg3y7kbcmlUSXqYuy+QGv8gO4h+lINbMQXHCUjKlDC0Sowf4knxM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619895203809725.5289786215527; Sat, 1 May 2021 11:53:23 -0700 (PDT) Received: from localhost ([::1]:49380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcujy-0000Jg-MX for importer@patchew.org; Sat, 01 May 2021 14:53:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuaU-000890-51 for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:34 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]:35427) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaS-0008U3-1u for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:33 -0400 Received: by mail-pl1-x62a.google.com with SMTP id t21so681676plo.2 for ; Sat, 01 May 2021 11:43:28 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Lhfa+4fc39/8zQCjA36z3jMbuqMJRs1LoYZWUgZZB5w=; b=An1wHr0sbkBK31bh1Tx3Q2cbVjxoSgyX8AHoUpb1ZBOEYAiHHTasEH61LU2Mrg64TD DaeMXkcsA7EB5PHzgTLKkfG6/EKtpMM75UngMp6iiD5JX1/5SmZifAMy1ahiOGa6mLo4 jiHukH5iq80l6xLLzW0r5qdVEHsgZk6X18pJ7v9kO7NddnbWaGig6HkT/demXFFoWEuE DerWzgrgIwKbjiVpXEI3dMPcOntY86AOnx6ObXwQBt3NXRP6N7NeF8FE7fA2PqyH91k6 o/X8phIlh/jWMWatgywvcqvZxklWczFe8LNh0625gLmYPwH4A/ml/WwxBIUDcyFow71g Bi7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Lhfa+4fc39/8zQCjA36z3jMbuqMJRs1LoYZWUgZZB5w=; b=UMgkrW+8F7t3vMj1jp91lpPm3Q564ZaKqxIgIo5DzItdwGghNLiFFLuEonpdOXipqF zQ2Pey8jw1Z8/QepaVF/nOv7/VYLk2YL7OmdCYQc9aG165cd3QpZcJ6qYx4OEToRNsjL gz9DlJeyEGbtal4SXVrlY1Uys5d8+Br1vanzANTCbu9Bg+7tAZE42gOGkq3PKaR0IG3o jIwmGmyQaHEyBM8qcR5mwaA5WCpDwW8/z+w0gDGRBZl3YMh4RP2OVVl0ms1O62/7LTRw 1acQUokC3byInfB0BAkC38NhfRex6zt7gIC7+Sp/KtRyowyEKUs4KI6LpawHH3x+V8Ax a+Fg== X-Gm-Message-State: AOAM5322SB0jRiiZmvQxrmM4F47TR3IyV5lwjDl0eRXRQjRSHE3wih57 tfHrFYZ68C+SQQvQvXCR7jfpJK39x7hA4A== X-Google-Smtp-Source: ABdhPJyvUdp9MtsWYWhSlP2Ps/NGbkddsomBg1rA7ic0JtwKsl3Ckkersa8BeAcuJ8Nb7QH+Ry+YOQ== X-Received: by 2002:a17:90b:2390:: with SMTP id mr16mr5200622pjb.133.1619894607939; Sat, 01 May 2021 11:43:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 04/31] target/hexagon: fix typo in comment Date: Sat, 1 May 2021 11:42:57 -0700 Message-Id: <20210501184324.1338186-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Taylor Simpson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Taylor Simpson Message-Id: <1615784115-26559-1-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index 2c6d718579..d6b5c47500 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -298,7 +298,7 @@ int32_t HELPER(fcircadd)(int32_t RxV, int32_t offset, i= nt32_t M, int32_t CS) } =20 /* - * Hexagon FP operations return ~0 insteat of NaN + * Hexagon FP operations return ~0 instead of NaN * The hex_check_sfnan/hex_check_dfnan functions perform this check */ static float32 hex_check_sfnan(float32 x) --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895060; cv=none; d=zohomail.com; s=zohoarc; b=eY1Uq9So1sHrPdNdJEFpku/EqSxFpMlnkUVOiOT0l30BZWX+SD8HpyA9LulWA9572c6aL+pn5pdMoeZTYdERRZsOVz3LB0IMbx4XXqAdv5xSjZroeDiAVIgiSwJE/o/LH2Os6pel1/5ciyLdymW2Mqz34DhMeNOqQd/XcNBRIB8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895060; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=i5rMc+7tkRmty/Z8ETHm8OuACyQrJr38+SoOSY+AtiA=; b=AcL8i+Ayj5/qfAKgmOXHKOyZE+Zz5JGE1MGTeLoptQZ6qO1zTEpEWXuPg5/GyhAlGwZO2Bfq6p/okJ2RucQVFAFUWZFwdPpX9ECVxb06mdOvWWob4Kka9QQxRLJV2N9HcUDlGgbZzWrUAH+dxoVhBSIGJCbMNYIf6Hf4qmVUp/o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail 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 1619895060400621.3768459398051; Sat, 1 May 2021 11:51:00 -0700 (PDT) Received: from localhost ([::1]:41374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcuhe-0005Q6-Cp for importer@patchew.org; Sat, 01 May 2021 14:50:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuag-0008G1-Aa for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:47 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:43926) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaS-0008Uh-2d for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:44 -0400 Received: by mail-pf1-x42d.google.com with SMTP id e15so1308097pfv.10 for ; Sat, 01 May 2021 11:43:29 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i5rMc+7tkRmty/Z8ETHm8OuACyQrJr38+SoOSY+AtiA=; b=XcM/7uVgmfAwgnC+RPc8cLdJzujP/UpPuujvMeabUNVSRFxWqXa2RU1ArDwapup9Qm 0z/EWgk/4zmRv2rOQ+TmtfeGHLFzd1a3jHP/jTHVg0QhXxwhZm15KM0zFoc2alagYWrc fksqf4Qw9UHeonJ6A0ENx8SCCYqqBT8NYIC1nrdNl84fOpxivFgicIKUPn+dH7K8ThDT eLb/LQlx9KVMKg8z4PmMrT5g15ujXK5I9AtC38yeQrJ85TjoyIXNlcYpCl6tsg5jn7+k bBDmyrEj522whSq9j1JJAaXq0V2/9QSKjYzQiJUpps0lvkTg9qqPrtmle1QVDvy50byK 3ERQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i5rMc+7tkRmty/Z8ETHm8OuACyQrJr38+SoOSY+AtiA=; b=fIsRo6QxNPai8C9msCz/os/PKhN2QyoX3UzaIjvAov54+6y4yB8Hyp2y1GLU94OWR+ WkIS9qcBV/SD5tMepcBpP9p3z8NiTz8gHcrgRksd24RTc0uShD906OR22wyfSqefh++d FnA3qr80nqs4LuStHiVBrVEP6u/kmNKzSq33MG+LJzP9DCxfnf7EYxCdB61ZbyzEjHWk KkceDgVy6YPDCJgnCwoZNogFfI41r6GSciyeNZMJxdiYeteuneIwrjjUok0SkIpL7ybD uF4Pmdya5TaXHyYGSEgdzcef+r9eSKyqNwyWqaX4Oz83c9x+mpfA0heoJ2AIBu6dHFaa Lucg== X-Gm-Message-State: AOAM530ag1KJkhEfJ+bEPR8e0v0Te0fB0YZghJ9wGcMKcbtYOwjw9VWq ZkESKnw4Uljbq/0hL9Yeh11YmWkBSvkVqQ== X-Google-Smtp-Source: ABdhPJw1YWJtebPN0qTPgGVlASCo/ZkyOi0/cWK57ublxbsuXVnVFSB9qAmz3EpNzzk67yX6Qlb06w== X-Received: by 2002:a63:1d06:: with SMTP id d6mr10233870pgd.202.1619894608707; Sat, 01 May 2021 11:43:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 05/31] target/hexagon: remove unnecessary semicolons Date: Sat, 1 May 2021 11:42:58 -0700 Message-Id: <20210501184324.1338186-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_SPACE_RATIO=0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: peter.maydell@linaro.org, Taylor Simpson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Taylor Simpson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reported-by: Richard Henderson < Signed-off-by: Taylor Simpson Message-Id: <1615784100-26459-1-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/gen_tcg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/hexagon/gen_tcg.h b/target/hexagon/gen_tcg.h index e044deaff2..a30048ee57 100644 --- a/target/hexagon/gen_tcg.h +++ b/target/hexagon/gen_tcg.h @@ -83,9 +83,9 @@ #define fGEN_TCG_L2_loadrub_pr(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadrub_pi(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadrb_pr(SHORTCODE) SHORTCODE -#define fGEN_TCG_L2_loadrb_pi(SHORTCODE) SHORTCODE; +#define fGEN_TCG_L2_loadrb_pi(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadruh_pr(SHORTCODE) SHORTCODE -#define fGEN_TCG_L2_loadruh_pi(SHORTCODE) SHORTCODE; +#define fGEN_TCG_L2_loadruh_pi(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadrh_pr(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadrh_pi(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadri_pr(SHORTCODE) SHORTCODE --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895202; cv=none; d=zohomail.com; s=zohoarc; b=cVH1E6kJnsbT6iZKwanhS7LOJkO9nr5Roy4lFdLvLiLZprar8kz7OEfDcig1DuczE+s3wNl9zH4xKbBtnvEoQbMwCTeUu+WdGmCPBsBftQXeHGg5uzWXbBP8Rxn2uXhjtmnzbYFVePnQ8e3HRfG58FwgCZX9rhWEvkUFwr48Lv0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895202; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qhStDMuAAq22D0KTN861hUrYomJPu6B6dNcr8mKWQIs=; b=Becv3fvGuLiTCSwE8DB/7/XK/Kgb2HLiE7HfgBlQXHVhDunMoh8h6iQNFf1pgjVg3OsQvdlvhUhLNBy5A7Ux8/+3qlW2BPbWEWIXNwRKX4vw8wtRWxNhDZ7S5ARlCoiFhYt1Rvgaj+vGAi2p9WxOhnwdoRtO/VP0ccD9KPaoMgo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619895202292515.5897303597599; Sat, 1 May 2021 11:53:22 -0700 (PDT) Received: from localhost ([::1]:49216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcujx-0000FU-7p for importer@patchew.org; Sat, 01 May 2021 14:53:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuaV-0008Aa-52 for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:35 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]:35427) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaS-0008Um-1x for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:34 -0400 Received: by mail-pj1-x102a.google.com with SMTP id h14-20020a17090aea8eb02901553e1cc649so3485360pjz.0 for ; Sat, 01 May 2021 11:43:30 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qhStDMuAAq22D0KTN861hUrYomJPu6B6dNcr8mKWQIs=; b=owtqfc7nUd+VJtrGrgo1olue5B09cfjQVTtDmHOCmMU6vuai0vaWe3zn0f92IgTagU J0RF3wXeh+FSXX1NmVV8Yr7yiXIqOBaY68mtIpLB59Xdn6IhW7c7N6R4KdQTrUM69Pp+ Fc+7iWShkkUzS0TDaIB81RCMWbwATDX6A/2Hk/2kKe4VeYYn5Q2YQX//pT9MmNK3/n18 mXOB2QxCtwUTE77Atit5nWhO5Xd/j5BFCHDdM/EtN4X61CpJCbVa3QYlUm5z+ujzqlPc Qr8CYGw75wp1m0Mnvpa5L0cjDq5Gk/DCjRrfwqI0NQC958gHFYUn4ShrtneOi4p1icMs vGFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qhStDMuAAq22D0KTN861hUrYomJPu6B6dNcr8mKWQIs=; b=oYY+IbtWGtuhuW1ELdLUQsXMHuCMnQ1USHcRKUHpv8WVfHYsVm4JSbSfZdwFLgnK0U JycMNLHi3a2uBG6RZHvx8BXkn/lriEO8qrjM+QguiJh3LollNfFI48aG6uQxKAFPlT0K 20rGi1u6f1KrIl5ISHFCujQSiL+yyvKTR18HCW+6BAijEPxekLa+SiIMKZt/oMyQDdkY rUVDRRBjgY9nNNGH8cNrDjASQ5+oK94cHCzMm3ha3UYNqBNh2kX3B/XNcy8NQgIxSO20 iauB3B0a+kIeBCrmFvnGCehoTCjAR+J3JtXir8TQTJ4roQixxJiTd1rIQFJzv9fgAftW fofA== X-Gm-Message-State: AOAM530OQyhGu0yjUu9fSvJlGkaVod1QSX/gEajCb4aYCgnH5hP2p2ps FBKr0UKaBnPiClNGlZln2W53LEinLeNT+g== X-Google-Smtp-Source: ABdhPJwf5ydhIq10wxpCOEfmhLHvQFp2eHnuQNouj9skdS3nHy0KIr0sM2XChk/+caVotW+lXTbuAQ== X-Received: by 2002:a17:90a:4a0e:: with SMTP id e14mr22133456pjh.209.1619894609471; Sat, 01 May 2021 11:43:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 06/31] Hexagon (target/hexagon) TCG generation cleanup Date: Sat, 1 May 2021 11:42:59 -0700 Message-Id: <20210501184324.1338186-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Simplify TCG generation of hex_reg_written Suggested-by: Richard Henderson Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-2-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/genptr.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/target/hexagon/genptr.c b/target/hexagon/genptr.c index 7481f4c1dd..87f5d92994 100644 --- a/target/hexagon/genptr.c +++ b/target/hexagon/genptr.c @@ -35,7 +35,6 @@ static inline TCGv gen_read_preg(TCGv pred, uint8_t num) =20 static inline void gen_log_predicated_reg_write(int rnum, TCGv val, int sl= ot) { - TCGv one =3D tcg_const_tl(1); TCGv zero =3D tcg_const_tl(0); TCGv slot_mask =3D tcg_temp_new(); =20 @@ -43,12 +42,17 @@ static inline void gen_log_predicated_reg_write(int rnu= m, TCGv val, int slot) tcg_gen_movcond_tl(TCG_COND_EQ, hex_new_value[rnum], slot_mask, zero, val, hex_new_value[rnum]); #if HEX_DEBUG - /* Do this so HELPER(debug_commit_end) will know */ - tcg_gen_movcond_tl(TCG_COND_EQ, hex_reg_written[rnum], slot_mask, zero, - one, hex_reg_written[rnum]); + /* + * Do this so HELPER(debug_commit_end) will know + * + * Note that slot_mask indicates the value is not written + * (i.e., slot was cancelled), so we create a true/false value before + * or'ing with hex_reg_written[rnum]. + */ + tcg_gen_setcond_tl(TCG_COND_EQ, slot_mask, slot_mask, zero); + tcg_gen_or_tl(hex_reg_written[rnum], hex_reg_written[rnum], slot_mask); #endif =20 - tcg_temp_free(one); tcg_temp_free(zero); tcg_temp_free(slot_mask); } --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619894833; cv=none; d=zohomail.com; s=zohoarc; b=jp/0jbkj4b9KPYqTqrIcRru9CsC/FtZsHSJNodDrNH3f+xxE4et/IJkm4fJoj9jIaOcQ4gW7mXTXvdAy65SE3OuWCaDHlyalXRn9TBYTULD4EPq5a9uTNM/qNCS7b9/m5UXE6pgl6MGEf9P3zfwggwg9h9gFSqYzYdpRXPtKzVg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619894833; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kR3P2xiX5PJwZxtiIf6JxRJdWTUQ+DfdDMSonfEfAUg=; b=NUDO3DTDy0/cgK8T6ip2WeB8/3f+GstCVeiIvVjIfsrakiENTOtVpFZ/RW0zKsp7Bvu4mmil+IIghIXqIFcMPyU6eHWsGwpbwFf+jmoKBmg9IJ69v3XRIwI3Uf/Qp6u8MdD9sKl/YExTxo0nsfSnKXnsUyjsirqRw7z5dHpVxhE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619894833840515.4303573937611; Sat, 1 May 2021 11:47:13 -0700 (PDT) Received: from localhost ([::1]:60750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcue0-0001du-Oc for importer@patchew.org; Sat, 01 May 2021 14:47:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuaX-0008Dj-Eu for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:37 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]:35491) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaS-0008Up-2p for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:37 -0400 Received: by mail-pf1-x429.google.com with SMTP id i13so1346802pfu.2 for ; Sat, 01 May 2021 11:43:30 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kR3P2xiX5PJwZxtiIf6JxRJdWTUQ+DfdDMSonfEfAUg=; b=wbSLpiTY3QN2z05ySxIf5Zm+pppkC+x/eqrV4GpXlcamrv7wCuW3NIP+RRndqncGq7 yTsdaX6/mAzoYCxXKj75a3N4yrO+n1lueUkkwp3hPHxg80UVI0cTIQZQ4+YYcIuaYSwr hXoZ78nQ8R0TVqFWI7JR/zsRog/pu9380cdvaVaLBs1s7me5HosSwU6XtVg6VGzgX0Fn d9Gpe92/74+3g4iO4yn5DXVhCm68J+vcAkZoDCregUxrQSWVvJnDVr5dMzDSESD8c1Kt ak0I9iCMpZWJVq5QuXCxqCPALf3v2yyLb5q8gZQ9DxOAH7vHIbMAXwYBBSxxrNRXfOoK /Atw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kR3P2xiX5PJwZxtiIf6JxRJdWTUQ+DfdDMSonfEfAUg=; b=KCVBsiNmD3q8rdwHss8IYMr0YI1wmTBjgbU8dvdxmxDaD1S1Mgr9LJ+uuD3G2IO0Xn 3/x6s2Q5TCA+npPbFNqgvcb6pHQi3oO8DcImv2gn3MNe169wk+6vIjuPkuiWsVR1WZ3X Q6xXPVpLX+PofWCoNOiDlh9N1d4zjFCSRNf5cMIx01nZe5t/IMe2DAN7/9N6FGxHR2lZ 5ivTv0qgdNjrkZZwRtPI20xox2OtGAGIN4olbgRopQECcrHxvCiIXt58QvvbbxgRfXZT SEcfR0+Nf9KFWwR8KeeS9PG6+TEmvlCPYl7wnHSFa2GlBhEenRdYm7KsOPecwg0MQ5co x4JQ== X-Gm-Message-State: AOAM530l6C7w7OzPB0N0a+ZV0nosiA9Igk7v1AgcVfi4zyqwhcLxb8zF k5Z1qsc9ENwf3HS3UsuzWJayNWFsgDTgbQ== X-Google-Smtp-Source: ABdhPJyN+PlRIo0Na/mSGH518hoH948BWGoUkLVkigrVJ3XeltWHgETgiKDVSxFHeagpNHtMDoL9rA== X-Received: by 2002:a63:5458:: with SMTP id e24mr10420077pgm.170.1619894610080; Sat, 01 May 2021 11:43:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 07/31] Hexagon (target/hexagon) cleanup gen_log_predicated_reg_write_pair Date: Sat, 1 May 2021 11:43:00 -0700 Message-Id: <20210501184324.1338186-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Similar to previous cleanup of gen_log_predicated_reg_write Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-3-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/genptr.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/target/hexagon/genptr.c b/target/hexagon/genptr.c index 87f5d92994..07d970fc6c 100644 --- a/target/hexagon/genptr.c +++ b/target/hexagon/genptr.c @@ -69,36 +69,35 @@ static inline void gen_log_reg_write(int rnum, TCGv val) static void gen_log_predicated_reg_write_pair(int rnum, TCGv_i64 val, int = slot) { TCGv val32 =3D tcg_temp_new(); - TCGv one =3D tcg_const_tl(1); TCGv zero =3D tcg_const_tl(0); TCGv slot_mask =3D tcg_temp_new(); =20 tcg_gen_andi_tl(slot_mask, hex_slot_cancelled, 1 << slot); /* Low word */ tcg_gen_extrl_i64_i32(val32, val); - tcg_gen_movcond_tl(TCG_COND_EQ, hex_new_value[rnum], slot_mask, zero, - val32, hex_new_value[rnum]); -#if HEX_DEBUG - /* Do this so HELPER(debug_commit_end) will know */ - tcg_gen_movcond_tl(TCG_COND_EQ, hex_reg_written[rnum], + tcg_gen_movcond_tl(TCG_COND_EQ, hex_new_value[rnum], slot_mask, zero, - one, hex_reg_written[rnum]); -#endif - + val32, hex_new_value[rnum]); /* High word */ tcg_gen_extrh_i64_i32(val32, val); tcg_gen_movcond_tl(TCG_COND_EQ, hex_new_value[rnum + 1], slot_mask, zero, val32, hex_new_value[rnum + 1]); #if HEX_DEBUG - /* Do this so HELPER(debug_commit_end) will know */ - tcg_gen_movcond_tl(TCG_COND_EQ, hex_reg_written[rnum + 1], - slot_mask, zero, - one, hex_reg_written[rnum + 1]); + /* + * Do this so HELPER(debug_commit_end) will know + * + * Note that slot_mask indicates the value is not written + * (i.e., slot was cancelled), so we create a true/false value before + * or'ing with hex_reg_written[rnum]. + */ + tcg_gen_setcond_tl(TCG_COND_EQ, slot_mask, slot_mask, zero); + tcg_gen_or_tl(hex_reg_written[rnum], hex_reg_written[rnum], slot_mask); + tcg_gen_or_tl(hex_reg_written[rnum + 1], hex_reg_written[rnum + 1], + slot_mask); #endif =20 tcg_temp_free(val32); - tcg_temp_free(one); tcg_temp_free(zero); tcg_temp_free(slot_mask); } --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619894836; cv=none; d=zohomail.com; s=zohoarc; b=Ca9Q0bSxAqGe2l5a83gwcsRnmDyNzOQUUSGOTMOslLhuind1kWINB2hDnpMZnUtzDi1wDdeXDNW7ovyvCz32qRUqXYEoKYUosNv8ipZy0ZhYkaNbFY7iF5OHrhAJrD9g42ILlU42aMq3w2eD+gzLaDWVI/PMgZ6YtSlsuKAvjDc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619894836; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=O/pItQsQ9Y9zVqgnbFnM4eZJR/WZu0GVfOi6XxB0n7E=; b=YcJ9kJGZJYs8ArqQy282EVoOZLcdduGIZX/nBf9ysvIBrn3+2z9W3X0YDqKe6NtAaDzKeQKvN28BpvVrJn6UTQYQw0DlZhCBz+9dM+z2ipdlyHa/Htbfs3VGvq/j1kqTMjv6aX8vFHQNfb7IgNLZvyuyYF5Mn90qR/eWKkYMXQc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619894836748298.7212267650498; Sat, 1 May 2021 11:47:16 -0700 (PDT) Received: from localhost ([::1]:60708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcue2-0001d2-4K for importer@patchew.org; Sat, 01 May 2021 14:47:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuaW-0008CS-9V for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:36 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:46657) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaS-0008Uv-2G for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:36 -0400 Received: by mail-pg1-x532.google.com with SMTP id q9so821916pgl.13 for ; Sat, 01 May 2021 11:43:31 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O/pItQsQ9Y9zVqgnbFnM4eZJR/WZu0GVfOi6XxB0n7E=; b=kpRSPAtXi7O7WOWdenbCrc9wMzeOWWyollsPXENx+VTONlkVNgddxTkl2dU5/ZT0uL shBzvMzTJrjWWSG6DOYiBZ6cfUyd8ioGSxN7V2XHpHRSsAHtg15CRS/swVWuypMoEEFF sgJ6yiRFfqxv2ZEU8F+Xfn17ph9CFspu3wr9MMh1olIiA6WVfu5NEzkiRwYFTi/6ZkJT VnV+8N1uiNh30p7ZyNdJHBlvVJ67rjKPblGKqVFSqTweLQn/UbemeFapXbCMvny5e0V1 3C/YK/iqK2xxQJSuwSdNqZGjQQGN/gMfqLiNP+RYGmbCGRvzlOmuwiqOyDPKjLgJtQ6n wzpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O/pItQsQ9Y9zVqgnbFnM4eZJR/WZu0GVfOi6XxB0n7E=; b=k8cXTHN9kBOn5I92y2zo/wXfCN445xij61WTUErxtgaF+ed1TND9Rf1nQqLkl8PmBx c8G7L1pPgqrqBpjvajXSdsRwLd8+j1c/r0YWYf8REVRWpx/ddF3ebTjMzhF7jQo4Wt2D Xdo5unHk1kvOprw4fuvvtuoB5f/rYRy7BkEh1bB8rkQwq3JLP16zC52FTtqZ/C48oU9X MDJ928Hv2XXE3aY4kUtdMbg2PBIgEV9FNrTMN6Y5rnRH+QYEdhGqcwtNZDJNH6SqXqmD SshXIH/UW6rHLjpoiTqapP9QF7DCpAm4+C/sZJYxRSDeT7PnSvkYt9y1dbx6Atoxmk+0 KqsQ== X-Gm-Message-State: AOAM530uaLdDwkbTvuio0Ytf4znNDz24c4affSs23kfSxFe8oyQEZp0A x4QkfbAIENJ48+yHuf23iGF7NUXYzTrjqw== X-Google-Smtp-Source: ABdhPJwTkxYosED3Is4+F9vDHU9cesbhae2GLETemoKO+wdiTpP2qeySovVlJIU1RSj1QAPnh7t9uA== X-Received: by 2002:a63:ea04:: with SMTP id c4mr10095687pgi.243.1619894610668; Sat, 01 May 2021 11:43:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 08/31] Hexagon (target/hexagon) remove unnecessary inline directives Date: Sat, 1 May 2021 11:43:01 -0700 Message-Id: <20210501184324.1338186-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::532; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x532.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Suggested-by: Richard Henderson Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-4-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/cpu.c | 9 ++++----- target/hexagon/decode.c | 6 +++--- target/hexagon/fma_emu.c | 39 +++++++++++++++++++------------------- target/hexagon/op_helper.c | 37 ++++++++++++++++++------------------ target/hexagon/translate.c | 2 +- 5 files changed, 46 insertions(+), 47 deletions(-) diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index b0b3040dd1..c2fe357702 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -69,10 +69,9 @@ const char * const hexagon_regnames[TOTAL_PER_THREAD_REG= S] =3D { * stacks at different locations. This is used to compensate so the diff = is * cleaner. */ -static inline target_ulong adjust_stack_ptrs(CPUHexagonState *env, - target_ulong addr) +static target_ulong adjust_stack_ptrs(CPUHexagonState *env, target_ulong a= ddr) { - HexagonCPU *cpu =3D container_of(env, HexagonCPU, env); + HexagonCPU *cpu =3D hexagon_env_get_cpu(env); target_ulong stack_adjust =3D cpu->lldb_stack_adjust; target_ulong stack_start =3D env->stack_start; target_ulong stack_size =3D 0x10000; @@ -88,7 +87,7 @@ static inline target_ulong adjust_stack_ptrs(CPUHexagonSt= ate *env, } =20 /* HEX_REG_P3_0 (aka C4) is an alias for the predicate registers */ -static inline target_ulong read_p3_0(CPUHexagonState *env) +static target_ulong read_p3_0(CPUHexagonState *env) { int32_t control_reg =3D 0; int i; @@ -116,7 +115,7 @@ static void print_reg(FILE *f, CPUHexagonState *env, in= t regnum) =20 static void hexagon_dump(CPUHexagonState *env, FILE *f) { - HexagonCPU *cpu =3D container_of(env, HexagonCPU, env); + HexagonCPU *cpu =3D hexagon_env_get_cpu(env); =20 if (cpu->lldb_compat) { /* diff --git a/target/hexagon/decode.c b/target/hexagon/decode.c index 1c9c07412a..65d97ce64b 100644 --- a/target/hexagon/decode.c +++ b/target/hexagon/decode.c @@ -354,7 +354,7 @@ static void decode_split_cmpjump(Packet *pkt) } } =20 -static inline int decode_opcode_can_jump(int opcode) +static int decode_opcode_can_jump(int opcode) { if ((GET_ATTRIB(opcode, A_JUMP)) || (GET_ATTRIB(opcode, A_CALL)) || @@ -370,7 +370,7 @@ static inline int decode_opcode_can_jump(int opcode) return 0; } =20 -static inline int decode_opcode_ends_loop(int opcode) +static int decode_opcode_ends_loop(int opcode) { return GET_ATTRIB(opcode, A_HWLOOP0_END) || GET_ATTRIB(opcode, A_HWLOOP1_END); @@ -764,7 +764,7 @@ static void decode_add_endloop_insn(Insn *insn, int loo= pnum) } } =20 -static inline int decode_parsebits_is_loopend(uint32_t encoding32) +static int decode_parsebits_is_loopend(uint32_t encoding32) { uint32_t bits =3D parse_bits(encoding32); return bits =3D=3D 0x2; diff --git a/target/hexagon/fma_emu.c b/target/hexagon/fma_emu.c index 842d903710..f324b83e3c 100644 --- a/target/hexagon/fma_emu.c +++ b/target/hexagon/fma_emu.c @@ -64,7 +64,7 @@ typedef union { }; } Float; =20 -static inline uint64_t float64_getmant(float64 f64) +static uint64_t float64_getmant(float64 f64) { Double a =3D { .i =3D f64 }; if (float64_is_normal(f64)) { @@ -91,7 +91,7 @@ int32_t float64_getexp(float64 f64) return -1; } =20 -static inline uint64_t float32_getmant(float32 f32) +static uint64_t float32_getmant(float32 f32) { Float a =3D { .i =3D f32 }; if (float32_is_normal(f32)) { @@ -118,17 +118,17 @@ int32_t float32_getexp(float32 f32) return -1; } =20 -static inline uint32_t int128_getw0(Int128 x) +static uint32_t int128_getw0(Int128 x) { return int128_getlo(x); } =20 -static inline uint32_t int128_getw1(Int128 x) +static uint32_t int128_getw1(Int128 x) { return int128_getlo(x) >> 32; } =20 -static inline Int128 int128_mul_6464(uint64_t ai, uint64_t bi) +static Int128 int128_mul_6464(uint64_t ai, uint64_t bi) { Int128 a, b; uint64_t pp0, pp1a, pp1b, pp1s, pp2; @@ -152,7 +152,7 @@ static inline Int128 int128_mul_6464(uint64_t ai, uint6= 4_t bi) return int128_make128(ret_low, pp2 + (pp1s >> 32)); } =20 -static inline Int128 int128_sub_borrow(Int128 a, Int128 b, int borrow) +static Int128 int128_sub_borrow(Int128 a, Int128 b, int borrow) { Int128 ret =3D int128_sub(a, b); if (borrow !=3D 0) { @@ -170,7 +170,7 @@ typedef struct { uint8_t sticky; } Accum; =20 -static inline void accum_init(Accum *p) +static void accum_init(Accum *p) { p->mant =3D int128_zero(); p->exp =3D 0; @@ -180,7 +180,7 @@ static inline void accum_init(Accum *p) p->sticky =3D 0; } =20 -static inline Accum accum_norm_left(Accum a) +static Accum accum_norm_left(Accum a) { a.exp--; a.mant =3D int128_lshift(a.mant, 1); @@ -190,6 +190,7 @@ static inline Accum accum_norm_left(Accum a) return a; } =20 +/* This function is marked inline for performance reasons */ static inline Accum accum_norm_right(Accum a, int amt) { if (amt > 130) { @@ -226,7 +227,7 @@ static inline Accum accum_norm_right(Accum a, int amt) */ static Accum accum_add(Accum a, Accum b); =20 -static inline Accum accum_sub(Accum a, Accum b, int negate) +static Accum accum_sub(Accum a, Accum b, int negate) { Accum ret; accum_init(&ret); @@ -329,7 +330,7 @@ static Accum accum_add(Accum a, Accum b) } =20 /* Return an infinity with requested sign */ -static inline float64 infinite_float64(uint8_t sign) +static float64 infinite_float64(uint8_t sign) { if (sign) { return make_float64(DF_MINUS_INF); @@ -339,7 +340,7 @@ static inline float64 infinite_float64(uint8_t sign) } =20 /* Return a maximum finite value with requested sign */ -static inline float64 maxfinite_float64(uint8_t sign) +static float64 maxfinite_float64(uint8_t sign) { if (sign) { return make_float64(DF_MINUS_MAXF); @@ -349,7 +350,7 @@ static inline float64 maxfinite_float64(uint8_t sign) } =20 /* Return a zero value with requested sign */ -static inline float64 zero_float64(uint8_t sign) +static float64 zero_float64(uint8_t sign) { if (sign) { return make_float64(0x8000000000000000); @@ -369,7 +370,7 @@ float32 infinite_float32(uint8_t sign) } =20 /* Return a maximum finite value with the requested sign */ -static inline float32 maxfinite_float32(uint8_t sign) +static float32 maxfinite_float32(uint8_t sign) { if (sign) { return make_float32(SF_MINUS_MAXF); @@ -379,7 +380,7 @@ static inline float32 maxfinite_float32(uint8_t sign) } =20 /* Return a zero value with requested sign */ -static inline float32 zero_float32(uint8_t sign) +static float32 zero_float32(uint8_t sign) { if (sign) { return make_float32(0x80000000); @@ -389,7 +390,7 @@ static inline float32 zero_float32(uint8_t sign) } =20 #define GEN_XF_ROUND(SUFFIX, MANTBITS, INF_EXP, INTERNAL_TYPE) \ -static inline SUFFIX accum_round_##SUFFIX(Accum a, float_status * fp_statu= s) \ +static SUFFIX accum_round_##SUFFIX(Accum a, float_status * fp_status) \ { \ if ((int128_gethi(a.mant) =3D=3D 0) && (int128_getlo(a.mant) =3D=3D 0)= \ && ((a.guard | a.round | a.sticky) =3D=3D 0)) { \ @@ -526,8 +527,8 @@ static bool is_inf_prod(float64 a, float64 b) (float64_is_infinity(b) && is_finite(a) && (!float64_is_zero(a= )))); } =20 -static inline float64 special_fma(float64 a, float64 b, float64 c, - float_status *fp_status) +static float64 special_fma(float64 a, float64 b, float64 c, + float_status *fp_status) { float64 ret =3D make_float64(0); =20 @@ -586,8 +587,8 @@ static inline float64 special_fma(float64 a, float64 b,= float64 c, g_assert_not_reached(); } =20 -static inline float32 special_fmaf(float32 a, float32 b, float32 c, - float_status *fp_status) +static float32 special_fmaf(float32 a, float32 b, float32 c, + float_status *fp_status) { float64 aa, bb, cc; aa =3D float32_to_float64(a, fp_status); diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index d6b5c47500..5d35dfc8f3 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -46,8 +46,8 @@ void QEMU_NORETURN HELPER(raise_exception)(CPUHexagonStat= e *env, uint32_t excp) do_raise_exception_err(env, excp, 0); } =20 -static inline void log_reg_write(CPUHexagonState *env, int rnum, - target_ulong val, uint32_t slot) +static void log_reg_write(CPUHexagonState *env, int rnum, + target_ulong val, uint32_t slot) { HEX_DEBUG_LOG("log_reg_write[%d] =3D " TARGET_FMT_ld " (0x" TARGET_FMT= _lx ")", rnum, val, val); @@ -63,8 +63,7 @@ static inline void log_reg_write(CPUHexagonState *env, in= t rnum, #endif } =20 -static inline void log_pred_write(CPUHexagonState *env, int pnum, - target_ulong val) +static void log_pred_write(CPUHexagonState *env, int pnum, target_ulong va= l) { HEX_DEBUG_LOG("log_pred_write[%d] =3D " TARGET_FMT_ld " (0x" TARGET_FMT_lx ")\n", @@ -79,8 +78,8 @@ static inline void log_pred_write(CPUHexagonState *env, i= nt pnum, } } =20 -static inline void log_store32(CPUHexagonState *env, target_ulong addr, - target_ulong val, int width, int slot) +static void log_store32(CPUHexagonState *env, target_ulong addr, + target_ulong val, int width, int slot) { HEX_DEBUG_LOG("log_store%d(0x" TARGET_FMT_lx ", %" PRId32 " [0x08%" PRIx32 "])\n", @@ -90,8 +89,8 @@ static inline void log_store32(CPUHexagonState *env, targ= et_ulong addr, env->mem_log_stores[slot].data32 =3D val; } =20 -static inline void log_store64(CPUHexagonState *env, target_ulong addr, - int64_t val, int width, int slot) +static void log_store64(CPUHexagonState *env, target_ulong addr, + int64_t val, int width, int slot) { HEX_DEBUG_LOG("log_store%d(0x" TARGET_FMT_lx ", %" PRId64 " [0x016%" PRIx64 "])\n", @@ -101,7 +100,7 @@ static inline void log_store64(CPUHexagonState *env, ta= rget_ulong addr, env->mem_log_stores[slot].data64 =3D val; } =20 -static inline void write_new_pc(CPUHexagonState *env, target_ulong addr) +static void write_new_pc(CPUHexagonState *env, target_ulong addr) { HEX_DEBUG_LOG("write_new_pc(0x" TARGET_FMT_lx ")\n", addr); =20 @@ -132,7 +131,7 @@ void HELPER(debug_start_packet)(CPUHexagonState *env) } #endif =20 -static inline int32_t new_pred_value(CPUHexagonState *env, int pnum) +static int32_t new_pred_value(CPUHexagonState *env, int pnum) { return env->new_pred_value[pnum]; } @@ -332,8 +331,8 @@ static void check_noshuf(CPUHexagonState *env, uint32_t= slot) } } =20 -static inline uint8_t mem_load1(CPUHexagonState *env, uint32_t slot, - target_ulong vaddr) +static uint8_t mem_load1(CPUHexagonState *env, uint32_t slot, + target_ulong vaddr) { uint8_t retval; check_noshuf(env, slot); @@ -341,8 +340,8 @@ static inline uint8_t mem_load1(CPUHexagonState *env, u= int32_t slot, return retval; } =20 -static inline uint16_t mem_load2(CPUHexagonState *env, uint32_t slot, - target_ulong vaddr) +static uint16_t mem_load2(CPUHexagonState *env, uint32_t slot, + target_ulong vaddr) { uint16_t retval; check_noshuf(env, slot); @@ -350,8 +349,8 @@ static inline uint16_t mem_load2(CPUHexagonState *env, = uint32_t slot, return retval; } =20 -static inline uint32_t mem_load4(CPUHexagonState *env, uint32_t slot, - target_ulong vaddr) +static uint32_t mem_load4(CPUHexagonState *env, uint32_t slot, + target_ulong vaddr) { uint32_t retval; check_noshuf(env, slot); @@ -359,8 +358,8 @@ static inline uint32_t mem_load4(CPUHexagonState *env, = uint32_t slot, return retval; } =20 -static inline uint64_t mem_load8(CPUHexagonState *env, uint32_t slot, - target_ulong vaddr) +static uint64_t mem_load8(CPUHexagonState *env, uint32_t slot, + target_ulong vaddr) { uint64_t retval; check_noshuf(env, slot); @@ -939,7 +938,7 @@ float32 HELPER(sffms)(CPUHexagonState *env, float32 RxV, return RxV; } =20 -static inline bool is_inf_prod(int32_t a, int32_t b) +static bool is_inf_prod(int32_t a, int32_t b) { return (float32_is_infinity(a) && float32_is_infinity(b)) || (float32_is_infinity(a) && is_finite(b) && !float32_is_zero(b))= || diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index 2317508fa5..f975d7a5a1 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -585,7 +585,7 @@ static void hexagon_tr_translate_packet(DisasContextBas= e *dcbase, CPUState *cpu) * The CPU log is used to compare against LLDB single stepping, * so end the TLB after every packet. */ - HexagonCPU *hex_cpu =3D container_of(env, HexagonCPU, env); + HexagonCPU *hex_cpu =3D hexagon_env_get_cpu(env); if (hex_cpu->lldb_compat && qemu_loglevel_mask(CPU_LOG_TB_CPU)) { ctx->base.is_jmp =3D DISAS_TOO_MANY; } --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895424; cv=none; d=zohomail.com; s=zohoarc; b=DNVRyTWm7bLYa8ucm2Y6QvuzkIjHAuCTST2Hha1wqERTu24ketUrCee1U3bso6FsBt6XIpojHaKseoVsR38YYy0JFeuYlOyS8RRHP/aOoBPp9UD5gW5gmlduDx+1Ga/GUED16lOYXZoNle7g60HwKfz6avhmqUVyuZoQjxU+1T4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895424; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pbV3d5UOp4zIucQ+jGGDM6Fy1q3YuNEMSA2V6e1mngs=; b=MRkVtRGCvGZoxKkw+y6Q+6LARJaNaYYCfiYBNsDGnXOu1M62PY2fKBE6xWuUYskuOud8HrYzviOSJf3pr6g3SDUTQZkMVcl5F4K46mz5jFgZkiM4puXQmB45yJ1kc4zU6E1LOAtnD5vSL7xTpWHiwcaoVbrE4+7yLQ02dbjqxak= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619895424247258.08339961017623; Sat, 1 May 2021 11:57:04 -0700 (PDT) Received: from localhost ([::1]:57850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcunW-0003sR-US for importer@patchew.org; Sat, 01 May 2021 14:57:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuaX-0008DW-5x for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:37 -0400 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]:40936) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaS-0008Ux-H1 for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:36 -0400 Received: by mail-pg1-x535.google.com with SMTP id y30so837286pgl.7 for ; Sat, 01 May 2021 11:43:32 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pbV3d5UOp4zIucQ+jGGDM6Fy1q3YuNEMSA2V6e1mngs=; b=ElcQS2jP6bUawuhu2+s6xBR56O4wuDAyS1OBP2Y/p/xK90Mg/jMcpkvhKcEO3tCFzn hS7oo02dCfRep+3aXFDligNbBRgu6iyB9zSQaN4Bi/hKLCaenaFlYNhGhMO7Ogw9U56C juGe3hJvwySSmKvSs0BMZahOkC6hKuWFkd2GIQNElyLVHcgfdd3EdKh9WqfNFRW4EVSx sc403EhHwtMKr1mLdscSutsYNBTfiPXDPSLGmTouTXQY2mhnlzLzQ2yFYDI9zJHXEbrQ bobYyz/Dzowl1q/RdiEN34SQ7yRdJNy7edcladahwJjeFSNzR+ypkVR1x2doH27CGP3V hGvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pbV3d5UOp4zIucQ+jGGDM6Fy1q3YuNEMSA2V6e1mngs=; b=CfMI60SWvfKSq+b9B8wkDcqURz72ZxAfScx6QhjHeXaWpDuHtER45G7OGVPgEN4t9Q DvTgyCxT+yzsCrDFyiZP34uW+bby8EM2hczEEW86z7/NbW8PWiUJ1aLkt4c61APJ9H1n JRUh51KYZUm8vJKHEMzxGal1BckbLXKsuVQmg/fpHuohyVi+MfYuGYEoeyFeGdctYsf/ 4xm66b4gJVwytLYvXTsq0Yb3tNdzhWxIQul2t8oFa7YTEz5Np7j4guwAoDj2kxfhZXO7 UeWCTD114FHZEkZEoJ0Yh6lWdUixSF2m/P91Poo/yfWiAV9ya6cSCShpnCjE0sC1KEbZ fv9g== X-Gm-Message-State: AOAM531r+jIqp5NkUpvCjl4T2kb8xO4aAKjrtGwkB83lFAJU3RlO0ahN 3FsbJrqH8hcdxjGqrVQ4BEHvkRGD5kOQbA== X-Google-Smtp-Source: ABdhPJxgrmNNJ3tIC1i5z8EFKVRtjM+1J6UyvIxcdib2TiLYKrrA9A3m01gBOPQ7vK6UnIzSTMj+bQ== X-Received: by 2002:a63:b24:: with SMTP id 36mr10177996pgl.51.1619894611245; Sat, 01 May 2021 11:43:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 09/31] Hexagon (target/hexagon) use env_archcpu and env_cpu Date: Sat, 1 May 2021 11:43:02 -0700 Message-Id: <20210501184324.1338186-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::535; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x535.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Remove hexagon_env_get_cpu and replace with env_archcpu Replace CPU(hexagon_env_get_cpu(env)) with env_cpu(env) Suggested-by: Richard Henderson Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-5-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/cpu.h | 5 ----- linux-user/hexagon/cpu_loop.c | 2 +- target/hexagon/cpu.c | 4 ++-- target/hexagon/op_helper.c | 2 +- target/hexagon/translate.c | 2 +- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h index e04eac591c..2855dd3881 100644 --- a/target/hexagon/cpu.h +++ b/target/hexagon/cpu.h @@ -127,11 +127,6 @@ typedef struct HexagonCPU { target_ulong lldb_stack_adjust; } HexagonCPU; =20 -static inline HexagonCPU *hexagon_env_get_cpu(CPUHexagonState *env) -{ - return container_of(env, HexagonCPU, env); -} - #include "cpu_bits.h" =20 #define cpu_signal_handler cpu_hexagon_signal_handler diff --git a/linux-user/hexagon/cpu_loop.c b/linux-user/hexagon/cpu_loop.c index 9a68ca05c3..bc34f5d7c3 100644 --- a/linux-user/hexagon/cpu_loop.c +++ b/linux-user/hexagon/cpu_loop.c @@ -25,7 +25,7 @@ =20 void cpu_loop(CPUHexagonState *env) { - CPUState *cs =3D CPU(hexagon_env_get_cpu(env)); + CPUState *cs =3D env_cpu(env); int trapnr, signum, sigcode; target_ulong sigaddr; target_ulong syscallnum; diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index c2fe357702..f044506d0f 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -71,7 +71,7 @@ const char * const hexagon_regnames[TOTAL_PER_THREAD_REGS= ] =3D { */ static target_ulong adjust_stack_ptrs(CPUHexagonState *env, target_ulong a= ddr) { - HexagonCPU *cpu =3D hexagon_env_get_cpu(env); + HexagonCPU *cpu =3D env_archcpu(env); target_ulong stack_adjust =3D cpu->lldb_stack_adjust; target_ulong stack_start =3D env->stack_start; target_ulong stack_size =3D 0x10000; @@ -115,7 +115,7 @@ static void print_reg(FILE *f, CPUHexagonState *env, in= t regnum) =20 static void hexagon_dump(CPUHexagonState *env, FILE *f) { - HexagonCPU *cpu =3D hexagon_env_get_cpu(env); + HexagonCPU *cpu =3D env_archcpu(env); =20 if (cpu->lldb_compat) { /* diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index 5d35dfc8f3..7ac85549db 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -35,7 +35,7 @@ static void QEMU_NORETURN do_raise_exception_err(CPUHexag= onState *env, uint32_t exception, uintptr_t pc) { - CPUState *cs =3D CPU(hexagon_env_get_cpu(env)); + CPUState *cs =3D env_cpu(env); qemu_log_mask(CPU_LOG_INT, "%s: %d\n", __func__, exception); cs->exception_index =3D exception; cpu_loop_exit_restore(cs, pc); diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index f975d7a5a1..e235fdb315 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -585,7 +585,7 @@ static void hexagon_tr_translate_packet(DisasContextBas= e *dcbase, CPUState *cpu) * The CPU log is used to compare against LLDB single stepping, * so end the TLB after every packet. */ - HexagonCPU *hex_cpu =3D hexagon_env_get_cpu(env); + HexagonCPU *hex_cpu =3D env_archcpu(env); if (hex_cpu->lldb_compat && qemu_loglevel_mask(CPU_LOG_TB_CPU)) { ctx->base.is_jmp =3D DISAS_TOO_MANY; } --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895424; cv=none; d=zohomail.com; s=zohoarc; b=G+Esot4aHT68SZBdlPU+YEbTWjSLSE32qNammazGUz7Bn39io0ZLnnjEqw5KCBv3uBIO4p9O72D7NbZMh5vHZKsAY+ckhfons0DCUU19ZgtWAdXsN0IgFiTk6XSjdU+o3t6thufGttzV0fG2X6u6FMgaNkuHJDQCVFg71z6sG3Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895424; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2LxA893QCcSE5NR8FvdeWPmP4th9kBJwNhUIEaAJdaM=; b=Xb5h5SfHoL6VlsdyGog6b2hFgPkenkZcR7CMDcKZsMlpAlKzPTjq+4rz1gyDxK5jtZ1dpvvhzzBsD4vpBVVIcQYoYCbBm0qtfkuFRbD6Ox9KYctvS8hg+D5LJt1b+OxYEAfBKxPzXnUPPizNnkjNPysk7/KXiJ1k1lu0ujkzeb4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619895424852987.6311812488581; Sat, 1 May 2021 11:57:04 -0700 (PDT) Received: from localhost ([::1]:57690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcunU-0003oH-Ag for importer@patchew.org; Sat, 01 May 2021 14:57:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuaY-0008Ea-Ni for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:38 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]:35493) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaT-0008V8-66 for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:38 -0400 Received: by mail-pf1-x42b.google.com with SMTP id i13so1346828pfu.2 for ; Sat, 01 May 2021 11:43:32 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2LxA893QCcSE5NR8FvdeWPmP4th9kBJwNhUIEaAJdaM=; b=iU4TjVXdD8+XQbDhc2xH4kXxlKjDNnb+k2ZQPEOozkkgApVkyRXNhsC3YLN/ghH3FC efwCjI/2iulyCktabJ9Db9anzOsab5jVA5kqWZorBQ1lVxBo8dxy7eK3VUz61p2RJRfW hRvMuuNqhCP0dW/6eczrQWolVb3N1WJ7DS08CRT0nEVnEDi8Ox6/v2nmZrcB9cn2a2R0 aCotAz6bnXvgdxIe+QX9n8WS4WMjVMkfUaPvadRHlxLx9THHGtN6Kh+66y2v8Xz0F9dX 6yGy/bQwbK9XHgDO0Njx83vSF08dTi7/vziQaPhgM4VjxH0NIlH8wRlHyhkLsVA8W5z0 6KIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2LxA893QCcSE5NR8FvdeWPmP4th9kBJwNhUIEaAJdaM=; b=GFN9/ttmvVHKDhrPwx8aVd4z7Q/Ou0q1Q9488vB2Y+PVtuTCZUDMDd/nuvLZkbUhaP Q8B6UzVJb2g7QmShssskBbYT3AY14WMTWraD38l7Wdp8D9m6dv3CBZevpCGiNfLRSHIr j+3CsAC0Vp0Odk+nO7vpKJs/p8VyGiJ6GBNQmjMuU8orhL4y6fxy68UgoV8mabM2wzjJ ABs7AmEJuPpUYrSf9EyMaKti7p9EBO3NLZZtlFqUDl/cpoVO1B1+95yFYO00xgx/dd47 eEQdwiRpatsCwT27YN0BCSYqUoXLTIRsI/W46xXUBtT1HXNKZ21yHuk0QzFssqarIsKH +Exg== X-Gm-Message-State: AOAM532uVuE2A7gzj69eb234qGOOa7Q8r3uZWYFvVbLXSq0pnzCGEsZM co9Lj948LcfLbCCUQ+zpWvHq2GB8m4EMSQ== X-Google-Smtp-Source: ABdhPJwqcWydEi4HWoJbqHqHKV8X6V7LZ8itPy9pDpfwSJXlnJLS9hyuezIx/9r7mN7+6t5ITe2jAw== X-Received: by 2002:a65:4486:: with SMTP id l6mr10536924pgq.347.1619894611885; Sat, 01 May 2021 11:43:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 10/31] Hexagon (target/hexagon) properly generate TB end for DISAS_NORETURN Date: Sat, 1 May 2021 11:43:03 -0700 Message-Id: <20210501184324.1338186-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::42b; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson When exiting a TB, generate all the code before returning from hexagon_tr_translate_packet so that nothing needs to be done in hexagon_tr_tb_stop. Suggested-by: Richard Henderson Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-6-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/translate.h | 3 -- target/hexagon/translate.c | 62 ++++++++++++++++++++------------------ 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/target/hexagon/translate.h b/target/hexagon/translate.h index 938f7fbb9f..12506c8caf 100644 --- a/target/hexagon/translate.h +++ b/target/hexagon/translate.h @@ -86,8 +86,5 @@ extern TCGv hex_llsc_addr; extern TCGv hex_llsc_val; extern TCGv_i64 hex_llsc_val_i64; =20 -void gen_exception(int excp); -void gen_exception_debug(void); - void process_store(DisasContext *ctx, Packet *pkt, int slot_num); #endif diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index e235fdb315..9f2a531969 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -54,16 +54,40 @@ static const char * const hexagon_prednames[] =3D { "p0", "p1", "p2", "p3" }; =20 -void gen_exception(int excp) +static void gen_exception_raw(int excp) { TCGv_i32 helper_tmp =3D tcg_const_i32(excp); gen_helper_raise_exception(cpu_env, helper_tmp); tcg_temp_free_i32(helper_tmp); } =20 -void gen_exception_debug(void) +static void gen_exec_counters(DisasContext *ctx) { - gen_exception(EXCP_DEBUG); + tcg_gen_addi_tl(hex_gpr[HEX_REG_QEMU_PKT_CNT], + hex_gpr[HEX_REG_QEMU_PKT_CNT], ctx->num_packets); + tcg_gen_addi_tl(hex_gpr[HEX_REG_QEMU_INSN_CNT], + hex_gpr[HEX_REG_QEMU_INSN_CNT], ctx->num_insns); +} + +static void gen_end_tb(DisasContext *ctx) +{ + gen_exec_counters(ctx); + tcg_gen_mov_tl(hex_gpr[HEX_REG_PC], hex_next_PC); + if (ctx->base.singlestep_enabled) { + gen_exception_raw(EXCP_DEBUG); + } else { + tcg_gen_exit_tb(NULL, 0); + } + ctx->base.is_jmp =3D DISAS_NORETURN; +} + +static void gen_exception_end_tb(DisasContext *ctx, int excp) +{ + gen_exec_counters(ctx); + tcg_gen_mov_tl(hex_gpr[HEX_REG_PC], hex_next_PC); + gen_exception_raw(excp); + ctx->base.is_jmp =3D DISAS_NORETURN; + } =20 #if HEX_DEBUG @@ -225,8 +249,7 @@ static void gen_insn(CPUHexagonState *env, DisasContext= *ctx, mark_implicit_writes(ctx, insn); insn->generate(env, ctx, insn, pkt); } else { - gen_exception(HEX_EXCP_INVALID_OPCODE); - ctx->base.is_jmp =3D DISAS_NORETURN; + gen_exception_end_tb(ctx, HEX_EXCP_INVALID_OPCODE); } } =20 @@ -447,14 +470,6 @@ static void update_exec_counters(DisasContext *ctx, Pa= cket *pkt) ctx->num_insns +=3D num_real_insns; } =20 -static void gen_exec_counters(DisasContext *ctx) -{ - tcg_gen_addi_tl(hex_gpr[HEX_REG_QEMU_PKT_CNT], - hex_gpr[HEX_REG_QEMU_PKT_CNT], ctx->num_packets); - tcg_gen_addi_tl(hex_gpr[HEX_REG_QEMU_INSN_CNT], - hex_gpr[HEX_REG_QEMU_INSN_CNT], ctx->num_insns); -} - static void gen_commit_packet(DisasContext *ctx, Packet *pkt) { gen_reg_writes(ctx); @@ -478,7 +493,7 @@ static void gen_commit_packet(DisasContext *ctx, Packet= *pkt) #endif =20 if (pkt->pkt_has_cof) { - ctx->base.is_jmp =3D DISAS_NORETURN; + gen_end_tb(ctx); } } =20 @@ -491,8 +506,7 @@ static void decode_and_translate_packet(CPUHexagonState= *env, DisasContext *ctx) =20 nwords =3D read_packet_words(env, ctx, words); if (!nwords) { - gen_exception(HEX_EXCP_INVALID_PACKET); - ctx->base.is_jmp =3D DISAS_NORETURN; + gen_exception_end_tb(ctx, HEX_EXCP_INVALID_PACKET); return; } =20 @@ -505,8 +519,7 @@ static void decode_and_translate_packet(CPUHexagonState= *env, DisasContext *ctx) gen_commit_packet(ctx, &pkt); ctx->base.pc_next +=3D pkt.encod_pkt_size_in_bytes; } else { - gen_exception(HEX_EXCP_INVALID_PACKET); - ctx->base.is_jmp =3D DISAS_NORETURN; + gen_exception_end_tb(ctx, HEX_EXCP_INVALID_PACKET); } } =20 @@ -536,9 +549,7 @@ static bool hexagon_tr_breakpoint_check(DisasContextBas= e *dcbase, CPUState *cpu, { DisasContext *ctx =3D container_of(dcbase, DisasContext, base); =20 - tcg_gen_movi_tl(hex_gpr[HEX_REG_PC], ctx->base.pc_next); - ctx->base.is_jmp =3D DISAS_NORETURN; - gen_exception_debug(); + gen_exception_end_tb(ctx, EXCP_DEBUG); /* * The address covered by the breakpoint must be included in * [tb->pc, tb->pc + tb->size) in order to for it to be @@ -601,19 +612,12 @@ static void hexagon_tr_tb_stop(DisasContextBase *dcba= se, CPUState *cpu) gen_exec_counters(ctx); tcg_gen_movi_tl(hex_gpr[HEX_REG_PC], ctx->base.pc_next); if (ctx->base.singlestep_enabled) { - gen_exception_debug(); + gen_exception_raw(EXCP_DEBUG); } else { tcg_gen_exit_tb(NULL, 0); } break; case DISAS_NORETURN: - gen_exec_counters(ctx); - tcg_gen_mov_tl(hex_gpr[HEX_REG_PC], hex_next_PC); - if (ctx->base.singlestep_enabled) { - gen_exception_debug(); - } else { - tcg_gen_exit_tb(NULL, 0); - } break; default: g_assert_not_reached(); --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895060; cv=none; d=zohomail.com; s=zohoarc; b=Db6ydm3GloAhvTsvZS6Mgt0qy0LIQe1CpP/IhWcYIIVn3gDHyL+wXkA/T+h0ASsxN9sr7VwUw6ctj45gcfpTn8ykTbKVKuwHVmnQXYvlP6IwFXadd9DQqFxXGadTuH1CPgRnMEF198QQd5JLUcV2e9+inWtZJw0taYtjQnPQG6w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895060; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=exZ7GiFA5pPXMXe8dVROehinsUtAPvg6uCK8aQ+whzU=; b=lmRg2yR3hRKLXXwbxdoageV7V2fWKy/oc94s3BXouCEuUfyEwutGTFMbnoFs6k5V/OeXUdLd/inyiZWF2dzendBbnv6VCUlJpRU9nLCprW8T34aSgUtbzibYPy07PHAvZ8oZ0s47TPupertcKjPCG0Ls9ZlvTj6JcWOHlcxLOyk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619895060308232.51911624797685; Sat, 1 May 2021 11:51:00 -0700 (PDT) Received: from localhost ([::1]:41352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcuhe-0005PV-66 for importer@patchew.org; Sat, 01 May 2021 14:50:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuaY-0008EG-3l for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:38 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]:36793) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaT-0008Vw-RW for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:37 -0400 Received: by mail-pf1-x433.google.com with SMTP id p4so1343094pfo.3 for ; Sat, 01 May 2021 11:43:33 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=exZ7GiFA5pPXMXe8dVROehinsUtAPvg6uCK8aQ+whzU=; b=gG83qsEYGnAyFBmh5QDmmoQ1WVJMFQIFVXP/eVGyVyzV3S1MEcka+bbsHvdWOUlF0A R7kV1cXFVgUX1xDCqper9ZkMiogvpD77GDG777UVXiB2WTCEZPEgghOn5xOXxxeHT8D0 8CPsSs7klw/y+8HI2okLJq07PGy6SnnggNIfbKpjEN2MCy9bF8EeyEHDlqeSLuj4K9t2 7JGviEoctPtks/Tv3Q0X2JsqWPwgNtTVsxSFB2iRnZ7Yy9IOmRA20EJDpmVir/pNW0fG tppIuCC4g9vgFeDETR4BFpHF9j/EQAXjZPGc6tRjH0OIEKRvKNwGAykWs6rDU58ft46W tPYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=exZ7GiFA5pPXMXe8dVROehinsUtAPvg6uCK8aQ+whzU=; b=AscqJggxAsggUd37Gi8cwci6k00YcpraGD49d2MITqYPdBW/U0cqW2KqhbXte8oUJO iO1s+doMfomyE1mLAwPV90XWBDPddPqtrtnSJktApvX26BbUPKIKjcPY7kMkMFtn5B+O 4CNJVCjB/tqyU6jecZ6MOMl8KXiCU58JgyuuRT/zENKF5dEzuVEszB14N+1JbkGogCEP DI7RI9Q6RwKkodeR6EYZOdx9TONiNNhR0gbum9PtSZQdJlRS9M6QhBlluwwbQG5eh2S7 2dxdB1P2Y3p+boFPiOOHhp0y+saURAp/K4LqakgH9uBb7KZ6m3EDbBiw9fbiWcd6aUqq FtYA== X-Gm-Message-State: AOAM5331OjXVT1wJS1h5TDvqx4KzdyCTXmflPO8kxuKTJPHkieCPDn55 PO6ODoLJRCTCRbA0KjobLrLkALkrm1GXaQ== X-Google-Smtp-Source: ABdhPJwCGL0s7xQ5CypZ5mohOIYzPGURq6QtfstWzFm3j93X0LuwSIH81SKWVDy/4FNRL/jJu+JtSA== X-Received: by 2002:a05:6a00:2389:b029:28c:ede4:8a60 with SMTP id f9-20020a056a002389b029028cede48a60mr8081606pfc.54.1619894612476; Sat, 01 May 2021 11:43:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 11/31] Hexagon (target/hexagon) decide if pred has been written at TCG gen time Date: Sat, 1 May 2021 11:43:04 -0700 Message-Id: <20210501184324.1338186-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Multiple writes to the same preg are and'ed together. Rather than generating a runtime check, we can determine at TCG generation time if the predicate has previously been written in the packet. Test added to tests/tcg/hexagon/misc.c Suggested-by: Richard Henderson Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-7-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/translate.h | 2 ++ target/hexagon/genptr.c | 22 +++++++++++++++------- target/hexagon/translate.c | 9 +++++++-- tests/tcg/hexagon/misc.c | 19 +++++++++++++++++++ target/hexagon/gen_tcg_funcs.py | 2 +- 5 files changed, 44 insertions(+), 10 deletions(-) diff --git a/target/hexagon/translate.h b/target/hexagon/translate.h index 12506c8caf..0ecfbd7d52 100644 --- a/target/hexagon/translate.h +++ b/target/hexagon/translate.h @@ -34,6 +34,7 @@ typedef struct DisasContext { DECLARE_BITMAP(regs_written, TOTAL_PER_THREAD_REGS); int preg_log[PRED_WRITES_MAX]; int preg_log_idx; + DECLARE_BITMAP(pregs_written, NUM_PREGS); uint8_t store_width[STORES_MAX]; uint8_t s1_store_processed; } DisasContext; @@ -60,6 +61,7 @@ static inline void ctx_log_pred_write(DisasContext *ctx, = int pnum) { ctx->preg_log[ctx->preg_log_idx] =3D pnum; ctx->preg_log_idx++; + set_bit(pnum, ctx->pregs_written); } =20 static inline bool is_preloaded(DisasContext *ctx, int num) diff --git a/target/hexagon/genptr.c b/target/hexagon/genptr.c index 07d970fc6c..6b74344795 100644 --- a/target/hexagon/genptr.c +++ b/target/hexagon/genptr.c @@ -119,20 +119,28 @@ static void gen_log_reg_write_pair(int rnum, TCGv_i64= val) #endif } =20 -static inline void gen_log_pred_write(int pnum, TCGv val) +static inline void gen_log_pred_write(DisasContext *ctx, int pnum, TCGv va= l) { TCGv zero =3D tcg_const_tl(0); TCGv base_val =3D tcg_temp_new(); TCGv and_val =3D tcg_temp_new(); TCGv pred_written =3D tcg_temp_new(); =20 - /* Multiple writes to the same preg are and'ed together */ tcg_gen_andi_tl(base_val, val, 0xff); - tcg_gen_and_tl(and_val, base_val, hex_new_pred_value[pnum]); - tcg_gen_andi_tl(pred_written, hex_pred_written, 1 << pnum); - tcg_gen_movcond_tl(TCG_COND_NE, hex_new_pred_value[pnum], - pred_written, zero, - and_val, base_val); + + /* + * Section 6.1.3 of the Hexagon V67 Programmer's Reference Manual + * + * Multiple writes to the same preg are and'ed together + * If this is the first predicate write in the packet, do a + * straight assignment. Otherwise, do an and. + */ + if (!test_bit(pnum, ctx->pregs_written)) { + tcg_gen_mov_tl(hex_new_pred_value[pnum], base_val); + } else { + tcg_gen_and_tl(hex_new_pred_value[pnum], + hex_new_pred_value[pnum], base_val); + } tcg_gen_ori_tl(hex_pred_written, hex_pred_written, 1 << pnum); =20 tcg_temp_free(zero); diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index 9f2a531969..49ec8b76ed 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -172,6 +172,7 @@ static void gen_start_packet(DisasContext *ctx, Packet = *pkt) ctx->reg_log_idx =3D 0; bitmap_zero(ctx->regs_written, TOTAL_PER_THREAD_REGS); ctx->preg_log_idx =3D 0; + bitmap_zero(ctx->pregs_written, NUM_PREGS); for (i =3D 0; i < STORES_MAX; i++) { ctx->store_width[i] =3D 0; } @@ -226,7 +227,7 @@ static void mark_implicit_pred_write(DisasContext *ctx,= Insn *insn, } } =20 -static void mark_implicit_writes(DisasContext *ctx, Insn *insn) +static void mark_implicit_reg_writes(DisasContext *ctx, Insn *insn) { mark_implicit_reg_write(ctx, insn, A_IMPLICIT_WRITES_FP, HEX_REG_FP); mark_implicit_reg_write(ctx, insn, A_IMPLICIT_WRITES_SP, HEX_REG_SP); @@ -235,7 +236,10 @@ static void mark_implicit_writes(DisasContext *ctx, In= sn *insn) mark_implicit_reg_write(ctx, insn, A_IMPLICIT_WRITES_SA0, HEX_REG_SA0); mark_implicit_reg_write(ctx, insn, A_IMPLICIT_WRITES_LC1, HEX_REG_LC1); mark_implicit_reg_write(ctx, insn, A_IMPLICIT_WRITES_SA1, HEX_REG_SA1); +} =20 +static void mark_implicit_pred_writes(DisasContext *ctx, Insn *insn) +{ mark_implicit_pred_write(ctx, insn, A_IMPLICIT_WRITES_P0, 0); mark_implicit_pred_write(ctx, insn, A_IMPLICIT_WRITES_P1, 1); mark_implicit_pred_write(ctx, insn, A_IMPLICIT_WRITES_P2, 2); @@ -246,8 +250,9 @@ static void gen_insn(CPUHexagonState *env, DisasContext= *ctx, Insn *insn, Packet *pkt) { if (insn->generate) { - mark_implicit_writes(ctx, insn); + mark_implicit_reg_writes(ctx, insn); insn->generate(env, ctx, insn, pkt); + mark_implicit_pred_writes(ctx, insn); } else { gen_exception_end_tb(ctx, HEX_EXCP_INVALID_OPCODE); } diff --git a/tests/tcg/hexagon/misc.c b/tests/tcg/hexagon/misc.c index 458759f7b1..e5d78b471f 100644 --- a/tests/tcg/hexagon/misc.c +++ b/tests/tcg/hexagon/misc.c @@ -264,6 +264,22 @@ static long long creg_pair(int x, int y) return retval; } =20 +/* Check that predicates are auto-and'ed in a packet */ +static int auto_and(void) +{ + int retval; + asm ("r5 =3D #1\n\t" + "{\n\t" + " p0 =3D cmp.eq(r1, #1)\n\t" + " p0 =3D cmp.eq(r1, #2)\n\t" + "}\n\t" + "%0 =3D p0\n\t" + : "=3Dr"(retval) + : + : "r5", "p0"); + return retval; +} + int main() { =20 @@ -375,6 +391,9 @@ int main() res =3D test_clrtnew(2, 7); check(res, 7); =20 + res =3D auto_and(); + check(res, 0); + puts(err ? "FAIL" : "PASS"); return err; } diff --git a/target/hexagon/gen_tcg_funcs.py b/target/hexagon/gen_tcg_funcs= .py index db9f663a77..7ceb25b5f6 100755 --- a/target/hexagon/gen_tcg_funcs.py +++ b/target/hexagon/gen_tcg_funcs.py @@ -316,7 +316,7 @@ def genptr_dst_write(f, tag, regtype, regid): print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "P"): if (regid in {"d", "e", "x"}): - f.write(" gen_log_pred_write(%s%sN, %s%sV);\n" % \ + f.write(" gen_log_pred_write(ctx, %s%sN, %s%sV);\n" % \ (regtype, regid, regtype, regid)) f.write(" ctx_log_pred_write(ctx, %s%sN);\n" % \ (regtype, regid)) --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895212; cv=none; d=zohomail.com; s=zohoarc; b=lYLWpFoAb+6csUd8ST6Fur9EA+W54Qp0HeQEAkcITuWDZOCIXkCv4GRUBeNSn7aWEGlKYaEAwKNXUN1ymt1n6WjQe3Jyr+7wGzv1JM0/4pfIKNoiVcVag2XMD2og4pJq8LP7k0SdHde0gdZgs3g8cRW5OJcz3NVFOnt1sjPaoJA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895212; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Yx4G4Iv5ZatKfDFJ7Be+L669qIe/zhze2py593an1Pk=; b=QJZUkUwp3pu0dBqAPXUxrwyuQ2epfvCliPJLv61XewesarP2/drpANKLOaipFdJgrrNBrJskNuky3TjpTuNVwh6q3ux64G/W+E0BaJYFe7sRIxKoDH3fOgROBhT8ILwzSg4dKA2xnIarJubVveYZodSd6QswnNOPJgsCHzyF1to= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619895212334861.7161887351068; Sat, 1 May 2021 11:53:32 -0700 (PDT) Received: from localhost ([::1]:50004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcuk7-0000aj-2d for importer@patchew.org; Sat, 01 May 2021 14:53:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuai-0008Gb-4m for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:48 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:36649) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaU-00005w-FL for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:46 -0400 Received: by mail-pg1-x532.google.com with SMTP id j7so851233pgi.3 for ; Sat, 01 May 2021 11:43:33 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Yx4G4Iv5ZatKfDFJ7Be+L669qIe/zhze2py593an1Pk=; b=bqlWAoAjf0vLM6ZSq/nGgFvIZMhTkCTi3EPqY3kVEcmWUlFEum3D7QS+cwxgCIxFiG 6ZRCSScL2C7zoB7wUfv93YL0B4on48jpAss9OMsUM9yMKpSWc13vcTCzfR6RiYcGhbjd migLJyYXrWBT8VfyMdjsD7SHvpRanr0oEF1f1+lgOky0DQXqkZzWuBdE/EPIrq5MRDpK 73w+/2E/sOErgF3Cw6JCtGy9Qm/0s+DFiZ4Pn3kO0Y8ilmp3VZG87VmXywTjan/zTrTh /ZVmPZz9RwkMqRtDN4fZ/xYZk3BqCR/Kii32Zr3va2xBmMB/u75Ls8OxycXKnk2RMMW5 E8+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Yx4G4Iv5ZatKfDFJ7Be+L669qIe/zhze2py593an1Pk=; b=qkpwbg176FPSKm93jVF7597L/gaDIyyqR6hoV2BuUCC18ZlhbjSojyKyGLarWus6bX dF9Y3mE9s8WaYYr+33HE1W7i/xPV79gYqA14GnUIbQi7IAfbzKDA+u7CXU9LuMeVLz1E TgJN4spz5/di2/RnAlRlcbIZ7282ZkUbVuiSDKRS9uvRutzrNMT08takErS0Yrnt0vpR htvhjUj8uPVVmE7SjvUnjdmzit6nKqu6l9E52DwO7rErrElq4swehlpT4ZTDqEmqm0h7 nYLLD8ItcH0cvWpImvwd3tUrHykbXgdyiCCAsVUX+P0WdFo9Mf5TsfwVt8ZFnpiqFEul 7LyA== X-Gm-Message-State: AOAM530bVNnN3b3FDdINWhpX8pOzI/va7rVCvD4COQV5Oq91sGBwCLNn zVI/PT/TdGLI7iieCQFijgl6ZEVcwV15jg== X-Google-Smtp-Source: ABdhPJyXzIvAHb8tvNY13Jdr2pflTsf0tZT8xtr0r7DR+qMuh7cGZnSIqD11OJoEIdVOvdSiZau9Gw== X-Received: by 2002:a63:a0c:: with SMTP id 12mr10238251pgk.247.1619894613150; Sat, 01 May 2021 11:43:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 12/31] Hexagon (target/hexagon) change variables from int to bool when appropriate Date: Sat, 1 May 2021 11:43:05 -0700 Message-Id: <20210501184324.1338186-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::532; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x532.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Taylor Simpson Suggested-by: Richard Henderson Signed-off-by: Taylor Simpson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-8-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/cpu_bits.h | 2 +- target/hexagon/insn.h | 21 +++++----- target/hexagon/translate.h | 2 +- target/hexagon/decode.c | 80 +++++++++++++++++++------------------- target/hexagon/op_helper.c | 8 ++-- target/hexagon/translate.c | 6 +-- 6 files changed, 60 insertions(+), 59 deletions(-) diff --git a/target/hexagon/cpu_bits.h b/target/hexagon/cpu_bits.h index 96af834d0e..96fef71729 100644 --- a/target/hexagon/cpu_bits.h +++ b/target/hexagon/cpu_bits.h @@ -47,7 +47,7 @@ static inline uint32_t iclass_bits(uint32_t encoding) return iclass; } =20 -static inline int is_packet_end(uint32_t endocing) +static inline bool is_packet_end(uint32_t endocing) { uint32_t bits =3D parse_bits(endocing); return ((bits =3D=3D 0x3) || (bits =3D=3D 0x0)); diff --git a/target/hexagon/insn.h b/target/hexagon/insn.h index 5756a1d0ca..2e345912a8 100644 --- a/target/hexagon/insn.h +++ b/target/hexagon/insn.h @@ -40,14 +40,15 @@ struct Instruction { =20 uint32_t iclass:6; uint32_t slot:3; - uint32_t part1:1; /* + uint32_t which_extended:1; /* If has an extender, which immediate */ + uint32_t new_value_producer_slot:4; + + bool part1; /* * cmp-jumps are split into two insns. * set for the compare and clear for the jump */ - uint32_t extension_valid:1; /* Has a constant extender attached */ - uint32_t which_extended:1; /* If has an extender, which immediate */ - uint32_t is_endloop:1; /* This is an end of loop */ - uint32_t new_value_producer_slot:4; + bool extension_valid; /* Has a constant extender attached */ + bool is_endloop; /* This is an end of loop */ int32_t immed[IMMEDS_MAX]; /* immediate field */ }; =20 @@ -58,13 +59,13 @@ struct Packet { uint16_t encod_pkt_size_in_bytes; =20 /* Pre-decodes about COF */ - uint32_t pkt_has_cof:1; /* Has any change-of-flow */ - uint32_t pkt_has_endloop:1; + bool pkt_has_cof; /* Has any change-of-flow */ + bool pkt_has_endloop; =20 - uint32_t pkt_has_dczeroa:1; + bool pkt_has_dczeroa; =20 - uint32_t pkt_has_store_s0:1; - uint32_t pkt_has_store_s1:1; + bool pkt_has_store_s0; + bool pkt_has_store_s1; =20 Insn insn[INSTRUCTIONS_MAX]; }; diff --git a/target/hexagon/translate.h b/target/hexagon/translate.h index 0ecfbd7d52..97b12a7d18 100644 --- a/target/hexagon/translate.h +++ b/target/hexagon/translate.h @@ -36,7 +36,7 @@ typedef struct DisasContext { int preg_log_idx; DECLARE_BITMAP(pregs_written, NUM_PREGS); uint8_t store_width[STORES_MAX]; - uint8_t s1_store_processed; + bool s1_store_processed; } DisasContext; =20 static inline void ctx_log_reg_write(DisasContext *ctx, int rnum) diff --git a/target/hexagon/decode.c b/target/hexagon/decode.c index 65d97ce64b..dffe1d1972 100644 --- a/target/hexagon/decode.c +++ b/target/hexagon/decode.c @@ -340,8 +340,8 @@ static void decode_split_cmpjump(Packet *pkt) if (GET_ATTRIB(pkt->insn[i].opcode, A_NEWCMPJUMP)) { last =3D pkt->num_insns; pkt->insn[last] =3D pkt->insn[i]; /* copy the instruction */ - pkt->insn[last].part1 =3D 1; /* last instruction does the C= MP */ - pkt->insn[i].part1 =3D 0; /* existing instruction does the = JUMP */ + pkt->insn[last].part1 =3D true; /* last insn does the CMP= */ + pkt->insn[i].part1 =3D false; /* existing insn does the= JUMP */ pkt->num_insns++; } } @@ -354,7 +354,7 @@ static void decode_split_cmpjump(Packet *pkt) } } =20 -static int decode_opcode_can_jump(int opcode) +static bool decode_opcode_can_jump(int opcode) { if ((GET_ATTRIB(opcode, A_JUMP)) || (GET_ATTRIB(opcode, A_CALL)) || @@ -362,15 +362,15 @@ static int decode_opcode_can_jump(int opcode) (opcode =3D=3D J2_pause)) { /* Exception to A_JUMP attribute */ if (opcode =3D=3D J4_hintjumpr) { - return 0; + return false; } - return 1; + return true; } =20 - return 0; + return false; } =20 -static int decode_opcode_ends_loop(int opcode) +static bool decode_opcode_ends_loop(int opcode) { return GET_ATTRIB(opcode, A_HWLOOP0_END) || GET_ATTRIB(opcode, A_HWLOOP1_END); @@ -383,9 +383,9 @@ static void decode_set_insn_attr_fields(Packet *pkt) int numinsns =3D pkt->num_insns; uint16_t opcode; =20 - pkt->pkt_has_cof =3D 0; - pkt->pkt_has_endloop =3D 0; - pkt->pkt_has_dczeroa =3D 0; + pkt->pkt_has_cof =3D false; + pkt->pkt_has_endloop =3D false; + pkt->pkt_has_dczeroa =3D false; =20 for (i =3D 0; i < numinsns; i++) { opcode =3D pkt->insn[i].opcode; @@ -394,14 +394,14 @@ static void decode_set_insn_attr_fields(Packet *pkt) } =20 if (GET_ATTRIB(opcode, A_DCZEROA)) { - pkt->pkt_has_dczeroa =3D 1; + pkt->pkt_has_dczeroa =3D true; } =20 if (GET_ATTRIB(opcode, A_STORE)) { if (pkt->insn[i].slot =3D=3D 0) { - pkt->pkt_has_store_s0 =3D 1; + pkt->pkt_has_store_s0 =3D true; } else { - pkt->pkt_has_store_s1 =3D 1; + pkt->pkt_has_store_s1 =3D true; } } =20 @@ -422,9 +422,9 @@ static void decode_set_insn_attr_fields(Packet *pkt) */ static void decode_shuffle_for_execution(Packet *packet) { - int changed =3D 0; + bool changed =3D false; int i; - int flag; /* flag means we've seen a non-memory instruction */ + bool flag; /* flag means we've seen a non-memory instruction */ int n_mems; int last_insn =3D packet->num_insns - 1; =20 @@ -437,7 +437,7 @@ static void decode_shuffle_for_execution(Packet *packet) } =20 do { - changed =3D 0; + changed =3D false; /* * Stores go last, must not reorder. * Cannot shuffle stores past loads, either. @@ -445,13 +445,13 @@ static void decode_shuffle_for_execution(Packet *pack= et) * then a store, shuffle the store to the front. Don't shuffle * stores wrt each other or a load. */ - for (flag =3D n_mems =3D 0, i =3D last_insn; i >=3D 0; i--) { + for (flag =3D false, n_mems =3D 0, i =3D last_insn; i >=3D 0; i--)= { int opcode =3D packet->insn[i].opcode; =20 if (flag && GET_ATTRIB(opcode, A_STORE)) { decode_send_insn_to(packet, i, last_insn - n_mems); n_mems++; - changed =3D 1; + changed =3D true; } else if (GET_ATTRIB(opcode, A_STORE)) { n_mems++; } else if (GET_ATTRIB(opcode, A_LOAD)) { @@ -466,7 +466,7 @@ static void decode_shuffle_for_execution(Packet *packet) * a .new value */ } else { - flag =3D 1; + flag =3D true; } } =20 @@ -474,7 +474,7 @@ static void decode_shuffle_for_execution(Packet *packet) continue; } /* Compares go first, may be reordered wrt each other */ - for (flag =3D 0, i =3D 0; i < last_insn + 1; i++) { + for (flag =3D false, i =3D 0; i < last_insn + 1; i++) { int opcode =3D packet->insn[i].opcode; =20 if ((strstr(opcode_wregs[opcode], "Pd4") || @@ -483,7 +483,7 @@ static void decode_shuffle_for_execution(Packet *packet) /* This should be a compare (not a store conditional) */ if (flag) { decode_send_insn_to(packet, i, 0); - changed =3D 1; + changed =3D true; continue; } } else if (GET_ATTRIB(opcode, A_IMPLICIT_WRITES_P3) && @@ -495,18 +495,18 @@ static void decode_shuffle_for_execution(Packet *pack= et) */ if (flag) { decode_send_insn_to(packet, i, 0); - changed =3D 1; + changed =3D true; continue; } } else if (GET_ATTRIB(opcode, A_IMPLICIT_WRITES_P0) && !GET_ATTRIB(opcode, A_NEWCMPJUMP)) { if (flag) { decode_send_insn_to(packet, i, 0); - changed =3D 1; + changed =3D true; continue; } } else { - flag =3D 1; + flag =3D true; } } if (changed) { @@ -543,7 +543,7 @@ static void decode_apply_extenders(Packet *packet) int i; for (i =3D 0; i < packet->num_insns; i++) { if (GET_ATTRIB(packet->insn[i].opcode, A_IT_EXTENDER)) { - packet->insn[i + 1].extension_valid =3D 1; + packet->insn[i + 1].extension_valid =3D true; apply_extender(packet, i + 1, packet->insn[i].immed[0]); } } @@ -764,7 +764,7 @@ static void decode_add_endloop_insn(Insn *insn, int loo= pnum) } } =20 -static int decode_parsebits_is_loopend(uint32_t encoding32) +static bool decode_parsebits_is_loopend(uint32_t encoding32) { uint32_t bits =3D parse_bits(encoding32); return bits =3D=3D 0x2; @@ -775,8 +775,11 @@ decode_set_slot_number(Packet *pkt) { int slot; int i; - int hit_mem_insn =3D 0; - int hit_duplex =3D 0; + bool hit_mem_insn =3D false; + bool hit_duplex =3D false; + bool slot0_found =3D false; + bool slot1_found =3D false; + int slot1_iidx =3D 0; =20 /* * The slots are encoded in reverse order @@ -801,7 +804,7 @@ decode_set_slot_number(Packet *pkt) if ((GET_ATTRIB(pkt->insn[i].opcode, A_MEMLIKE) || GET_ATTRIB(pkt->insn[i].opcode, A_MEMLIKE_PACKET_RULES)) && !hit_mem_insn) { - hit_mem_insn =3D 1; + hit_mem_insn =3D true; pkt->insn[i].slot =3D 0; continue; } @@ -818,7 +821,7 @@ decode_set_slot_number(Packet *pkt) for (i =3D pkt->num_insns - 1; i >=3D 0; i--) { /* First subinsn always goes to slot 0 */ if (GET_ATTRIB(pkt->insn[i].opcode, A_SUBINSN) && !hit_duplex) { - hit_duplex =3D 1; + hit_duplex =3D true; pkt->insn[i].slot =3D 0; continue; } @@ -830,13 +833,10 @@ decode_set_slot_number(Packet *pkt) } =20 /* Fix the exceptions - slot 1 is never empty, always aligns to slot 0= */ - int slot0_found =3D 0; - int slot1_found =3D 0; - int slot1_iidx =3D 0; for (i =3D pkt->num_insns - 1; i >=3D 0; i--) { /* Is slot0 used? */ if (pkt->insn[i].slot =3D=3D 0) { - int is_endloop =3D (pkt->insn[i].opcode =3D=3D J2_endloop01); + bool is_endloop =3D (pkt->insn[i].opcode =3D=3D J2_endloop01); is_endloop |=3D (pkt->insn[i].opcode =3D=3D J2_endloop0); is_endloop |=3D (pkt->insn[i].opcode =3D=3D J2_endloop1); =20 @@ -845,17 +845,17 @@ decode_set_slot_number(Packet *pkt) * slot0 for endloop */ if (!is_endloop) { - slot0_found =3D 1; + slot0_found =3D true; } } /* Is slot1 used? */ if (pkt->insn[i].slot =3D=3D 1) { - slot1_found =3D 1; + slot1_found =3D true; slot1_iidx =3D i; } } /* Is slot0 empty and slot1 used? */ - if ((slot0_found =3D=3D 0) && (slot1_found =3D=3D 1)) { + if ((!slot0_found) && slot1_found) { /* Then push it to slot0 */ pkt->insn[slot1_iidx].slot =3D 0; } @@ -873,7 +873,7 @@ int decode_packet(int max_words, const uint32_t *words,= Packet *pkt, { int num_insns =3D 0; int words_read =3D 0; - int end_of_packet =3D 0; + bool end_of_packet =3D false; int new_insns =3D 0; uint32_t encoding32; =20 @@ -890,7 +890,7 @@ int decode_packet(int max_words, const uint32_t *words,= Packet *pkt, * decode works */ if (pkt->insn[num_insns].opcode =3D=3D A4_ext) { - pkt->insn[num_insns + 1].extension_valid =3D 1; + pkt->insn[num_insns + 1].extension_valid =3D true; } num_insns +=3D new_insns; words_read++; @@ -913,7 +913,7 @@ int decode_packet(int max_words, const uint32_t *words,= Packet *pkt, decode_add_endloop_insn(&pkt->insn[pkt->num_insns++], 0); } if (words_read >=3D 3) { - uint32_t has_loop0, has_loop1; + bool has_loop0, has_loop1; has_loop0 =3D decode_parsebits_is_loopend(words[0]); has_loop1 =3D decode_parsebits_is_loopend(words[1]); if (has_loop0 && has_loop1) { diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index 7ac85549db..1d91fa2743 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -948,8 +948,8 @@ static bool is_inf_prod(int32_t a, int32_t b) float32 HELPER(sffma_lib)(CPUHexagonState *env, float32 RxV, float32 RsV, float32 RtV) { - int infinp; - int infminusinf; + bool infinp; + bool infminusinf; float32 tmp; =20 arch_fpop_start(env); @@ -982,8 +982,8 @@ float32 HELPER(sffma_lib)(CPUHexagonState *env, float32= RxV, float32 HELPER(sffms_lib)(CPUHexagonState *env, float32 RxV, float32 RsV, float32 RtV) { - int infinp; - int infminusinf; + bool infinp; + bool infminusinf; float32 tmp; =20 arch_fpop_start(env); diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index 49ec8b76ed..04684221ca 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -177,7 +177,7 @@ static void gen_start_packet(DisasContext *ctx, Packet = *pkt) ctx->store_width[i] =3D 0; } tcg_gen_movi_tl(hex_pkt_has_store_s1, pkt->pkt_has_store_s1); - ctx->s1_store_processed =3D 0; + ctx->s1_store_processed =3D false; =20 #if HEX_DEBUG /* Handy place to set a breakpoint before the packet executes */ @@ -210,7 +210,7 @@ static void mark_implicit_reg_write(DisasContext *ctx, = Insn *insn, int attrib, int rnum) { if (GET_ATTRIB(insn->opcode, attrib)) { - int is_predicated =3D GET_ATTRIB(insn->opcode, A_CONDEXEC); + bool is_predicated =3D GET_ATTRIB(insn->opcode, A_CONDEXEC); if (is_predicated && !is_preloaded(ctx, rnum)) { tcg_gen_mov_tl(hex_new_value[rnum], hex_gpr[rnum]); } @@ -354,7 +354,7 @@ void process_store(DisasContext *ctx, Packet *pkt, int = slot_num) if (slot_num =3D=3D 1 && ctx->s1_store_processed) { return; } - ctx->s1_store_processed =3D 1; + ctx->s1_store_processed =3D true; =20 if (is_predicated) { TCGv cancelled =3D tcg_temp_new(); --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895648; cv=none; d=zohomail.com; s=zohoarc; b=hlgaBFVff/GQknXB1nHGLAjJLlnrsGkOHidI5pViPKF2c5CLTxcTL26StmpBhD+J4amTzXzlfMIikV5jVWvnhRfe9T9x++zbA3sWe38qsdh3a4pqrDWofyJbQWgQXkKRiszCpSHTWG3QNnFRl0FjF8oNV4cbTwJffHuhtXgy/3I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895648; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WUDOODL8OY/WyPfVJS6CSPQqXcHEI2wa1hK51LclNQc=; b=kpjg2I+ELGv4y77Nc162v/EDdmPsVfxRXsbWRJEPvAlML5dQQ9JTEV6JBSemd+UWHf+sMV/RYJDJsfP/nLCpR0fU1VzMg0vx08J4VByWCRLFJRoG/6InFbsRLeg0ijYu9yyQGL1zuTJkhPUFnIlDRYP17lUUh/2P6dKrsm+YbHI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 161989564876768.75992801442555; Sat, 1 May 2021 12:00:48 -0700 (PDT) Received: from localhost ([::1]:37936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcur9-0007Fm-ON for importer@patchew.org; Sat, 01 May 2021 15:00:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuab-0008Fo-Jm for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:45 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]:34511) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaV-00006U-2c for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:41 -0400 Received: by mail-pg1-x534.google.com with SMTP id z16so856795pga.1 for ; Sat, 01 May 2021 11:43:34 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WUDOODL8OY/WyPfVJS6CSPQqXcHEI2wa1hK51LclNQc=; b=qYbAaejOLbwkVgR2PztywNdwkLGma2MY1rAMOU3oBa0s8X1QY7sARe0b0UE5vQ9Zg2 GA7tORNWfwTKZV94e1ZUONQ/E74tmmbB+to3E+jNnllgS5nogQjIkSGUJju3aUcjYJmC MSoc2x9QdoQL6RaF28aqV6qiPZ5anIwaH1WT8YCHvNo/fOJD7WsUfeOhAvRvDaJijpLh /QtDgQmTaxNntb1qu8+PosBqWIjABLLoq/h4L/Q3MMiO5C7obfjGdSd7o7qMr+OXVMcK cLN1EEHu6+kA0d0ns/6n6UGi2toopyZEAPpLzimE2HtpNCPU6tXKYQWtIhKbAcP908iI aDZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WUDOODL8OY/WyPfVJS6CSPQqXcHEI2wa1hK51LclNQc=; b=ISbL0HoskTgqNkLGYNW8ESRjxCs4IX2y+meTXpr0pO0tJuhGa6BXbgvlOJ5ToalNyA Mt1NX0EppFbM5+oSJwdhrm7Nus1icrrr4n3rlMwUfXJzfrZd3Sk2xPLbQ+5ghto8EIzv cSUR5wiAkaHJYixkbP74VmrnbMFd4L1gJW1tyWxw7H91nYqBhcVwVLruDk47OpZbg7yk GlorbtstmopHinXZ0chI+6e9Cq8ajaKL+F0/uQ9vSAUSXLMmKnx0v++zfM5PTW+3rr7f tH+WkzrLZwXtrtAS7ZgAu+skJZdHG296hgAMKO0fqZiiRBHGrX5nw40HupKrFUV5it0t iIpA== X-Gm-Message-State: AOAM530bAVyGmEz0BPXezkOTBfsJtsBDKsZVdSOobexaAnZvFkLdViEw rcUH+e/1MiCwsXB3JdnMhuBz7eB2y91UnA== X-Google-Smtp-Source: ABdhPJwqctVCqF05shUypKgzarKJgbOyDLZcx4QaeE+g+roUaKpiNmdszW4Y5f18TYCVHDhQGwJZOQ== X-Received: by 2002:a63:211c:: with SMTP id h28mr10248010pgh.278.1619894613667; Sat, 01 May 2021 11:43:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 13/31] Hexagon (target/hexagon) remove unused carry_from_add64 function Date: Sat, 1 May 2021 11:43:06 -0700 Message-Id: <20210501184324.1338186-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x534.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Suggested-by: Richard Henderson Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-9-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/arch.h | 1 - target/hexagon/macros.h | 2 -- target/hexagon/arch.c | 13 ------------- 3 files changed, 16 deletions(-) diff --git a/target/hexagon/arch.h b/target/hexagon/arch.h index 1f7f03693a..6e0b0d9a24 100644 --- a/target/hexagon/arch.h +++ b/target/hexagon/arch.h @@ -22,7 +22,6 @@ =20 uint64_t interleave(uint32_t odd, uint32_t even); uint64_t deinterleave(uint64_t src); -uint32_t carry_from_add64(uint64_t a, uint64_t b, uint32_t c); int32_t conv_round(int32_t a, int n); void arch_fpop_start(CPUHexagonState *env); void arch_fpop_end(CPUHexagonState *env); diff --git a/target/hexagon/macros.h b/target/hexagon/macros.h index cfcb8173ba..8cb211dfde 100644 --- a/target/hexagon/macros.h +++ b/target/hexagon/macros.h @@ -341,8 +341,6 @@ static inline void gen_logical_not(TCGv dest, TCGv src) #define fWRITE_LC0(VAL) WRITE_RREG(HEX_REG_LC0, VAL) #define fWRITE_LC1(VAL) WRITE_RREG(HEX_REG_LC1, VAL) =20 -#define fCARRY_FROM_ADD(A, B, C) carry_from_add64(A, B, C) - #define fSET_OVERFLOW() SET_USR_FIELD(USR_OVF, 1) #define fSET_LPCFG(VAL) SET_USR_FIELD(USR_LPCFG, (VAL)) #define fGET_LPCFG (GET_USR_FIELD(USR_LPCFG)) diff --git a/target/hexagon/arch.c b/target/hexagon/arch.c index 09de124818..699e2cfb8f 100644 --- a/target/hexagon/arch.c +++ b/target/hexagon/arch.c @@ -76,19 +76,6 @@ uint64_t deinterleave(uint64_t src) return myeven | (myodd << 32); } =20 -uint32_t carry_from_add64(uint64_t a, uint64_t b, uint32_t c) -{ - uint64_t tmpa, tmpb, tmpc; - tmpa =3D fGETUWORD(0, a); - tmpb =3D fGETUWORD(0, b); - tmpc =3D tmpa + tmpb + c; - tmpa =3D fGETUWORD(1, a); - tmpb =3D fGETUWORD(1, b); - tmpc =3D tmpa + tmpb + fGETUWORD(1, tmpc); - tmpc =3D fGETUWORD(1, tmpc); - return tmpc; -} - int32_t conv_round(int32_t a, int n) { int64_t val; --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895656; cv=none; d=zohomail.com; s=zohoarc; b=hUKzJMtudbvT5Lkv4PvwYppT1BZU7Cppq0+ho5FnyVz0e5uLOlOfNaSgF0xu4EevlCeM+XKsLVSPE3COyQaeY9TUFUFjwvl+4DLQ7j2gTsNzXdT5pq5TCxYfTegrqerHNsnjEDp+nV7XhlSAtTgJzE+7dY3pzUxSXpkNTMcOKZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895656; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ANqvCljUwyEEHHedDj3/bUM/EvfjNzycWYdOdklpBSg=; b=Q0vUBneZh1niCiUVXQG/G19HhNs8i6rt2peJJnRkB8le42ekR6HXOYprAcQypfvjVtENCrrVW4cy1wte4UpcMmam4iIXWi4RpeeiQepCIy2KNXTa9hfmAtIOJPuJxXA1P5NdzcEfdOaMb2Kow3ZbaJdct1NUG8r33OEnsMTUsxg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 161989565640264.56371687653984; Sat, 1 May 2021 12:00:56 -0700 (PDT) Received: from localhost ([::1]:38024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcurG-0007Hr-Oe for importer@patchew.org; Sat, 01 May 2021 15:00:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuai-0008HM-EP for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:48 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:42585) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaV-00006d-FZ for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:48 -0400 Received: by mail-pg1-x532.google.com with SMTP id m12so829374pgr.9 for ; Sat, 01 May 2021 11:43:35 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ANqvCljUwyEEHHedDj3/bUM/EvfjNzycWYdOdklpBSg=; b=FDphD1SovhgYYeZsb5ONkplhdEcaGaFD6GWJXRFSD10rs1IFqyX92NwqWvKOwV2OKy VrXuXkJXArKqsQE6AkykrJXhW4eZyYoTwrfbGGzmJ3+At7HX/aWDCiJ/YH6PXpwSEu3q /5Q2KLk0KRs/bbGdIbPBcxYmAlZNFUgIuSI6OfADkgDyO7RTtM3jL4NfyFUXwBtRDNCa QesapefgMLyHEYO9s/yexwZx6FZGGAGUID6cXepZjJvRCaX8YoIuqrCs39ZsSutDvRWp yPHJWS6sz3Vi7h559Ag2YwvuD30vi/1yq9K7xpL+oVmlUxD0czc1e1I37KuQ3dqGN/oA us0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ANqvCljUwyEEHHedDj3/bUM/EvfjNzycWYdOdklpBSg=; b=kRw3e+jlrXklpRCvhKpvXiaMKpIgEi0MnwVQmvQ3ZKRgLVyd4TF0SahIQfL40pTI6l fr2srUVb8cvNGdyE4x6kbNC1azwLckrxcRBKTlETSeeA+pCVGzLSKbsq9jPfVW+OuX6T 2u5oPkmvrKCTwsae2x36cvmvi5WwSpdxSGPjTHFsO+p3uA5ITJ/nVaevZ1BHyG/M4PVo jnqiOiYu/oCKLKp5S88Z6fqbd4PgQoallcUwYefZjbDdSWyxrg9lafZ/TO5tvduEWSoe 1sEarGMc6yV/ZPautOFFMX1H00o9BlsaHt9erfUbJC1iM3VfguXLsWmVUYXl+CiMBeGu CxWA== X-Gm-Message-State: AOAM531zoHhcDmFHKIo6B7SVfjCyNH+50Tpczk4vAjmgEmq3EhOKGaQV tkI73Hp4ztXeIkMPgPiR6JIfIH1BPlIiRg== X-Google-Smtp-Source: ABdhPJyAhe6P/pGkZ16WmAh8bojrIjRAXvvDa0bL2wEh/rDKudeuGxo11LxyRycsfmPXMTRPzWPZCA== X-Received: by 2002:aa7:9731:0:b029:28e:46dd:97c7 with SMTP id k17-20020aa797310000b029028e46dd97c7mr3310814pfg.27.1619894614246; Sat, 01 May 2021 11:43:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 14/31] Hexagon (target/hexagon) change type of softfloat_roundingmodes Date: Sat, 1 May 2021 11:43:07 -0700 Message-Id: <20210501184324.1338186-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::532; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x532.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Suggested-by: Richard Henderson Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-10-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/arch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/hexagon/arch.c b/target/hexagon/arch.c index 699e2cfb8f..bb51f19a3d 100644 --- a/target/hexagon/arch.c +++ b/target/hexagon/arch.c @@ -95,7 +95,7 @@ int32_t conv_round(int32_t a, int n) =20 /* Floating Point Stuff */ =20 -static const int softfloat_roundingmodes[] =3D { +static const FloatRoundMode softfloat_roundingmodes[] =3D { float_round_nearest_even, float_round_to_zero, float_round_down, --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895714; cv=none; d=zohomail.com; s=zohoarc; b=Y6Ve9DAzDJPzpmchHLNXWpJNoNQi6XeZsLAaCxlNJj1P2w4aWxWvdU+3MeKLk3XbAiRg/dbCDJPtRXvR3b91jBHTjUKhY4eZCs67SXuITMt4QyFuXxdyvOdjfgXPG6uRpQ7C48LIhNlZigWYwDnTQSxq6W1uacSTawFO4Z3D8JM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895714; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aStbYbKUiD4TllqxrNl7dSzCGKZHpmJE5GcojLzrLOI=; b=UYwhVus/aeBh4/B1KV9jFu0Lq3PAhixPUBynHIpvRQM2n5btvwhRafD2hg6eMdXHLU7l22NyuSEAJP68VYkNgAynhnd813EFQe/twwW8A0/V1/7PttGmFtqeYTrB9l+TpQ97tZlxtYR4Z1vCmD0FN5ztTAM+h5AZ/ztDipbTM/g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619895714440512.1962290395362; Sat, 1 May 2021 12:01:54 -0700 (PDT) Received: from localhost ([::1]:39094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcusD-0007j1-9l for importer@patchew.org; Sat, 01 May 2021 15:01:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuam-0008L3-SW for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:52 -0400 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]:39742) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaW-00006q-7r for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:51 -0400 Received: by mail-pg1-x533.google.com with SMTP id s22so839606pgk.6 for ; Sat, 01 May 2021 11:43:35 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aStbYbKUiD4TllqxrNl7dSzCGKZHpmJE5GcojLzrLOI=; b=nknF3cfA9yG69kYJ/MwxYu7Rw9YjMkADT+rSsdS/GNTpoRL/kYRo+NkbwMmanWFd7a C29Vyxf7oNETdMPg1PfsJvy32ZCd4DWKKQAwE6yBFn8Vd8x3t4z14emwAg9q9AgRcKi1 f7+0h+5zZUzGWp42BEa2cGgfiTicdlQZr514t3uB6pgeIPC1R41/7wSkVy5tzlb1fKL8 7Ffv3Z7iD4pE5SFiAREu7Hz8cOZAN66qSTo7Th55enGHa2sgQfU3sifoPFgE37qOKxCE MuqC4ZXt7PeUHS4NCWRyNY5W7+Acb2CCWuFOq0aSN+ViRhKlLQz+24HUXAEPuJbiWhqg m7DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aStbYbKUiD4TllqxrNl7dSzCGKZHpmJE5GcojLzrLOI=; b=uQf3vZrbBDdjdIUyIjNJK4c2u21NpHiaC1su39F4R0+50Q5dorf+ZMEYEXS4SFZ/Ac BE23pIaFlE376tzv78yYFfRX3aalSRYwIz264YGjiT62ZqBCls0A+Lwi2glNwTCwPhhM BJQFnCYRgzYF+8yOkAUB7kh3ZKtCVobb0OIDWvggVA9N5nGNMSONcJxY1wIi9nbhS1bG zwii8R7YAt7kMvYw61w3LiMkcrPX3xsYaMVCsGkTV2KYDXa6h2Gm+c6CgejdEq79c6r3 u/WxPsN6OHKoJhhhkYyWFhaB0uTGPRqPqzKNZSmGFRp1Rwk1J29l52WdCxzBeLdDd2Zh zqIQ== X-Gm-Message-State: AOAM530CXt+IGaXcKBQkHAH/1svtzvGWevUs8c1jQp8reNnXvK4Ug990 Ob0o/Xe7cPc47B3+jaDJ8AqeXkISyMAQug== X-Google-Smtp-Source: ABdhPJy47qo1/QBDzYFzLEQ2v+KLTL0+oUNTQ9l0/6tisgeXTf8kOBydUPlUqasDbivecMmDaT5khg== X-Received: by 2002:a63:5b23:: with SMTP id p35mr10275977pgb.352.1619894614923; Sat, 01 May 2021 11:43:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 15/31] Hexagon (target/hexagon) use softfloat default NaN and tininess Date: Sat, 1 May 2021 11:43:08 -0700 Message-Id: <20210501184324.1338186-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::533; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x533.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Suggested-by: Richard Henderson Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-11-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/cpu.c | 5 ++++ target/hexagon/op_helper.c | 47 ---------------------------------- fpu/softfloat-specialize.c.inc | 3 +++ 3 files changed, 8 insertions(+), 47 deletions(-) diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index f044506d0f..ff44fd6637 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -23,6 +23,7 @@ #include "exec/exec-all.h" #include "qapi/error.h" #include "hw/qdev-properties.h" +#include "fpu/softfloat-helpers.h" =20 static void hexagon_v67_cpu_init(Object *obj) { @@ -205,8 +206,12 @@ static void hexagon_cpu_reset(DeviceState *dev) CPUState *cs =3D CPU(dev); HexagonCPU *cpu =3D HEXAGON_CPU(cs); HexagonCPUClass *mcc =3D HEXAGON_CPU_GET_CLASS(cpu); + CPUHexagonState *env =3D &cpu->env; =20 mcc->parent_reset(dev); + + set_default_nan_mode(1, &env->fp_status); + set_float_detect_tininess(float_tininess_before_rounding, &env->fp_sta= tus); } =20 static void hexagon_cpu_disas_set_info(CPUState *s, disassemble_info *info) diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index 1d91fa2743..478421d147 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -296,26 +296,6 @@ int32_t HELPER(fcircadd)(int32_t RxV, int32_t offset, = int32_t M, int32_t CS) return new_ptr; } =20 -/* - * Hexagon FP operations return ~0 instead of NaN - * The hex_check_sfnan/hex_check_dfnan functions perform this check - */ -static float32 hex_check_sfnan(float32 x) -{ - if (float32_is_any_nan(x)) { - return make_float32(0xFFFFFFFFU); - } - return x; -} - -static float64 hex_check_dfnan(float64 x) -{ - if (float64_is_any_nan(x)) { - return make_float64(0xFFFFFFFFFFFFFFFFULL); - } - return x; -} - /* * mem_noshuf * Section 5.5 of the Hexagon V67 Programmer's Reference Manual @@ -373,7 +353,6 @@ float64 HELPER(conv_sf2df)(CPUHexagonState *env, float3= 2 RsV) float64 out_f64; arch_fpop_start(env); out_f64 =3D float32_to_float64(RsV, &env->fp_status); - out_f64 =3D hex_check_dfnan(out_f64); arch_fpop_end(env); return out_f64; } @@ -383,7 +362,6 @@ float32 HELPER(conv_df2sf)(CPUHexagonState *env, float6= 4 RssV) float32 out_f32; arch_fpop_start(env); out_f32 =3D float64_to_float32(RssV, &env->fp_status); - out_f32 =3D hex_check_sfnan(out_f32); arch_fpop_end(env); return out_f32; } @@ -393,7 +371,6 @@ float32 HELPER(conv_uw2sf)(CPUHexagonState *env, int32_= t RsV) float32 RdV; arch_fpop_start(env); RdV =3D uint32_to_float32(RsV, &env->fp_status); - RdV =3D hex_check_sfnan(RdV); arch_fpop_end(env); return RdV; } @@ -403,7 +380,6 @@ float64 HELPER(conv_uw2df)(CPUHexagonState *env, int32_= t RsV) float64 RddV; arch_fpop_start(env); RddV =3D uint32_to_float64(RsV, &env->fp_status); - RddV =3D hex_check_dfnan(RddV); arch_fpop_end(env); return RddV; } @@ -413,7 +389,6 @@ float32 HELPER(conv_w2sf)(CPUHexagonState *env, int32_t= RsV) float32 RdV; arch_fpop_start(env); RdV =3D int32_to_float32(RsV, &env->fp_status); - RdV =3D hex_check_sfnan(RdV); arch_fpop_end(env); return RdV; } @@ -423,7 +398,6 @@ float64 HELPER(conv_w2df)(CPUHexagonState *env, int32_t= RsV) float64 RddV; arch_fpop_start(env); RddV =3D int32_to_float64(RsV, &env->fp_status); - RddV =3D hex_check_dfnan(RddV); arch_fpop_end(env); return RddV; } @@ -433,7 +407,6 @@ float32 HELPER(conv_ud2sf)(CPUHexagonState *env, int64_= t RssV) float32 RdV; arch_fpop_start(env); RdV =3D uint64_to_float32(RssV, &env->fp_status); - RdV =3D hex_check_sfnan(RdV); arch_fpop_end(env); return RdV; } @@ -443,7 +416,6 @@ float64 HELPER(conv_ud2df)(CPUHexagonState *env, int64_= t RssV) float64 RddV; arch_fpop_start(env); RddV =3D uint64_to_float64(RssV, &env->fp_status); - RddV =3D hex_check_dfnan(RddV); arch_fpop_end(env); return RddV; } @@ -453,7 +425,6 @@ float32 HELPER(conv_d2sf)(CPUHexagonState *env, int64_t= RssV) float32 RdV; arch_fpop_start(env); RdV =3D int64_to_float32(RssV, &env->fp_status); - RdV =3D hex_check_sfnan(RdV); arch_fpop_end(env); return RdV; } @@ -463,7 +434,6 @@ float64 HELPER(conv_d2df)(CPUHexagonState *env, int64_t= RssV) float64 RddV; arch_fpop_start(env); RddV =3D int64_to_float64(RssV, &env->fp_status); - RddV =3D hex_check_dfnan(RddV); arch_fpop_end(env); return RddV; } @@ -625,7 +595,6 @@ float32 HELPER(sfadd)(CPUHexagonState *env, float32 RsV= , float32 RtV) float32 RdV; arch_fpop_start(env); RdV =3D float32_add(RsV, RtV, &env->fp_status); - RdV =3D hex_check_sfnan(RdV); arch_fpop_end(env); return RdV; } @@ -635,7 +604,6 @@ float32 HELPER(sfsub)(CPUHexagonState *env, float32 RsV= , float32 RtV) float32 RdV; arch_fpop_start(env); RdV =3D float32_sub(RsV, RtV, &env->fp_status); - RdV =3D hex_check_sfnan(RdV); arch_fpop_end(env); return RdV; } @@ -687,7 +655,6 @@ float32 HELPER(sfmax)(CPUHexagonState *env, float32 RsV= , float32 RtV) float32 RdV; arch_fpop_start(env); RdV =3D float32_maxnum(RsV, RtV, &env->fp_status); - RdV =3D hex_check_sfnan(RdV); arch_fpop_end(env); return RdV; } @@ -697,7 +664,6 @@ float32 HELPER(sfmin)(CPUHexagonState *env, float32 RsV= , float32 RtV) float32 RdV; arch_fpop_start(env); RdV =3D float32_minnum(RsV, RtV, &env->fp_status); - RdV =3D hex_check_sfnan(RdV); arch_fpop_end(env); return RdV; } @@ -764,7 +730,6 @@ float64 HELPER(dfadd)(CPUHexagonState *env, float64 Rss= V, float64 RttV) float64 RddV; arch_fpop_start(env); RddV =3D float64_add(RssV, RttV, &env->fp_status); - RddV =3D hex_check_dfnan(RddV); arch_fpop_end(env); return RddV; } @@ -774,7 +739,6 @@ float64 HELPER(dfsub)(CPUHexagonState *env, float64 Rss= V, float64 RttV) float64 RddV; arch_fpop_start(env); RddV =3D float64_sub(RssV, RttV, &env->fp_status); - RddV =3D hex_check_dfnan(RddV); arch_fpop_end(env); return RddV; } @@ -787,7 +751,6 @@ float64 HELPER(dfmax)(CPUHexagonState *env, float64 Rss= V, float64 RttV) if (float64_is_any_nan(RssV) || float64_is_any_nan(RttV)) { float_raise(float_flag_invalid, &env->fp_status); } - RddV =3D hex_check_dfnan(RddV); arch_fpop_end(env); return RddV; } @@ -800,7 +763,6 @@ float64 HELPER(dfmin)(CPUHexagonState *env, float64 Rss= V, float64 RttV) if (float64_is_any_nan(RssV) || float64_is_any_nan(RttV)) { float_raise(float_flag_invalid, &env->fp_status); } - RddV =3D hex_check_dfnan(RddV); arch_fpop_end(env); return RddV; } @@ -876,7 +838,6 @@ float32 HELPER(sfmpy)(CPUHexagonState *env, float32 RsV= , float32 RtV) float32 RdV; arch_fpop_start(env); RdV =3D internal_mpyf(RsV, RtV, &env->fp_status); - RdV =3D hex_check_sfnan(RdV); arch_fpop_end(env); return RdV; } @@ -886,7 +847,6 @@ float32 HELPER(sffma)(CPUHexagonState *env, float32 RxV, { arch_fpop_start(env); RxV =3D internal_fmafx(RsV, RtV, RxV, 0, &env->fp_status); - RxV =3D hex_check_sfnan(RxV); arch_fpop_end(env); return RxV; } @@ -918,7 +878,6 @@ float32 HELPER(sffma_sc)(CPUHexagonState *env, float32 = RxV, RxV =3D check_nan(RxV, RsV, &env->fp_status); RxV =3D check_nan(RxV, RtV, &env->fp_status); tmp =3D internal_fmafx(RsV, RtV, RxV, fSXTN(8, 64, PuV), &env->fp_stat= us); - tmp =3D hex_check_sfnan(tmp); if (!(float32_is_zero(RxV) && is_zero_prod(RsV, RtV))) { RxV =3D tmp; } @@ -933,7 +892,6 @@ float32 HELPER(sffms)(CPUHexagonState *env, float32 RxV, arch_fpop_start(env); neg_RsV =3D float32_sub(float32_zero, RsV, &env->fp_status); RxV =3D internal_fmafx(neg_RsV, RtV, RxV, 0, &env->fp_status); - RxV =3D hex_check_sfnan(RxV); arch_fpop_end(env); return RxV; } @@ -964,7 +922,6 @@ float32 HELPER(sffma_lib)(CPUHexagonState *env, float32= RxV, RxV =3D check_nan(RxV, RsV, &env->fp_status); RxV =3D check_nan(RxV, RtV, &env->fp_status); tmp =3D internal_fmafx(RsV, RtV, RxV, 0, &env->fp_status); - tmp =3D hex_check_sfnan(tmp); if (!(float32_is_zero(RxV) && is_zero_prod(RsV, RtV))) { RxV =3D tmp; } @@ -999,7 +956,6 @@ float32 HELPER(sffms_lib)(CPUHexagonState *env, float32= RxV, RxV =3D check_nan(RxV, RtV, &env->fp_status); float32 minus_RsV =3D float32_sub(float32_zero, RsV, &env->fp_status); tmp =3D internal_fmafx(minus_RsV, RtV, RxV, 0, &env->fp_status); - tmp =3D hex_check_sfnan(tmp); if (!(float32_is_zero(RxV) && is_zero_prod(RsV, RtV))) { RxV =3D tmp; } @@ -1023,13 +979,11 @@ float64 HELPER(dfmpyfix)(CPUHexagonState *env, float= 64 RssV, float64 RttV) float64_is_normal(RttV)) { RddV =3D float64_mul(RssV, make_float64(0x4330000000000000), &env->fp_status); - RddV =3D hex_check_dfnan(RddV); } else if (float64_is_denormal(RttV) && (float64_getexp(RssV) >=3D 512) && float64_is_normal(RssV)) { RddV =3D float64_mul(RssV, make_float64(0x3cb0000000000000), &env->fp_status); - RddV =3D hex_check_dfnan(RddV); } else { RddV =3D RssV; } @@ -1042,7 +996,6 @@ float64 HELPER(dfmpyhh)(CPUHexagonState *env, float64 = RxxV, { arch_fpop_start(env); RxxV =3D internal_mpyhh(RssV, RttV, RxxV, &env->fp_status); - RxxV =3D hex_check_dfnan(RxxV); arch_fpop_end(env); return RxxV; } diff --git a/fpu/softfloat-specialize.c.inc b/fpu/softfloat-specialize.c.inc index c2f87addb2..9ea318f3e2 100644 --- a/fpu/softfloat-specialize.c.inc +++ b/fpu/softfloat-specialize.c.inc @@ -145,6 +145,9 @@ static FloatParts parts_default_nan(float_status *statu= s) #elif defined(TARGET_HPPA) /* snan_bit_is_one, set msb-1. */ frac =3D 1ULL << (DECOMPOSED_BINARY_POINT - 2); +#elif defined(TARGET_HEXAGON) + sign =3D 1; + frac =3D ~0ULL; #else /* This case is true for Alpha, ARM, MIPS, OpenRISC, PPC, RISC-V, * S390, SH4, TriCore, and Xtensa. I cannot find documentation --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895435; cv=none; d=zohomail.com; s=zohoarc; b=mI9b3etfk+h0h8CXNW2ddbJ4vvk6FMbsn+LVB78twEmVyV4X8FHhBevwvYL9jiBa35Qm8sM2fQPERBMA54jzlYR4dbuS9eKGQaauwyNQGQlxh94zGkgP0I7sbXPcXvG/w9QrOs99YFs6B6AaCUOHuKtY5QVBEkJaM8MGXto/w6w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895435; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+4RlndkABy70UiZ/oy2xt6QweGU3hHu478DrMWi7zZE=; b=fgDmK4i5U7Idi3k1d2gbwvmXFVZnXMo3AjFrMiZ65THlqDiAZVxLZvdnDjxVIoIW/RT+FwhkAhR/5SCUuNC9BJCyEWwmuiw4Vub5sVA0CfjV85u/IWzsmm6ChLdihbHtqnLdbtETkTMvYuUO7J9BceLpBH62M0e0hhqJ/aXBN4I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619895435837962.1033337059855; Sat, 1 May 2021 11:57:15 -0700 (PDT) Received: from localhost ([::1]:58620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcuni-0004B9-Qw for importer@patchew.org; Sat, 01 May 2021 14:57:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuai-0008IL-QD for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:49 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]:39916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaW-00007D-T9 for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:48 -0400 Received: by mail-pf1-x42c.google.com with SMTP id c17so1332573pfn.6 for ; Sat, 01 May 2021 11:43:36 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+4RlndkABy70UiZ/oy2xt6QweGU3hHu478DrMWi7zZE=; b=e51n+J8I+6gUKATw3RxuvBZxsSGh2hDmWSJeLx2tMsnJPvev0JexRaEn8YXLCV+njF tCdSdfvOriohl4rS20Ady6QSRq/A9iX9CdVl7yUMX45ZeCiPYHwY/5U4Dv2D3MCszJy/ r6wOl8OXCk3CTxMz7pcoey1gnJLlx3vybJa7Mdwd2dN7ma2ay8o1djXStCwey1brPwXW S599M20kKm4HYgVtD4IVmTLirLVli1hLR8Tdb0AYiMjA6ouAuV6BcNRQ+JQnvvvf0A+M fcCIBmODXntZDz4oDOxzG0P2I24AeyYM/eOEJElZhRPgoWKjAy7V/tOhNW0QNNmn2keR 3Pig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+4RlndkABy70UiZ/oy2xt6QweGU3hHu478DrMWi7zZE=; b=qB9sy/UMHV7aLwUTYRbB0y0cZDrtIxXJ6C5DwtZNlPpzN0mJ+05tpkE2MvMOCaQDOE 2QhRGfDUKaiF4u3ex8yFvad0YKZS49OnCsUDfqt/59GWmfTjile4mp387/Bc4qTxBmKF VomFHzsxooewlddcHsagXk7SPTq+hJ9ywbIkdrEk9m0DO6XvF45oTcghMfNP5OaZNqiv 50nfIT3lX0YS9H4ObU016f1F9tXmsd7BXQfC8AnD0KcibqdJQLnd5EvOARXB3aDbT5iS IsI8RsH9eAdEk7Sc8iClOY4/MjelZHODSPh4Qrfx6kniMRd9+HcK1E/0VC5hL44q4R1e SCng== X-Gm-Message-State: AOAM5302bLyBlNnDvjE8uzTySpYIUY+LaZE5Vw8iTHSpYQGiEFuaJgg4 Q8zpLxom20PS+lgcWW+6jpCSVc/mC7ePWA== X-Google-Smtp-Source: ABdhPJwf77Jv0lTlep5O6Kf28SL1EJ7MOtpmZq/AKC3R0cgXUkDAdgrWMUOiW365b0pOSWJaEPPMTQ== X-Received: by 2002:a05:6a00:150d:b029:27a:ce95:bb0e with SMTP id q13-20020a056a00150db029027ace95bb0emr10672878pfu.64.1619894615568; Sat, 01 May 2021 11:43:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 16/31] Hexagon (target/hexagon) replace float32_mul_pow2 with float32_scalbn Date: Sat, 1 May 2021 11:43:09 -0700 Message-Id: <20210501184324.1338186-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::42c; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Suggested-by: Richard Henderson Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-12-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/arch.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/target/hexagon/arch.c b/target/hexagon/arch.c index bb51f19a3d..40b6e3d0c0 100644 --- a/target/hexagon/arch.c +++ b/target/hexagon/arch.c @@ -143,12 +143,6 @@ void arch_fpop_end(CPUHexagonState *env) } } =20 -static float32 float32_mul_pow2(float32 a, uint32_t p, float_status *fp_st= atus) -{ - float32 b =3D make_float32((SF_BIAS + p) << SF_MANTBITS); - return float32_mul(a, b, fp_status); -} - int arch_sf_recip_common(float32 *Rs, float32 *Rt, float32 *Rd, int *adjus= t, float_status *fp_status) { @@ -217,22 +211,22 @@ int arch_sf_recip_common(float32 *Rs, float32 *Rt, fl= oat32 *Rd, int *adjust, if ((n_exp - d_exp + SF_BIAS) <=3D SF_MANTBITS) { /* Near quotient underflow / inexact Q */ PeV =3D 0x80; - RtV =3D float32_mul_pow2(RtV, -64, fp_status); - RsV =3D float32_mul_pow2(RsV, 64, fp_status); + RtV =3D float32_scalbn(RtV, -64, fp_status); + RsV =3D float32_scalbn(RsV, 64, fp_status); } else if ((n_exp - d_exp + SF_BIAS) > (SF_MAXEXP - 24)) { /* Near quotient overflow */ PeV =3D 0x40; - RtV =3D float32_mul_pow2(RtV, 32, fp_status); - RsV =3D float32_mul_pow2(RsV, -32, fp_status); + RtV =3D float32_scalbn(RtV, 32, fp_status); + RsV =3D float32_scalbn(RsV, -32, fp_status); } else if (n_exp <=3D SF_MANTBITS + 2) { - RtV =3D float32_mul_pow2(RtV, 64, fp_status); - RsV =3D float32_mul_pow2(RsV, 64, fp_status); + RtV =3D float32_scalbn(RtV, 64, fp_status); + RsV =3D float32_scalbn(RsV, 64, fp_status); } else if (d_exp <=3D 1) { - RtV =3D float32_mul_pow2(RtV, 32, fp_status); - RsV =3D float32_mul_pow2(RsV, 32, fp_status); + RtV =3D float32_scalbn(RtV, 32, fp_status); + RsV =3D float32_scalbn(RsV, 32, fp_status); } else if (d_exp > 252) { - RtV =3D float32_mul_pow2(RtV, -32, fp_status); - RsV =3D float32_mul_pow2(RsV, -32, fp_status); + RtV =3D float32_scalbn(RtV, -32, fp_status); + RsV =3D float32_scalbn(RsV, -32, fp_status); } RdV =3D 0; ret =3D 1; @@ -274,7 +268,7 @@ int arch_sf_invsqrt_common(float32 *Rs, float32 *Rd, in= t *adjust, /* Basic checks passed */ r_exp =3D float32_getexp(RsV); if (r_exp <=3D 24) { - RsV =3D float32_mul_pow2(RsV, 64, fp_status); + RsV =3D float32_scalbn(RsV, 64, fp_status); PeV =3D 0xe0; } RdV =3D 0; --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895869; cv=none; d=zohomail.com; s=zohoarc; b=TgxbfiK0tf7NbK91ZWwoBoM008vr7yjP7RpG/zDc2HiKPre+wk6StwU4sdd9SlALjIe1a+kGnjYxGRXplH1O8bXwCsxHlV7l08zW5idHHJq1mnSl1Y+eIcEfCRCf8ZV8iZuXtRNhW1rENBPCxGeMyuS5GedZkVoDg9/gYh3l4NI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895869; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uY22gRg+QPJnEc4mZ70azfZwv/HbyO7ImLO00TxJf58=; b=Ha8VHQ8WH210HTQ9qk0PrBGeA0e2gVEcSOXneedLJUzq/dw5VkFmrKED5uMKwyqbtuh9xFNLWekYHihGmOM+OK1jIK6Axw8eu1OePvrzTskCU2cG85Bx5oQV2U9jFAuVbI19H7t5AqFJ2SmSXkMGjKQceh3qxt1lVCgrutfL5VA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619895869214807.5656443874232; Sat, 1 May 2021 12:04:29 -0700 (PDT) Received: from localhost ([::1]:46618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcuug-0002So-KS for importer@patchew.org; Sat, 01 May 2021 15:04:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuak-0008J5-EZ for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:50 -0400 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]:43540) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaX-00008D-Py for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:50 -0400 Received: by mail-pg1-x530.google.com with SMTP id p12so829489pgj.10 for ; Sat, 01 May 2021 11:43:37 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uY22gRg+QPJnEc4mZ70azfZwv/HbyO7ImLO00TxJf58=; b=cNmkeMuJX/nms1Oyhfn/JHrterM2i7NJ2P6LWrjOhTqg6cuASVsrDQ8C0pWRfO/Ad2 LfJaACDquNIXVMK3YymuU5Sy9i3yhW4dRUbypvaqC0fLKTZ6dIikbeIoDi4oOBro1FKF ZwKqqQFwY14ykmosMuH95gXxdEWtRqlGTIcF9eaYeJ//wfVVtq3mOeIA3t/0z5RnbIUk 5bC5ftXM0LMTlLky7qpL0xCJVxmPxxwI06rX3Lcrsea1Qfssxn826MyvTl7sYNSurJTw yuxOpRfJTFjF67cdSxYL7z4i5WHvnVul51g9N2orXgwfIkXDgfIq3f4OZXjKZRoJwdsF SHKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uY22gRg+QPJnEc4mZ70azfZwv/HbyO7ImLO00TxJf58=; b=QkwmJLByA+t6Ruk+2wgj0fK6iNVjV46hJkkjX89Ky/t4mwoAH622O4TeI7OH3phVRX aYiY416DkYzRMdwxZn8hg1zHC2JwSvKb41t3HVRTJCkgjZYymFZ1R3CZtV2/pE9sx268 QlhOq9fMqq5AUViZwh6CHv7Qx860hrJSAPz0O2njdAoSn8rco1jAJRCYy3MtnZfzXo0e sEXRj8Q+OGR/LNwFCKUx8M1wcrP4hCFtk2HLOf4rJnZVgxtvSV7h4y/3bqji5MkRsomz rln2khHHEWPdMhmJ5TNbcpcWwXliXToc2uUYY3v7Q4T2cBH3PTtQtpTWAN4lE0iBBh4U FIbA== X-Gm-Message-State: AOAM531DcDJRAPA0+pOEYzHgozxh8Ob0lXjKnAJJK8tt7JvCH0egFx26 SSOHPTO7CJeM6HGbyJwS1UslDKZfJCBpFw== X-Google-Smtp-Source: ABdhPJw/d9j7kytlRauKvJ96DVmB3OcKM7eX7i3IC1VMmQ1mg96piEjL6TPQ+2Jn45+jC7ZnYgrXLQ== X-Received: by 2002:a65:624e:: with SMTP id q14mr10693440pgv.90.1619894616215; Sat, 01 May 2021 11:43:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 17/31] Hexagon (target/hexagon) use softfloat for float-to-int conversions Date: Sat, 1 May 2021 11:43:10 -0700 Message-Id: <20210501184324.1338186-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::530; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x530.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Use the proper return for helpers that convert to unsigned Remove target/hexagon/conv_emu.[ch] Suggested-by: Richard Henderson Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-13-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/conv_emu.h | 31 ------- target/hexagon/helper.h | 16 ++-- target/hexagon/conv_emu.c | 177 ------------------------------------ target/hexagon/fma_emu.c | 1 - target/hexagon/op_helper.c | 169 +++++++++++++++++++++++++--------- tests/tcg/hexagon/fpstuff.c | 145 +++++++++++++++++++++++++++++ target/hexagon/meson.build | 1 - 7 files changed, 281 insertions(+), 259 deletions(-) delete mode 100644 target/hexagon/conv_emu.h delete mode 100644 target/hexagon/conv_emu.c diff --git a/target/hexagon/conv_emu.h b/target/hexagon/conv_emu.h deleted file mode 100644 index cade9de91f..0000000000 --- a/target/hexagon/conv_emu.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright(c) 2019-2021 Qualcomm Innovation Center, Inc. All Rights Res= erved. - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ - -#ifndef HEXAGON_CONV_EMU_H -#define HEXAGON_CONV_EMU_H - -uint64_t conv_sf_to_8u(float32 in, float_status *fp_status); -uint32_t conv_sf_to_4u(float32 in, float_status *fp_status); -int64_t conv_sf_to_8s(float32 in, float_status *fp_status); -int32_t conv_sf_to_4s(float32 in, float_status *fp_status); - -uint64_t conv_df_to_8u(float64 in, float_status *fp_status); -uint32_t conv_df_to_4u(float64 in, float_status *fp_status); -int64_t conv_df_to_8s(float64 in, float_status *fp_status); -int32_t conv_df_to_4s(float64 in, float_status *fp_status); - -#endif diff --git a/target/hexagon/helper.h b/target/hexagon/helper.h index a5f340ce67..715c24662f 100644 --- a/target/hexagon/helper.h +++ b/target/hexagon/helper.h @@ -38,21 +38,21 @@ DEF_HELPER_2(conv_ud2sf, f32, env, s64) DEF_HELPER_2(conv_ud2df, f64, env, s64) DEF_HELPER_2(conv_d2sf, f32, env, s64) DEF_HELPER_2(conv_d2df, f64, env, s64) -DEF_HELPER_2(conv_sf2uw, s32, env, f32) +DEF_HELPER_2(conv_sf2uw, i32, env, f32) DEF_HELPER_2(conv_sf2w, s32, env, f32) -DEF_HELPER_2(conv_sf2ud, s64, env, f32) +DEF_HELPER_2(conv_sf2ud, i64, env, f32) DEF_HELPER_2(conv_sf2d, s64, env, f32) -DEF_HELPER_2(conv_df2uw, s32, env, f64) +DEF_HELPER_2(conv_df2uw, i32, env, f64) DEF_HELPER_2(conv_df2w, s32, env, f64) -DEF_HELPER_2(conv_df2ud, s64, env, f64) +DEF_HELPER_2(conv_df2ud, i64, env, f64) DEF_HELPER_2(conv_df2d, s64, env, f64) -DEF_HELPER_2(conv_sf2uw_chop, s32, env, f32) +DEF_HELPER_2(conv_sf2uw_chop, i32, env, f32) DEF_HELPER_2(conv_sf2w_chop, s32, env, f32) -DEF_HELPER_2(conv_sf2ud_chop, s64, env, f32) +DEF_HELPER_2(conv_sf2ud_chop, i64, env, f32) DEF_HELPER_2(conv_sf2d_chop, s64, env, f32) -DEF_HELPER_2(conv_df2uw_chop, s32, env, f64) +DEF_HELPER_2(conv_df2uw_chop, i32, env, f64) DEF_HELPER_2(conv_df2w_chop, s32, env, f64) -DEF_HELPER_2(conv_df2ud_chop, s64, env, f64) +DEF_HELPER_2(conv_df2ud_chop, i64, env, f64) DEF_HELPER_2(conv_df2d_chop, s64, env, f64) DEF_HELPER_3(sfadd, f32, env, f32, f32) DEF_HELPER_3(sfsub, f32, env, f32, f32) diff --git a/target/hexagon/conv_emu.c b/target/hexagon/conv_emu.c deleted file mode 100644 index 3985b1032a..0000000000 --- a/target/hexagon/conv_emu.c +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Copyright(c) 2019-2021 Qualcomm Innovation Center, Inc. All Rights Res= erved. - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ - -#include "qemu/osdep.h" -#include "qemu/host-utils.h" -#include "fpu/softfloat.h" -#include "macros.h" -#include "conv_emu.h" - -#define LL_MAX_POS 0x7fffffffffffffffULL -#define MAX_POS 0x7fffffffU - -static uint64_t conv_f64_to_8u_n(float64 in, int will_negate, - float_status *fp_status) -{ - uint8_t sign =3D float64_is_neg(in); - if (float64_is_infinity(in)) { - float_raise(float_flag_invalid, fp_status); - if (float64_is_neg(in)) { - return 0ULL; - } else { - return ~0ULL; - } - } - if (float64_is_any_nan(in)) { - float_raise(float_flag_invalid, fp_status); - return ~0ULL; - } - if (float64_is_zero(in)) { - return 0; - } - if (sign) { - float_raise(float_flag_invalid, fp_status); - return 0; - } - if (float64_lt(in, float64_half, fp_status)) { - /* Near zero, captures large fracshifts, denorms, etc */ - float_raise(float_flag_inexact, fp_status); - switch (get_float_rounding_mode(fp_status)) { - case float_round_down: - if (will_negate) { - return 1; - } else { - return 0; - } - case float_round_up: - if (!will_negate) { - return 1; - } else { - return 0; - } - default: - return 0; /* nearest or towards zero */ - } - } - return float64_to_uint64(in, fp_status); -} - -static void clr_float_exception_flags(uint8_t flag, float_status *fp_statu= s) -{ - uint8_t flags =3D fp_status->float_exception_flags; - flags &=3D ~flag; - set_float_exception_flags(flags, fp_status); -} - -static uint32_t conv_df_to_4u_n(float64 fp64, int will_negate, - float_status *fp_status) -{ - uint64_t tmp; - tmp =3D conv_f64_to_8u_n(fp64, will_negate, fp_status); - if (tmp > 0x00000000ffffffffULL) { - clr_float_exception_flags(float_flag_inexact, fp_status); - float_raise(float_flag_invalid, fp_status); - return ~0U; - } - return (uint32_t)tmp; -} - -uint64_t conv_df_to_8u(float64 in, float_status *fp_status) -{ - return conv_f64_to_8u_n(in, 0, fp_status); -} - -uint32_t conv_df_to_4u(float64 in, float_status *fp_status) -{ - return conv_df_to_4u_n(in, 0, fp_status); -} - -int64_t conv_df_to_8s(float64 in, float_status *fp_status) -{ - uint8_t sign =3D float64_is_neg(in); - uint64_t tmp; - if (float64_is_any_nan(in)) { - float_raise(float_flag_invalid, fp_status); - return -1; - } - if (sign) { - float64 minus_fp64 =3D float64_abs(in); - tmp =3D conv_f64_to_8u_n(minus_fp64, 1, fp_status); - } else { - tmp =3D conv_f64_to_8u_n(in, 0, fp_status); - } - if (tmp > (LL_MAX_POS + sign)) { - clr_float_exception_flags(float_flag_inexact, fp_status); - float_raise(float_flag_invalid, fp_status); - tmp =3D (LL_MAX_POS + sign); - } - if (sign) { - return -tmp; - } else { - return tmp; - } -} - -int32_t conv_df_to_4s(float64 in, float_status *fp_status) -{ - uint8_t sign =3D float64_is_neg(in); - uint64_t tmp; - if (float64_is_any_nan(in)) { - float_raise(float_flag_invalid, fp_status); - return -1; - } - if (sign) { - float64 minus_fp64 =3D float64_abs(in); - tmp =3D conv_f64_to_8u_n(minus_fp64, 1, fp_status); - } else { - tmp =3D conv_f64_to_8u_n(in, 0, fp_status); - } - if (tmp > (MAX_POS + sign)) { - clr_float_exception_flags(float_flag_inexact, fp_status); - float_raise(float_flag_invalid, fp_status); - tmp =3D (MAX_POS + sign); - } - if (sign) { - return -tmp; - } else { - return tmp; - } -} - -uint64_t conv_sf_to_8u(float32 in, float_status *fp_status) -{ - float64 fp64 =3D float32_to_float64(in, fp_status); - return conv_df_to_8u(fp64, fp_status); -} - -uint32_t conv_sf_to_4u(float32 in, float_status *fp_status) -{ - float64 fp64 =3D float32_to_float64(in, fp_status); - return conv_df_to_4u(fp64, fp_status); -} - -int64_t conv_sf_to_8s(float32 in, float_status *fp_status) -{ - float64 fp64 =3D float32_to_float64(in, fp_status); - return conv_df_to_8s(fp64, fp_status); -} - -int32_t conv_sf_to_4s(float32 in, float_status *fp_status) -{ - float64 fp64 =3D float32_to_float64(in, fp_status); - return conv_df_to_4s(fp64, fp_status); -} diff --git a/target/hexagon/fma_emu.c b/target/hexagon/fma_emu.c index f324b83e3c..d3b45d494f 100644 --- a/target/hexagon/fma_emu.c +++ b/target/hexagon/fma_emu.c @@ -19,7 +19,6 @@ #include "qemu/int128.h" #include "fpu/softfloat.h" #include "macros.h" -#include "conv_emu.h" #include "fma_emu.h" =20 #define DF_INF_EXP 0x7ff diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index 478421d147..b70c5d607a 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -25,7 +25,6 @@ #include "arch.h" #include "hex_arch_types.h" #include "fma_emu.h" -#include "conv_emu.h" =20 #define SF_BIAS 127 #define SF_MANTBITS 23 @@ -438,11 +437,17 @@ float64 HELPER(conv_d2df)(CPUHexagonState *env, int64= _t RssV) return RddV; } =20 -int32_t HELPER(conv_sf2uw)(CPUHexagonState *env, float32 RsV) +uint32_t HELPER(conv_sf2uw)(CPUHexagonState *env, float32 RsV) { - int32_t RdV; + uint32_t RdV; arch_fpop_start(env); - RdV =3D conv_sf_to_4u(RsV, &env->fp_status); + /* Hexagon checks the sign before rounding */ + if (float32_is_neg(RsV) && !float32_is_any_nan(RsV)) { + float_raise(float_flag_invalid, &env->fp_status); + RdV =3D 0; + } else { + RdV =3D float32_to_uint32(RsV, &env->fp_status); + } arch_fpop_end(env); return RdV; } @@ -451,16 +456,28 @@ int32_t HELPER(conv_sf2w)(CPUHexagonState *env, float= 32 RsV) { int32_t RdV; arch_fpop_start(env); - RdV =3D conv_sf_to_4s(RsV, &env->fp_status); + /* Hexagon returns -1 for NaN */ + if (float32_is_any_nan(RsV)) { + float_raise(float_flag_invalid, &env->fp_status); + RdV =3D -1; + } else { + RdV =3D float32_to_int32(RsV, &env->fp_status); + } arch_fpop_end(env); return RdV; } =20 -int64_t HELPER(conv_sf2ud)(CPUHexagonState *env, float32 RsV) +uint64_t HELPER(conv_sf2ud)(CPUHexagonState *env, float32 RsV) { - int64_t RddV; + uint64_t RddV; arch_fpop_start(env); - RddV =3D conv_sf_to_8u(RsV, &env->fp_status); + /* Hexagon checks the sign before rounding */ + if (float32_is_neg(RsV) && !float32_is_any_nan(RsV)) { + float_raise(float_flag_invalid, &env->fp_status); + RddV =3D 0; + } else { + RddV =3D float32_to_uint64(RsV, &env->fp_status); + } arch_fpop_end(env); return RddV; } @@ -469,16 +486,28 @@ int64_t HELPER(conv_sf2d)(CPUHexagonState *env, float= 32 RsV) { int64_t RddV; arch_fpop_start(env); - RddV =3D conv_sf_to_8s(RsV, &env->fp_status); + /* Hexagon returns -1 for NaN */ + if (float32_is_any_nan(RsV)) { + float_raise(float_flag_invalid, &env->fp_status); + RddV =3D -1; + } else { + RddV =3D float32_to_int64(RsV, &env->fp_status); + } arch_fpop_end(env); return RddV; } =20 -int32_t HELPER(conv_df2uw)(CPUHexagonState *env, float64 RssV) +uint32_t HELPER(conv_df2uw)(CPUHexagonState *env, float64 RssV) { - int32_t RdV; + uint32_t RdV; arch_fpop_start(env); - RdV =3D conv_df_to_4u(RssV, &env->fp_status); + /* Hexagon checks the sign before rounding */ + if (float64_is_neg(RssV) && !float64_is_any_nan(RssV)) { + float_raise(float_flag_invalid, &env->fp_status); + RdV =3D 0; + } else { + RdV =3D float64_to_uint32(RssV, &env->fp_status); + } arch_fpop_end(env); return RdV; } @@ -487,16 +516,28 @@ int32_t HELPER(conv_df2w)(CPUHexagonState *env, float= 64 RssV) { int32_t RdV; arch_fpop_start(env); - RdV =3D conv_df_to_4s(RssV, &env->fp_status); + /* Hexagon returns -1 for NaN */ + if (float64_is_any_nan(RssV)) { + float_raise(float_flag_invalid, &env->fp_status); + RdV =3D -1; + } else { + RdV =3D float64_to_int32(RssV, &env->fp_status); + } arch_fpop_end(env); return RdV; } =20 -int64_t HELPER(conv_df2ud)(CPUHexagonState *env, float64 RssV) +uint64_t HELPER(conv_df2ud)(CPUHexagonState *env, float64 RssV) { - int64_t RddV; + uint64_t RddV; arch_fpop_start(env); - RddV =3D conv_df_to_8u(RssV, &env->fp_status); + /* Hexagon checks the sign before rounding */ + if (float64_is_neg(RssV) && !float64_is_any_nan(RssV)) { + float_raise(float_flag_invalid, &env->fp_status); + RddV =3D 0; + } else { + RddV =3D float64_to_uint64(RssV, &env->fp_status); + } arch_fpop_end(env); return RddV; } @@ -505,17 +546,28 @@ int64_t HELPER(conv_df2d)(CPUHexagonState *env, float= 64 RssV) { int64_t RddV; arch_fpop_start(env); - RddV =3D conv_df_to_8s(RssV, &env->fp_status); + /* Hexagon returns -1 for NaN */ + if (float64_is_any_nan(RssV)) { + float_raise(float_flag_invalid, &env->fp_status); + RddV =3D -1; + } else { + RddV =3D float64_to_int64(RssV, &env->fp_status); + } arch_fpop_end(env); return RddV; } =20 -int32_t HELPER(conv_sf2uw_chop)(CPUHexagonState *env, float32 RsV) +uint32_t HELPER(conv_sf2uw_chop)(CPUHexagonState *env, float32 RsV) { - int32_t RdV; + uint32_t RdV; arch_fpop_start(env); - set_float_rounding_mode(float_round_to_zero, &env->fp_status); - RdV =3D conv_sf_to_4u(RsV, &env->fp_status); + /* Hexagon checks the sign before rounding */ + if (float32_is_neg(RsV) && !float32_is_any_nan(RsV)) { + float_raise(float_flag_invalid, &env->fp_status); + RdV =3D 0; + } else { + RdV =3D float32_to_uint32_round_to_zero(RsV, &env->fp_status); + } arch_fpop_end(env); return RdV; } @@ -524,18 +576,28 @@ int32_t HELPER(conv_sf2w_chop)(CPUHexagonState *env, = float32 RsV) { int32_t RdV; arch_fpop_start(env); - set_float_rounding_mode(float_round_to_zero, &env->fp_status); - RdV =3D conv_sf_to_4s(RsV, &env->fp_status); + /* Hexagon returns -1 for NaN */ + if (float32_is_any_nan(RsV)) { + float_raise(float_flag_invalid, &env->fp_status); + RdV =3D -1; + } else { + RdV =3D float32_to_int32_round_to_zero(RsV, &env->fp_status); + } arch_fpop_end(env); return RdV; } =20 -int64_t HELPER(conv_sf2ud_chop)(CPUHexagonState *env, float32 RsV) +uint64_t HELPER(conv_sf2ud_chop)(CPUHexagonState *env, float32 RsV) { - int64_t RddV; + uint64_t RddV; arch_fpop_start(env); - set_float_rounding_mode(float_round_to_zero, &env->fp_status); - RddV =3D conv_sf_to_8u(RsV, &env->fp_status); + /* Hexagon checks the sign before rounding */ + if (float32_is_neg(RsV) && !float32_is_any_nan(RsV)) { + float_raise(float_flag_invalid, &env->fp_status); + RddV =3D 0; + } else { + RddV =3D float32_to_uint64_round_to_zero(RsV, &env->fp_status); + } arch_fpop_end(env); return RddV; } @@ -544,18 +606,28 @@ int64_t HELPER(conv_sf2d_chop)(CPUHexagonState *env, = float32 RsV) { int64_t RddV; arch_fpop_start(env); - set_float_rounding_mode(float_round_to_zero, &env->fp_status); - RddV =3D conv_sf_to_8s(RsV, &env->fp_status); + /* Hexagon returns -1 for NaN */ + if (float32_is_any_nan(RsV)) { + float_raise(float_flag_invalid, &env->fp_status); + RddV =3D -1; + } else { + RddV =3D float32_to_int64_round_to_zero(RsV, &env->fp_status); + } arch_fpop_end(env); return RddV; } =20 -int32_t HELPER(conv_df2uw_chop)(CPUHexagonState *env, float64 RssV) +uint32_t HELPER(conv_df2uw_chop)(CPUHexagonState *env, float64 RssV) { - int32_t RdV; + uint32_t RdV; arch_fpop_start(env); - set_float_rounding_mode(float_round_to_zero, &env->fp_status); - RdV =3D conv_df_to_4u(RssV, &env->fp_status); + /* Hexagon checks the sign before rounding */ + if (float64_is_neg(RssV) && !float32_is_any_nan(RssV)) { + float_raise(float_flag_invalid, &env->fp_status); + RdV =3D 0; + } else { + RdV =3D float64_to_uint32_round_to_zero(RssV, &env->fp_status); + } arch_fpop_end(env); return RdV; } @@ -564,18 +636,28 @@ int32_t HELPER(conv_df2w_chop)(CPUHexagonState *env, = float64 RssV) { int32_t RdV; arch_fpop_start(env); - set_float_rounding_mode(float_round_to_zero, &env->fp_status); - RdV =3D conv_df_to_4s(RssV, &env->fp_status); + /* Hexagon returns -1 for NaN */ + if (float64_is_any_nan(RssV)) { + float_raise(float_flag_invalid, &env->fp_status); + RdV =3D -1; + } else { + RdV =3D float64_to_int32_round_to_zero(RssV, &env->fp_status); + } arch_fpop_end(env); return RdV; } =20 -int64_t HELPER(conv_df2ud_chop)(CPUHexagonState *env, float64 RssV) +uint64_t HELPER(conv_df2ud_chop)(CPUHexagonState *env, float64 RssV) { - int64_t RddV; + uint64_t RddV; arch_fpop_start(env); - set_float_rounding_mode(float_round_to_zero, &env->fp_status); - RddV =3D conv_df_to_8u(RssV, &env->fp_status); + /* Hexagon checks the sign before rounding */ + if (float64_is_neg(RssV) && !float64_is_any_nan(RssV)) { + float_raise(float_flag_invalid, &env->fp_status); + RddV =3D 0; + } else { + RddV =3D float64_to_uint64_round_to_zero(RssV, &env->fp_status); + } arch_fpop_end(env); return RddV; } @@ -584,8 +666,13 @@ int64_t HELPER(conv_df2d_chop)(CPUHexagonState *env, f= loat64 RssV) { int64_t RddV; arch_fpop_start(env); - set_float_rounding_mode(float_round_to_zero, &env->fp_status); - RddV =3D conv_df_to_8s(RssV, &env->fp_status); + /* Hexagon returns -1 for NaN */ + if (float64_is_any_nan(RssV)) { + float_raise(float_flag_invalid, &env->fp_status); + RddV =3D -1; + } else { + RddV =3D float64_to_int64_round_to_zero(RssV, &env->fp_status); + } arch_fpop_end(env); return RddV; } diff --git a/tests/tcg/hexagon/fpstuff.c b/tests/tcg/hexagon/fpstuff.c index e4f1a0eeb4..6b60f92d18 100644 --- a/tests/tcg/hexagon/fpstuff.c +++ b/tests/tcg/hexagon/fpstuff.c @@ -37,10 +37,12 @@ const int SF_NaN =3D 0x7fc00000; const int SF_NaN_special =3D 0x7f800001; const int SF_ANY =3D 0x3f800000; const int SF_HEX_NAN =3D 0xffffffff; +const int SF_small_neg =3D 0xab98fba8; =20 const long long DF_NaN =3D 0x7ff8000000000000ULL; const long long DF_ANY =3D 0x3f80000000000000ULL; const long long DF_HEX_NAN =3D 0xffffffffffffffffULL; +const long long DF_small_neg =3D 0xbd731f7500000000ULL; =20 int err; =20 @@ -358,12 +360,155 @@ static void check_canonical_NaN(void) check_fpstatus(usr, 0); } =20 +static void check_float2int_convs() +{ + int res32; + long long res64; + int usr; + + /* + * Check that the various forms of float-to-unsigned + * check sign before rounding + */ + asm(CLEAR_FPSTATUS + "%0 =3D convert_sf2uw(%2)\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(res32), "=3Dr"(usr) : "r"(SF_small_neg) + : "r2", "usr"); + check32(res32, 0); + check_fpstatus(usr, FPINVF); + + asm(CLEAR_FPSTATUS + "%0 =3D convert_sf2uw(%2):chop\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(res32), "=3Dr"(usr) : "r"(SF_small_neg) + : "r2", "usr"); + check32(res32, 0); + check_fpstatus(usr, FPINVF); + + asm(CLEAR_FPSTATUS + "%0 =3D convert_sf2ud(%2)\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(res64), "=3Dr"(usr) : "r"(SF_small_neg) + : "r2", "usr"); + check64(res64, 0); + check_fpstatus(usr, FPINVF); + + asm(CLEAR_FPSTATUS + "%0 =3D convert_sf2ud(%2):chop\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(res64), "=3Dr"(usr) : "r"(SF_small_neg) + : "r2", "usr"); + check64(res64, 0); + check_fpstatus(usr, FPINVF); + + asm(CLEAR_FPSTATUS + "%0 =3D convert_df2uw(%2)\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(res32), "=3Dr"(usr) : "r"(DF_small_neg) + : "r2", "usr"); + check32(res32, 0); + check_fpstatus(usr, FPINVF); + + asm(CLEAR_FPSTATUS + "%0 =3D convert_df2uw(%2):chop\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(res32), "=3Dr"(usr) : "r"(DF_small_neg) + : "r2", "usr"); + check32(res32, 0); + check_fpstatus(usr, FPINVF); + + asm(CLEAR_FPSTATUS + "%0 =3D convert_df2ud(%2)\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(res64), "=3Dr"(usr) : "r"(DF_small_neg) + : "r2", "usr"); + check64(res64, 0); + check_fpstatus(usr, FPINVF); + + asm(CLEAR_FPSTATUS + "%0 =3D convert_df2ud(%2):chop\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(res64), "=3Dr"(usr) : "r"(DF_small_neg) + : "r2", "usr"); + check64(res64, 0); + check_fpstatus(usr, FPINVF); + + /* + * Check that the various forms of float-to-signed return -1 for NaN + */ + asm(CLEAR_FPSTATUS + "%0 =3D convert_sf2w(%2)\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(res32), "=3Dr"(usr) : "r"(SF_NaN) + : "r2", "usr"); + check32(res32, -1); + check_fpstatus(usr, FPINVF); + + asm(CLEAR_FPSTATUS + "%0 =3D convert_sf2w(%2):chop\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(res32), "=3Dr"(usr) : "r"(SF_NaN) + : "r2", "usr"); + check32(res32, -1); + check_fpstatus(usr, FPINVF); + + asm(CLEAR_FPSTATUS + "%0 =3D convert_sf2d(%2)\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(res64), "=3Dr"(usr) : "r"(SF_NaN) + : "r2", "usr"); + check64(res64, -1); + check_fpstatus(usr, FPINVF); + + asm(CLEAR_FPSTATUS + "%0 =3D convert_sf2d(%2):chop\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(res64), "=3Dr"(usr) : "r"(SF_NaN) + : "r2", "usr"); + check64(res64, -1); + check_fpstatus(usr, FPINVF); + + asm(CLEAR_FPSTATUS + "%0 =3D convert_df2w(%2)\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(res32), "=3Dr"(usr) : "r"(DF_NaN) + : "r2", "usr"); + check32(res32, -1); + check_fpstatus(usr, FPINVF); + + asm(CLEAR_FPSTATUS + "%0 =3D convert_df2w(%2):chop\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(res32), "=3Dr"(usr) : "r"(DF_NaN) + : "r2", "usr"); + check32(res32, -1); + check_fpstatus(usr, FPINVF); + + asm(CLEAR_FPSTATUS + "%0 =3D convert_df2d(%2)\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(res64), "=3Dr"(usr) : "r"(DF_NaN) + : "r2", "usr"); + check64(res64, -1); + check_fpstatus(usr, FPINVF); + + asm(CLEAR_FPSTATUS + "%0 =3D convert_df2d(%2):chop\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(res64), "=3Dr"(usr) : "r"(DF_NaN) + : "r2", "usr"); + check64(res64, -1); + check_fpstatus(usr, FPINVF); +} + int main() { check_compare_exception(); check_sfminmax(); check_dfminmax(); check_canonical_NaN(); + check_float2int_convs(); =20 puts(err ? "FAIL" : "PASS"); return err ? 1 : 0; diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build index bb0b4fb621..6fd9360b74 100644 --- a/target/hexagon/meson.build +++ b/target/hexagon/meson.build @@ -173,7 +173,6 @@ hexagon_ss.add(files( 'printinsn.c', 'arch.c', 'fma_emu.c', - 'conv_emu.c', )) =20 target_arch +=3D {'hexagon': hexagon_ss} --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895896; cv=none; d=zohomail.com; s=zohoarc; b=ZzVEtmEerzCiscTqdTwyGlF2AyMFAQeuiw2ZrE7s06YKfc7ZeIRrDni++bFFzD51aFrJuSEd9kESmPFoCe/XChOWChY5yw2Al0aR06ZlUoJfOBUD0n5mceF3t5JHYUoAXAPnTzKfhf8dC8SHBR50PlM29Wn7glcPn7qqjQz/joA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895896; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YwG/b/Ju2JoZgacaVeefdHMOmTrNBfuVIrbtO2SSiSg=; b=WwP+R6O0LVxtkQPWA8yYxLC8gw0c+suBGeY/Qs7yyyKCL6zEX/PcMlcIInYTOChW5m/4aEdRsQAlVLwSstrEKZxdQwf+/bf8Q/vpbjDCpMM5UegM35mnaQTRr8w4XRPO75PQaVpNmjqb6E/sJ9aAqE6p6Z1Fkksjbt0s4Xnjwx4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619895896186443.49838356457315; Sat, 1 May 2021 12:04:56 -0700 (PDT) Received: from localhost ([::1]:47744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcuv9-0002uv-5y for importer@patchew.org; Sat, 01 May 2021 15:04:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuam-0008LI-So for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:52 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]:52113) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaY-00008w-Cp for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:52 -0400 Received: by mail-pj1-x102c.google.com with SMTP id lp8so794014pjb.1 for ; Sat, 01 May 2021 11:43:37 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YwG/b/Ju2JoZgacaVeefdHMOmTrNBfuVIrbtO2SSiSg=; b=uhQtyhUGQxGPBWwtTanI+Wk38nhNVwF8oSCmYxTICh52zY45Kxflt1DC8/9hY5l7Us HXIUcpsEZdMU+O5aOqJlVF4Klie3Mrflzw+THyHfDLwY2++osNEy4OrlNlHfL7KsErZY s1ztLTaMM/pl2m7jqyUyWCAr/ISCOI6s7wRnJhJ9a43pcQIPyIFSmeCc8A/YL6Z432u6 JJGiyvxDwW3EPAMxfZxQYTgJurY9CH628ALIWGWJ9ivLHilOpBt2JYbuIy14QBD0Pkoc v1OQV+l0mZH0VhWEfEan7XXZ22U6DrGTRuKILt4sQvMtGn0OE5AERpXjED2Os9EGaFmY t+vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YwG/b/Ju2JoZgacaVeefdHMOmTrNBfuVIrbtO2SSiSg=; b=dlt07+MDyWC9PuVzyjPLh/erdNaI+GxxG628hQeB3TCqEwpncPs41QTUtr9NwpcfK/ AY99wawPbawWi5oxvRqvadmAeMSrtN8SpEa5lqIrZEIzbIXLkLZwaTdzw9/n/wXRX1JT 6hRkutdzMAOtpJ+/gxdHGY1vSRatsLZMOPZLrfADJimhiWhVWhd57xemByuQoV7FK7xh X0iOapisxbf9wm+jnwmXfHSzMyqHusF25WGRqOrR9aYQuFI6i6oNkNIYvrpWiUY8YIeA XisdgKsVarQ+DZgCSsLtAZTgqFYT/gZ+YhJAi3GeRMyMMYVLOkQOej40tBNJArNip8Bb uUhQ== X-Gm-Message-State: AOAM530iwVE/PEW8wMCdYpxpCnYoRVUaPKGZbXE8RvP3vnN3Pc2MG1mr c/vHzOJCyimPWL5uekvScTQjyGmJGCPyhw== X-Google-Smtp-Source: ABdhPJx0R5FmOYS3s5w9tygqZ5yC44H1Dj2G7L4/NI+53zUAomSV5RrxQzoqb38/ceR9FFS23CqMkQ== X-Received: by 2002:a17:90a:414a:: with SMTP id m10mr20893214pjg.63.1619894616936; Sat, 01 May 2021 11:43:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 18/31] Hexagon (target/hexagon) cleanup ternary operators in semantics Date: Sat, 1 May 2021 11:43:11 -0700 Message-Id: <20210501184324.1338186-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Change (cond ? (res =3D x) : (res =3D y)) to res =3D (cond ? x : y) This makes the semnatics easier to for idef-parser to deal with The following instructions are impacted C2_any8 C2_all8 C2_mux C2_muxii C2_muxir C2_muxri Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-14-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/imported/compare.idef | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/target/hexagon/imported/compare.idef b/target/hexagon/imported= /compare.idef index 3551467854..abd016ffb5 100644 --- a/target/hexagon/imported/compare.idef +++ b/target/hexagon/imported/compare.idef @@ -198,11 +198,11 @@ Q6INSN(C4_or_orn,"Pd4=3Dor(Ps4,or(Pt4,!Pu4))",ATTRIBS= (A_CRSLOT23), =20 Q6INSN(C2_any8,"Pd4=3Dany8(Ps4)",ATTRIBS(A_CRSLOT23), "Logical ANY of low 8 predicate bits", -{ PsV ? (PdV=3D0xff) : (PdV=3D0x00); }) +{ PdV =3D (PsV ? 0xff : 0x00); }) =20 Q6INSN(C2_all8,"Pd4=3Dall8(Ps4)",ATTRIBS(A_CRSLOT23), "Logical ALL of low 8 predicate bits", -{ (PsV=3D=3D0xff) ? (PdV=3D0xff) : (PdV=3D0x00); }) +{ PdV =3D (PsV =3D=3D 0xff ? 0xff : 0x00); }) =20 Q6INSN(C2_vitpack,"Rd32=3Dvitpack(Ps4,Pt4)",ATTRIBS(), "Pack the odd and even bits of two predicate registers", @@ -212,7 +212,7 @@ Q6INSN(C2_vitpack,"Rd32=3Dvitpack(Ps4,Pt4)",ATTRIBS(), =20 Q6INSN(C2_mux,"Rd32=3Dmux(Pu4,Rs32,Rt32)",ATTRIBS(), "Scalar MUX", -{ (fLSBOLD(PuV)) ? (RdV=3DRsV):(RdV=3DRtV); }) +{ RdV =3D (fLSBOLD(PuV) ? RsV : RtV); }) =20 =20 Q6INSN(C2_cmovenewit,"if (Pu4.new) Rd32=3D#s12",ATTRIBS(A_ARCHV2), @@ -269,18 +269,18 @@ Q6INSN(C2_ccombinewf,"if (!Pu4) Rdd32=3Dcombine(Rs32,= Rt32)",ATTRIBS(A_ARCHV2), =20 Q6INSN(C2_muxii,"Rd32=3Dmux(Pu4,#s8,#S8)",ATTRIBS(A_ARCHV2), "Scalar MUX immediates", -{ fIMMEXT(siV); (fLSBOLD(PuV)) ? (RdV=3DsiV):(RdV=3DSiV); }) +{ fIMMEXT(siV); RdV =3D (fLSBOLD(PuV) ? siV : SiV); }) =20 =20 =20 Q6INSN(C2_muxir,"Rd32=3Dmux(Pu4,Rs32,#s8)",ATTRIBS(A_ARCHV2), "Scalar MUX register immediate", -{ fIMMEXT(siV); (fLSBOLD(PuV)) ? (RdV=3DRsV):(RdV=3DsiV); }) +{ fIMMEXT(siV); RdV =3D (fLSBOLD(PuV) ? RsV : siV); }) =20 =20 Q6INSN(C2_muxri,"Rd32=3Dmux(Pu4,#s8,Rs32)",ATTRIBS(A_ARCHV2), "Scalar MUX register immediate", -{ fIMMEXT(siV); (fLSBOLD(PuV)) ? (RdV=3DsiV):(RdV=3DRsV); }) +{ fIMMEXT(siV); RdV =3D (fLSBOLD(PuV) ? siV : RsV); }) =20 =20 =20 --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895286; cv=none; d=zohomail.com; s=zohoarc; b=FnV+OvnmgzfSBZbpOWs8MNrC6icrAsHQnZlItbWwTlak+Flpao5/Yt5Hl/ZCd3/VQfj3AnWWJ7fTlElvgwHTZjQLGq39D3uasUdV8abjyJV42Sb33GvlKTyT0vgdl1oUWwXjuEX+00Uhg/3l1deGJEa67RU5p89PxMLOJOpr8Ts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895286; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rZuld2Nudm5aU7AYmY0x2StLFfnXOi6CVhhsG8Zb9Hg=; b=fa10UZwPlolT1kV2z8M6NJlItqXLrfuUZpXGUm43ZG5BMe7C6BMR/vOin6pK7nLDTDVjGRK3gESBlkqqUQcsZdwCprNRNdiCjd8NJ4FvWDl7qpMQvycnRHJEsl9tmZVjkkvg/HWTH5QwFtnC/4D3qmG/SPkBgrFYko21FinhAGQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619895286529980.1791271900097; Sat, 1 May 2021 11:54:46 -0700 (PDT) Received: from localhost ([::1]:52934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lculJ-0001ls-Cl for importer@patchew.org; Sat, 01 May 2021 14:54:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuak-0008KC-Rj for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:52 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:34557) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaZ-00009D-2t for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:50 -0400 Received: by mail-pf1-x436.google.com with SMTP id 10so1354367pfl.1 for ; Sat, 01 May 2021 11:43:38 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rZuld2Nudm5aU7AYmY0x2StLFfnXOi6CVhhsG8Zb9Hg=; b=ynji0CNVgDF+sgxLW3Dc1ul3iZDuVGoPEY/ZNffeWRmFqgs6dO+c3jItB4SHfzvkHn B/VDobmjLq1mPJkKAfEMhb07QWEg22eb+upbtNJkhRPBPWdKWOZxJYSAwOceIzB+bG0o HiEK56jesok2FNKDvBfceOw0Nz7nI4Qs5qRoWF7kwSWa+ph8IF4QIrH80Lowodabx5h4 mf7wqSDy4s70rDo990UvA41Kt80PdwS/7WeUfYULVouj++9HQOj0EcBW2fg7HKUrESAK vi2OHPK0/gjGxaNOc+K9FFY0oreWL3EmWfHC7gvBb6+34r2QWCwDGWdZDLd0hEGg40CU FI3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rZuld2Nudm5aU7AYmY0x2StLFfnXOi6CVhhsG8Zb9Hg=; b=pvk5GpS/7BveNu1e/O/tPfRmhySjn5Zf5o8frKkkBj8eN3uBeie7GwkajbpLLGFu16 SJGWPqmNpeOWdwCoFm3Id6+1VUNxs5uCvR6eSLrxf6zDSydHgyj2Sch0P9SkaYv6kFJh /pIzBF3zMcF8+ZtNRn4cTTpoipBxQP4D6FEARsH1CNefHpC9yyjobIWgSNs06oyutWbt +PGm66FYWLT0LMrkW3paaZuoli+sb6sghY631h3oBwTpurB3knlUlFJ23Pk2+pH/OOvh QK63aqQB2Eoj5JBkIalq4RQYjzLDQMAAxVJyJs5IuuBye2Hy/2Q+52ILNoGAlBrqqz5d loDg== X-Gm-Message-State: AOAM5327SFHUZu5yaB2Wy95Tbt7mvHWF5F+zgeqnnu+61GrXF5fb6Rko GexGaINK3zyezsRqkdpK+mYicJAcdvULLg== X-Google-Smtp-Source: ABdhPJybFq2OMXE24h5MpL/lT68W3UsIXtPZP30Bi85mLSkZEe0TMnPJUv6yAa0YsoS7RdCl0LPwrA== X-Received: by 2002:a05:6a00:c8:b029:260:f25a:f2ef with SMTP id e8-20020a056a0000c8b0290260f25af2efmr10602993pfj.78.1619894617645; Sat, 01 May 2021 11:43:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 19/31] Hexagon (target/hexagon) cleanup reg_field_info definition Date: Sat, 1 May 2021 11:43:12 -0700 Message-Id: <20210501184324.1338186-20-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Include size in declaration Remove {0, 0} entry Suggested-by: Richard Henderson Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-15-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/reg_fields.h | 4 ++-- target/hexagon/reg_fields.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/target/hexagon/reg_fields.h b/target/hexagon/reg_fields.h index d3c86c942f..9e2ad5d997 100644 --- a/target/hexagon/reg_fields.h +++ b/target/hexagon/reg_fields.h @@ -23,8 +23,6 @@ typedef struct { int width; } RegField; =20 -extern const RegField reg_field_info[]; - enum { #define DEF_REG_FIELD(TAG, START, WIDTH) \ TAG, @@ -33,4 +31,6 @@ enum { #undef DEF_REG_FIELD }; =20 +extern const RegField reg_field_info[NUM_REG_FIELDS]; + #endif diff --git a/target/hexagon/reg_fields.c b/target/hexagon/reg_fields.c index bdcab79428..6713203725 100644 --- a/target/hexagon/reg_fields.c +++ b/target/hexagon/reg_fields.c @@ -18,10 +18,9 @@ #include "qemu/osdep.h" #include "reg_fields.h" =20 -const RegField reg_field_info[] =3D { +const RegField reg_field_info[NUM_REG_FIELDS] =3D { #define DEF_REG_FIELD(TAG, START, WIDTH) \ { START, WIDTH }, #include "reg_fields_def.h.inc" - { 0, 0 } #undef DEF_REG_FIELD }; --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895866; cv=none; d=zohomail.com; s=zohoarc; b=ZuQh+PYcZNe1YPSN8lS3qJ4vzVGZQWs87+Yav/pSSTjqjNC5ZI1pTs3UGtKlYnrM7wwi3OSYZEBaN2cJjLW2bnsSfYE7Kdms344AWDqLq57OsyyUP0dbMx9mZebL2fo3pJZP+ODrqp9wq5tSnwOfrl/+dd5O46rmW02Y00jhOEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895866; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UdUcyujGpauXTdAtiBYYXQP2ZLdHxofdS+1N9npM370=; b=H8ONhExwiazJnKih/Dp1eb67b4J6R01547RaZpFY3zzcGzZHwmu18wWxNMtDTdK0P1Gmd5Y9UtrS3D2q1Z2tGPh8MaSe/8VsSsWoxoz8ian4tnhXoYtcIFI2sGpXXdduWhcDUeXTzhz2DTrsiaBhyI38zX+OkcWEmsQLGuyejPg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 161989586669311.287228355134857; Sat, 1 May 2021 12:04:26 -0700 (PDT) Received: from localhost ([::1]:46566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcuuf-0002RS-E2 for importer@patchew.org; Sat, 01 May 2021 15:04:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuav-00005h-Mz for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:01 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]:46651) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaa-00009G-6g for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:01 -0400 Received: by mail-pg1-x52b.google.com with SMTP id q9so822063pgl.13 for ; Sat, 01 May 2021 11:43:39 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UdUcyujGpauXTdAtiBYYXQP2ZLdHxofdS+1N9npM370=; b=seAeEaysSIoFwvdPVYfmq67UdDIwtDln0GTddotClzQC8qleZs4B1BSJ2wyG6vgEcf ADwS3k9ydZOVB0hYIkx4lC0LnG0twp/eJQn5C/FcYuYNeFomdbF9FvKKDIpRym6YL6Hb Xc7vLfS1NFqLN+63Sm+qUOAkIeHu+ZBpbSpJIIw1MvpJ2DnuEL86jSmayot/PyAUwun7 61Oxr0f0cw4StiguTl3J9M2WdsEyV8ih6q7Eu4fyACBJbe5eotaMoXThNrggguZcqr4e 80shO3By7JY0GaRNxOXhf1psPbEjN6sZBxrScrqsKLiy3vVmhwb4vQxdqQ195hHsJvIl gAgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UdUcyujGpauXTdAtiBYYXQP2ZLdHxofdS+1N9npM370=; b=IJm3BCOYtQrctMLWzEYCAIfAFsFMDoRFF/4MPAODDyc+s4mFhtmuwi3Kb7oixBR0e9 RQN0fz2KTEho/bPQ2x2vFKKpHNzQM2JR0cI3SUUNw1rWdgNvr6d6b+5ePlaZq4qCbZEl gbVbyI+8tByrsgDG7z+pwoLNVrszgVSI391iYdiE7uYrUfNBra1Ae0ZRaS7136p8z691 /mJnrrVoq9kgAH7hiObmWtbyDnTjyE4UX6XK0wRIacobYHczpkbtkzvihC012HOzj24X iCM81x8RLF1Jr/j2sTU14BvaL4ONHBc7KdvbWcjwJbB3X6UKs20jGANBYLM4gApBbrnF D4mA== X-Gm-Message-State: AOAM532CdBPgMtvoI0ekqbbJddlpkvQMmPtwkdwRaA7MOoni1z9r3eYl 9Ug1N4slFa89kUTpvSA9bIWuvD/DI7mGmw== X-Google-Smtp-Source: ABdhPJySxQLzxD8aXPgBMrMGO2zO4NcJbgklAjHmWrKT3q25OGFZxh2IVbGXlLpoi5B2xep35A8ZuA== X-Received: by 2002:a65:52c3:: with SMTP id z3mr10394387pgp.338.1619894618208; Sat, 01 May 2021 11:43:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 20/31] Hexagon (target/hexagon) move QEMU_GENERATE to only be on during macros.h Date: Sat, 1 May 2021 11:43:13 -0700 Message-Id: <20210501184324.1338186-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::52b; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Taylor Simpson Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-16-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/genptr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/hexagon/genptr.c b/target/hexagon/genptr.c index 6b74344795..b87e264ccf 100644 --- a/target/hexagon/genptr.c +++ b/target/hexagon/genptr.c @@ -15,7 +15,6 @@ * along with this program; if not, see . */ =20 -#define QEMU_GENERATE #include "qemu/osdep.h" #include "qemu/log.h" #include "cpu.h" @@ -24,7 +23,9 @@ #include "insn.h" #include "opcodes.h" #include "translate.h" +#define QEMU_GENERATE /* Used internally by macros.h */ #include "macros.h" +#undef QEMU_GENERATE #include "gen_tcg.h" =20 static inline TCGv gen_read_preg(TCGv pred, uint8_t num) --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619896326; cv=none; d=zohomail.com; s=zohoarc; b=GeYueX57PwX7OgCdbS+Qs8aVXQYnxHBdPvrfJvhGeM1ScdoqZUaxfzh0h90v7bVpAOFxDDr0WB54vOx+xAuWZSmPsCeHNs+2e/gmrBjxqepal+3QcNNoCIeHZs/xX5hf/5J1uip0LxikyQYUSOGoRckqOTn1OzCNzTN1HowUwoU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619896326; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3ah5G1WYf1ENyHl+qVq+4a4OFQF4iQyUKFh9kb0jd6Y=; b=Lz9Pl6ORhT7YeO6fbG2MyNxxve/SgcK4v+mX8iQ1uwyzW9+QKDsCXbgXTHReXMjTjHkodKK/vEUNdsIaadHKdMuyy1PQ1VA1JW8InPUImSCUUJ+0srUQ4jK7eqhFla77Thq2WGOn4CHdlqdS0T+MuYbcK2Yld65S5gpHjluQgdE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619896326085823.065675997252; Sat, 1 May 2021 12:12:06 -0700 (PDT) Received: from localhost ([::1]:35070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcv25-0000tu-02 for importer@patchew.org; Sat, 01 May 2021 15:12:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuaw-00007s-MO for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:02 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:40544) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuaa-00009R-6o for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:02 -0400 Received: by mail-pl1-x62e.google.com with SMTP id n16so586558plf.7 for ; Sat, 01 May 2021 11:43:39 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3ah5G1WYf1ENyHl+qVq+4a4OFQF4iQyUKFh9kb0jd6Y=; b=ffGNIJ1jpdPW52a0uWqkKUg6NbkZpPwTMZW8sfQUWKyb1rP2cgVOy+uiUxPObEtp+b dDwYzb8Wb5Bfvw+22QMFX6/aGOF41ZC0zeaF3mgyzQ5tqrKJA66AoThYLiPEt1L/Lc+U 6lOWL5AUQlPyYCt+9A4eAdaMHFmDZXptV99+0WS5xcVBKyuZOnmWVl8lqEewUyeBG0RV 16aLAhX4QGEYq0FsZMubtsNeYRSi6VbmsKubkirz9oLh7hnZnCyZ2Ow3LdzvnqO6XYA3 7RB6/8scsczs/voB6ylyPKmjwibsgG5fW5aBvJK1oWvwQrsfLRC7ZEsoNVq6rlPnUgdF Liyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3ah5G1WYf1ENyHl+qVq+4a4OFQF4iQyUKFh9kb0jd6Y=; b=FBNtgpuhBKh6IwrKxjn1M2aBM35lQHVln8JnW+HZFiz4LKy0P+FCVHCy8Mk9aCQndI U96BPYGifTHJ/KjzuEzWqxgeTvwPZXzoKAxpullRiKXSk1tRyN4vhAZLmM0cQPBpD5A9 63/LzPCafYURiff0NWoifRVrC5kClhJ7hF2qdwQwljyZrBONjaEggjB+ZiDDlw9KOnW3 L5q6Th0kwztEGgKb1Fh74mcpSYBlwCSl3zRK/qxabK8rHle2QXSgZtIpiLnu1kpV6Lx6 FcZ+mW+GtXB2TxcnEpO02u9eVT4q/cvwV4HLfHK78VZip/r2Gs5+Nt6TP/q+TXmvn3DM bqqQ== X-Gm-Message-State: AOAM530fVq9IcMvrVpeMz4ZNaCi4Oh8wGP7Ith+W1A3JRD0SC1QESQ+6 NoZTTNPKrqbrzNc4AnAXQiFMD0cgYX/U3w== X-Google-Smtp-Source: ABdhPJx0SOlWhEATNqNVLYT99FchDCJ2n5U6DNE6Mt6Qi/GZaT2ACWP9nn/Q1wEkAocKsz+9CTVgiQ== X-Received: by 2002:a17:90a:d512:: with SMTP id t18mr19529780pju.108.1619894618878; Sat, 01 May 2021 11:43:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 21/31] Hexagon (target/hexagon) compile all debug code Date: Sat, 1 May 2021 11:43:14 -0700 Message-Id: <20210501184324.1338186-22-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Taylor Simpson Change #if HEX_DEBUG to if (HEX_DEBUG) so the debug code doesn't bit rot Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-17-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/helper.h | 2 -- target/hexagon/internal.h | 11 +++--- target/hexagon/translate.h | 2 -- target/hexagon/genptr.c | 72 ++++++++++++++++++------------------- target/hexagon/op_helper.c | 14 +++----- target/hexagon/translate.c | 74 ++++++++++++++++++-------------------- 6 files changed, 81 insertions(+), 94 deletions(-) diff --git a/target/hexagon/helper.h b/target/hexagon/helper.h index 715c24662f..efe6069118 100644 --- a/target/hexagon/helper.h +++ b/target/hexagon/helper.h @@ -19,11 +19,9 @@ #include "helper_protos_generated.h.inc" =20 DEF_HELPER_FLAGS_2(raise_exception, TCG_CALL_NO_RETURN, noreturn, env, i32) -#if HEX_DEBUG DEF_HELPER_1(debug_start_packet, void, env) DEF_HELPER_FLAGS_3(debug_check_store_width, TCG_CALL_NO_WG, void, env, int= , int) DEF_HELPER_FLAGS_3(debug_commit_end, TCG_CALL_NO_WG, void, env, int, int) -#endif DEF_HELPER_2(commit_store, void, env, int) DEF_HELPER_FLAGS_4(fcircadd, TCG_CALL_NO_RWG_SE, s32, s32, s32, s32, s32) =20 diff --git a/target/hexagon/internal.h b/target/hexagon/internal.h index 2da85c8606..6b20affdfa 100644 --- a/target/hexagon/internal.h +++ b/target/hexagon/internal.h @@ -22,11 +22,12 @@ * Change HEX_DEBUG to 1 to turn on debugging output */ #define HEX_DEBUG 0 -#if HEX_DEBUG -#define HEX_DEBUG_LOG(...) qemu_log(__VA_ARGS__) -#else -#define HEX_DEBUG_LOG(...) do { } while (0) -#endif +#define HEX_DEBUG_LOG(...) \ + do { \ + if (HEX_DEBUG) { \ + qemu_log(__VA_ARGS__); \ + } \ + } while (0) =20 int hexagon_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); int hexagon_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); diff --git a/target/hexagon/translate.h b/target/hexagon/translate.h index 97b12a7d18..703fd1345f 100644 --- a/target/hexagon/translate.h +++ b/target/hexagon/translate.h @@ -41,11 +41,9 @@ typedef struct DisasContext { =20 static inline void ctx_log_reg_write(DisasContext *ctx, int rnum) { -#if HEX_DEBUG if (test_bit(rnum, ctx->regs_written)) { HEX_DEBUG_LOG("WARNING: Multiple writes to r%d\n", rnum); } -#endif ctx->reg_log[ctx->reg_log_idx] =3D rnum; ctx->reg_log_idx++; set_bit(rnum, ctx->regs_written); diff --git a/target/hexagon/genptr.c b/target/hexagon/genptr.c index b87e264ccf..24d575853c 100644 --- a/target/hexagon/genptr.c +++ b/target/hexagon/genptr.c @@ -42,17 +42,17 @@ static inline void gen_log_predicated_reg_write(int rnu= m, TCGv val, int slot) tcg_gen_andi_tl(slot_mask, hex_slot_cancelled, 1 << slot); tcg_gen_movcond_tl(TCG_COND_EQ, hex_new_value[rnum], slot_mask, zero, val, hex_new_value[rnum]); -#if HEX_DEBUG - /* - * Do this so HELPER(debug_commit_end) will know - * - * Note that slot_mask indicates the value is not written - * (i.e., slot was cancelled), so we create a true/false value before - * or'ing with hex_reg_written[rnum]. - */ - tcg_gen_setcond_tl(TCG_COND_EQ, slot_mask, slot_mask, zero); - tcg_gen_or_tl(hex_reg_written[rnum], hex_reg_written[rnum], slot_mask); -#endif + if (HEX_DEBUG) { + /* + * Do this so HELPER(debug_commit_end) will know + * + * Note that slot_mask indicates the value is not written + * (i.e., slot was cancelled), so we create a true/false value bef= ore + * or'ing with hex_reg_written[rnum]. + */ + tcg_gen_setcond_tl(TCG_COND_EQ, slot_mask, slot_mask, zero); + tcg_gen_or_tl(hex_reg_written[rnum], hex_reg_written[rnum], slot_m= ask); + } =20 tcg_temp_free(zero); tcg_temp_free(slot_mask); @@ -61,10 +61,10 @@ static inline void gen_log_predicated_reg_write(int rnu= m, TCGv val, int slot) static inline void gen_log_reg_write(int rnum, TCGv val) { tcg_gen_mov_tl(hex_new_value[rnum], val); -#if HEX_DEBUG - /* Do this so HELPER(debug_commit_end) will know */ - tcg_gen_movi_tl(hex_reg_written[rnum], 1); -#endif + if (HEX_DEBUG) { + /* Do this so HELPER(debug_commit_end) will know */ + tcg_gen_movi_tl(hex_reg_written[rnum], 1); + } } =20 static void gen_log_predicated_reg_write_pair(int rnum, TCGv_i64 val, int = slot) @@ -84,19 +84,19 @@ static void gen_log_predicated_reg_write_pair(int rnum,= TCGv_i64 val, int slot) tcg_gen_movcond_tl(TCG_COND_EQ, hex_new_value[rnum + 1], slot_mask, zero, val32, hex_new_value[rnum + 1]); -#if HEX_DEBUG - /* - * Do this so HELPER(debug_commit_end) will know - * - * Note that slot_mask indicates the value is not written - * (i.e., slot was cancelled), so we create a true/false value before - * or'ing with hex_reg_written[rnum]. - */ - tcg_gen_setcond_tl(TCG_COND_EQ, slot_mask, slot_mask, zero); - tcg_gen_or_tl(hex_reg_written[rnum], hex_reg_written[rnum], slot_mask); - tcg_gen_or_tl(hex_reg_written[rnum + 1], hex_reg_written[rnum + 1], - slot_mask); -#endif + if (HEX_DEBUG) { + /* + * Do this so HELPER(debug_commit_end) will know + * + * Note that slot_mask indicates the value is not written + * (i.e., slot was cancelled), so we create a true/false value bef= ore + * or'ing with hex_reg_written[rnum]. + */ + tcg_gen_setcond_tl(TCG_COND_EQ, slot_mask, slot_mask, zero); + tcg_gen_or_tl(hex_reg_written[rnum], hex_reg_written[rnum], slot_m= ask); + tcg_gen_or_tl(hex_reg_written[rnum + 1], hex_reg_written[rnum + 1], + slot_mask); + } =20 tcg_temp_free(val32); tcg_temp_free(zero); @@ -107,17 +107,17 @@ static void gen_log_reg_write_pair(int rnum, TCGv_i64= val) { /* Low word */ tcg_gen_extrl_i64_i32(hex_new_value[rnum], val); -#if HEX_DEBUG - /* Do this so HELPER(debug_commit_end) will know */ - tcg_gen_movi_tl(hex_reg_written[rnum], 1); -#endif + if (HEX_DEBUG) { + /* Do this so HELPER(debug_commit_end) will know */ + tcg_gen_movi_tl(hex_reg_written[rnum], 1); + } =20 /* High word */ tcg_gen_extrh_i64_i32(hex_new_value[rnum + 1], val); -#if HEX_DEBUG - /* Do this so HELPER(debug_commit_end) will know */ - tcg_gen_movi_tl(hex_reg_written[rnum + 1], 1); -#endif + if (HEX_DEBUG) { + /* Do this so HELPER(debug_commit_end) will know */ + tcg_gen_movi_tl(hex_reg_written[rnum + 1], 1); + } } =20 static inline void gen_log_pred_write(DisasContext *ctx, int pnum, TCGv va= l) diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index b70c5d607a..33b67138ca 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -56,10 +56,10 @@ static void log_reg_write(CPUHexagonState *env, int rnu= m, HEX_DEBUG_LOG("\n"); =20 env->new_value[rnum] =3D val; -#if HEX_DEBUG - /* Do this so HELPER(debug_commit_end) will know */ - env->reg_written[rnum] =3D 1; -#endif + if (HEX_DEBUG) { + /* Do this so HELPER(debug_commit_end) will know */ + env->reg_written[rnum] =3D 1; + } } =20 static void log_pred_write(CPUHexagonState *env, int pnum, target_ulong va= l) @@ -117,7 +117,6 @@ static void write_new_pc(CPUHexagonState *env, target_u= long addr) } } =20 -#if HEX_DEBUG /* Handy place to set a breakpoint */ void HELPER(debug_start_packet)(CPUHexagonState *env) { @@ -128,14 +127,12 @@ void HELPER(debug_start_packet)(CPUHexagonState *env) env->reg_written[i] =3D 0; } } -#endif =20 static int32_t new_pred_value(CPUHexagonState *env, int pnum) { return env->new_pred_value[pnum]; } =20 -#if HEX_DEBUG /* Checks for bookkeeping errors between disassembly context and runtime */ void HELPER(debug_check_store_width)(CPUHexagonState *env, int slot, int c= heck) { @@ -145,7 +142,6 @@ void HELPER(debug_check_store_width)(CPUHexagonState *e= nv, int slot, int check) g_assert_not_reached(); } } -#endif =20 void HELPER(commit_store)(CPUHexagonState *env, int slot_num) { @@ -171,7 +167,6 @@ void HELPER(commit_store)(CPUHexagonState *env, int slo= t_num) } } =20 -#if HEX_DEBUG static void print_store(CPUHexagonState *env, int slot) { if (!(env->slot_cancelled & (1 << slot))) { @@ -255,7 +250,6 @@ void HELPER(debug_commit_end)(CPUHexagonState *env, int= has_st0, int has_st1) env->gpr[HEX_REG_QEMU_INSN_CNT]); =20 } -#endif =20 static int32_t fcircadd_v4(int32_t RxV, int32_t offset, int32_t M, int32_t= CS) { diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index 04684221ca..9a37644182 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -35,9 +35,7 @@ TCGv hex_this_PC; TCGv hex_slot_cancelled; TCGv hex_branch_taken; TCGv hex_new_value[TOTAL_PER_THREAD_REGS]; -#if HEX_DEBUG TCGv hex_reg_written[TOTAL_PER_THREAD_REGS]; -#endif TCGv hex_new_pred_value[NUM_PREGS]; TCGv hex_pred_written; TCGv hex_store_addr[STORES_MAX]; @@ -90,7 +88,6 @@ static void gen_exception_end_tb(DisasContext *ctx, int e= xcp) =20 } =20 -#if HEX_DEBUG #define PACKET_BUFFER_LEN 1028 static void print_pkt(Packet *pkt) { @@ -99,10 +96,12 @@ static void print_pkt(Packet *pkt) HEX_DEBUG_LOG("%s", buf->str); g_string_free(buf, true); } -#define HEX_DEBUG_PRINT_PKT(pkt) print_pkt(pkt) -#else -#define HEX_DEBUG_PRINT_PKT(pkt) /* nothing */ -#endif +#define HEX_DEBUG_PRINT_PKT(pkt) \ + do { \ + if (HEX_DEBUG) { \ + print_pkt(pkt); \ + } \ + } while (0) =20 static int read_packet_words(CPUHexagonState *env, DisasContext *ctx, uint32_t words[]) @@ -179,11 +178,11 @@ static void gen_start_packet(DisasContext *ctx, Packe= t *pkt) tcg_gen_movi_tl(hex_pkt_has_store_s1, pkt->pkt_has_store_s1); ctx->s1_store_processed =3D false; =20 -#if HEX_DEBUG - /* Handy place to set a breakpoint before the packet executes */ - gen_helper_debug_start_packet(cpu_env); - tcg_gen_movi_tl(hex_this_PC, ctx->base.pc_next); -#endif + if (HEX_DEBUG) { + /* Handy place to set a breakpoint before the packet executes */ + gen_helper_debug_start_packet(cpu_env); + tcg_gen_movi_tl(hex_this_PC, ctx->base.pc_next); + } =20 /* Initialize the runtime state for packet semantics */ if (need_pc(pkt)) { @@ -308,10 +307,11 @@ static void gen_pred_writes(DisasContext *ctx, Packet= *pkt) for (i =3D 0; i < ctx->preg_log_idx; i++) { int pred_num =3D ctx->preg_log[i]; tcg_gen_mov_tl(hex_pred[pred_num], hex_new_pred_value[pred_num= ]); -#if HEX_DEBUG - /* Do this so HELPER(debug_commit_end) will know */ - tcg_gen_ori_tl(hex_pred_written, hex_pred_written, 1 << pred_n= um); -#endif + if (HEX_DEBUG) { + /* Do this so HELPER(debug_commit_end) will know */ + tcg_gen_ori_tl(hex_pred_written, hex_pred_written, + 1 << pred_num); + } } } =20 @@ -322,13 +322,13 @@ static void gen_pred_writes(DisasContext *ctx, Packet= *pkt) =20 static void gen_check_store_width(DisasContext *ctx, int slot_num) { -#if HEX_DEBUG - TCGv slot =3D tcg_const_tl(slot_num); - TCGv check =3D tcg_const_tl(ctx->store_width[slot_num]); - gen_helper_debug_check_store_width(cpu_env, slot, check); - tcg_temp_free(slot); - tcg_temp_free(check); -#endif + if (HEX_DEBUG) { + TCGv slot =3D tcg_const_tl(slot_num); + TCGv check =3D tcg_const_tl(ctx->store_width[slot_num]); + gen_helper_debug_check_store_width(cpu_env, slot, check); + tcg_temp_free(slot); + tcg_temp_free(check); + } } =20 static bool slot_is_predicated(Packet *pkt, int slot_num) @@ -482,8 +482,7 @@ static void gen_commit_packet(DisasContext *ctx, Packet= *pkt) process_store_log(ctx, pkt); process_dczeroa(ctx, pkt); update_exec_counters(ctx, pkt); -#if HEX_DEBUG - { + if (HEX_DEBUG) { TCGv has_st0 =3D tcg_const_tl(pkt->pkt_has_store_s0 && !pkt->pkt_has_dczeroa); TCGv has_st1 =3D @@ -495,7 +494,6 @@ static void gen_commit_packet(DisasContext *ctx, Packet= *pkt) tcg_temp_free(has_st0); tcg_temp_free(has_st1); } -#endif =20 if (pkt->pkt_has_cof) { gen_end_tb(ctx); @@ -655,9 +653,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlo= ck *tb, int max_insns) =20 #define NAME_LEN 64 static char new_value_names[TOTAL_PER_THREAD_REGS][NAME_LEN]; -#if HEX_DEBUG static char reg_written_names[TOTAL_PER_THREAD_REGS][NAME_LEN]; -#endif static char new_pred_value_names[NUM_PREGS][NAME_LEN]; static char store_addr_names[STORES_MAX][NAME_LEN]; static char store_width_names[STORES_MAX][NAME_LEN]; @@ -670,11 +666,11 @@ void hexagon_translate_init(void) =20 opcode_init(); =20 -#if HEX_DEBUG - if (!qemu_logfile) { - qemu_set_log(qemu_loglevel); + if (HEX_DEBUG) { + if (!qemu_logfile) { + qemu_set_log(qemu_loglevel); + } } -#endif =20 for (i =3D 0; i < TOTAL_PER_THREAD_REGS; i++) { hex_gpr[i] =3D tcg_global_mem_new(cpu_env, @@ -686,13 +682,13 @@ void hexagon_translate_init(void) offsetof(CPUHexagonState, new_value[i]), new_value_names[i]); =20 -#if HEX_DEBUG - snprintf(reg_written_names[i], NAME_LEN, "reg_written_%s", - hexagon_regnames[i]); - hex_reg_written[i] =3D tcg_global_mem_new(cpu_env, - offsetof(CPUHexagonState, reg_written[i]), - reg_written_names[i]); -#endif + if (HEX_DEBUG) { + snprintf(reg_written_names[i], NAME_LEN, "reg_written_%s", + hexagon_regnames[i]); + hex_reg_written[i] =3D tcg_global_mem_new(cpu_env, + offsetof(CPUHexagonState, reg_written[i]), + reg_written_names[i]); + } } for (i =3D 0; i < NUM_PREGS; i++) { hex_pred[i] =3D tcg_global_mem_new(cpu_env, --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619896124; cv=none; d=zohomail.com; s=zohoarc; b=MpOxKZce3DcZr4ChJ3RPBu8Ow6/xNB7cF8yOK79n6NkL+dGchT+n1ayg2IPMQyIa8G35jUf4B5WFn+zDgegXYun9pfOyKHQpcfPW/U2iFWu3kooKu/ctES/0J6wI6urG8J6YR54vO7/SXEwqwE45lBOBdIubGAodXas+brUxxPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619896124; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4SeN9caAs4ApLwIeYye38SRE5dxFExcRolPRumS0f5k=; b=ZOYAZmouJJZZSRMoVLInSxZ2nIjrnCSpcI2xBpS4gIZyb8FaaxutzA1ZosBQVoC5DXdEqYzeEmOmUGHIfb3MnGWBdKuSOqnxUNV8iFZq1sb2DcbtWR+fNDtngv8cz5puymfCJ36fznd3ZXKFJPrOKbJciraJkbrnl3tkEg+eNXQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619896124331317.41281056524554; Sat, 1 May 2021 12:08:44 -0700 (PDT) Received: from localhost ([::1]:55372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcuyo-00064Y-T5 for importer@patchew.org; Sat, 01 May 2021 15:08:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuau-0008UV-F6 for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:00 -0400 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]:46654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuab-0000A4-0a for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:00 -0400 Received: by mail-pg1-x52e.google.com with SMTP id q9so822090pgl.13 for ; Sat, 01 May 2021 11:43:40 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4SeN9caAs4ApLwIeYye38SRE5dxFExcRolPRumS0f5k=; b=tWHfO4IL0g6TC581QNhADS4Ht95Re/H9QmAzscUrgphqCUpyl4xB64iDUhwmgGizcq oEoLXZpbglsi2a+KhbEETQ6l30MaKKogwo9F4qRwWKsrDe9ZsreDOoKDYDVjnAck9PSG UjBd5V+KENyh4L574ULhBajUvKQwiWVrONYF5UVXK6xrWh8SQwmA+ITuQejDkMczQPTS 9YbpCNGG5UobFpi1ll+l0QqaJ7t09pLIFPsQyMIzb4MnwDdOcH4peelGcetgERiQuAT7 g0nS9APQltTU3KbKGVK/bk/a3MNRYt1mj6Ccb1xLAnFiR8JE9JvtTo6UESNE/X/rD0bB ePgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4SeN9caAs4ApLwIeYye38SRE5dxFExcRolPRumS0f5k=; b=Xoemgf7s1hipSQ9WV3iOaJ7utHxQSpvtsPDPBTb8HBTnJho9wHtiR8wzqnyEJFdt+3 yDIyDbjbQt+B/ep1k/wbyqE4Y5Qe77lgUlCw9FVY4lQvc33mA8Vr/GS/jhWEw9vCuHBL xNrS2yx0F8KASFceJbN4KqzUhvfUIoaBOhGRNh2M7vLOn47rBFWGsQvUh+TH5jyH/In5 YUQymXdNPoBKIdSAz7aahsJmBNt02Hnc6D6ZzRkVUl0bVsADVu//GR2QiVaSAXXxlUq9 qyW6TCZ04L3JcIPtuETsS5Toh5i7EFY+W6rLW8+atpHdX1riurVeixcWb5ixGuasHTnB TfEQ== X-Gm-Message-State: AOAM530TQ8Nr+CWbfb2UJhownGfTYx/+WFWueyxdDB2K+g9xLtSEc8K3 TB94/k+jrCIRaDU8tJdVxnSSyDb03ST0KA== X-Google-Smtp-Source: ABdhPJyVVzj3I3Im/S8m1zxDXotktIDWmbRRqbPATvnpHg6/80AzKp86IvOE8EpHHffKhG7qe2B8iw== X-Received: by 2002:a05:6a00:1a54:b029:278:e0f7:919d with SMTP id h20-20020a056a001a54b0290278e0f7919dmr11183527pfv.52.1619894619518; Sat, 01 May 2021 11:43:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 22/31] Hexagon (target/hexagon) add F2_sfrecipa instruction Date: Sat, 1 May 2021 11:43:15 -0700 Message-Id: <20210501184324.1338186-23-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::52e; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Rd32,Pe4 =3D sfrecipa(Rs32, Rt32) Recripocal approx Test cases in tests/tcg/hexagon/multi_result.c FP exception tests added to tests/tcg/hexagon/fpstuff.c Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-18-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/arch.h | 2 + target/hexagon/gen_tcg.h | 21 +++++++ target/hexagon/helper.h | 1 + target/hexagon/arch.c | 26 ++++++++- target/hexagon/op_helper.c | 37 ++++++++++++ tests/tcg/hexagon/fpstuff.c | 82 +++++++++++++++++++++++++++ tests/tcg/hexagon/multi_result.c | 68 ++++++++++++++++++++++ target/hexagon/imported/encode_pp.def | 1 + target/hexagon/imported/float.idef | 16 ++++++ tests/tcg/hexagon/Makefile.target | 1 + 10 files changed, 252 insertions(+), 3 deletions(-) create mode 100644 tests/tcg/hexagon/multi_result.c diff --git a/target/hexagon/arch.h b/target/hexagon/arch.h index 6e0b0d9a24..b6634e9615 100644 --- a/target/hexagon/arch.h +++ b/target/hexagon/arch.h @@ -30,4 +30,6 @@ int arch_sf_recip_common(float32 *Rs, float32 *Rt, float3= 2 *Rd, int arch_sf_invsqrt_common(float32 *Rs, float32 *Rd, int *adjust, float_status *fp_status); =20 +extern const uint8_t recip_lookup_table[128]; + #endif diff --git a/target/hexagon/gen_tcg.h b/target/hexagon/gen_tcg.h index a30048ee57..428a670281 100644 --- a/target/hexagon/gen_tcg.h +++ b/target/hexagon/gen_tcg.h @@ -195,6 +195,27 @@ #define fGEN_TCG_S4_stored_locked(SHORTCODE) \ do { SHORTCODE; READ_PREG(PdV, PdN); } while (0) =20 +/* + * Mathematical operations with more than one definition require + * special handling + */ + +/* + * Approximate reciprocal + * r3,p1 =3D sfrecipa(r0, r1) + * + * The helper packs the 2 32-bit results into a 64-bit value, + * so unpack them into the proper results. + */ +#define fGEN_TCG_F2_sfrecipa(SHORTCODE) \ + do { \ + TCGv_i64 tmp =3D tcg_temp_new_i64(); \ + gen_helper_sfrecipa(tmp, cpu_env, RsV, RtV); \ + tcg_gen_extrh_i64_i32(RdV, tmp); \ + tcg_gen_extrl_i64_i32(PeV, tmp); \ + tcg_temp_free_i64(tmp); \ + } while (0) + /* Floating point */ #define fGEN_TCG_F2_conv_sf2df(SHORTCODE) \ gen_helper_conv_sf2df(RddV, cpu_env, RsV) diff --git a/target/hexagon/helper.h b/target/hexagon/helper.h index efe6069118..b377293dd3 100644 --- a/target/hexagon/helper.h +++ b/target/hexagon/helper.h @@ -24,6 +24,7 @@ DEF_HELPER_FLAGS_3(debug_check_store_width, TCG_CALL_NO_W= G, void, env, int, int) DEF_HELPER_FLAGS_3(debug_commit_end, TCG_CALL_NO_WG, void, env, int, int) DEF_HELPER_2(commit_store, void, env, int) DEF_HELPER_FLAGS_4(fcircadd, TCG_CALL_NO_RWG_SE, s32, s32, s32, s32, s32) +DEF_HELPER_3(sfrecipa, i64, env, f32, f32) =20 /* Floating point */ DEF_HELPER_2(conv_sf2df, f64, env, f32) diff --git a/target/hexagon/arch.c b/target/hexagon/arch.c index 40b6e3d0c0..46edf45b13 100644 --- a/target/hexagon/arch.c +++ b/target/hexagon/arch.c @@ -181,12 +181,13 @@ int arch_sf_recip_common(float32 *Rs, float32 *Rt, fl= oat32 *Rd, int *adjust, /* or put Inf in num fixup? */ uint8_t RsV_sign =3D float32_is_neg(RsV); uint8_t RtV_sign =3D float32_is_neg(RtV); + /* Check that RsV is NOT infinite before we overwrite it */ + if (!float32_is_infinity(RsV)) { + float_raise(float_flag_divbyzero, fp_status); + } RsV =3D infinite_float32(RsV_sign ^ RtV_sign); RtV =3D float32_one; RdV =3D float32_one; - if (float32_is_infinity(RsV)) { - float_raise(float_flag_divbyzero, fp_status); - } } else if (float32_is_infinity(RtV)) { RsV =3D make_float32(0x80000000 & (RsV ^ RtV)); RtV =3D float32_one; @@ -279,3 +280,22 @@ int arch_sf_invsqrt_common(float32 *Rs, float32 *Rd, i= nt *adjust, *adjust =3D PeV; return ret; } + +const uint8_t recip_lookup_table[128] =3D { + 0x0fe, 0x0fa, 0x0f6, 0x0f2, 0x0ef, 0x0eb, 0x0e7, 0x0e4, + 0x0e0, 0x0dd, 0x0d9, 0x0d6, 0x0d2, 0x0cf, 0x0cc, 0x0c9, + 0x0c6, 0x0c2, 0x0bf, 0x0bc, 0x0b9, 0x0b6, 0x0b3, 0x0b1, + 0x0ae, 0x0ab, 0x0a8, 0x0a5, 0x0a3, 0x0a0, 0x09d, 0x09b, + 0x098, 0x096, 0x093, 0x091, 0x08e, 0x08c, 0x08a, 0x087, + 0x085, 0x083, 0x080, 0x07e, 0x07c, 0x07a, 0x078, 0x075, + 0x073, 0x071, 0x06f, 0x06d, 0x06b, 0x069, 0x067, 0x065, + 0x063, 0x061, 0x05f, 0x05e, 0x05c, 0x05a, 0x058, 0x056, + 0x054, 0x053, 0x051, 0x04f, 0x04e, 0x04c, 0x04a, 0x049, + 0x047, 0x045, 0x044, 0x042, 0x040, 0x03f, 0x03d, 0x03c, + 0x03a, 0x039, 0x037, 0x036, 0x034, 0x033, 0x032, 0x030, + 0x02f, 0x02d, 0x02c, 0x02b, 0x029, 0x028, 0x027, 0x025, + 0x024, 0x023, 0x021, 0x020, 0x01f, 0x01e, 0x01c, 0x01b, + 0x01a, 0x019, 0x017, 0x016, 0x015, 0x014, 0x013, 0x012, + 0x011, 0x00f, 0x00e, 0x00d, 0x00c, 0x00b, 0x00a, 0x009, + 0x008, 0x007, 0x006, 0x005, 0x004, 0x003, 0x002, 0x000, +}; diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index 33b67138ca..75861e26c4 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -289,6 +289,43 @@ int32_t HELPER(fcircadd)(int32_t RxV, int32_t offset, = int32_t M, int32_t CS) return new_ptr; } =20 +static float32 build_float32(uint8_t sign, uint32_t exp, uint32_t mant) +{ + return make_float32( + ((sign & 1) << 31) | + ((exp & 0xff) << SF_MANTBITS) | + (mant & ((1 << SF_MANTBITS) - 1))); +} + +/* + * sfrecipa, sfinvsqrta have two 32-bit results + * r0,p0=3Dsfrecipa(r1,r2) + * r0,p0=3Dsfinvsqrta(r1) + * + * Since helpers can only return a single value, we pack the two results + * into a 64-bit value. + */ +uint64_t HELPER(sfrecipa)(CPUHexagonState *env, float32 RsV, float32 RtV) +{ + int32_t PeV =3D 0; + float32 RdV; + int idx; + int adjust; + int mant; + int exp; + + arch_fpop_start(env); + if (arch_sf_recip_common(&RsV, &RtV, &RdV, &adjust, &env->fp_status)) { + PeV =3D adjust; + idx =3D (RtV >> 16) & 0x7f; + mant =3D (recip_lookup_table[idx] << 15) | 1; + exp =3D SF_BIAS - (float32_getexp(RtV) - SF_BIAS) - 1; + RdV =3D build_float32(extract32(RtV, 31, 1), exp, mant); + } + arch_fpop_end(env); + return ((uint64_t)RdV << 32) | PeV; +} + /* * mem_noshuf * Section 5.5 of the Hexagon V67 Programmer's Reference Manual diff --git a/tests/tcg/hexagon/fpstuff.c b/tests/tcg/hexagon/fpstuff.c index 6b60f92d18..8e3ba780d2 100644 --- a/tests/tcg/hexagon/fpstuff.c +++ b/tests/tcg/hexagon/fpstuff.c @@ -250,6 +250,87 @@ static void check_dfminmax(void) check_fpstatus(usr, FPINVF); } =20 +static void check_recip_exception(void) +{ + int result; + int usr; + + /* + * Check that sfrecipa doesn't set status bits when + * a NaN with bit 22 non-zero is passed + */ + asm (CLEAR_FPSTATUS + "%0,p0 =3D sfrecipa(%2, %3)\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(result), "=3Dr"(usr) : "r"(SF_NaN), "r"(SF_ANY) + : "r2", "p0", "usr"); + check32(result, SF_HEX_NAN); + check_fpstatus(usr, 0); + + asm (CLEAR_FPSTATUS + "%0,p0 =3D sfrecipa(%2, %3)\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(result), "=3Dr"(usr) : "r"(SF_ANY), "r"(SF_NaN) + : "r2", "p0", "usr"); + check32(result, SF_HEX_NAN); + check_fpstatus(usr, 0); + + asm (CLEAR_FPSTATUS + "%0,p0 =3D sfrecipa(%2, %2)\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(result), "=3Dr"(usr) : "r"(SF_NaN) + : "r2", "p0", "usr"); + check32(result, SF_HEX_NAN); + check_fpstatus(usr, 0); + + /* + * Check that sfrecipa doesn't set status bits when + * a NaN with bit 22 zero is passed + */ + asm (CLEAR_FPSTATUS + "%0,p0 =3D sfrecipa(%2, %3)\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(result), "=3Dr"(usr) : "r"(SF_NaN_special), "r"(SF_ANY) + : "r2", "p0", "usr"); + check32(result, SF_HEX_NAN); + check_fpstatus(usr, FPINVF); + + asm (CLEAR_FPSTATUS + "%0,p0 =3D sfrecipa(%2, %3)\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(result), "=3Dr"(usr) : "r"(SF_ANY), "r"(SF_NaN_special) + : "r2", "p0", "usr"); + check32(result, SF_HEX_NAN); + check_fpstatus(usr, FPINVF); + + asm (CLEAR_FPSTATUS + "%0,p0 =3D sfrecipa(%2, %2)\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(result), "=3Dr"(usr) : "r"(SF_NaN_special) + : "r2", "p0", "usr"); + check32(result, SF_HEX_NAN); + check_fpstatus(usr, FPINVF); + + /* + * Check that sfrecipa properly sets divid-by-zero + */ + asm (CLEAR_FPSTATUS + "%0,p0 =3D sfrecipa(%2, %3)\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(result), "=3Dr"(usr) : "r"(0x885dc960), "r"(0x80000000) + : "r2", "p0", "usr"); + check32(result, 0x3f800000); + check_fpstatus(usr, FPDBZF); + + asm (CLEAR_FPSTATUS + "%0,p0 =3D sfrecipa(%2, %3)\n\t" + "%1 =3D usr\n\t" + : "=3Dr"(result), "=3Dr"(usr) : "r"(0x7f800000), "r"(SF_ZERO) + : "r2", "p0", "usr"); + check32(result, 0x3f800000); + check_fpstatus(usr, 0); +} + static void check_canonical_NaN(void) { int sf_result; @@ -507,6 +588,7 @@ int main() check_compare_exception(); check_sfminmax(); check_dfminmax(); + check_recip_exception(); check_canonical_NaN(); check_float2int_convs(); =20 diff --git a/tests/tcg/hexagon/multi_result.c b/tests/tcg/hexagon/multi_res= ult.c new file mode 100644 index 0000000000..cb7dd313d4 --- /dev/null +++ b/tests/tcg/hexagon/multi_result.c @@ -0,0 +1,68 @@ +/* + * Copyright(c) 2019-2021 Qualcomm Innovation Center, Inc. All Rights Res= erved. + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#include + +static int sfrecipa(int Rs, int Rt, int *pred_result) +{ + int result; + int predval; + + asm volatile("%0,p0 =3D sfrecipa(%2, %3)\n\t" + "%1 =3D p0\n\t" + : "+r"(result), "=3Dr"(predval) + : "r"(Rs), "r"(Rt) + : "p0"); + *pred_result =3D predval; + return result; +} + +int err; + +static void check(int val, int expect) +{ + if (val !=3D expect) { + printf("ERROR: 0x%08x !=3D 0x%08x\n", val, expect); + err++; + } +} + +static void check_p(int val, int expect) +{ + if (val !=3D expect) { + printf("ERROR: 0x%02x !=3D 0x%02x\n", val, expect); + err++; + } +} + +static void test_sfrecipa() +{ + int res; + int pred_result; + + res =3D sfrecipa(0x04030201, 0x05060708, &pred_result); + check(res, 0x59f38001); + check_p(pred_result, 0x00); +} + +int main() +{ + test_sfrecipa(); + + puts(err ? "FAIL" : "PASS"); + return err; +} diff --git a/target/hexagon/imported/encode_pp.def b/target/hexagon/importe= d/encode_pp.def index c21cb730af..b01b4d7aa7 100644 --- a/target/hexagon/imported/encode_pp.def +++ b/target/hexagon/imported/encode_pp.def @@ -1028,6 +1028,7 @@ MPY_ENC(F2_sfmin, "1011","ddddd","0","0","= 0","1","01") MPY_ENC(F2_sfmpy, "1011","ddddd","0","0","1","0","00") MPY_ENC(F2_sffixupn, "1011","ddddd","0","0","1","1","00") MPY_ENC(F2_sffixupd, "1011","ddddd","0","0","1","1","01") +MPY_ENC(F2_sfrecipa, "1011","ddddd","1","1","1","1","ee") =20 DEF_FIELDROW_DESC32(ICLASS_M" 1100 -------- PP------ --------","[#12] Rd= =3D(Rs,Rt)") DEF_FIELD32(ICLASS_M" 1100 -------- PP------ --!-----",Mc_tH,"Rt i= s High") /*Rt high */ diff --git a/target/hexagon/imported/float.idef b/target/hexagon/imported/f= loat.idef index 76cecfebf5..eb5415801a 100644 --- a/target/hexagon/imported/float.idef +++ b/target/hexagon/imported/float.idef @@ -146,6 +146,22 @@ Q6INSN(F2_sfimm_n,"Rd32=3Dsfmake(#u10):neg",ATTRIBS(), }) =20 =20 +Q6INSN(F2_sfrecipa,"Rd32,Pe4=3Dsfrecipa(Rs32,Rt32)",ATTRIBS(), +"Reciprocal Approximation for Division", +{ + fHIDE(int idx;) + fHIDE(int adjust;) + fHIDE(int mant;) + fHIDE(int exp;) + if (fSF_RECIP_COMMON(RsV,RtV,RdV,adjust)) { + PeV =3D adjust; + idx =3D (RtV >> 16) & 0x7f; + mant =3D (fSF_RECIP_LOOKUP(idx) << 15) | 1; + exp =3D fSF_BIAS() - (fSF_GETEXP(RtV) - fSF_BIAS()) - 1; + RdV =3D fMAKESF(fGETBIT(31,RtV),exp,mant); + } +}) + Q6INSN(F2_sffixupn,"Rd32=3Dsffixupn(Rs32,Rt32)",ATTRIBS(), "Fix Up Numerator", { diff --git a/tests/tcg/hexagon/Makefile.target b/tests/tcg/hexagon/Makefile= .target index 616af697fe..18218ad05a 100644 --- a/tests/tcg/hexagon/Makefile.target +++ b/tests/tcg/hexagon/Makefile.target @@ -39,6 +39,7 @@ HEX_TESTS =3D first HEX_TESTS +=3D misc HEX_TESTS +=3D preg_alias HEX_TESTS +=3D dual_stores +HEX_TESTS +=3D multi_result HEX_TESTS +=3D mem_noshuf HEX_TESTS +=3D atomics HEX_TESTS +=3D fpstuff --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619896133; cv=none; d=zohomail.com; s=zohoarc; b=oCSHNm4HGNNWon2/5EhBZ3KENLEmxUESGId3i8Apt2ksEW/Gzcts1BYR4UOb3PGJ8n9xNyQtLUcA4QJHOq0//nrnaumeFTHnrL23DJpatdyK6sSAW+T3Ih8iywJyTxZmrQ1MM93St0VyD34ljxyaJqnESXfaUqIdaq7XlaNQNno= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619896133; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bQmvMol4L6NLI9pwqHq/nK/UsN0vmBrtmnpsOQfPeC0=; b=GuBEz/0X5NNYGw3+HVVoRRHY02TIjwTiSN+9E8nOJjJffxz2mXPkHuxaxSAobN5HiMqTbDiIAS9zn+92D/SunzDiyek8+ft8zOpVgXvyvpFgiool41nyFTeqtT4e6wAT118YHxfrH3daBkXlcj2/S5/vZTdP7V2aTX61qtiWyYo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619896133316961.4507823462146; Sat, 1 May 2021 12:08:53 -0700 (PDT) Received: from localhost ([::1]:56076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcuyy-0006L4-5c for importer@patchew.org; Sat, 01 May 2021 15:08:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuat-0008RT-Ac for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:59 -0400 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]:39734) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuab-0000AA-Ce for qemu-devel@nongnu.org; Sat, 01 May 2021 14:43:59 -0400 Received: by mail-pg1-x52a.google.com with SMTP id s22so839695pgk.6 for ; Sat, 01 May 2021 11:43:40 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bQmvMol4L6NLI9pwqHq/nK/UsN0vmBrtmnpsOQfPeC0=; b=THpyYKfKpsJwQHvlMrOyWpw22bbdoAxthfbj6l0UwWGlqik/V8BZllqxo02FvtBmEZ vXC/zwggW8u0N1N7G1qfitYW90gtOD4+2YHjbL7nGJTo56vfoXI7vhbVPjgClWxn9x4/ 6hHxbYTyJiCSptIe1Jw76RCZh1PJHzI09FzaexgyDbL0iePJaBhB+ifcbaugm3Stow1S /Q+mupQUvVlDRAQPoju0KRngZZzYr7WU6vlkoRA0W8tCeAQ7SnqnTFvm2e24ANx9SVmH CrMwc5QtxK/lOYvrkpBcs97BFykQDoCwcOOQ83KFaGdVXigPN9CKcIjDjfmQjOCO0rJB iy0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bQmvMol4L6NLI9pwqHq/nK/UsN0vmBrtmnpsOQfPeC0=; b=o1U/z7LEXud+JwztF6UdPYtyy04x9lTPzptlItAqECPsoNxRhXHGRqNprilfG1mwz1 1rhT0/PwMaI+yW8vWcoZeSPxEjg1Jz4QrZlB3i5SzHAy9OyIt7IRnF7sNqjfHQIwyj5V RyTrYvQ/EyEbQCGBwDZ8Nkk0JWDBjL4wbKW7b9V28UH+0oLAaCcr3NgZlmdYSXOvZbxC dUHUDmLfAopwOFxszWKf61NE3y3zt5WSVkgrxdEkO+NpCVGj0t7m4EpOVm+LFItB6Qln W4TbMJpFlDGnDXYngRbx8l28DOd9MLlpxWjNJwRMPnhX4u91tMy9OcJS468v1vdqXYYa Gv1A== X-Gm-Message-State: AOAM5320o4mfOqP7Bu4gl+JsGidwvQMLUpIfIMgAESHX7RE3ednm39LB G4pYqTQVNx8om7yj6uHMS3lBdfN8UKjFYQ== X-Google-Smtp-Source: ABdhPJwceiV2Fv2wM9SGwLUT5czOOVgwUp+AQLAB9AEgL0f0RWUdkJboKw5M7IgJIcJolQy3TucisQ== X-Received: by 2002:a63:e552:: with SMTP id z18mr10395835pgj.100.1619894620075; Sat, 01 May 2021 11:43:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 23/31] Hexagon (target/hexagon) add F2_sfinvsqrta Date: Sat, 1 May 2021 11:43:16 -0700 Message-Id: <20210501184324.1338186-24-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::52a; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Rd32,Pe4 =3D sfinvsqrta(Rs32) Square root approx The helper packs the 2 32-bit results into a 64-bit value, and the fGEN_TCG override unpacks them into the proper results. Test cases in tests/tcg/hexagon/multi_result.c FP exception tests added to tests/tcg/hexagon/fpstuff.c Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-19-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/arch.h | 2 ++ target/hexagon/gen_tcg.h | 16 +++++++++++++++ target/hexagon/helper.h | 1 + target/hexagon/arch.c | 21 ++++++++++++++++++- target/hexagon/op_helper.c | 21 +++++++++++++++++++ tests/tcg/hexagon/fpstuff.c | 15 ++++++++++++++ tests/tcg/hexagon/multi_result.c | 29 +++++++++++++++++++++++++++ target/hexagon/imported/encode_pp.def | 1 + target/hexagon/imported/float.idef | 16 +++++++++++++++ 9 files changed, 121 insertions(+), 1 deletion(-) diff --git a/target/hexagon/arch.h b/target/hexagon/arch.h index b6634e9615..3e0c334209 100644 --- a/target/hexagon/arch.h +++ b/target/hexagon/arch.h @@ -32,4 +32,6 @@ int arch_sf_invsqrt_common(float32 *Rs, float32 *Rd, int = *adjust, =20 extern const uint8_t recip_lookup_table[128]; =20 +extern const uint8_t invsqrt_lookup_table[128]; + #endif diff --git a/target/hexagon/gen_tcg.h b/target/hexagon/gen_tcg.h index 428a670281..d78e7b8e5c 100644 --- a/target/hexagon/gen_tcg.h +++ b/target/hexagon/gen_tcg.h @@ -216,6 +216,22 @@ tcg_temp_free_i64(tmp); \ } while (0) =20 +/* + * Approximation of the reciprocal square root + * r1,p0 =3D sfinvsqrta(r0) + * + * The helper packs the 2 32-bit results into a 64-bit value, + * so unpack them into the proper results. + */ +#define fGEN_TCG_F2_sfinvsqrta(SHORTCODE) \ + do { \ + TCGv_i64 tmp =3D tcg_temp_new_i64(); \ + gen_helper_sfinvsqrta(tmp, cpu_env, RsV); \ + tcg_gen_extrh_i64_i32(RdV, tmp); \ + tcg_gen_extrl_i64_i32(PeV, tmp); \ + tcg_temp_free_i64(tmp); \ + } while (0) + /* Floating point */ #define fGEN_TCG_F2_conv_sf2df(SHORTCODE) \ gen_helper_conv_sf2df(RddV, cpu_env, RsV) diff --git a/target/hexagon/helper.h b/target/hexagon/helper.h index b377293dd3..cb7508f746 100644 --- a/target/hexagon/helper.h +++ b/target/hexagon/helper.h @@ -25,6 +25,7 @@ DEF_HELPER_FLAGS_3(debug_commit_end, TCG_CALL_NO_WG, void= , env, int, int) DEF_HELPER_2(commit_store, void, env, int) DEF_HELPER_FLAGS_4(fcircadd, TCG_CALL_NO_RWG_SE, s32, s32, s32, s32, s32) DEF_HELPER_3(sfrecipa, i64, env, f32, f32) +DEF_HELPER_2(sfinvsqrta, i64, env, f32) =20 /* Floating point */ DEF_HELPER_2(conv_sf2df, f64, env, f32) diff --git a/target/hexagon/arch.c b/target/hexagon/arch.c index 46edf45b13..dee852e106 100644 --- a/target/hexagon/arch.c +++ b/target/hexagon/arch.c @@ -247,7 +247,7 @@ int arch_sf_invsqrt_common(float32 *Rs, float32 *Rd, in= t *adjust, int r_exp; int ret =3D 0; RsV =3D *Rs; - if (float32_is_infinity(RsV)) { + if (float32_is_any_nan(RsV)) { if (extract32(RsV, 22, 1) =3D=3D 0) { float_raise(float_flag_invalid, fp_status); } @@ -299,3 +299,22 @@ const uint8_t recip_lookup_table[128] =3D { 0x011, 0x00f, 0x00e, 0x00d, 0x00c, 0x00b, 0x00a, 0x009, 0x008, 0x007, 0x006, 0x005, 0x004, 0x003, 0x002, 0x000, }; + +const uint8_t invsqrt_lookup_table[128] =3D { + 0x069, 0x066, 0x063, 0x061, 0x05e, 0x05b, 0x059, 0x057, + 0x054, 0x052, 0x050, 0x04d, 0x04b, 0x049, 0x047, 0x045, + 0x043, 0x041, 0x03f, 0x03d, 0x03b, 0x039, 0x037, 0x036, + 0x034, 0x032, 0x030, 0x02f, 0x02d, 0x02c, 0x02a, 0x028, + 0x027, 0x025, 0x024, 0x022, 0x021, 0x01f, 0x01e, 0x01d, + 0x01b, 0x01a, 0x019, 0x017, 0x016, 0x015, 0x014, 0x012, + 0x011, 0x010, 0x00f, 0x00d, 0x00c, 0x00b, 0x00a, 0x009, + 0x008, 0x007, 0x006, 0x005, 0x004, 0x003, 0x002, 0x001, + 0x0fe, 0x0fa, 0x0f6, 0x0f3, 0x0ef, 0x0eb, 0x0e8, 0x0e4, + 0x0e1, 0x0de, 0x0db, 0x0d7, 0x0d4, 0x0d1, 0x0ce, 0x0cb, + 0x0c9, 0x0c6, 0x0c3, 0x0c0, 0x0be, 0x0bb, 0x0b8, 0x0b6, + 0x0b3, 0x0b1, 0x0af, 0x0ac, 0x0aa, 0x0a8, 0x0a5, 0x0a3, + 0x0a1, 0x09f, 0x09d, 0x09b, 0x099, 0x097, 0x095, 0x093, + 0x091, 0x08f, 0x08d, 0x08b, 0x089, 0x087, 0x086, 0x084, + 0x082, 0x080, 0x07f, 0x07d, 0x07b, 0x07a, 0x078, 0x077, + 0x075, 0x074, 0x072, 0x071, 0x06f, 0x06e, 0x06c, 0x06b, +}; diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index 75861e26c4..a25fb98f24 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -326,6 +326,27 @@ uint64_t HELPER(sfrecipa)(CPUHexagonState *env, float3= 2 RsV, float32 RtV) return ((uint64_t)RdV << 32) | PeV; } =20 +uint64_t HELPER(sfinvsqrta)(CPUHexagonState *env, float32 RsV) +{ + int PeV =3D 0; + float32 RdV; + int idx; + int adjust; + int mant; + int exp; + + arch_fpop_start(env); + if (arch_sf_invsqrt_common(&RsV, &RdV, &adjust, &env->fp_status)) { + PeV =3D adjust; + idx =3D (RsV >> 17) & 0x7f; + mant =3D (invsqrt_lookup_table[idx] << 15); + exp =3D SF_BIAS - ((float32_getexp(RsV) - SF_BIAS) >> 1) - 1; + RdV =3D build_float32(extract32(RsV, 31, 1), exp, mant); + } + arch_fpop_end(env); + return ((uint64_t)RdV << 32) | PeV; +} + /* * mem_noshuf * Section 5.5 of the Hexagon V67 Programmer's Reference Manual diff --git a/tests/tcg/hexagon/fpstuff.c b/tests/tcg/hexagon/fpstuff.c index 8e3ba780d2..0dff429f4c 100644 --- a/tests/tcg/hexagon/fpstuff.c +++ b/tests/tcg/hexagon/fpstuff.c @@ -441,6 +441,20 @@ static void check_canonical_NaN(void) check_fpstatus(usr, 0); } =20 +static void check_invsqrta(void) +{ + int result; + int predval; + + asm volatile("%0,p0 =3D sfinvsqrta(%2)\n\t" + "%1 =3D p0\n\t" + : "+r"(result), "=3Dr"(predval) + : "r"(0x7f800000) + : "p0"); + check32(result, 0xff800000); + check32(predval, 0x0); +} + static void check_float2int_convs() { int res32; @@ -590,6 +604,7 @@ int main() check_dfminmax(); check_recip_exception(); check_canonical_NaN(); + check_invsqrta(); check_float2int_convs(); =20 puts(err ? "FAIL" : "PASS"); diff --git a/tests/tcg/hexagon/multi_result.c b/tests/tcg/hexagon/multi_res= ult.c index cb7dd313d4..67aa46249b 100644 --- a/tests/tcg/hexagon/multi_result.c +++ b/tests/tcg/hexagon/multi_result.c @@ -31,6 +31,20 @@ static int sfrecipa(int Rs, int Rt, int *pred_result) return result; } =20 +static int sfinvsqrta(int Rs, int *pred_result) +{ + int result; + int predval; + + asm volatile("%0,p0 =3D sfinvsqrta(%2)\n\t" + "%1 =3D p0\n\t" + : "+r"(result), "=3Dr"(predval) + : "r"(Rs) + : "p0"); + *pred_result =3D predval; + return result; +} + int err; =20 static void check(int val, int expect) @@ -59,9 +73,24 @@ static void test_sfrecipa() check_p(pred_result, 0x00); } =20 +static void test_sfinvsqrta() +{ + int res; + int pred_result; + + res =3D sfinvsqrta(0x04030201, &pred_result); + check(res, 0x4d330000); + check_p(pred_result, 0xe0); + + res =3D sfinvsqrta(0x0, &pred_result); + check(res, 0x3f800000); + check_p(pred_result, 0x0); +} + int main() { test_sfrecipa(); + test_sfinvsqrta(); =20 puts(err ? "FAIL" : "PASS"); return err; diff --git a/target/hexagon/imported/encode_pp.def b/target/hexagon/importe= d/encode_pp.def index b01b4d7aa7..18fe45d696 100644 --- a/target/hexagon/imported/encode_pp.def +++ b/target/hexagon/imported/encode_pp.def @@ -1642,6 +1642,7 @@ SH2_RR_ENC(F2_conv_sf2w, "1011","100","-","0= 00","ddddd") SH2_RR_ENC(F2_conv_sf2uw_chop, "1011","011","-","001","ddddd") SH2_RR_ENC(F2_conv_sf2w_chop, "1011","100","-","001","ddddd") SH2_RR_ENC(F2_sffixupr, "1011","101","-","000","ddddd") +SH2_RR_ENC(F2_sfinvsqrta, "1011","111","-","0ee","ddddd") =20 =20 DEF_FIELDROW_DESC32(ICLASS_S2op" 1100 -------- PP------ --------","[#= 12] Rd=3D(Rs,#u6)") diff --git a/target/hexagon/imported/float.idef b/target/hexagon/imported/f= loat.idef index eb5415801a..3e75bc4604 100644 --- a/target/hexagon/imported/float.idef +++ b/target/hexagon/imported/float.idef @@ -178,6 +178,22 @@ Q6INSN(F2_sffixupd,"Rd32=3Dsffixupd(Rs32,Rt32)",ATTRIB= S(), RdV =3D RtV; }) =20 +Q6INSN(F2_sfinvsqrta,"Rd32,Pe4=3Dsfinvsqrta(Rs32)",ATTRIBS(), +"Reciprocal Square Root Approximation", +{ + fHIDE(int idx;) + fHIDE(int adjust;) + fHIDE(int mant;) + fHIDE(int exp;) + if (fSF_INVSQRT_COMMON(RsV,RdV,adjust)) { + PeV =3D adjust; + idx =3D (RsV >> 17) & 0x7f; + mant =3D (fSF_INVSQRT_LOOKUP(idx) << 15); + exp =3D fSF_BIAS() - ((fSF_GETEXP(RsV) - fSF_BIAS()) >> 1) - 1; + RdV =3D fMAKESF(fGETBIT(31,RsV),exp,mant); + } +}) + Q6INSN(F2_sffixupr,"Rd32=3Dsffixupr(Rs32)",ATTRIBS(), "Fix Up Radicand", { --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619896316; cv=none; d=zohomail.com; s=zohoarc; b=PJ+rQuW20Bvb56vdQzK2r2PSuiDAzz/yOUaa7Gnp2zYXgNB/qMM+0FP8b4m9BEZBiq6u9R97ULlQtQp3pg11wiNMwPmvy2Eu22pWf4HVNGlMnBOkxwGVPsx7wmN0j0VuL0RBzbFFwT2SL609ahWDz69oQAT8K+npG0KiNxNF6uY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619896316; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZQszf2n9Vu77nBFizeiELUUngyh4LSUTsvPP7YhmnWw=; b=AU67RdsQkbPPHiReee9X0zTMCLXcctfE9tRslAeOD0ktvb1TYA63No/ZIHaw5j9yzEokLGd3LuZH2NfzQfPxWCnQgtwXj9ThaRtbDeWIgKtH7T/7ll3A/y9RQRHagjoikPRdiunyY2frIx50wYgBSutNDqYO13q/8WkW29j7Qus= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619896316539644.7690331854087; Sat, 1 May 2021 12:11:56 -0700 (PDT) Received: from localhost ([::1]:34318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcv1v-0000bo-7k for importer@patchew.org; Sat, 01 May 2021 15:11:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuav-0008WL-Ba for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:01 -0400 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]:39714) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuag-0000Ar-3p for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:01 -0400 Received: by mail-pj1-x1030.google.com with SMTP id z6-20020a17090a1706b0290155e8a752d8so3447482pjd.4 for ; Sat, 01 May 2021 11:43:41 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZQszf2n9Vu77nBFizeiELUUngyh4LSUTsvPP7YhmnWw=; b=MThKinSCOgvwH4p43GvFpVPpEzWY0okt6DwkUI+I8zzcP6rqYg/BH4Oajew+KlgF/P upJcxkP5GScJAAbS9odh2rOi0kGfS+wazcMCyTIUR28rphShPuKBctVuERoNs6LehK4W eud1w9S4H82U24e8ghIFgE66E5N0iSpz46m0rPIOHtEwWw2cs85QoUorJq5N2zFCjOxI m+vAJtY9jXT08/YB5ts2uWMjjc/aXK9a9PjF2VcUuf1OwNzVfyj/LtoglnPDKK6ZNrJM h7t7uD++VMt0pYKHaJ11L12oaJQH5U93mmlTbDYfUpthQUYzZLM7pLwR60uXQucp+8hb /GEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZQszf2n9Vu77nBFizeiELUUngyh4LSUTsvPP7YhmnWw=; b=EiTbA1+4KsLkEX9eVTTMtv62sEkIeEQ09xL9vRL4d2EB15drvzSKJ4a2QndCJQAaZa FtweYYg53FiK00dhFSLdqZwd7X1lmRK0PFtfm9i+S1QcGu4clvxITDlBkwNuZmHlQ6aT KrG14DqnOV/IRObC1WcVTjQv2lR2gDDpKGCyV00Z9YQjDOZ5JJa5Dc6S67EXgdqq0sAM f0MdEMF5yzTjDZvPME3ytZhYoq0nbd0L76YVlL162Y6hRLRkMFis81S88a9SKw/BWp0I lLb65a/POns0wNpPbVrL4fEVoEjLJF06zgQTk2jvWwvBgYMkDYvErdxwiG7/kVvzfsv5 H4zA== X-Gm-Message-State: AOAM531X/szeC8mWtV3plh31zO3cdza8+LfLyACfQqOl+Nwim9zNOxM0 jSL3OEs/PvssNEnN8xychP0EhaCrKy2v9Q== X-Google-Smtp-Source: ABdhPJzVUTioh3jeDjyucqntLyeHkO55pJcm630BIC/0H7FLdU+wsAO+T1QG7SLNHyNmy4kYfUjskg== X-Received: by 2002:a17:90b:1a8b:: with SMTP id ng11mr18361727pjb.93.1619894620626; Sat, 01 May 2021 11:43:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 24/31] Hexagon (target/hexagon) add A5_ACS (vacsh) Date: Sat, 1 May 2021 11:43:17 -0700 Message-Id: <20210501184324.1338186-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1030.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Rxx32,Pe4 =3D vacsh(Rss32, Rtt32) Add compare and select elements of two vectors Test cases in tests/tcg/hexagon/multi_result.c Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-20-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/gen_tcg.h | 5 ++ target/hexagon/helper.h | 2 + target/hexagon/op_helper.c | 33 +++++++++++++ tests/tcg/hexagon/multi_result.c | 69 +++++++++++++++++++++++++++ target/hexagon/imported/alu.idef | 19 ++++++++ target/hexagon/imported/encode_pp.def | 1 + 6 files changed, 129 insertions(+) diff --git a/target/hexagon/gen_tcg.h b/target/hexagon/gen_tcg.h index d78e7b8e5c..93310c5edc 100644 --- a/target/hexagon/gen_tcg.h +++ b/target/hexagon/gen_tcg.h @@ -199,6 +199,11 @@ * Mathematical operations with more than one definition require * special handling */ +#define fGEN_TCG_A5_ACS(SHORTCODE) \ + do { \ + gen_helper_vacsh_pred(PeV, cpu_env, RxxV, RssV, RttV); \ + gen_helper_vacsh_val(RxxV, cpu_env, RxxV, RssV, RttV); \ + } while (0) =20 /* * Approximate reciprocal diff --git a/target/hexagon/helper.h b/target/hexagon/helper.h index cb7508f746..3824ae01ea 100644 --- a/target/hexagon/helper.h +++ b/target/hexagon/helper.h @@ -26,6 +26,8 @@ DEF_HELPER_2(commit_store, void, env, int) DEF_HELPER_FLAGS_4(fcircadd, TCG_CALL_NO_RWG_SE, s32, s32, s32, s32, s32) DEF_HELPER_3(sfrecipa, i64, env, f32, f32) DEF_HELPER_2(sfinvsqrta, i64, env, f32) +DEF_HELPER_4(vacsh_val, s64, env, s64, s64, s64) +DEF_HELPER_FLAGS_4(vacsh_pred, TCG_CALL_NO_RWG_SE, s32, env, s64, s64, s64) =20 /* Floating point */ DEF_HELPER_2(conv_sf2df, f64, env, f32) diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index a25fb98f24..f9fb65555b 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -347,6 +347,39 @@ uint64_t HELPER(sfinvsqrta)(CPUHexagonState *env, floa= t32 RsV) return ((uint64_t)RdV << 32) | PeV; } =20 +int64_t HELPER(vacsh_val)(CPUHexagonState *env, + int64_t RxxV, int64_t RssV, int64_t RttV) +{ + for (int i =3D 0; i < 4; i++) { + int xv =3D sextract64(RxxV, i * 16, 16); + int sv =3D sextract64(RssV, i * 16, 16); + int tv =3D sextract64(RttV, i * 16, 16); + int max; + xv =3D xv + tv; + sv =3D sv - tv; + max =3D xv > sv ? xv : sv; + /* Note that fSATH can set the OVF bit in usr */ + RxxV =3D deposit64(RxxV, i * 16, 16, fSATH(max)); + } + return RxxV; +} + +int32_t HELPER(vacsh_pred)(CPUHexagonState *env, + int64_t RxxV, int64_t RssV, int64_t RttV) +{ + int32_t PeV =3D 0; + for (int i =3D 0; i < 4; i++) { + int xv =3D sextract64(RxxV, i * 16, 16); + int sv =3D sextract64(RssV, i * 16, 16); + int tv =3D sextract64(RttV, i * 16, 16); + xv =3D xv + tv; + sv =3D sv - tv; + PeV =3D deposit32(PeV, i * 2, 1, (xv > sv)); + PeV =3D deposit32(PeV, i * 2 + 1, 1, (xv > sv)); + } + return PeV; +} + /* * mem_noshuf * Section 5.5 of the Hexagon V67 Programmer's Reference Manual diff --git a/tests/tcg/hexagon/multi_result.c b/tests/tcg/hexagon/multi_res= ult.c index 67aa46249b..c21148fc20 100644 --- a/tests/tcg/hexagon/multi_result.c +++ b/tests/tcg/hexagon/multi_result.c @@ -45,8 +45,41 @@ static int sfinvsqrta(int Rs, int *pred_result) return result; } =20 +static long long vacsh(long long Rxx, long long Rss, long long Rtt, + int *pred_result, int *ovf_result) +{ + long long result =3D Rxx; + int predval; + int usr; + + /* + * This instruction can set bit 0 (OVF/overflow) in usr + * Clear the bit first, then return that bit to the caller + */ + asm volatile("r2 =3D usr\n\t" + "r2 =3D clrbit(r2, #0)\n\t" /* clear overflow bit */ + "usr =3D r2\n\t" + "%0,p0 =3D vacsh(%3, %4)\n\t" + "%1 =3D p0\n\t" + "%2 =3D usr\n\t" + : "+r"(result), "=3Dr"(predval), "=3Dr"(usr) + : "r"(Rss), "r"(Rtt) + : "r2", "p0", "usr"); + *pred_result =3D predval; + *ovf_result =3D (usr & 1); + return result; +} + int err; =20 +static void check_ll(long long val, long long expect) +{ + if (val !=3D expect) { + printf("ERROR: 0x%016llx !=3D 0x%016llx\n", val, expect); + err++; + } +} + static void check(int val, int expect) { if (val !=3D expect) { @@ -87,10 +120,46 @@ static void test_sfinvsqrta() check_p(pred_result, 0x0); } =20 +static void test_vacsh() +{ + long long res64; + int pred_result; + int ovf_result; + + res64 =3D vacsh(0x0004000300020001LL, + 0x0001000200030004LL, + 0x0000000000000000LL, &pred_result, &ovf_result); + check_ll(res64, 0x0004000300030004LL); + check_p(pred_result, 0xf0); + check(ovf_result, 0); + + res64 =3D vacsh(0x0004000300020001LL, + 0x0001000200030004LL, + 0x000affff000d0000LL, &pred_result, &ovf_result); + check_ll(res64, 0x000e0003000f0004LL); + check_p(pred_result, 0xcc); + check(ovf_result, 0); + + res64 =3D vacsh(0x00047fff00020001LL, + 0x00017fff00030004LL, + 0x000a0fff000d0000LL, &pred_result, &ovf_result); + check_ll(res64, 0x000e7fff000f0004LL); + check_p(pred_result, 0xfc); + check(ovf_result, 1); + + res64 =3D vacsh(0x0004000300020001LL, + 0x0001000200030009LL, + 0x000affff000d0001LL, &pred_result, &ovf_result); + check_ll(res64, 0x000e0003000f0008LL); + check_p(pred_result, 0xcc); + check(ovf_result, 0); +} + int main() { test_sfrecipa(); test_sfinvsqrta(); + test_vacsh(); =20 puts(err ? "FAIL" : "PASS"); return err; diff --git a/target/hexagon/imported/alu.idef b/target/hexagon/imported/alu= .idef index 45cc529fbc..e8cc52c290 100644 --- a/target/hexagon/imported/alu.idef +++ b/target/hexagon/imported/alu.idef @@ -1240,6 +1240,25 @@ MINMAX(uw,WORD,UWORD,2) #undef VMINORMAX3 =20 =20 +Q6INSN(A5_ACS,"Rxx32,Pe4=3Dvacsh(Rss32,Rtt32)",ATTRIBS(), +"Add Compare and Select elements of two vectors, record the maximums and t= he decisions ", +{ + fHIDE(int i;) + fHIDE(int xv;) + fHIDE(int sv;) + fHIDE(int tv;) + for (i =3D 0; i < 4; i++) { + xv =3D (int) fGETHALF(i,RxxV); + sv =3D (int) fGETHALF(i,RssV); + tv =3D (int) fGETHALF(i,RttV); + xv =3D xv + tv; //assumes 17bit datapath + sv =3D sv - tv; //assumes 17bit datapath + fSETBIT(i*2, PeV, (xv > sv)); + fSETBIT(i*2+1,PeV, (xv > sv)); + fSETHALF(i, RxxV, fSATH(fMAX(xv,sv))); + } +}) + /**********************************************/ /* Vector Min/Max */ /**********************************************/ diff --git a/target/hexagon/imported/encode_pp.def b/target/hexagon/importe= d/encode_pp.def index 18fe45d696..87e0426c05 100644 --- a/target/hexagon/imported/encode_pp.def +++ b/target/hexagon/imported/encode_pp.def @@ -1017,6 +1017,7 @@ MPY_ENC(M7_dcmpyiwc_acc, "1010","xxxxx","1","0","= 1","0","10") =20 =20 =20 +MPY_ENC(A5_ACS, "1010","xxxxx","0","1","0","1","ee") /* */ =20 --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619896318; cv=none; d=zohomail.com; s=zohoarc; b=OTJJatE0sH++Tc3jeZhykj4gXHSG3JhvD1zkFYK0xCafpxSCD74TwO7RKsqoDgrwcJnUH0qnOSYcLysRMRRFCP5EJGC7B6O38dGWJ69GZ90hd/blKaGrV69XjLqeRMS3/dQpwhVg8AJnhXwpVrEyVgo12IXniT1GxKuBTqmob8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619896318; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dT+w9JygmnLwtPadRmzu3U6SgMiBL3bicGhZHH25Tfk=; b=oLDpON97ZahNKERGK/9kZnQ5beKckd9D69qaJWibg/IpqfYKJa685yBhsdhMb2rmk5fmIyJEsjqgqBaTOOwSTWpX8TTebEk8OgetKCYParibEL25DrQBmIEsp2X+M/7i1/V4U9IFonJrbi9MKJvAIXTX8RBpb4Ru+naDBer6bB4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619896318488530.081277291866; Sat, 1 May 2021 12:11:58 -0700 (PDT) Received: from localhost ([::1]:34516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcv1x-0000gQ-Eo for importer@patchew.org; Sat, 01 May 2021 15:11:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcub8-0000Ic-2T for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:14 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]:44849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuah-0000B4-Tw for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:13 -0400 Received: by mail-pg1-x52b.google.com with SMTP id y32so828698pga.11 for ; Sat, 01 May 2021 11:43:41 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dT+w9JygmnLwtPadRmzu3U6SgMiBL3bicGhZHH25Tfk=; b=J+da+PKkatBvZJxLww4c0Yu0/cKXkLwkOJlXhb+dntsbrmH3oCmdfJsoA+RQb9Ocvi d3MzjKwUMXd+aESjfuX+vdJ+2Evjb7QLDA5sBdzNtriOqvOda1qkNMhfclkSfDwA98Y2 7uY/G5WqktL1zl49B9FHmpeFdYJhjG8S3hlIaGnkmoueUn/nKBGC8gMFow9jHymA/s2Q PIi8fH0MYrZzroWhIjqB+tGHelA5KpjuAik+g8XiGNtQ5/DlVeaIMhhbXjVAD+sbT/zy 1sWypFsiS3VI4o+NXGgOjhdSY+nR8/XsGNQcfkjwLV6xqJTx/3a2tz4CI2M9v0jZ0bNe edkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dT+w9JygmnLwtPadRmzu3U6SgMiBL3bicGhZHH25Tfk=; b=X1Z6p2dZnq9AaVhLldJsEjaKa9qKh9djEKLwHdWbaUxtduID6nnqFOIjebmommx7Qn kGCB5OekfEF2w6eStgf4gEJhwhOb9cIi3Dfd0eWdxz1Rp5eQEbhmB5XpEncXKhcgMTue 9H/XtUnUigv2Mz86JrEKwxPB5G8ldq5e/NKg2K/NP9e+pJUKg010ICfowIQNsq3eYg1/ 62blgRid3ecVFndGY6Bz/01Zh0VD5x9Afy3VnsSFZKbxdj2yXwp4QPVhS/DyJ3It8KnV fStbgfyU7T7Eatw7FFTjsWkpZD4mT+HiguYP8IEIm22RiN1hA8KJ6SobUVGJTXo9HKpK Bubg== X-Gm-Message-State: AOAM532gyly4B7U2VyQohzrcc2IhqunwtLBWS5hhvGE3YOVxHEooO/ii 5OaovHldAGWcqOZvvSZNC2UGuh7jtxW76A== X-Google-Smtp-Source: ABdhPJyzz8rsMYSW3V7avEX0uNclwonaObKHvDRwGPAyTwkn50nDdv74AGjtVJoHbFT4REoooQkjPQ== X-Received: by 2002:a62:fb14:0:b029:22e:e189:c6b1 with SMTP id x20-20020a62fb140000b029022ee189c6b1mr10885315pfm.31.1619894621149; Sat, 01 May 2021 11:43:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 25/31] Hexagon (target/hexagon) add A6_vminub_RdP Date: Sat, 1 May 2021 11:43:18 -0700 Message-Id: <20210501184324.1338186-26-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::52b; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Rdd32,Pe4 =3D vminub(Rtt32, Rss32) Vector min of bytes Test cases in tests/tcg/hexagon/multi_result.c Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-21-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/gen_tcg.h | 27 +++++++++++++++++++++ target/hexagon/genptr.c | 22 +++++++++++++++++ tests/tcg/hexagon/multi_result.c | 34 +++++++++++++++++++++++++++ target/hexagon/imported/alu.idef | 10 ++++++++ target/hexagon/imported/encode_pp.def | 1 + 5 files changed, 94 insertions(+) diff --git a/target/hexagon/gen_tcg.h b/target/hexagon/gen_tcg.h index 93310c5edc..aea0c55564 100644 --- a/target/hexagon/gen_tcg.h +++ b/target/hexagon/gen_tcg.h @@ -237,6 +237,33 @@ tcg_temp_free_i64(tmp); \ } while (0) =20 +/* + * Compare each of the 8 unsigned bytes + * The minimum is placed in each byte of the destination. + * Each bit of the predicate is set true if the bit from the first operand + * is greater than the bit from the second operand. + * r5:4,p1 =3D vminub(r1:0, r3:2) + */ +#define fGEN_TCG_A6_vminub_RdP(SHORTCODE) \ + do { \ + TCGv left =3D tcg_temp_new(); \ + TCGv right =3D tcg_temp_new(); \ + TCGv tmp =3D tcg_temp_new(); \ + tcg_gen_movi_tl(PeV, 0); \ + tcg_gen_movi_i64(RddV, 0); \ + for (int i =3D 0; i < 8; i++) { \ + gen_get_byte_i64(left, i, RttV, false); \ + gen_get_byte_i64(right, i, RssV, false); \ + tcg_gen_setcond_tl(TCG_COND_GT, tmp, left, right); \ + tcg_gen_deposit_tl(PeV, PeV, tmp, i, 1); \ + tcg_gen_umin_tl(tmp, left, right); \ + gen_set_byte_i64(i, RddV, tmp); \ + } \ + tcg_temp_free(left); \ + tcg_temp_free(right); \ + tcg_temp_free(tmp); \ + } while (0) + /* 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 24d575853c..9dbebc64b5 100644 --- a/target/hexagon/genptr.c +++ b/target/hexagon/genptr.c @@ -266,6 +266,28 @@ static inline void gen_write_ctrl_reg_pair(DisasContex= t *ctx, int reg_num, } } =20 +static TCGv gen_get_byte_i64(TCGv result, int N, TCGv_i64 src, bool sign) +{ + TCGv_i64 res64 =3D tcg_temp_new_i64(); + if (sign) { + tcg_gen_sextract_i64(res64, src, N * 8, 8); + } else { + tcg_gen_extract_i64(res64, src, N * 8, 8); + } + tcg_gen_extrl_i64_i32(result, res64); + tcg_temp_free_i64(res64); + + return result; +} + +static void gen_set_byte_i64(int N, TCGv_i64 result, TCGv src) +{ + TCGv_i64 src64 =3D tcg_temp_new_i64(); + tcg_gen_extu_i32_i64(src64, src); + tcg_gen_deposit_i64(result, result, src64, N * 8, 8); + tcg_temp_free_i64(src64); +} + static inline void gen_load_locked4u(TCGv dest, TCGv vaddr, int mem_index) { tcg_gen_qemu_ld32u(dest, vaddr, mem_index); diff --git a/tests/tcg/hexagon/multi_result.c b/tests/tcg/hexagon/multi_res= ult.c index c21148fc20..95d99a0c90 100644 --- a/tests/tcg/hexagon/multi_result.c +++ b/tests/tcg/hexagon/multi_result.c @@ -70,6 +70,21 @@ static long long vacsh(long long Rxx, long long Rss, lon= g long Rtt, return result; } =20 +static long long vminub(long long Rtt, long long Rss, + int *pred_result) +{ + long long result; + int predval; + + asm volatile("%0,p0 =3D vminub(%2, %3)\n\t" + "%1 =3D p0\n\t" + : "=3Dr"(result), "=3Dr"(predval) + : "r"(Rtt), "r"(Rss) + : "p0"); + *pred_result =3D predval; + return result; +} + int err; =20 static void check_ll(long long val, long long expect) @@ -155,11 +170,30 @@ static void test_vacsh() check(ovf_result, 0); } =20 +static void test_vminub() +{ + long long res64; + int pred_result; + + res64 =3D vminub(0x0807060504030201LL, + 0x0102030405060708LL, + &pred_result); + check_ll(res64, 0x0102030404030201LL); + check_p(pred_result, 0xf0); + + res64 =3D vminub(0x0802060405030701LL, + 0x0107030504060208LL, + &pred_result); + check_ll(res64, 0x0102030404030201LL); + check_p(pred_result, 0xaa); +} + int main() { test_sfrecipa(); test_sfinvsqrta(); test_vacsh(); + test_vminub(); =20 puts(err ? "FAIL" : "PASS"); return err; diff --git a/target/hexagon/imported/alu.idef b/target/hexagon/imported/alu= .idef index e8cc52c290..f0c9bb47ec 100644 --- a/target/hexagon/imported/alu.idef +++ b/target/hexagon/imported/alu.idef @@ -1259,6 +1259,16 @@ Q6INSN(A5_ACS,"Rxx32,Pe4=3Dvacsh(Rss32,Rtt32)",ATTRI= BS(), } }) =20 +Q6INSN(A6_vminub_RdP,"Rdd32,Pe4=3Dvminub(Rtt32,Rss32)",ATTRIBS(), +"Vector minimum of bytes, records minimum and decision vector", +{ + fHIDE(int i;) + for (i =3D 0; i < 8; i++) { + fSETBIT(i, PeV, (fGETUBYTE(i,RttV) > fGETUBYTE(i,RssV))); + fSETBYTE(i,RddV,fMIN(fGETUBYTE(i,RttV),fGETUBYTE(i,RssV))); + } +}) + /**********************************************/ /* Vector Min/Max */ /**********************************************/ diff --git a/target/hexagon/imported/encode_pp.def b/target/hexagon/importe= d/encode_pp.def index 87e0426c05..46193984c5 100644 --- a/target/hexagon/imported/encode_pp.def +++ b/target/hexagon/imported/encode_pp.def @@ -1018,6 +1018,7 @@ MPY_ENC(M7_dcmpyiwc_acc, "1010","xxxxx","1","0","= 1","0","10") =20 =20 MPY_ENC(A5_ACS, "1010","xxxxx","0","1","0","1","ee") +MPY_ENC(A6_vminub_RdP, "1010","ddddd","0","1","1","1","ee") /* */ =20 --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619896435; cv=none; d=zohomail.com; s=zohoarc; b=Ml91D3/tjdFxcIYswuI2UGylxRqFdgYbIu4Jfez8fegm7kRKqIi4FzYEmRIOAtOJ/G0DdrTKYZCPPu9roZCQjMQzrELm8Ahwwv6BKDsgixnS1mwoG3hQ1pT0bdS3QBRvkxRf6qZk+W1I41rHKnYZj95C/VrncHbdT/0ERyhBfWE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619896435; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Bko11SHAX916ignYkLJOit9Le7a99eo2cbUa1LPPGg8=; b=CAK4uJhyRNTs2qiZgcnB8mhEfJ5Dzk99QjAoRtmzeRDtSoKCcuKQ6ZI5iVjC6RTZZj5d1JLiEmc1CdtgwB2S6v7TfTtn10q7QJJ9xSFJJ4XzMBHusPH5HwuQu2eJUfdOsuQoEKLztYdnWVnDlqlm/CBHYbh32mi/zwLQIC4hy6Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619896435882649.3243106282381; Sat, 1 May 2021 12:13:55 -0700 (PDT) Received: from localhost ([::1]:41018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcv3q-0003IU-Hy for importer@patchew.org; Sat, 01 May 2021 15:13:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuaw-00007C-5q for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:02 -0400 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]:45912) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuag-0000BE-3D for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:01 -0400 Received: by mail-pg1-x52d.google.com with SMTP id d10so825804pgf.12 for ; Sat, 01 May 2021 11:43:42 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Bko11SHAX916ignYkLJOit9Le7a99eo2cbUa1LPPGg8=; b=WuwXWHJ2dcraQkar9tf5kxRSB7KdrsH7qACpX7hqqroG9QJ+Geo3gLG4PTMGWEuq9y U09mWe+oUVyZW1xMPnTuQWDQ9pw9wVwD0XyemIaWPSa00bFVSS3JDfD/8Ah6JZ5KbhcE s6mcTlZxY2KKnK/D9SiEX69YPz6A+sFaMpSWNR8pIlJSTFAnSTDUVIARWcX96KBGlVaK vmgpjTGGh0AnyHfQTX6ECIS7sCojSd0Z/WkgGAfMDUnHzm2x+pKOZm5pp4WY0tfLGUSp 7bnPFzN7J68e6hbv4c125kNi/ROnMOXCgha44Enf/mXNIhHC3EtfphF0kyHQE6EXfHuu Se4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Bko11SHAX916ignYkLJOit9Le7a99eo2cbUa1LPPGg8=; b=NAoTWoh/TdHpCkNfQ3w4iYiW9NcpDSlsku1bE1Cm9+ZaMT1qASZTU03WLdYJqV9y71 vwzeyQ+N5EypkUPke/xd0WdFmso9GWbAmrQuxMWs7SE/EXQkEjdhw3iq4D3vpiikLWaG FrZAQJuB3tE4fbcG13UFCFuKM2ztaIL9ACxHEXdbba33fpIsa9xJzi37UjmEdiHnBVD6 jhkbb5mFlRW+KX/1Pht5pHGKLjs2aDa7aFjUermePb5ESPZhabatSk1VWrnTzVFPF9tj GKy13Dh+Y1nv7O5QlLGsl02XL7D+5aQUMN/lLd3wMwH8rQ66JZqwOdelzXmYsPh65a86 c+WA== X-Gm-Message-State: AOAM533m2kzrPfe1YDs1EoGvCUXNUlJyEXn2HeL7KzYQ7zUI3TFJRFk0 L+fzUM93cs1suos7gflFBlv7/30KUAEUKQ== X-Google-Smtp-Source: ABdhPJwhS1zAsGZYEWJ9GnMVVlhfPucq97PBBQz29xF0mS6pJoxhtScMODRhvI1BB9bP6U03NxVAiQ== X-Received: by 2002:a65:4341:: with SMTP id k1mr10258061pgq.178.1619894621989; Sat, 01 May 2021 11:43:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 26/31] Hexagon (target/hexagon) add A4_addp_c/A4_subp_c Date: Sat, 1 May 2021 11:43:19 -0700 Message-Id: <20210501184324.1338186-27-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::52d; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson Rdd32 =3D add(Rss32, Rtt32, Px4):carry Add with carry Rdd32 =3D sub(Rss32, Rtt32, Px4):carry Sub with carry Test cases in tests/tcg/hexagon/multi_result.c Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-22-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/gen_tcg.h | 37 ++++++++++++ target/hexagon/genptr.c | 11 ++++ tests/tcg/hexagon/multi_result.c | 82 +++++++++++++++++++++++++++ target/hexagon/imported/alu.idef | 15 +++++ target/hexagon/imported/encode_pp.def | 2 + 5 files changed, 147 insertions(+) diff --git a/target/hexagon/gen_tcg.h b/target/hexagon/gen_tcg.h index aea0c55564..6bc578dfda 100644 --- a/target/hexagon/gen_tcg.h +++ b/target/hexagon/gen_tcg.h @@ -237,6 +237,43 @@ tcg_temp_free_i64(tmp); \ } while (0) =20 +/* + * Add or subtract with carry. + * Predicate register is used as an extra input and output. + * r5:4 =3D add(r1:0, r3:2, p1):carry + */ +#define fGEN_TCG_A4_addp_c(SHORTCODE) \ + do { \ + TCGv_i64 carry =3D tcg_temp_new_i64(); \ + TCGv_i64 zero =3D tcg_const_i64(0); \ + tcg_gen_extu_i32_i64(carry, PxV); \ + tcg_gen_andi_i64(carry, carry, 1); \ + tcg_gen_add2_i64(RddV, carry, RssV, zero, carry, zero); \ + tcg_gen_add2_i64(RddV, carry, RddV, carry, RttV, zero); \ + tcg_gen_extrl_i64_i32(PxV, carry); \ + gen_8bitsof(PxV, PxV); \ + tcg_temp_free_i64(carry); \ + tcg_temp_free_i64(zero); \ + } while (0) + +/* r5:4 =3D sub(r1:0, r3:2, p1):carry */ +#define fGEN_TCG_A4_subp_c(SHORTCODE) \ + do { \ + TCGv_i64 carry =3D tcg_temp_new_i64(); \ + TCGv_i64 zero =3D tcg_const_i64(0); \ + TCGv_i64 not_RttV =3D tcg_temp_new_i64(); \ + tcg_gen_extu_i32_i64(carry, PxV); \ + tcg_gen_andi_i64(carry, carry, 1); \ + tcg_gen_not_i64(not_RttV, RttV); \ + tcg_gen_add2_i64(RddV, carry, RssV, zero, carry, zero); \ + tcg_gen_add2_i64(RddV, carry, RddV, carry, not_RttV, zero); \ + tcg_gen_extrl_i64_i32(PxV, carry); \ + gen_8bitsof(PxV, PxV); \ + tcg_temp_free_i64(carry); \ + tcg_temp_free_i64(zero); \ + tcg_temp_free_i64(not_RttV); \ + } while (0) + /* * Compare each of the 8 unsigned bytes * The minimum is placed in each byte of the destination. diff --git a/target/hexagon/genptr.c b/target/hexagon/genptr.c index 9dbebc64b5..333f7d74bf 100644 --- a/target/hexagon/genptr.c +++ b/target/hexagon/genptr.c @@ -361,5 +361,16 @@ static inline void gen_store_conditional8(CPUHexagonSt= ate *env, tcg_gen_movi_tl(hex_llsc_addr, ~0); } =20 +static TCGv gen_8bitsof(TCGv result, TCGv value) +{ + TCGv zero =3D tcg_const_tl(0); + TCGv ones =3D tcg_const_tl(0xff); + tcg_gen_movcond_tl(TCG_COND_NE, result, value, zero, ones, zero); + tcg_temp_free(zero); + tcg_temp_free(ones); + + return result; +} + #include "tcg_funcs_generated.c.inc" #include "tcg_func_table_generated.c.inc" diff --git a/tests/tcg/hexagon/multi_result.c b/tests/tcg/hexagon/multi_res= ult.c index 95d99a0c90..52997b3128 100644 --- a/tests/tcg/hexagon/multi_result.c +++ b/tests/tcg/hexagon/multi_result.c @@ -85,6 +85,38 @@ static long long vminub(long long Rtt, long long Rss, return result; } =20 +static long long add_carry(long long Rss, long long Rtt, + int pred_in, int *pred_result) +{ + long long result; + int predval =3D pred_in; + + asm volatile("p0 =3D %1\n\t" + "%0 =3D add(%2, %3, p0):carry\n\t" + "%1 =3D p0\n\t" + : "=3Dr"(result), "+r"(predval) + : "r"(Rss), "r"(Rtt) + : "p0"); + *pred_result =3D predval; + return result; +} + +static long long sub_carry(long long Rss, long long Rtt, + int pred_in, int *pred_result) +{ + long long result; + int predval =3D pred_in; + + asm volatile("p0 =3D !cmp.eq(%1, #0)\n\t" + "%0 =3D sub(%2, %3, p0):carry\n\t" + "%1 =3D p0\n\t" + : "=3Dr"(result), "+r"(predval) + : "r"(Rss), "r"(Rtt) + : "p0"); + *pred_result =3D predval; + return result; +} + int err; =20 static void check_ll(long long val, long long expect) @@ -188,12 +220,62 @@ static void test_vminub() check_p(pred_result, 0xaa); } =20 +static void test_add_carry() +{ + long long res64; + int pred_result; + + res64 =3D add_carry(0x0000000000000000LL, + 0xffffffffffffffffLL, + 1, &pred_result); + check_ll(res64, 0x0000000000000000LL); + check_p(pred_result, 0xff); + + res64 =3D add_carry(0x0000000100000000LL, + 0xffffffffffffffffLL, + 0, &pred_result); + check_ll(res64, 0x00000000ffffffffLL); + check_p(pred_result, 0xff); + + res64 =3D add_carry(0x0000000100000000LL, + 0xffffffffffffffffLL, + 0, &pred_result); + check_ll(res64, 0x00000000ffffffffLL); + check_p(pred_result, 0xff); +} + +static void test_sub_carry() +{ + long long res64; + int pred_result; + + res64 =3D sub_carry(0x0000000000000000LL, + 0x0000000000000000LL, + 1, &pred_result); + check_ll(res64, 0x0000000000000000LL); + check_p(pred_result, 0xff); + + res64 =3D sub_carry(0x0000000100000000LL, + 0x0000000000000000LL, + 0, &pred_result); + check_ll(res64, 0x00000000ffffffffLL); + check_p(pred_result, 0xff); + + res64 =3D sub_carry(0x0000000100000000LL, + 0x0000000000000000LL, + 0, &pred_result); + check_ll(res64, 0x00000000ffffffffLL); + check_p(pred_result, 0xff); +} + int main() { test_sfrecipa(); test_sfinvsqrta(); test_vacsh(); test_vminub(); + test_add_carry(); + test_sub_carry(); =20 puts(err ? "FAIL" : "PASS"); return err; diff --git a/target/hexagon/imported/alu.idef b/target/hexagon/imported/alu= .idef index f0c9bb47ec..58477ae40a 100644 --- a/target/hexagon/imported/alu.idef +++ b/target/hexagon/imported/alu.idef @@ -153,6 +153,21 @@ Q6INSN(A2_subp,"Rdd32=3Dsub(Rtt32,Rss32)",ATTRIBS(), "Sub", { RddV=3DRttV-RssV;}) =20 +/* 64-bit with carry */ + +Q6INSN(A4_addp_c,"Rdd32=3Dadd(Rss32,Rtt32,Px4):carry",ATTRIBS(),"Add with = Carry", +{ + RddV =3D RssV + RttV + fLSBOLD(PxV); + PxV =3D f8BITSOF(fCARRY_FROM_ADD(RssV,RttV,fLSBOLD(PxV))); +}) + +Q6INSN(A4_subp_c,"Rdd32=3Dsub(Rss32,Rtt32,Px4):carry",ATTRIBS(),"Sub with = Carry", +{ + RddV =3D RssV + ~RttV + fLSBOLD(PxV); + PxV =3D f8BITSOF(fCARRY_FROM_ADD(RssV,~RttV,fLSBOLD(PxV))); +}) + + /* NEG and ABS */ =20 Q6INSN(A2_negsat,"Rd32=3Dneg(Rs32):sat",ATTRIBS(), diff --git a/target/hexagon/imported/encode_pp.def b/target/hexagon/importe= d/encode_pp.def index 46193984c5..514c2404ce 100644 --- a/target/hexagon/imported/encode_pp.def +++ b/target/hexagon/imported/encode_pp.def @@ -1749,6 +1749,8 @@ SH_RRR_ENC(S4_extractp_rp, "0001","11-","-","10-= ","ddddd") DEF_FIELDROW_DESC32(ICLASS_S3op" 0010 -------- PP------ --------","[#2] Rd= d=3D(Rss,Rtt,Pu)") SH_RRR_ENC(S2_valignrb, "0010","0--","-","-uu","ddddd") SH_RRR_ENC(S2_vsplicerb, "0010","100","-","-uu","ddddd") +SH_RRR_ENC(A4_addp_c, "0010","110","-","-xx","ddddd") +SH_RRR_ENC(A4_subp_c, "0010","111","-","-xx","ddddd") =20 =20 DEF_FIELDROW_DESC32(ICLASS_S3op" 0011 -------- PP------ --------","[#3] Rd= d=3D(Rss,Rt)") --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619896850; cv=none; d=zohomail.com; s=zohoarc; b=UVYjJj1P/cmSnTPOqjQVcS38TAJH3wAjketofLF+2WAEE+YQFHljlDtrM1IfKfyKtKIYVU3gnpzmb5IIyyrEexI8qoWewN23xJTab35kSVyUygssRqhrLcL/dbZSoF1sHjfvjttg2L+MYrnfZYLYymJXayKwTejLHau0HjGEHY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619896850; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=k4XSEqyXiRtjJwO2gtAz97//kteN7PCPKLWgTDfEX9U=; b=lvz7pz679zsZyZHvC1coU2LSPDKcYJJxmyFDJ1UgWQnLxk6uekFOdXjsfju4cqguSnt1epqx2o5/yGWDnyUnleqCZ9JpvPZteK2sFkY1y9XDcn+mRNClfCzX4wAWlgICjaMTCs0DOSFkYIatNnsr4U4PzykCieq+7nO3MnXKeOo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619896850397703.6640425098941; Sat, 1 May 2021 12:20:50 -0700 (PDT) Received: from localhost ([::1]:57876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcvAX-0001rS-41 for importer@patchew.org; Sat, 01 May 2021 15:20:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcub0-0000CE-Ki for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:06 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]:39910) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuag-0000BP-3x for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:06 -0400 Received: by mail-pl1-x634.google.com with SMTP id s15so672336plg.6 for ; Sat, 01 May 2021 11:43:43 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k4XSEqyXiRtjJwO2gtAz97//kteN7PCPKLWgTDfEX9U=; b=OpVRgmZ5x93rV4A5FoiIgPDWa7GQorelvAX58/aQM2Swv//zUS1a7QX0OofrO+50AS WvBpPDTd0cvwWGoZWjGwfUCzPN2gf/d1m4KJNOmsNu4cJOQ5eSevdZWfY5Rv4TlHNgKX vPWYBaNiMonZPndQ8Rur2bZa1BaJdLEs81RTuCIAB29W2IU2OjaQDl1TiGuxLyMGw4zF mbIbCuDm460ZZdmWZizkED6YyvPIbLkIWZ6VZ6DLRot4xALaWhgm+qpRj9K2MrUClCON h3945zNwBN/9K/E3Dhf+TzhclWqeTUWntfw3qQBr1gTN5ZdS1BIS2sg2o/tF3R0FPu4T Oqnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k4XSEqyXiRtjJwO2gtAz97//kteN7PCPKLWgTDfEX9U=; b=DC6n2jUyArcX0bsQI3Mi3tLZABSIPKu0AE1JLLZgdFYSOKXTkLuJy7rdMeZ0IZ8gJH kOr/qIIXOWlzetBCMhJqMeGMpX+zqyjKlsDjJjX7CjZQYbAuhSOdsEtAqNS7GIyqHlim 6HkclkQcFHila+uQiELXdRik3MopJoEPJOOUuZG/pHdM58YJ5sVaKnIPGR3fjiSaBj9T PzoQHE3ushqCarfh45+HIQe2A4MDYAhhWFHPn2UtZhTqa/RSrQhWfVUE4j47cUWtkF+f MGI4kpWuJ09hFIO+Hnn47d4S0EG7ZlDTimNwQR65Jju1J/2x/0JxaR4va28oDuQl5QOp QodQ== X-Gm-Message-State: AOAM532pIXctTyzVfI9j+YU7DdKVzDo5nNtoL6MAXhaes7Uy83T21y9i /NZzdNY7N0ipF9NqC0SvogWh6d2UKT+pAA== X-Google-Smtp-Source: ABdhPJywNICtfNtHCcFVUFkqPNvM2HZx3mRUVP2uS5xF0WnNUHwXGFJfz9dkhdmGdtsf87YUnrzgVQ== X-Received: by 2002:a17:90a:690d:: with SMTP id r13mr2480760pjj.19.1619894622622; Sat, 01 May 2021 11:43:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 27/31] Hexagon (target/hexagon) circular addressing Date: Sat, 1 May 2021 11:43:20 -0700 Message-Id: <20210501184324.1338186-28-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson The following instructions are added L2_loadrub_pci Rd32 =3D memub(Rx32++#s4:0:circ(Mu2)) L2_loadrb_pci Rd32 =3D memb(Rx32++#s4:0:circ(Mu2)) L2_loadruh_pci Rd32 =3D memuh(Rx32++#s4:1:circ(Mu2)) L2_loadrh_pci Rd32 =3D memh(Rx32++#s4:1:circ(Mu2)) L2_loadri_pci Rd32 =3D memw(Rx32++#s4:2:circ(Mu2)) L2_loadrd_pci Rdd32 =3D memd(Rx32++#s4:3:circ(Mu2)) S2_storerb_pci memb(Rx32++#s4:0:circ(Mu2)) =3D Rt32 S2_storerh_pci memh(Rx32++#s4:1:circ(Mu2)) =3D Rt32 S2_storerf_pci memh(Rx32++#s4:1:circ(Mu2)) =3D Rt.H32 S2_storeri_pci memw(Rx32++#s4:2:circ(Mu2)) =3D Rt32 S2_storerd_pci memd(Rx32++#s4:3:circ(Mu2)) =3D Rtt32 S2_storerbnew_pci memb(Rx32++#s4:0:circ(Mu2)) =3D Nt8.new S2_storerhnew_pci memw(Rx32++#s4:1:circ(Mu2)) =3D Nt8.new S2_storerinew_pci memw(Rx32++#s4:2:circ(Mu2)) =3D Nt8.new L2_loadrub_pcr Rd32 =3D memub(Rx32++I:circ(Mu2)) L2_loadrb_pcr Rd32 =3D memb(Rx32++I:circ(Mu2)) L2_loadruh_pcr Rd32 =3D memuh(Rx32++I:circ(Mu2)) L2_loadrh_pcr Rd32 =3D memh(Rx32++I:circ(Mu2)) L2_loadri_pcr Rd32 =3D memw(Rx32++I:circ(Mu2)) L2_loadrd_pcr Rdd32 =3D memd(Rx32++I:circ(Mu2)) S2_storerb_pcr memb(Rx32++I:circ(Mu2)) =3D Rt32 S2_storerh_pcr memh(Rx32++I:circ(Mu2)) =3D Rt32 S2_storerf_pcr memh(Rx32++I:circ(Mu2)) =3D Rt32.H32 S2_storeri_pcr memw(Rx32++I:circ(Mu2)) =3D Rt32 S2_storerd_pcr memd(Rx32++I:circ(Mu2)) =3D Rtt32 S2_storerbnew_pcr memb(Rx32++I:circ(Mu2)) =3D Nt8.new S2_storerhnew_pcr memh(Rx32++I:circ(Mu2)) =3D Nt8.new S2_storerinew_pcr memw(Rx32++I:circ(Mu2)) =3D Nt8.new Test cases in tests/tcg/hexagon/circ.c Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-23-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/gen_tcg.h | 112 +++++- target/hexagon/macros.h | 92 +++++ target/hexagon/genptr.c | 100 ++++++ target/hexagon/op_helper.c | 36 +- tests/tcg/hexagon/circ.c | 486 ++++++++++++++++++++++++++ target/hexagon/imported/encode_pp.def | 10 + target/hexagon/imported/ldst.idef | 4 + target/hexagon/imported/macros.def | 26 ++ tests/tcg/hexagon/Makefile.target | 2 + 9 files changed, 845 insertions(+), 23 deletions(-) create mode 100644 tests/tcg/hexagon/circ.c diff --git a/target/hexagon/gen_tcg.h b/target/hexagon/gen_tcg.h index 6bc578dfda..25c228c112 100644 --- a/target/hexagon/gen_tcg.h +++ b/target/hexagon/gen_tcg.h @@ -38,6 +38,8 @@ * _ap absolute set r0 =3D memw(r1=3D##vari= able) * _pr post increment register r0 =3D memw(r1++m1) * _pi post increment immediate r0 =3D memb(r1++#1) + * _pci post increment circular immediate r0 =3D memw(r1++#4:circ= (m0)) + * _pcr post increment circular register r0 =3D memw(r1++I:circ(= m0)) */ =20 /* Macros for complex addressing modes */ @@ -56,7 +58,22 @@ fEA_REG(RxV); \ fPM_I(RxV, siV); \ } while (0) - +#define GET_EA_pci \ + do { \ + TCGv tcgv_siV =3D tcg_const_tl(siV); \ + tcg_gen_mov_tl(EA, RxV); \ + gen_helper_fcircadd(RxV, RxV, tcgv_siV, MuV, \ + hex_gpr[HEX_REG_CS0 + MuN]); \ + tcg_temp_free(tcgv_siV); \ + } while (0) +#define GET_EA_pcr(SHIFT) \ + do { \ + TCGv ireg =3D tcg_temp_new(); \ + tcg_gen_mov_tl(EA, RxV); \ + gen_read_ireg(ireg, MuV, (SHIFT)); \ + gen_helper_fcircadd(RxV, RxV, ireg, MuV, hex_gpr[HEX_REG_CS0 + MuN= ]); \ + tcg_temp_free(ireg); \ + } while (0) =20 /* Instructions with multiple definitions */ #define fGEN_TCG_LOAD_AP(RES, SIZE, SIGN) \ @@ -80,6 +97,36 @@ #define fGEN_TCG_L4_loadrd_ap(SHORTCODE) \ fGEN_TCG_LOAD_AP(RddV, 8, u) =20 +#define fGEN_TCG_L2_loadrub_pci(SHORTCODE) SHORTCODE +#define fGEN_TCG_L2_loadrb_pci(SHORTCODE) SHORTCODE +#define fGEN_TCG_L2_loadruh_pci(SHORTCODE) SHORTCODE +#define fGEN_TCG_L2_loadrh_pci(SHORTCODE) SHORTCODE +#define fGEN_TCG_L2_loadri_pci(SHORTCODE) SHORTCODE +#define fGEN_TCG_L2_loadrd_pci(SHORTCODE) SHORTCODE + +#define fGEN_TCG_LOAD_pcr(SHIFT, LOAD) \ + do { \ + TCGv ireg =3D tcg_temp_new(); \ + tcg_gen_mov_tl(EA, RxV); \ + gen_read_ireg(ireg, MuV, SHIFT); \ + gen_helper_fcircadd(RxV, RxV, ireg, MuV, hex_gpr[HEX_REG_CS0 + MuN= ]); \ + LOAD; \ + tcg_temp_free(ireg); \ + } while (0) + +#define fGEN_TCG_L2_loadrub_pcr(SHORTCODE) \ + fGEN_TCG_LOAD_pcr(0, fLOAD(1, 1, u, EA, RdV)) +#define fGEN_TCG_L2_loadrb_pcr(SHORTCODE) \ + fGEN_TCG_LOAD_pcr(0, fLOAD(1, 1, s, EA, RdV)) +#define fGEN_TCG_L2_loadruh_pcr(SHORTCODE) \ + fGEN_TCG_LOAD_pcr(1, fLOAD(1, 2, u, EA, RdV)) +#define fGEN_TCG_L2_loadrh_pcr(SHORTCODE) \ + fGEN_TCG_LOAD_pcr(1, fLOAD(1, 2, s, EA, RdV)) +#define fGEN_TCG_L2_loadri_pcr(SHORTCODE) \ + fGEN_TCG_LOAD_pcr(2, fLOAD(1, 4, u, EA, RdV)) +#define fGEN_TCG_L2_loadrd_pcr(SHORTCODE) \ + fGEN_TCG_LOAD_pcr(3, fLOAD(1, 8, u, EA, RddV)) + #define fGEN_TCG_L2_loadrub_pr(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadrub_pi(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadrb_pr(SHORTCODE) SHORTCODE @@ -195,6 +242,69 @@ #define fGEN_TCG_S4_stored_locked(SHORTCODE) \ do { SHORTCODE; READ_PREG(PdV, PdN); } while (0) =20 +#define fGEN_TCG_STORE(SHORTCODE) \ + do { \ + TCGv HALF =3D tcg_temp_new(); \ + TCGv BYTE =3D tcg_temp_new(); \ + SHORTCODE; \ + tcg_temp_free(HALF); \ + tcg_temp_free(BYTE); \ + } while (0) + +#define fGEN_TCG_STORE_pcr(SHIFT, STORE) \ + do { \ + TCGv ireg =3D tcg_temp_new(); \ + TCGv HALF =3D tcg_temp_new(); \ + TCGv BYTE =3D tcg_temp_new(); \ + tcg_gen_mov_tl(EA, RxV); \ + gen_read_ireg(ireg, MuV, SHIFT); \ + gen_helper_fcircadd(RxV, RxV, ireg, MuV, hex_gpr[HEX_REG_CS0 + MuN= ]); \ + STORE; \ + tcg_temp_free(ireg); \ + tcg_temp_free(HALF); \ + tcg_temp_free(BYTE); \ + } while (0) + +#define fGEN_TCG_S2_storerb_pci(SHORTCODE) \ + fGEN_TCG_STORE(SHORTCODE) +#define fGEN_TCG_S2_storerb_pcr(SHORTCODE) \ + fGEN_TCG_STORE_pcr(0, fSTORE(1, 1, EA, fGETBYTE(0, RtV))) + +#define fGEN_TCG_S2_storerh_pci(SHORTCODE) \ + fGEN_TCG_STORE(SHORTCODE) +#define fGEN_TCG_S2_storerh_pcr(SHORTCODE) \ + fGEN_TCG_STORE_pcr(1, fSTORE(1, 2, EA, fGETHALF(0, RtV))) + +#define fGEN_TCG_S2_storerf_pci(SHORTCODE) \ + fGEN_TCG_STORE(SHORTCODE) +#define fGEN_TCG_S2_storerf_pcr(SHORTCODE) \ + fGEN_TCG_STORE_pcr(1, fSTORE(1, 2, EA, fGETHALF(1, RtV))) + +#define fGEN_TCG_S2_storeri_pci(SHORTCODE) \ + fGEN_TCG_STORE(SHORTCODE) +#define fGEN_TCG_S2_storeri_pcr(SHORTCODE) \ + fGEN_TCG_STORE_pcr(2, fSTORE(1, 4, EA, RtV)) + +#define fGEN_TCG_S2_storerd_pci(SHORTCODE) \ + fGEN_TCG_STORE(SHORTCODE) +#define fGEN_TCG_S2_storerd_pcr(SHORTCODE) \ + fGEN_TCG_STORE_pcr(3, fSTORE(1, 8, EA, RttV)) + +#define fGEN_TCG_S2_storerbnew_pci(SHORTCODE) \ + fGEN_TCG_STORE(SHORTCODE) +#define fGEN_TCG_S2_storerbnew_pcr(SHORTCODE) \ + fGEN_TCG_STORE_pcr(0, fSTORE(1, 1, EA, fGETBYTE(0, NtN))) + +#define fGEN_TCG_S2_storerhnew_pci(SHORTCODE) \ + fGEN_TCG_STORE(SHORTCODE) +#define fGEN_TCG_S2_storerhnew_pcr(SHORTCODE) \ + fGEN_TCG_STORE_pcr(1, fSTORE(1, 2, EA, fGETHALF(0, NtN))) + +#define fGEN_TCG_S2_storerinew_pci(SHORTCODE) \ + fGEN_TCG_STORE(SHORTCODE) +#define fGEN_TCG_S2_storerinew_pcr(SHORTCODE) \ + fGEN_TCG_STORE_pcr(2, fSTORE(1, 4, EA, NtN)) + /* * Mathematical operations with more than one definition require * special handling diff --git a/target/hexagon/macros.h b/target/hexagon/macros.h index 8cb211dfde..494ea8dfd8 100644 --- a/target/hexagon/macros.h +++ b/target/hexagon/macros.h @@ -133,6 +133,38 @@ CHECK_NOSHUF; \ tcg_gen_qemu_ld64(DST, VA, ctx->mem_idx); \ } while (0) + +#define MEM_STORE1_FUNC(X) \ + __builtin_choose_expr(TYPE_INT(X), \ + gen_store1i, \ + __builtin_choose_expr(TYPE_TCGV(X), \ + gen_store1, (void)0)) +#define MEM_STORE1(VA, DATA, SLOT) \ + MEM_STORE1_FUNC(DATA)(cpu_env, VA, DATA, ctx, SLOT) + +#define MEM_STORE2_FUNC(X) \ + __builtin_choose_expr(TYPE_INT(X), \ + gen_store2i, \ + __builtin_choose_expr(TYPE_TCGV(X), \ + gen_store2, (void)0)) +#define MEM_STORE2(VA, DATA, SLOT) \ + MEM_STORE2_FUNC(DATA)(cpu_env, VA, DATA, ctx, SLOT) + +#define MEM_STORE4_FUNC(X) \ + __builtin_choose_expr(TYPE_INT(X), \ + gen_store4i, \ + __builtin_choose_expr(TYPE_TCGV(X), \ + gen_store4, (void)0)) +#define MEM_STORE4(VA, DATA, SLOT) \ + MEM_STORE4_FUNC(DATA)(cpu_env, VA, DATA, ctx, SLOT) + +#define MEM_STORE8_FUNC(X) \ + __builtin_choose_expr(TYPE_INT(X), \ + gen_store8i, \ + __builtin_choose_expr(TYPE_TCGV_I64(X), \ + gen_store8, (void)0)) +#define MEM_STORE8(VA, DATA, SLOT) \ + MEM_STORE8_FUNC(DATA)(cpu_env, VA, DATA, ctx, SLOT) #else #define MEM_LOAD1s(VA) ((int8_t)mem_load1(env, slot, VA)) #define MEM_LOAD1u(VA) ((uint8_t)mem_load1(env, slot, VA)) @@ -285,6 +317,39 @@ static inline void gen_logical_not(TCGv dest, TCGv src) =20 #define fPCALIGN(IMM) IMM =3D (IMM & ~PCALIGN_MASK) =20 +#ifdef QEMU_GENERATE +static inline TCGv gen_read_ireg(TCGv result, TCGv val, int shift) +{ + /* + * Section 2.2.4 of the Hexagon V67 Programmer's Reference Manual + * + * The "I" value from a modifier register is divided into two pieces + * LSB bits 23:17 + * MSB bits 31:28 + * The value is signed + * + * At the end we shift the result according to the shift argument + */ + TCGv msb =3D tcg_temp_new(); + TCGv lsb =3D tcg_temp_new(); + + tcg_gen_extract_tl(lsb, val, 17, 7); + tcg_gen_sari_tl(msb, val, 21); + tcg_gen_deposit_tl(result, msb, lsb, 0, 7); + + tcg_gen_shli_tl(result, result, shift); + + tcg_temp_free(msb); + tcg_temp_free(lsb); + + return result; +} +#define fREAD_IREG(VAL, SHIFT) gen_read_ireg(ireg, (VAL), (SHIFT)) +#else +#define fREAD_IREG(VAL) \ + (fSXTN(11, 64, (((VAL) & 0xf0000000) >> 21) | ((VAL >> 17) & 0x7f))) +#endif + #define fREAD_LR() (READ_REG(HEX_REG_LR)) =20 #define fWRITE_LR(A) WRITE_RREG(HEX_REG_LR, A) @@ -418,6 +483,13 @@ static inline void gen_logical_not(TCGv dest, TCGv src) #define fEA_REG(REG) tcg_gen_mov_tl(EA, REG) #define fPM_I(REG, IMM) tcg_gen_addi_tl(REG, REG, IMM) #define fPM_M(REG, MVAL) tcg_gen_add_tl(REG, REG, MVAL) +#define fPM_CIRI(REG, IMM, MVAL) \ + do { \ + TCGv tcgv_siV =3D tcg_const_tl(siV); \ + gen_helper_fcircadd(REG, REG, tcgv_siV, MuV, \ + hex_gpr[HEX_REG_CS0 + MuN]); \ + tcg_temp_free(tcgv_siV); \ + } while (0) #else #define fEA_IMM(IMM) do { EA =3D (IMM); } while (0) #define fEA_REG(REG) do { EA =3D (REG); } while (0) @@ -494,23 +566,43 @@ static inline void gen_logical_not(TCGv dest, TCGv sr= c) gen_load_locked##SIZE##SIGN(DST, EA, ctx->mem_idx); #endif =20 +#ifdef QEMU_GENERATE +#define fSTORE(NUM, SIZE, EA, SRC) MEM_STORE##SIZE(EA, SRC, insn->slot) +#else #define fSTORE(NUM, SIZE, EA, SRC) MEM_STORE##SIZE(EA, SRC, slot) +#endif =20 #ifdef QEMU_GENERATE #define fSTORE_LOCKED(NUM, SIZE, EA, SRC, PRED) \ gen_store_conditional##SIZE(env, ctx, PdN, PRED, EA, SRC); #endif =20 +#ifdef QEMU_GENERATE +#define GETBYTE_FUNC(X) \ + __builtin_choose_expr(TYPE_TCGV(X), \ + gen_get_byte, \ + __builtin_choose_expr(TYPE_TCGV_I64(X), \ + gen_get_byte_i64, (void)0)) +#define fGETBYTE(N, SRC) GETBYTE_FUNC(SRC)(BYTE, N, SRC, true) +#define fGETUBYTE(N, SRC) GETBYTE_FUNC(SRC)(BYTE, N, SRC, false) +#else #define fGETBYTE(N, SRC) ((int8_t)((SRC >> ((N) * 8)) & 0xff)) #define fGETUBYTE(N, SRC) ((uint8_t)((SRC >> ((N) * 8)) & 0xff)) +#endif =20 #define fSETBYTE(N, DST, VAL) \ do { \ DST =3D (DST & ~(0x0ffLL << ((N) * 8))) | \ (((uint64_t)((VAL) & 0x0ffLL)) << ((N) * 8)); \ } while (0) + +#ifdef QEMU_GENERATE +#define fGETHALF(N, SRC) gen_get_half(HALF, N, SRC, true) +#define fGETUHALF(N, SRC) gen_get_half(HALF, N, SRC, false) +#else #define fGETHALF(N, SRC) ((int16_t)((SRC >> ((N) * 16)) & 0xffff)) #define fGETUHALF(N, SRC) ((uint16_t)((SRC >> ((N) * 16)) & 0xffff)) +#endif #define fSETHALF(N, DST, VAL) \ do { \ DST =3D (DST & ~(0x0ffffLL << ((N) * 16))) | \ diff --git a/target/hexagon/genptr.c b/target/hexagon/genptr.c index 333f7d74bf..eac3f61921 100644 --- a/target/hexagon/genptr.c +++ b/target/hexagon/genptr.c @@ -28,6 +28,12 @@ #undef QEMU_GENERATE #include "gen_tcg.h" =20 +static inline TCGv gen_read_reg(TCGv result, int num) +{ + tcg_gen_mov_tl(result, hex_gpr[num]); + return result; +} + static inline TCGv gen_read_preg(TCGv pred, uint8_t num) { tcg_gen_mov_tl(pred, hex_pred[num]); @@ -266,6 +272,16 @@ static inline void gen_write_ctrl_reg_pair(DisasContex= t *ctx, int reg_num, } } =20 +static TCGv gen_get_byte(TCGv result, int N, TCGv src, bool sign) +{ + if (sign) { + tcg_gen_sextract_tl(result, src, N * 8, 8); + } else { + tcg_gen_extract_tl(result, src, N * 8, 8); + } + return result; +} + static TCGv gen_get_byte_i64(TCGv result, int N, TCGv_i64 src, bool sign) { TCGv_i64 res64 =3D tcg_temp_new_i64(); @@ -280,6 +296,21 @@ static TCGv gen_get_byte_i64(TCGv result, int N, TCGv_= i64 src, bool sign) return result; } =20 +static inline TCGv gen_get_half(TCGv result, int N, TCGv src, bool sign) +{ + if (sign) { + tcg_gen_sextract_tl(result, src, N * 16, 16); + } else { + tcg_gen_extract_tl(result, src, N * 16, 16); + } + return result; +} + +static inline void gen_set_byte(int N, TCGv result, TCGv src) +{ + tcg_gen_deposit_tl(result, result, src, N * 8, 8); +} + static void gen_set_byte_i64(int N, TCGv_i64 result, TCGv src) { TCGv_i64 src64 =3D tcg_temp_new_i64(); @@ -361,6 +392,75 @@ static inline void gen_store_conditional8(CPUHexagonSt= ate *env, tcg_gen_movi_tl(hex_llsc_addr, ~0); } =20 +static inline void gen_store32(TCGv vaddr, TCGv src, int width, int slot) +{ + tcg_gen_mov_tl(hex_store_addr[slot], vaddr); + tcg_gen_movi_tl(hex_store_width[slot], width); + tcg_gen_mov_tl(hex_store_val32[slot], src); +} + +static inline void gen_store1(TCGv_env cpu_env, TCGv vaddr, TCGv src, + DisasContext *ctx, int slot) +{ + gen_store32(vaddr, src, 1, slot); + ctx->store_width[slot] =3D 1; +} + +static inline void gen_store1i(TCGv_env cpu_env, TCGv vaddr, int32_t src, + DisasContext *ctx, int slot) +{ + TCGv tmp =3D tcg_const_tl(src); + gen_store1(cpu_env, vaddr, tmp, ctx, slot); + tcg_temp_free(tmp); +} + +static inline void gen_store2(TCGv_env cpu_env, TCGv vaddr, TCGv src, + DisasContext *ctx, int slot) +{ + gen_store32(vaddr, src, 2, slot); + ctx->store_width[slot] =3D 2; +} + +static inline void gen_store2i(TCGv_env cpu_env, TCGv vaddr, int32_t src, + DisasContext *ctx, int slot) +{ + TCGv tmp =3D tcg_const_tl(src); + gen_store2(cpu_env, vaddr, tmp, ctx, slot); + tcg_temp_free(tmp); +} + +static inline void gen_store4(TCGv_env cpu_env, TCGv vaddr, TCGv src, + DisasContext *ctx, int slot) +{ + gen_store32(vaddr, src, 4, slot); + ctx->store_width[slot] =3D 4; +} + +static inline void gen_store4i(TCGv_env cpu_env, TCGv vaddr, int32_t src, + DisasContext *ctx, int slot) +{ + TCGv tmp =3D tcg_const_tl(src); + gen_store4(cpu_env, vaddr, tmp, ctx, slot); + tcg_temp_free(tmp); +} + +static inline void gen_store8(TCGv_env cpu_env, TCGv vaddr, TCGv_i64 src, + DisasContext *ctx, int slot) +{ + tcg_gen_mov_tl(hex_store_addr[slot], vaddr); + tcg_gen_movi_tl(hex_store_width[slot], 8); + tcg_gen_mov_i64(hex_store_val64[slot], src); + ctx->store_width[slot] =3D 8; +} + +static inline void gen_store8i(TCGv_env cpu_env, TCGv vaddr, int64_t src, + DisasContext *ctx, int slot) +{ + TCGv_i64 tmp =3D tcg_const_i64(src); + gen_store8(cpu_env, vaddr, tmp, ctx, slot); + tcg_temp_free_i64(tmp); +} + static TCGv gen_8bitsof(TCGv result, TCGv value) { TCGv zero =3D tcg_const_tl(0); diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index f9fb65555b..2319b9313e 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -251,33 +251,25 @@ void HELPER(debug_commit_end)(CPUHexagonState *env, i= nt has_st0, int has_st1) =20 } =20 -static int32_t fcircadd_v4(int32_t RxV, int32_t offset, int32_t M, int32_t= CS) -{ - int32_t length =3D M & 0x0001ffff; - uint32_t new_ptr =3D RxV + offset; - uint32_t start_addr =3D CS; - uint32_t end_addr =3D start_addr + length; - - if (new_ptr >=3D end_addr) { - new_ptr -=3D length; - } else if (new_ptr < start_addr) { - new_ptr +=3D length; - } - - return new_ptr; -} - int32_t HELPER(fcircadd)(int32_t RxV, int32_t offset, int32_t M, int32_t C= S) { - int32_t K_const =3D (M >> 24) & 0xf; - int32_t length =3D M & 0x1ffff; - int32_t mask =3D (1 << (K_const + 2)) - 1; + int32_t K_const =3D sextract32(M, 24, 4); + int32_t length =3D sextract32(M, 0, 17); uint32_t new_ptr =3D RxV + offset; - uint32_t start_addr =3D RxV & (~mask); - uint32_t end_addr =3D start_addr | length; + uint32_t start_addr; + uint32_t end_addr; =20 if (K_const =3D=3D 0 && length >=3D 4) { - return fcircadd_v4(RxV, offset, M, CS); + start_addr =3D CS; + end_addr =3D start_addr + length; + } else { + /* + * Versions v3 and earlier used the K value to specify a power-of-= 2 size + * 2^(K+2) that is greater than the buffer length + */ + int32_t mask =3D (1 << (K_const + 2)) - 1; + start_addr =3D RxV & (~mask); + end_addr =3D start_addr | length; } =20 if (new_ptr >=3D end_addr) { diff --git a/tests/tcg/hexagon/circ.c b/tests/tcg/hexagon/circ.c new file mode 100644 index 0000000000..67a1aa3054 --- /dev/null +++ b/tests/tcg/hexagon/circ.c @@ -0,0 +1,486 @@ +/* + * Copyright(c) 2019-2021 Qualcomm Innovation Center, Inc. All Rights Res= erved. + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#include + +#define DEBUG 0 +#define DEBUG_PRINTF(...) \ + do { \ + if (DEBUG) { \ + printf(__VA_ARGS__); \ + } \ + } while (0) + + +#define NBYTES (1 << 8) +#define NHALFS (NBYTES / sizeof(short)) +#define NWORDS (NBYTES / sizeof(int)) +#define NDOBLS (NBYTES / sizeof(long long)) + +long long dbuf[NDOBLS] __attribute__((aligned(1 << 12))) =3D {0}; +int wbuf[NWORDS] __attribute__((aligned(1 << 12))) =3D {0}; +short hbuf[NHALFS] __attribute__((aligned(1 << 12))) =3D {0}; +unsigned char bbuf[NBYTES] __attribute__((aligned(1 << 12))) =3D {0}; + +/* + * We use the C preporcessor to deal with the combinations of types + */ + +#define INIT(BUF, N) \ + void init_##BUF(void) \ + { \ + int i; \ + for (i =3D 0; i < N; i++) { \ + BUF[i] =3D i; \ + } \ + } \ + +INIT(bbuf, NBYTES) +INIT(hbuf, NHALFS) +INIT(wbuf, NWORDS) +INIT(dbuf, NDOBLS) + +/* + * Macros for performing circular load + * RES result + * ADDR address + * START start address of buffer + * LEN length of buffer (in bytes) + * INC address increment (in bytes for IMM, elements for REG) + */ +#define CIRC_LOAD_IMM(SIZE, RES, ADDR, START, LEN, INC) \ + __asm__( \ + "r4 =3D %3\n\t" \ + "m0 =3D r4\n\t" \ + "cs0 =3D %2\n\t" \ + "%0 =3D mem" #SIZE "(%1++#" #INC ":circ(M0))\n\t" \ + : "=3Dr"(RES), "+r"(ADDR) \ + : "r"(START), "r"(LEN) \ + : "r4", "m0", "cs0") +#define CIRC_LOAD_IMM_b(RES, ADDR, START, LEN, INC) \ + CIRC_LOAD_IMM(b, RES, ADDR, START, LEN, INC) +#define CIRC_LOAD_IMM_ub(RES, ADDR, START, LEN, INC) \ + CIRC_LOAD_IMM(ub, RES, ADDR, START, LEN, INC) +#define CIRC_LOAD_IMM_h(RES, ADDR, START, LEN, INC) \ + CIRC_LOAD_IMM(h, RES, ADDR, START, LEN, INC) +#define CIRC_LOAD_IMM_uh(RES, ADDR, START, LEN, INC) \ + CIRC_LOAD_IMM(uh, RES, ADDR, START, LEN, INC) +#define CIRC_LOAD_IMM_w(RES, ADDR, START, LEN, INC) \ + CIRC_LOAD_IMM(w, RES, ADDR, START, LEN, INC) +#define CIRC_LOAD_IMM_d(RES, ADDR, START, LEN, INC) \ + CIRC_LOAD_IMM(d, RES, ADDR, START, LEN, INC) + +/* + * The mreg has the following pieces + * mreg[31:28] increment[10:7] + * mreg[27:24] K value (used Hexagon v3 and earlier) + * mreg[23:17] increment[6:0] + * mreg[16:0] circular buffer length + */ +static int build_mreg(int inc, int K, int len) +{ + return ((inc & 0x780) << 21) | + ((K & 0xf) << 24) | + ((inc & 0x7f) << 17) | + (len & 0x1ffff); +} + +#define CIRC_LOAD_REG(SIZE, RES, ADDR, START, LEN, INC) \ + __asm__( \ + "r4 =3D %2\n\t" \ + "m1 =3D r4\n\t" \ + "cs1 =3D %3\n\t" \ + "%0 =3D mem" #SIZE "(%1++I:circ(M1))\n\t" \ + : "=3Dr"(RES), "+r"(ADDR) \ + : "r"(build_mreg((INC), 0, (LEN))), \ + "r"(START) \ + : "r4", "m1", "cs1") +#define CIRC_LOAD_REG_b(RES, ADDR, START, LEN, INC) \ + CIRC_LOAD_REG(b, RES, ADDR, START, LEN, INC) +#define CIRC_LOAD_REG_ub(RES, ADDR, START, LEN, INC) \ + CIRC_LOAD_REG(ub, RES, ADDR, START, LEN, INC) +#define CIRC_LOAD_REG_h(RES, ADDR, START, LEN, INC) \ + CIRC_LOAD_REG(h, RES, ADDR, START, LEN, INC) +#define CIRC_LOAD_REG_uh(RES, ADDR, START, LEN, INC) \ + CIRC_LOAD_REG(uh, RES, ADDR, START, LEN, INC) +#define CIRC_LOAD_REG_w(RES, ADDR, START, LEN, INC) \ + CIRC_LOAD_REG(w, RES, ADDR, START, LEN, INC) +#define CIRC_LOAD_REG_d(RES, ADDR, START, LEN, INC) \ + CIRC_LOAD_REG(d, RES, ADDR, START, LEN, INC) + +/* + * Macros for performing circular store + * VAL value to store + * ADDR address + * START start address of buffer + * LEN length of buffer (in bytes) + * INC address increment (in bytes for IMM, elements for REG) + */ +#define CIRC_STORE_IMM(SIZE, PART, VAL, ADDR, START, LEN, INC) \ + __asm__( \ + "r4 =3D %3\n\t" \ + "m0 =3D r4\n\t" \ + "cs0 =3D %1\n\t" \ + "mem" #SIZE "(%0++#" #INC ":circ(M0)) =3D %2" PART "\n\t" \ + : "+r"(ADDR) \ + : "r"(START), "r"(VAL), "r"(LEN) \ + : "r4", "m0", "cs0", "memory") +#define CIRC_STORE_IMM_b(VAL, ADDR, START, LEN, INC) \ + CIRC_STORE_IMM(b, "", VAL, ADDR, START, LEN, INC) +#define CIRC_STORE_IMM_h(VAL, ADDR, START, LEN, INC) \ + CIRC_STORE_IMM(h, "", VAL, ADDR, START, LEN, INC) +#define CIRC_STORE_IMM_f(VAL, ADDR, START, LEN, INC) \ + CIRC_STORE_IMM(h, ".H", VAL, ADDR, START, LEN, INC) +#define CIRC_STORE_IMM_w(VAL, ADDR, START, LEN, INC) \ + CIRC_STORE_IMM(w, "", VAL, ADDR, START, LEN, INC) +#define CIRC_STORE_IMM_d(VAL, ADDR, START, LEN, INC) \ + CIRC_STORE_IMM(d, "", VAL, ADDR, START, LEN, INC) + +#define CIRC_STORE_NEW_IMM(SIZE, VAL, ADDR, START, LEN, INC) \ + __asm__( \ + "r4 =3D %3\n\t" \ + "m0 =3D r4\n\t" \ + "cs0 =3D %1\n\t" \ + "{\n\t" \ + " r5 =3D %2\n\t" \ + " mem" #SIZE "(%0++#" #INC ":circ(M0)) =3D r5.new\n\t" \ + "}\n\t" \ + : "+r"(ADDR) \ + : "r"(START), "r"(VAL), "r"(LEN) \ + : "r4", "r5", "m0", "cs0", "memory") +#define CIRC_STORE_IMM_bnew(VAL, ADDR, START, LEN, INC) \ + CIRC_STORE_NEW_IMM(b, VAL, ADDR, START, LEN, INC) +#define CIRC_STORE_IMM_hnew(VAL, ADDR, START, LEN, INC) \ + CIRC_STORE_NEW_IMM(h, VAL, ADDR, START, LEN, INC) +#define CIRC_STORE_IMM_wnew(VAL, ADDR, START, LEN, INC) \ + CIRC_STORE_NEW_IMM(w, VAL, ADDR, START, LEN, INC) + +#define CIRC_STORE_REG(SIZE, PART, VAL, ADDR, START, LEN, INC) \ + __asm__( \ + "r4 =3D %1\n\t" \ + "m1 =3D r4\n\t" \ + "cs1 =3D %2\n\t" \ + "mem" #SIZE "(%0++I:circ(M1)) =3D %3" PART "\n\t" \ + : "+r"(ADDR) \ + : "r"(build_mreg((INC), 0, (LEN))), \ + "r"(START), \ + "r"(VAL) \ + : "r4", "m1", "cs1", "memory") +#define CIRC_STORE_REG_b(VAL, ADDR, START, LEN, INC) \ + CIRC_STORE_REG(b, "", VAL, ADDR, START, LEN, INC) +#define CIRC_STORE_REG_h(VAL, ADDR, START, LEN, INC) \ + CIRC_STORE_REG(h, "", VAL, ADDR, START, LEN, INC) +#define CIRC_STORE_REG_f(VAL, ADDR, START, LEN, INC) \ + CIRC_STORE_REG(h, ".H", VAL, ADDR, START, LEN, INC) +#define CIRC_STORE_REG_w(VAL, ADDR, START, LEN, INC) \ + CIRC_STORE_REG(w, "", VAL, ADDR, START, LEN, INC) +#define CIRC_STORE_REG_d(VAL, ADDR, START, LEN, INC) \ + CIRC_STORE_REG(d, "", VAL, ADDR, START, LEN, INC) + +#define CIRC_STORE_NEW_REG(SIZE, VAL, ADDR, START, LEN, INC) \ + __asm__( \ + "r4 =3D %1\n\t" \ + "m1 =3D r4\n\t" \ + "cs1 =3D %2\n\t" \ + "{\n\t" \ + " r5 =3D %3\n\t" \ + " mem" #SIZE "(%0++I:circ(M1)) =3D r5.new\n\t" \ + "}\n\t" \ + : "+r"(ADDR) \ + : "r"(build_mreg((INC), 0, (LEN))), \ + "r"(START), \ + "r"(VAL) \ + : "r4", "r5", "m1", "cs1", "memory") +#define CIRC_STORE_REG_bnew(VAL, ADDR, START, LEN, INC) \ + CIRC_STORE_NEW_REG(b, VAL, ADDR, START, LEN, INC) +#define CIRC_STORE_REG_hnew(VAL, ADDR, START, LEN, INC) \ + CIRC_STORE_NEW_REG(h, VAL, ADDR, START, LEN, INC) +#define CIRC_STORE_REG_wnew(VAL, ADDR, START, LEN, INC) \ + CIRC_STORE_NEW_REG(w, VAL, ADDR, START, LEN, INC) + + +int err; + +/* We'll test increments +1 and -1 */ +void check_load(int i, long long result, int inc, int size) +{ + int expect =3D (i * inc); + while (expect >=3D size) { + expect -=3D size; + } + while (expect < 0) { + expect +=3D size; + } + if (result !=3D expect) { + printf("ERROR(%d): %lld !=3D %d\n", i, result, expect); + err++; + } +} + +#define TEST_LOAD_IMM(SZ, TYPE, BUF, BUFSIZE, INC, FMT) \ +void circ_test_load_imm_##SZ(void) \ +{ \ + TYPE *p =3D (TYPE *)BUF; \ + int size =3D 10; \ + int i; \ + for (i =3D 0; i < BUFSIZE; i++) { \ + TYPE element; \ + CIRC_LOAD_IMM_##SZ(element, p, BUF, size * sizeof(TYPE), (INC)); \ + DEBUG_PRINTF("i =3D %2d, p =3D 0x%p, element =3D %2" #FMT "\n", \ + i, p, element); \ + check_load(i, element, ((INC) / (int)sizeof(TYPE)), size); \ + } \ + p =3D (TYPE *)BUF; \ + for (i =3D 0; i < BUFSIZE; i++) { \ + TYPE element; \ + CIRC_LOAD_IMM_##SZ(element, p, BUF, size * sizeof(TYPE), -(INC)); \ + DEBUG_PRINTF("i =3D %2d, p =3D 0x%p, element =3D %2" #FMT "\n", \ + i, p, element); \ + check_load(i, element, (-(INC) / (int)sizeof(TYPE)), size); \ + } \ +} + +TEST_LOAD_IMM(b, char, bbuf, NBYTES, 1, d) +TEST_LOAD_IMM(ub, unsigned char, bbuf, NBYTES, 1, d) +TEST_LOAD_IMM(h, short, hbuf, NHALFS, 2, d) +TEST_LOAD_IMM(uh, unsigned short, hbuf, NHALFS, 2, d) +TEST_LOAD_IMM(w, int, wbuf, NWORDS, 4, d) +TEST_LOAD_IMM(d, long long, dbuf, NDOBLS, 8, lld) + +#define TEST_LOAD_REG(SZ, TYPE, BUF, BUFSIZE, FMT) \ +void circ_test_load_reg_##SZ(void) \ +{ \ + TYPE *p =3D (TYPE *)BUF; \ + int size =3D 13; \ + int i; \ + for (i =3D 0; i < BUFSIZE; i++) { \ + TYPE element; \ + CIRC_LOAD_REG_##SZ(element, p, BUF, size * sizeof(TYPE), 1); \ + DEBUG_PRINTF("i =3D %2d, p =3D 0x%p, element =3D %2" #FMT "\n", \ + i, p, element); \ + check_load(i, element, 1, size); \ + } \ + p =3D (TYPE *)BUF; \ + for (i =3D 0; i < BUFSIZE; i++) { \ + TYPE element; \ + CIRC_LOAD_REG_##SZ(element, p, BUF, size * sizeof(TYPE), -1); \ + DEBUG_PRINTF("i =3D %2d, p =3D 0x%p, element =3D %2" #FMT "\n", \ + i, p, element); \ + check_load(i, element, -1, size); \ + } \ +} + +TEST_LOAD_REG(b, char, bbuf, NBYTES, d) +TEST_LOAD_REG(ub, unsigned char, bbuf, NBYTES, d) +TEST_LOAD_REG(h, short, hbuf, NHALFS, d) +TEST_LOAD_REG(uh, unsigned short, hbuf, NHALFS, d) +TEST_LOAD_REG(w, int, wbuf, NWORDS, d) +TEST_LOAD_REG(d, long long, dbuf, NDOBLS, lld) + +/* The circular stores will wrap around somewhere inside the buffer */ +#define CIRC_VAL(SZ, TYPE, BUFSIZE) \ +TYPE circ_val_##SZ(int i, int inc, int size) \ +{ \ + int mod =3D BUFSIZE % size; \ + int elem =3D i * inc; \ + if (elem < 0) { \ + if (-elem <=3D size - mod) { \ + return (elem + BUFSIZE - mod); \ + } else { \ + return (elem + BUFSIZE + size - mod); \ + } \ + } else if (elem < mod) {\ + return (elem + BUFSIZE - mod); \ + } else { \ + return (elem + BUFSIZE - size - mod); \ + } \ +} + +CIRC_VAL(b, unsigned char, NBYTES) +CIRC_VAL(h, short, NHALFS) +CIRC_VAL(w, int, NWORDS) +CIRC_VAL(d, long long, NDOBLS) + +/* + * Circular stores should only write to the first "size" elements of the b= uffer + * the remainder of the elements should have BUF[i] =3D=3D i + */ +#define CHECK_STORE(SZ, BUF, BUFSIZE, FMT) \ +void check_store_##SZ(int inc, int size) \ +{ \ + int i; \ + for (i =3D 0; i < size; i++) { \ + DEBUG_PRINTF(#BUF "[%3d] =3D 0x%02" #FMT ", guess =3D 0x%02" #FMT = "\n", \ + i, BUF[i], circ_val_##SZ(i, inc, size)); \ + if (BUF[i] !=3D circ_val_##SZ(i, inc, size)) { \ + printf("ERROR(%3d): 0x%02" #FMT " !=3D 0x%02" #FMT "\n", \ + i, BUF[i], circ_val_##SZ(i, inc, size)); \ + err++; \ + } \ + } \ + for (i =3D size; i < BUFSIZE; i++) { \ + if (BUF[i] !=3D i) { \ + printf("ERROR(%3d): 0x%02" #FMT " !=3D 0x%02x\n", i, BUF[i], i= ); \ + err++; \ + } \ + } \ +} + +CHECK_STORE(b, bbuf, NBYTES, x) +CHECK_STORE(h, hbuf, NHALFS, x) +CHECK_STORE(w, wbuf, NWORDS, x) +CHECK_STORE(d, dbuf, NDOBLS, llx) + +#define CIRC_TEST_STORE_IMM(SZ, CHK, TYPE, BUF, BUFSIZE, SHIFT, INC) \ +void circ_test_store_imm_##SZ(void) \ +{ \ + unsigned int size =3D 27; \ + TYPE *p =3D BUF; \ + TYPE val =3D 0; \ + int i; \ + init_##BUF(); \ + for (i =3D 0; i < BUFSIZE; i++) { \ + CIRC_STORE_IMM_##SZ(val << SHIFT, p, BUF, size * sizeof(TYPE), INC= ); \ + val++; \ + } \ + check_store_##CHK(((INC) / (int)sizeof(TYPE)), size); \ + p =3D BUF; \ + val =3D 0; \ + init_##BUF(); \ + for (i =3D 0; i < BUFSIZE; i++) { \ + CIRC_STORE_IMM_##SZ(val << SHIFT, p, BUF, size * sizeof(TYPE), \ + -(INC)); \ + val++; \ + } \ + check_store_##CHK((-(INC) / (int)sizeof(TYPE)), size); \ +} + +CIRC_TEST_STORE_IMM(b, b, unsigned char, bbuf, NBYTES, 0, 1) +CIRC_TEST_STORE_IMM(h, h, short, hbuf, NHALFS, 0, 2) +CIRC_TEST_STORE_IMM(f, h, short, hbuf, NHALFS, 16, 2) +CIRC_TEST_STORE_IMM(w, w, int, wbuf, NWORDS, 0, 4) +CIRC_TEST_STORE_IMM(d, d, long long, dbuf, NDOBLS, 0, 8) +CIRC_TEST_STORE_IMM(bnew, b, unsigned char, bbuf, NBYTES, 0, 1) +CIRC_TEST_STORE_IMM(hnew, h, short, hbuf, NHALFS, 0, 2) +CIRC_TEST_STORE_IMM(wnew, w, int, wbuf, NWORDS, 0, 4) + +#define CIRC_TEST_STORE_REG(SZ, CHK, TYPE, BUF, BUFSIZE, SHIFT) \ +void circ_test_store_reg_##SZ(void) \ +{ \ + TYPE *p =3D BUF; \ + unsigned int size =3D 19; \ + TYPE val =3D 0; \ + int i; \ + init_##BUF(); \ + for (i =3D 0; i < BUFSIZE; i++) { \ + CIRC_STORE_REG_##SZ(val << SHIFT, p, BUF, size * sizeof(TYPE), 1);= \ + val++; \ + } \ + check_store_##CHK(1, size); \ + p =3D BUF; \ + val =3D 0; \ + init_##BUF(); \ + for (i =3D 0; i < BUFSIZE; i++) { \ + CIRC_STORE_REG_##SZ(val << SHIFT, p, BUF, size * sizeof(TYPE), -1)= ; \ + val++; \ + } \ + check_store_##CHK(-1, size); \ +} + +CIRC_TEST_STORE_REG(b, b, unsigned char, bbuf, NBYTES, 0) +CIRC_TEST_STORE_REG(h, h, short, hbuf, NHALFS, 0) +CIRC_TEST_STORE_REG(f, h, short, hbuf, NHALFS, 16) +CIRC_TEST_STORE_REG(w, w, int, wbuf, NWORDS, 0) +CIRC_TEST_STORE_REG(d, d, long long, dbuf, NDOBLS, 0) +CIRC_TEST_STORE_REG(bnew, b, unsigned char, bbuf, NBYTES, 0) +CIRC_TEST_STORE_REG(hnew, h, short, hbuf, NHALFS, 0) +CIRC_TEST_STORE_REG(wnew, w, int, wbuf, NWORDS, 0) + +/* Test the old scheme used in Hexagon V3 */ +static void circ_test_v3(void) +{ + int *p =3D wbuf; + int size =3D 15; + int K =3D 4; /* 64 bytes */ + int element; + int i; + + init_wbuf(); + + for (i =3D 0; i < NWORDS; i++) { + __asm__( + "r4 =3D %2\n\t" + "m1 =3D r4\n\t" + "%0 =3D memw(%1++I:circ(M1))\n\t" + : "=3Dr"(element), "+r"(p) + : "r"(build_mreg(1, K, size * sizeof(int))) + : "r4", "m1"); + DEBUG_PRINTF("i =3D %2d, p =3D 0x%p, element =3D %2d\n", i, p, ele= ment); + check_load(i, element, 1, size); + } +} + +int main() +{ + init_bbuf(); + init_hbuf(); + init_wbuf(); + init_dbuf(); + + DEBUG_PRINTF("NBYTES =3D %d\n", NBYTES); + DEBUG_PRINTF("Address of dbuf =3D 0x%p\n", dbuf); + DEBUG_PRINTF("Address of wbuf =3D 0x%p\n", wbuf); + DEBUG_PRINTF("Address of hbuf =3D 0x%p\n", hbuf); + DEBUG_PRINTF("Address of bbuf =3D 0x%p\n", bbuf); + + circ_test_load_imm_b(); + circ_test_load_imm_ub(); + circ_test_load_imm_h(); + circ_test_load_imm_uh(); + circ_test_load_imm_w(); + circ_test_load_imm_d(); + + circ_test_load_reg_b(); + circ_test_load_reg_ub(); + circ_test_load_reg_h(); + circ_test_load_reg_uh(); + circ_test_load_reg_w(); + circ_test_load_reg_d(); + + circ_test_store_imm_b(); + circ_test_store_imm_h(); + circ_test_store_imm_f(); + circ_test_store_imm_w(); + circ_test_store_imm_d(); + circ_test_store_imm_bnew(); + circ_test_store_imm_hnew(); + circ_test_store_imm_wnew(); + + circ_test_store_reg_b(); + circ_test_store_reg_h(); + circ_test_store_reg_f(); + circ_test_store_reg_w(); + circ_test_store_reg_d(); + circ_test_store_reg_bnew(); + circ_test_store_reg_hnew(); + circ_test_store_reg_wnew(); + + circ_test_v3(); + + puts(err ? "FAIL" : "PASS"); + return err ? 1 : 0; +} diff --git a/target/hexagon/imported/encode_pp.def b/target/hexagon/importe= d/encode_pp.def index 514c2404ce..68b435ebe7 100644 --- a/target/hexagon/imported/encode_pp.def +++ b/target/hexagon/imported/encode_pp.def @@ -294,6 +294,7 @@ DEF_CLASS32(ICLASS_LD" ---- -------- PP------ --------"= ,LD) =20 =20 DEF_CLASS32(ICLASS_LD" 0--- -------- PP------ --------",LD_ADDR_ROFFSET) +DEF_CLASS32(ICLASS_LD" 100- -------- PP----0- --------",LD_ADDR_POST_CIRC_= IMMED) DEF_CLASS32(ICLASS_LD" 101- -------- PP00---- --------",LD_ADDR_POST_IMMED) DEF_CLASS32(ICLASS_LD" 101- -------- PP01---- --------",LD_ADDR_ABS_UPDATE= _V4) DEF_CLASS32(ICLASS_LD" 101- -------- PP1----- --------",LD_ADDR_POST_IMMED= _PRED_V2) @@ -308,18 +309,23 @@ DEF_FIELD32(ICLASS_LD" ---- --!----- PP------ -------= -",LD_UN,"Unsigned") =20 #define STD_LD_ENC(TAG,OPC) \ DEF_ENC32(L2_load##TAG##_io, ICLASS_LD" 0 ii "OPC" sssss PPiiiiii iii= ddddd")\ +DEF_ENC32(L2_load##TAG##_pci, ICLASS_LD" 1 00 "OPC" xxxxx PPu0--0i iii= ddddd")\ DEF_ENC32(L2_load##TAG##_pi, ICLASS_LD" 1 01 "OPC" xxxxx PP00---i iii= ddddd")\ DEF_ENC32(L4_load##TAG##_ap, ICLASS_LD" 1 01 "OPC" eeeee PP01IIII -II= ddddd")\ DEF_ENC32(L2_load##TAG##_pr, ICLASS_LD" 1 10 "OPC" xxxxx PPu0---- 0--= ddddd")\ DEF_ENC32(L4_load##TAG##_ur, ICLASS_LD" 1 10 "OPC" ttttt PPi1IIII iII= ddddd")\ +DEF_ENC32(L2_load##TAG##_pcr, ICLASS_LD" 1 00 "OPC" xxxxx PPu0--1- 0--= ddddd")\ =20 =20 #define STD_LDX_ENC(TAG,OPC) \ DEF_ENC32(L2_load##TAG##_io, ICLASS_LD" 0 ii "OPC" sssss PPiiiiii iii= yyyyy")\ +DEF_ENC32(L2_load##TAG##_pci, ICLASS_LD" 1 00 "OPC" xxxxx PPu0--0i iii= yyyyy")\ DEF_ENC32(L2_load##TAG##_pi, ICLASS_LD" 1 01 "OPC" xxxxx PP00---i iii= yyyyy")\ DEF_ENC32(L4_load##TAG##_ap, ICLASS_LD" 1 01 "OPC" eeeee PP01IIII -II= yyyyy")\ DEF_ENC32(L2_load##TAG##_pr, ICLASS_LD" 1 10 "OPC" xxxxx PPu0---- 0--= yyyyy")\ DEF_ENC32(L4_load##TAG##_ur, ICLASS_LD" 1 10 "OPC" ttttt PPi1IIII iII= yyyyy")\ +DEF_ENC32(L2_load##TAG##_pcr, ICLASS_LD" 1 00 "OPC" xxxxx PPu0--1- 0--= yyyyy")\ +DEF_ENC32(L2_load##TAG##_pbr, ICLASS_LD" 1 11 "OPC" xxxxx PPu0---- 0--= yyyyy") =20 =20 #define STD_PLD_ENC(TAG,OPC) \ @@ -351,6 +357,7 @@ STD_PLD_ENC(rd, "1 110") /* note dest reg field LSB=3D= 0, 1 is reserved */ =20 DEF_CLASS32( ICLASS_LD" 0--0 000----- PP------ --------",LD_MISC) DEF_ANTICLASS32(ICLASS_LD" 0--0 000----- PP------ --------",LD_ADDR_ROFFSE= T) +DEF_ANTICLASS32(ICLASS_LD" 1000 000----- PP------ --------",LD_ADDR_POST_C= IRC_IMMED) DEF_ANTICLASS32(ICLASS_LD" 1010 000----- PP------ --------",LD_ADDR_POST_I= MMED) DEF_ANTICLASS32(ICLASS_LD" 1100 000----- PP------ --------",LD_ADDR_POST_R= EG) DEF_ANTICLASS32(ICLASS_LD" 1110 000----- PP------ --------",LD_ADDR_POST_R= EG) @@ -397,6 +404,7 @@ DEF_FIELD32(ICLASS_ST" ---! !!------ PP------ --------"= ,ST_Type,"Type") DEF_FIELD32(ICLASS_ST" ---- --!----- PP------ --------",ST_UN,"Unsigned") =20 DEF_CLASS32(ICLASS_ST" 0--1 -------- PP------ --------",ST_ADDR_ROFFSET) +DEF_CLASS32(ICLASS_ST" 1001 -------- PP------ ------0-",ST_ADDR_POST_CIRC_= IMMED) DEF_CLASS32(ICLASS_ST" 1011 -------- PP0----- 0-----0-",ST_ADDR_POST_IMMED) DEF_CLASS32(ICLASS_ST" 1011 -------- PP0----- 1-------",ST_ADDR_ABS_UPDATE= _V4) DEF_CLASS32(ICLASS_ST" 1011 -------- PP1----- --------",ST_ADDR_POST_IMMED= _PRED_V2) @@ -411,10 +419,12 @@ DEF_CLASS32(ICLASS_ST" 0--0 0------- PP------ -------= -",ST_MISC_CACHEOP) =20 #define STD_ST_ENC(TAG,OPC,SRC) \ DEF_ENC32(S2_store##TAG##_io, ICLASS_ST" 0 ii "OPC" sssss PPi"SRC" ii= iiiiii")\ +DEF_ENC32(S2_store##TAG##_pci, ICLASS_ST" 1 00 "OPC" xxxxx PPu"SRC" 0i= iii-0-")\ DEF_ENC32(S2_store##TAG##_pi, ICLASS_ST" 1 01 "OPC" xxxxx PP0"SRC" 0i= iii-0-")\ DEF_ENC32(S4_store##TAG##_ap, ICLASS_ST" 1 01 "OPC" eeeee PP0"SRC" 1-= IIIIII")\ DEF_ENC32(S2_store##TAG##_pr, ICLASS_ST" 1 10 "OPC" xxxxx PPu"SRC" 0-= ------")\ DEF_ENC32(S4_store##TAG##_ur, ICLASS_ST" 1 10 "OPC" uuuuu PPi"SRC" 1i= IIIIII")\ +DEF_ENC32(S2_store##TAG##_pcr, ICLASS_ST" 1 00 "OPC" xxxxx PPu"SRC" 0-= ----1-")\ =20 =20 #define STD_PST_ENC(TAG,OPC,SRC) \ diff --git a/target/hexagon/imported/ldst.idef b/target/hexagon/imported/ld= st.idef index 78a2ea441c..6ce0635e32 100644 --- a/target/hexagon/imported/ldst.idef +++ b/target/hexagon/imported/ldst.idef @@ -26,6 +26,8 @@ Q6INSN(L4_##TAG##_ur, OPER"(Rt32<<#u2+#U6)", = ATTRIB,DESCR,{fMUST_IM Q6INSN(L4_##TAG##_ap, OPER"(Re32=3D#U6)", ATTRIB,DESCR,{= fMUST_IMMEXT(UiV); fEA_IMM(UiV); SEMANTICS; ReV=3DUiV; })\ Q6INSN(L2_##TAG##_pr, OPER"(Rx32++Mu2)", ATTRIB,DESCR,{fE= A_REG(RxV); fPM_M(RxV,MuV); SEMANTICS;})\ Q6INSN(L2_##TAG##_pi, OPER"(Rx32++#s4:"SHFT")", ATTRIB,DESCR,{fE= A_REG(RxV); fPM_I(RxV,siV); SEMANTICS;})\ +Q6INSN(L2_##TAG##_pci, OPER"(Rx32++#s4:"SHFT":circ(Mu2))",ATTRIB,DESCR,{fE= A_REG(RxV); fPM_CIRI(RxV,siV,MuV); SEMANTICS;})\ +Q6INSN(L2_##TAG##_pcr, OPER"(Rx32++I:circ(Mu2))", ATTRIB,DESCR,{fEA_REG(R= xV); fPM_CIRR(RxV,fREAD_IREG(MuV)<>21) | ((VAL>>17)&0x7f) )), = /* behavior */ + () +) + DEF_MACRO( fREAD_LR, /* read link register */ (READ_RREG(REG_LR)), /* behavior */ @@ -306,6 +312,12 @@ DEF_MACRO( () ) =20 +DEF_MACRO( + fREAD_CSREG, /* read CS register */ + (READ_RREG(REG_CSA+N)), /* behavior */ + () +) + DEF_MACRO( fREAD_LC0, /* read loop count */ (READ_RREG(REG_LC0)), /* behavior */ @@ -824,6 +836,20 @@ DEF_MACRO( () ) =20 +DEF_MACRO( + fPM_CIRI, /* Post Modify Register using Circular arithmetic by Immedia= te */ + do { fcirc_add(REG,siV,MuV); } while (0), + () +) + +DEF_MACRO( + fPM_CIRR, /* Post Modify Register using Circular arithmetic by registe= r */ + do { fcirc_add(REG,VAL,MuV); } while (0), + () +) + + + DEF_MACRO( fSCALE, /* scale by N */ (((size8s_t)(A))< (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 1619896671406271.34336827068864; Sat, 1 May 2021 12:17:51 -0700 (PDT) Received: from localhost ([::1]:50382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcv7d-0007BY-Uh for importer@patchew.org; Sat, 01 May 2021 15:17:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcuay-0000Bp-Nt for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:06 -0400 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]:36644) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuag-0000BU-4d for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:04 -0400 Received: by mail-pg1-x52c.google.com with SMTP id j7so851442pgi.3 for ; Sat, 01 May 2021 11:43:44 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h8CO0R/BCPRuNJEaRYZFBabpS387zSk/CvQcLCZlvLc=; b=MNU0Ij9BrjIif8XmMGxY5wWY49H/x8a+cg0sVLbpVkrn9K3h+0odhMtWzltarVPvE1 LXX1YxWVRVnl9eWh1MT+IJIf+CbXozpoeByxtLw5m8o/CPUsTMX5Lk8fMadHVsMXNufe xAjZ4lSW9RM4lQDEbMz9PJhc+c60LKGc0AFLuyDwq1nPiau8dJxuZEjzegIMHh6fF61z zlbCtvvvugM3+7/1aZAjRjyQHsffYE7nUrmCxlKymr+S9Z/4bz8Ml91xDOaVd+uOIuAR FlpqvAccuoPJ5/dpg5GZ6D79oD0iNUH28aje2p/MApceHifO3lG539d+mAT8htkvecX5 KJCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h8CO0R/BCPRuNJEaRYZFBabpS387zSk/CvQcLCZlvLc=; b=NFPALmU+Ga4BvU8rhoCGW20IgWGCa5pgr9mo08kpmbZskj1iooB9KBVCAOBMNxj34O egxcsHtiTY5DyHmwURV8ZUWxAg0B/kg1cu5hACAoPsZXOt4c4ofVBqUU3a2IToplGNel Zu8zlKqcpqwx2kbi+33DnB22mTO/kKzCteg8q3f3Wy0fdAmBpyxkIS2cN4TPJkfqtUTN DaYfTVXbU0VY+kW4VV0o6ToqvUkrPBWnTDf8YijCgp+jLCx5oOaEYW833hv40WY89pbD PCLTGPbn3rcoEaalL+n+u81HSUMPunMcpExVAfIZsb0ag2fbejILwgT2RDlkM6AuhfzR oGng== X-Gm-Message-State: AOAM533bieGLcLSW4WPRwObteLGn9QGxMhl3/dq2306prGZknGNNXHZm +jvT7Iw6uOFJUrT80x1Q/s2UYk5nh4KDDQ== X-Google-Smtp-Source: ABdhPJwF4OL/fiq/b1hE3rrFnZHkfphD1cnbWuURpCPTRSWj2W8LP34E+TCJkbr6fxr1jCqeUkZqkw== X-Received: by 2002:a63:f715:: with SMTP id x21mr10169199pgh.399.1619894623376; Sat, 01 May 2021 11:43:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 28/31] Hexagon (target/hexagon) bit reverse (brev) addressing Date: Sat, 1 May 2021 11:43:21 -0700 Message-Id: <20210501184324.1338186-29-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::52c; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson The following instructions are added L2_loadrub_pbr Rd32 =3D memub(Rx32++Mu2:brev) L2_loadrb_pbr Rd32 =3D memb(Rx32++Mu2:brev) L2_loadruh_pbr Rd32 =3D memuh(Rx32++Mu2:brev) L2_loadrh_pbr Rd32 =3D memh(Rx32++Mu2:brev) L2_loadri_pbr Rd32 =3D memw(Rx32++Mu2:brev) L2_loadrd_pbr Rdd32 =3D memd(Rx32++Mu2:brev) S2_storerb_pbr memb(Rx32++Mu2:brev).=3D.Rt32 S2_storerh_pbr memh(Rx32++Mu2:brev).=3D.Rt32 S2_storerf_pbr memh(Rx32++Mu2:brev).=3D.Rt.H32 S2_storeri_pbr memw(Rx32++Mu2:brev).=3D.Rt32 S2_storerd_pbr memd(Rx32++Mu2:brev).=3D.Rt32 S2_storerinew_pbr memw(Rx32++Mu2:brev).=3D.Nt8.new S2_storerbnew_pbr memw(Rx32++Mu2:brev).=3D.Nt8.new S2_storerhnew_pbr memw(Rx32++Mu2:brev).=3D.Nt8.new Test cases in tests/tcg/hexagon/brev.c Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-24-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/gen_tcg.h | 28 ++++ target/hexagon/helper.h | 1 + target/hexagon/macros.h | 1 + target/hexagon/op_helper.c | 8 ++ tests/tcg/hexagon/brev.c | 190 ++++++++++++++++++++++++++ target/hexagon/imported/encode_pp.def | 4 + target/hexagon/imported/ldst.idef | 2 + target/hexagon/imported/macros.def | 6 + tests/tcg/hexagon/Makefile.target | 1 + 9 files changed, 241 insertions(+) create mode 100644 tests/tcg/hexagon/brev.c diff --git a/target/hexagon/gen_tcg.h b/target/hexagon/gen_tcg.h index 25c228c112..8f0ec01f0a 100644 --- a/target/hexagon/gen_tcg.h +++ b/target/hexagon/gen_tcg.h @@ -37,6 +37,7 @@ * _sp stack pointer relative r0 =3D memw(r29+#12) * _ap absolute set r0 =3D memw(r1=3D##vari= able) * _pr post increment register r0 =3D memw(r1++m1) + * _pbr post increment bit reverse r0 =3D memw(r1++m1:brev) * _pi post increment immediate r0 =3D memb(r1++#1) * _pci post increment circular immediate r0 =3D memw(r1++#4:circ= (m0)) * _pcr post increment circular register r0 =3D memw(r1++I:circ(= m0)) @@ -53,6 +54,11 @@ fEA_REG(RxV); \ fPM_M(RxV, MuV); \ } while (0) +#define GET_EA_pbr \ + do { \ + gen_helper_fbrev(EA, RxV); \ + tcg_gen_add_tl(RxV, RxV, MuV); \ + } while (0) #define GET_EA_pi \ do { \ fEA_REG(RxV); \ @@ -128,16 +134,22 @@ fGEN_TCG_LOAD_pcr(3, fLOAD(1, 8, u, EA, RddV)) =20 #define fGEN_TCG_L2_loadrub_pr(SHORTCODE) SHORTCODE +#define fGEN_TCG_L2_loadrub_pbr(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadrub_pi(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadrb_pr(SHORTCODE) SHORTCODE +#define fGEN_TCG_L2_loadrb_pbr(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadrb_pi(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadruh_pr(SHORTCODE) SHORTCODE +#define fGEN_TCG_L2_loadruh_pbr(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadruh_pi(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadrh_pr(SHORTCODE) SHORTCODE +#define fGEN_TCG_L2_loadrh_pbr(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadrh_pi(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadri_pr(SHORTCODE) SHORTCODE +#define fGEN_TCG_L2_loadri_pbr(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadri_pi(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadrd_pr(SHORTCODE) SHORTCODE +#define fGEN_TCG_L2_loadrd_pbr(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadrd_pi(SHORTCODE) SHORTCODE =20 /* @@ -265,41 +277,57 @@ tcg_temp_free(BYTE); \ } while (0) =20 +#define fGEN_TCG_S2_storerb_pbr(SHORTCODE) \ + fGEN_TCG_STORE(SHORTCODE) #define fGEN_TCG_S2_storerb_pci(SHORTCODE) \ fGEN_TCG_STORE(SHORTCODE) #define fGEN_TCG_S2_storerb_pcr(SHORTCODE) \ fGEN_TCG_STORE_pcr(0, fSTORE(1, 1, EA, fGETBYTE(0, RtV))) =20 +#define fGEN_TCG_S2_storerh_pbr(SHORTCODE) \ + fGEN_TCG_STORE(SHORTCODE) #define fGEN_TCG_S2_storerh_pci(SHORTCODE) \ fGEN_TCG_STORE(SHORTCODE) #define fGEN_TCG_S2_storerh_pcr(SHORTCODE) \ fGEN_TCG_STORE_pcr(1, fSTORE(1, 2, EA, fGETHALF(0, RtV))) =20 +#define fGEN_TCG_S2_storerf_pbr(SHORTCODE) \ + fGEN_TCG_STORE(SHORTCODE) #define fGEN_TCG_S2_storerf_pci(SHORTCODE) \ fGEN_TCG_STORE(SHORTCODE) #define fGEN_TCG_S2_storerf_pcr(SHORTCODE) \ fGEN_TCG_STORE_pcr(1, fSTORE(1, 2, EA, fGETHALF(1, RtV))) =20 +#define fGEN_TCG_S2_storeri_pbr(SHORTCODE) \ + fGEN_TCG_STORE(SHORTCODE) #define fGEN_TCG_S2_storeri_pci(SHORTCODE) \ fGEN_TCG_STORE(SHORTCODE) #define fGEN_TCG_S2_storeri_pcr(SHORTCODE) \ fGEN_TCG_STORE_pcr(2, fSTORE(1, 4, EA, RtV)) =20 +#define fGEN_TCG_S2_storerd_pbr(SHORTCODE) \ + fGEN_TCG_STORE(SHORTCODE) #define fGEN_TCG_S2_storerd_pci(SHORTCODE) \ fGEN_TCG_STORE(SHORTCODE) #define fGEN_TCG_S2_storerd_pcr(SHORTCODE) \ fGEN_TCG_STORE_pcr(3, fSTORE(1, 8, EA, RttV)) =20 +#define fGEN_TCG_S2_storerbnew_pbr(SHORTCODE) \ + fGEN_TCG_STORE(SHORTCODE) #define fGEN_TCG_S2_storerbnew_pci(SHORTCODE) \ fGEN_TCG_STORE(SHORTCODE) #define fGEN_TCG_S2_storerbnew_pcr(SHORTCODE) \ fGEN_TCG_STORE_pcr(0, fSTORE(1, 1, EA, fGETBYTE(0, NtN))) =20 +#define fGEN_TCG_S2_storerhnew_pbr(SHORTCODE) \ + fGEN_TCG_STORE(SHORTCODE) #define fGEN_TCG_S2_storerhnew_pci(SHORTCODE) \ fGEN_TCG_STORE(SHORTCODE) #define fGEN_TCG_S2_storerhnew_pcr(SHORTCODE) \ fGEN_TCG_STORE_pcr(1, fSTORE(1, 2, EA, fGETHALF(0, NtN))) =20 +#define fGEN_TCG_S2_storerinew_pbr(SHORTCODE) \ + fGEN_TCG_STORE(SHORTCODE) #define fGEN_TCG_S2_storerinew_pci(SHORTCODE) \ fGEN_TCG_STORE(SHORTCODE) #define fGEN_TCG_S2_storerinew_pcr(SHORTCODE) \ diff --git a/target/hexagon/helper.h b/target/hexagon/helper.h index 3824ae01ea..ca201fb680 100644 --- a/target/hexagon/helper.h +++ b/target/hexagon/helper.h @@ -24,6 +24,7 @@ DEF_HELPER_FLAGS_3(debug_check_store_width, TCG_CALL_NO_W= G, void, env, int, int) DEF_HELPER_FLAGS_3(debug_commit_end, TCG_CALL_NO_WG, void, env, int, int) DEF_HELPER_2(commit_store, void, env, int) DEF_HELPER_FLAGS_4(fcircadd, TCG_CALL_NO_RWG_SE, s32, s32, s32, s32, s32) +DEF_HELPER_FLAGS_1(fbrev, TCG_CALL_NO_RWG_SE, i32, i32) DEF_HELPER_3(sfrecipa, i64, env, f32, f32) DEF_HELPER_2(sfinvsqrta, i64, env, f32) DEF_HELPER_4(vacsh_val, s64, env, s64, s64, s64) diff --git a/target/hexagon/macros.h b/target/hexagon/macros.h index 494ea8dfd8..30c8951c16 100644 --- a/target/hexagon/macros.h +++ b/target/hexagon/macros.h @@ -481,6 +481,7 @@ static inline TCGv gen_read_ireg(TCGv result, TCGv val,= int shift) #ifdef QEMU_GENERATE #define fEA_IMM(IMM) tcg_gen_movi_tl(EA, IMM) #define fEA_REG(REG) tcg_gen_mov_tl(EA, REG) +#define fEA_BREVR(REG) gen_helper_fbrev(EA, REG) #define fPM_I(REG, IMM) tcg_gen_addi_tl(REG, REG, IMM) #define fPM_M(REG, MVAL) tcg_gen_add_tl(REG, REG, MVAL) #define fPM_CIRI(REG, IMM, MVAL) \ diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index 2319b9313e..63dd685658 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -281,6 +281,14 @@ int32_t HELPER(fcircadd)(int32_t RxV, int32_t offset, = int32_t M, int32_t CS) return new_ptr; } =20 +uint32_t HELPER(fbrev)(uint32_t addr) +{ + /* + * Bit reverse the low 16 bits of the address + */ + return deposit32(addr, 0, 16, revbit16(addr)); +} + static float32 build_float32(uint8_t sign, uint32_t exp, uint32_t mant) { return make_float32( diff --git a/tests/tcg/hexagon/brev.c b/tests/tcg/hexagon/brev.c new file mode 100644 index 0000000000..9736a2405d --- /dev/null +++ b/tests/tcg/hexagon/brev.c @@ -0,0 +1,190 @@ +/* + * Copyright(c) 2019-2021 Qualcomm Innovation Center, Inc. All Rights Res= erved. + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#include +#include + +int err; + +#define NBITS 8 +#define SIZE (1 << NBITS) + +long long dbuf[SIZE] __attribute__((aligned(1 << 16))) =3D {0}; +int wbuf[SIZE] __attribute__((aligned(1 << 16))) =3D {0}; +short hbuf[SIZE] __attribute__((aligned(1 << 16))) =3D {0}; +unsigned char bbuf[SIZE] __attribute__((aligned(1 << 16))) =3D {0}; + +/* + * We use the C preporcessor to deal with the combinations of types + */ + +#define BREV_LOAD(SZ, RES, ADDR, INC) \ + __asm__( \ + "m0 =3D %2\n\t" \ + "%0 =3D mem" #SZ "(%1++m0:brev)\n\t" \ + : "=3Dr"(RES), "+r"(ADDR) \ + : "r"(INC) \ + : "m0") + +#define BREV_LOAD_b(RES, ADDR, INC) \ + BREV_LOAD(b, RES, ADDR, INC) +#define BREV_LOAD_ub(RES, ADDR, INC) \ + BREV_LOAD(ub, RES, ADDR, INC) +#define BREV_LOAD_h(RES, ADDR, INC) \ + BREV_LOAD(h, RES, ADDR, INC) +#define BREV_LOAD_uh(RES, ADDR, INC) \ + BREV_LOAD(uh, RES, ADDR, INC) +#define BREV_LOAD_w(RES, ADDR, INC) \ + BREV_LOAD(w, RES, ADDR, INC) +#define BREV_LOAD_d(RES, ADDR, INC) \ + BREV_LOAD(d, RES, ADDR, INC) + +#define BREV_STORE(SZ, PART, ADDR, VAL, INC) \ + __asm__( \ + "m0 =3D %2\n\t" \ + "mem" #SZ "(%0++m0:brev) =3D %1" PART "\n\t" \ + : "+r"(ADDR) \ + : "r"(VAL), "r"(INC) \ + : "m0", "memory") + +#define BREV_STORE_b(ADDR, VAL, INC) \ + BREV_STORE(b, "", ADDR, VAL, INC) +#define BREV_STORE_h(ADDR, VAL, INC) \ + BREV_STORE(h, "", ADDR, VAL, INC) +#define BREV_STORE_f(ADDR, VAL, INC) \ + BREV_STORE(h, ".H", ADDR, VAL, INC) +#define BREV_STORE_w(ADDR, VAL, INC) \ + BREV_STORE(w, "", ADDR, VAL, INC) +#define BREV_STORE_d(ADDR, VAL, INC) \ + BREV_STORE(d, "", ADDR, VAL, INC) + +#define BREV_STORE_NEW(SZ, ADDR, VAL, INC) \ + __asm__( \ + "m0 =3D %2\n\t" \ + "{\n\t" \ + " r5 =3D %1\n\t" \ + " mem" #SZ "(%0++m0:brev) =3D r5.new\n\t" \ + "}\n\t" \ + : "+r"(ADDR) \ + : "r"(VAL), "r"(INC) \ + : "r5", "m0", "memory") + +#define BREV_STORE_bnew(ADDR, VAL, INC) \ + BREV_STORE_NEW(b, ADDR, VAL, INC) +#define BREV_STORE_hnew(ADDR, VAL, INC) \ + BREV_STORE_NEW(h, ADDR, VAL, INC) +#define BREV_STORE_wnew(ADDR, VAL, INC) \ + BREV_STORE_NEW(w, ADDR, VAL, INC) + +int bitreverse(int x) +{ + int result =3D 0; + int i; + for (i =3D 0; i < NBITS; i++) { + result <<=3D 1; + result |=3D x & 1; + x >>=3D 1; + } + return result; +} + +int sext8(int x) +{ + return (x << 24) >> 24; +} + +void check(int i, long long result, long long expect) +{ + if (result !=3D expect) { + printf("ERROR(%d): 0x%04llx !=3D 0x%04llx\n", i, result, expect); + err++; + } +} + +#define TEST_BREV_LOAD(SZ, TYPE, BUF, SHIFT, EXP) \ + do { \ + p =3D BUF; \ + for (i =3D 0; i < SIZE; i++) { \ + TYPE result; \ + BREV_LOAD_##SZ(result, p, 1 << (SHIFT - NBITS)); \ + check(i, result, EXP); \ + } \ + } while (0) + +#define TEST_BREV_STORE(SZ, TYPE, BUF, VAL, SHIFT) \ + do { \ + p =3D BUF; \ + memset(BUF, 0xff, sizeof(BUF)); \ + for (i =3D 0; i < SIZE; i++) { \ + BREV_STORE_##SZ(p, (TYPE)(VAL), 1 << (SHIFT - NBITS)); \ + } \ + for (i =3D 0; i < SIZE; i++) { \ + check(i, BUF[i], bitreverse(i)); \ + } \ + } while (0) + +#define TEST_BREV_STORE_NEW(SZ, BUF, SHIFT) \ + do { \ + p =3D BUF; \ + memset(BUF, 0xff, sizeof(BUF)); \ + for (i =3D 0; i < SIZE; i++) { \ + BREV_STORE_##SZ(p, i, 1 << (SHIFT - NBITS)); \ + } \ + for (i =3D 0; i < SIZE; i++) { \ + check(i, BUF[i], bitreverse(i)); \ + } \ + } while (0) + +/* + * We'll set high_half[i] =3D i << 16 for use in the .H form of store + * which stores from the high half of the word. + */ +int high_half[SIZE]; + +int main() +{ + void *p; + int i; + + for (i =3D 0; i < SIZE; i++) { + bbuf[i] =3D bitreverse(i); + hbuf[i] =3D bitreverse(i); + wbuf[i] =3D bitreverse(i); + dbuf[i] =3D bitreverse(i); + high_half[i] =3D i << 16; + } + + TEST_BREV_LOAD(b, int, bbuf, 16, sext8(i)); + TEST_BREV_LOAD(ub, int, bbuf, 16, i); + TEST_BREV_LOAD(h, int, hbuf, 15, i); + TEST_BREV_LOAD(uh, int, hbuf, 15, i); + TEST_BREV_LOAD(w, int, wbuf, 14, i); + TEST_BREV_LOAD(d, long long, dbuf, 13, i); + + TEST_BREV_STORE(b, int, bbuf, i, 16); + TEST_BREV_STORE(h, int, hbuf, i, 15); + TEST_BREV_STORE(f, int, hbuf, high_half[i], 15); + TEST_BREV_STORE(w, int, wbuf, i, 14); + TEST_BREV_STORE(d, long long, dbuf, i, 13); + + TEST_BREV_STORE_NEW(bnew, bbuf, 16); + TEST_BREV_STORE_NEW(hnew, hbuf, 15); + TEST_BREV_STORE_NEW(wnew, wbuf, 14); + + puts(err ? "FAIL" : "PASS"); + return err ? 1 : 0; +} diff --git a/target/hexagon/imported/encode_pp.def b/target/hexagon/importe= d/encode_pp.def index 68b435ebe7..4464926634 100644 --- a/target/hexagon/imported/encode_pp.def +++ b/target/hexagon/imported/encode_pp.def @@ -301,6 +301,7 @@ DEF_CLASS32(ICLASS_LD" 101- -------- PP1----- --------"= ,LD_ADDR_POST_IMMED_PRED_ DEF_CLASS32(ICLASS_LD" 110- -------- PP-0---- 0-------",LD_ADDR_POST_REG) DEF_CLASS32(ICLASS_LD" 110- -------- PP-1---- --------",LD_ADDR_ABS_PLUS_R= EG_V4) DEF_CLASS32(ICLASS_LD" 100- -------- PP----1- --------",LD_ADDR_POST_CREG_= V2) +DEF_CLASS32(ICLASS_LD" 111- -------- PP------ 0-------",LD_ADDR_POST_BREV_= REG) DEF_CLASS32(ICLASS_LD" 111- -------- PP------ 1-------",LD_ADDR_PRED_ABS_V= 4) =20 DEF_FIELD32(ICLASS_LD" !!!- -------- PP------ --------",LD_Amode,"Amode") @@ -315,6 +316,7 @@ DEF_ENC32(L4_load##TAG##_ap, ICLASS_LD" 1 01 "OPC" e= eeee PP01IIII -IIddddd" DEF_ENC32(L2_load##TAG##_pr, ICLASS_LD" 1 10 "OPC" xxxxx PPu0---- 0--= ddddd")\ DEF_ENC32(L4_load##TAG##_ur, ICLASS_LD" 1 10 "OPC" ttttt PPi1IIII iII= ddddd")\ DEF_ENC32(L2_load##TAG##_pcr, ICLASS_LD" 1 00 "OPC" xxxxx PPu0--1- 0--= ddddd")\ +DEF_ENC32(L2_load##TAG##_pbr, ICLASS_LD" 1 11 "OPC" xxxxx PPu0---- 0--= ddddd") =20 =20 #define STD_LDX_ENC(TAG,OPC) \ @@ -412,6 +414,7 @@ DEF_CLASS32(ICLASS_ST" 1111 -------- PP------ 1-------"= ,ST_ADDR_PRED_ABS_V4) DEF_CLASS32(ICLASS_ST" 1101 -------- PP------ 0-------",ST_ADDR_POST_REG) DEF_CLASS32(ICLASS_ST" 1101 -------- PP------ 1-------",ST_ADDR_ABS_PLUS_R= EG_V4) DEF_CLASS32(ICLASS_ST" 1001 -------- PP------ ------1-",ST_ADDR_POST_CREG_= V2) +DEF_CLASS32(ICLASS_ST" 1111 -------- PP------ 0-------",ST_ADDR_POST_BREV_= REG) DEF_CLASS32(ICLASS_ST" 0--0 1------- PP------ --------",ST_MISC_STORELIKE) DEF_CLASS32(ICLASS_ST" 1--0 0------- PP------ --------",ST_MISC_BUSOP) DEF_CLASS32(ICLASS_ST" 0--0 0------- PP------ --------",ST_MISC_CACHEOP) @@ -425,6 +428,7 @@ DEF_ENC32(S4_store##TAG##_ap, ICLASS_ST" 1 01 "OPC" = eeeee PP0"SRC" 1-IIIIII DEF_ENC32(S2_store##TAG##_pr, ICLASS_ST" 1 10 "OPC" xxxxx PPu"SRC" 0-= ------")\ DEF_ENC32(S4_store##TAG##_ur, ICLASS_ST" 1 10 "OPC" uuuuu PPi"SRC" 1i= IIIIII")\ DEF_ENC32(S2_store##TAG##_pcr, ICLASS_ST" 1 00 "OPC" xxxxx PPu"SRC" 0-= ----1-")\ +DEF_ENC32(S2_store##TAG##_pbr, ICLASS_ST" 1 11 "OPC" xxxxx PPu"SRC" 0-= ------") =20 =20 #define STD_PST_ENC(TAG,OPC,SRC) \ diff --git a/target/hexagon/imported/ldst.idef b/target/hexagon/imported/ld= st.idef index 6ce0635e32..fe7e018cf1 100644 --- a/target/hexagon/imported/ldst.idef +++ b/target/hexagon/imported/ldst.idef @@ -25,6 +25,7 @@ Q6INSN(L2_##TAG##_io, OPER"(Rs32+#s11:"SHFT")", = ATTRIB,DESCR,{fIMMEXT( Q6INSN(L4_##TAG##_ur, OPER"(Rt32<<#u2+#U6)", ATTRIB,DESCR,{fM= UST_IMMEXT(UiV); fEA_IRs(UiV,RtV,uiV); SEMANTICS;})\ Q6INSN(L4_##TAG##_ap, OPER"(Re32=3D#U6)", ATTRIB,DESCR,{= fMUST_IMMEXT(UiV); fEA_IMM(UiV); SEMANTICS; ReV=3DUiV; })\ Q6INSN(L2_##TAG##_pr, OPER"(Rx32++Mu2)", ATTRIB,DESCR,{fE= A_REG(RxV); fPM_M(RxV,MuV); SEMANTICS;})\ +Q6INSN(L2_##TAG##_pbr, OPER"(Rx32++Mu2:brev)", ATTRIB,DESCR,{fE= A_BREVR(RxV); fPM_M(RxV,MuV); SEMANTICS;})\ Q6INSN(L2_##TAG##_pi, OPER"(Rx32++#s4:"SHFT")", ATTRIB,DESCR,{fE= A_REG(RxV); fPM_I(RxV,siV); SEMANTICS;})\ Q6INSN(L2_##TAG##_pci, OPER"(Rx32++#s4:"SHFT":circ(Mu2))",ATTRIB,DESCR,{fE= A_REG(RxV); fPM_CIRI(RxV,siV,MuV); SEMANTICS;})\ Q6INSN(L2_##TAG##_pcr, OPER"(Rx32++I:circ(Mu2))", ATTRIB,DESCR,{fEA_REG(R= xV); fPM_CIRR(RxV,fREAD_IREG(MuV)< (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 1619896125686937.2846335842366; Sat, 1 May 2021 12:08:45 -0700 (PDT) Received: from localhost ([::1]:55428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcuyq-00065s-Jb for importer@patchew.org; Sat, 01 May 2021 15:08:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcub6-0000Ep-N6 for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:12 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]:42956) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuah-0000Bc-Js for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:12 -0400 Received: by mail-pj1-x102b.google.com with SMTP id j6-20020a17090adc86b02900cbfe6f2c96so1049294pjv.1 for ; Sat, 01 May 2021 11:43:45 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gKKAzrUHYz+ExPWP3NA9e1A81V78h+saxGFQViYCGzw=; b=HHHZ6xhK1G1beQ/uupUFy0fpdS8qQwATCfigpvrFDfuJjRqmirtxmoY88JoKii4cWM l8tdbUxd1CBU0SLzrh8ZcVG0FqTCRK21eEtavJZmIMZT61ejaRr+stdXAmrxlhFNKJth PwivOkAnhqe1HnwYXkRSXLZRFClSaw8UXCtlR1ahartpHFqY5dLEZ7XS+IM/Wvgh85zS fAyNLFUOQxxrGaWtVvm5OzwgR+aW8uB0wUfZMdshzzXG6sBf+jg347xCQ7Y3dkv+/CQc mdo2r2CS9TfSzOQXQVuOfKhmVSagqGlhKYR8YCTHCgvoRMjEA1kC3E+ocaGmu8ncZ8vv WLmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gKKAzrUHYz+ExPWP3NA9e1A81V78h+saxGFQViYCGzw=; b=Khv+aZ+o5hK2zkfx73HYIBaD5/UrXSfdXIKR988pvqlyOzklz04iSIqVA0ckU5SHQv Lh0+k1K5LfxS0FiSiVUFIxGXT8OU+lWKqQ5aF87oPUmo7Wt986gAx9V882q63NRE3veN ZXouFKmjSHqb8Q4bbRs37VJfDZAjs3rH16su3mt4rrvUpkBq38C4B/lhZJzej+gkWdZy 969ewLtSShMIFQmCTmdO8uDkwZxQwgZRF57vBueE7+KbXhyV4jzXNKUmukBVlFIgRI6M G1fVcVHiqB5PKNo9f7pOSP7CVHrKk19pn8CCIhVQf6vYye7t2tFMb1dHvwO54a2qDmZc EUWA== X-Gm-Message-State: AOAM533BVSREG1cJB4tUpBg/qqq36F0kFJOHb4rkmEo/EQdYAlKPsXUA oQaBd4B57iXD5fHLiN4S1MtTVzDLakr/ww== X-Google-Smtp-Source: ABdhPJw8e6WSvE4Ha5SNILP+vSIE0eQKCNHFqVkjHDTTc93jOrzRWAAymJ2dIOCBU99421wVFqn7GQ== X-Received: by 2002:a17:90a:bb13:: with SMTP id u19mr11780202pjr.96.1619894624028; Sat, 01 May 2021 11:43:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 29/31] Hexagon (target/hexagon) load and unpack bytes instructions Date: Sat, 1 May 2021 11:43:22 -0700 Message-Id: <20210501184324.1338186-30-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson The following instructions are added L2_loadbzw2_io Rd32 =3D memubh(Rs32+#s11:1) L2_loadbzw4_io Rdd32 =3D memubh(Rs32+#s11:1) L2_loadbsw2_io Rd32 =3D membh(Rs32+#s11:1) L2_loadbsw4_io Rdd32 =3D membh(Rs32+#s11:1) L4_loadbzw2_ur Rd32 =3D memubh(Rt32<<#u2+#U6) L4_loadbzw4_ur Rdd32 =3D memubh(Rt32<<#u2+#U6) L4_loadbsw2_ur Rd32 =3D membh(Rt32<<#u2+#U6) L4_loadbsw4_ur Rdd32 =3D membh(Rt32<<#u2+#U6) L4_loadbzw2_ap Rd32 =3D memubh(Re32=3D#U6) L4_loadbzw4_ap Rdd32 =3D memubh(Re32=3D#U6) L4_loadbsw2_ap Rd32 =3D membh(Re32=3D#U6) L4_loadbsw4_ap Rdd32 =3D membh(Re32=3D#U6) L2_loadbzw2_pr Rd32 =3D memubh(Rx32++Mu2) L2_loadbzw4_pr Rdd32 =3D memubh(Rx32++Mu2) L2_loadbsw2_pr Rd32 =3D membh(Rx32++Mu2) L2_loadbsw4_pr Rdd32 =3D membh(Rx32++Mu2) L2_loadbzw2_pbr Rd32 =3D memubh(Rx32++Mu2:brev) L2_loadbzw4_pbr Rdd32 =3D memubh(Rx32++Mu2:brev) L2_loadbsw2_pbr Rd32 =3D membh(Rx32++Mu2:brev) L2_loadbsw4_pbr Rdd32 =3D membh(Rx32++Mu2:brev) L2_loadbzw2_pi Rd32 =3D memubh(Rx32++#s4:1) L2_loadbzw4_pi Rdd32 =3D memubh(Rx32++#s4:1) L2_loadbsw2_pi Rd32 =3D membh(Rx32++#s4:1) L2_loadbsw4_pi Rdd32 =3D membh(Rx32++#s4:1) L2_loadbzw2_pci Rd32 =3D memubh(Rx32++#s4:1:circ(Mu2)) L2_loadbzw4_pci Rdd32 =3D memubh(Rx32++#s4:1:circ(Mu2)) L2_loadbsw2_pci Rd32 =3D membh(Rx32++#s4:1:circ(Mu2)) L2_loadbsw4_pci Rdd32 =3D membh(Rx32++#s4:1:circ(Mu2)) L2_loadbzw2_pcr Rd32 =3D memubh(Rx32++I:circ(Mu2)) L2_loadbzw4_pcr Rdd32 =3D memubh(Rx32++I:circ(Mu2)) L2_loadbsw2_pcr Rd32 =3D membh(Rx32++I:circ(Mu2)) L2_loadbsw4_pcr Rdd32 =3D membh(Rx32++I:circ(Mu2)) Test cases in tests/tcg/hexagon/load_unpack.c Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-25-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/gen_tcg.h | 108 ++++++ target/hexagon/macros.h | 16 + target/hexagon/genptr.c | 13 + tests/tcg/hexagon/load_unpack.c | 474 ++++++++++++++++++++++++++ target/hexagon/imported/encode_pp.def | 6 + target/hexagon/imported/ldst.idef | 43 +++ tests/tcg/hexagon/Makefile.target | 1 + 7 files changed, 661 insertions(+) create mode 100644 tests/tcg/hexagon/load_unpack.c diff --git a/target/hexagon/gen_tcg.h b/target/hexagon/gen_tcg.h index 8f0ec01f0a..1120aaed4e 100644 --- a/target/hexagon/gen_tcg.h +++ b/target/hexagon/gen_tcg.h @@ -152,6 +152,114 @@ #define fGEN_TCG_L2_loadrd_pbr(SHORTCODE) SHORTCODE #define fGEN_TCG_L2_loadrd_pi(SHORTCODE) SHORTCODE =20 +/* + * These instructions load 2 bytes and places them in + * two halves of the destination register. + * The GET_EA macro determines the addressing mode. + * The SIGN argument determines whether to zero-extend or + * sign-extend. + */ +#define fGEN_TCG_loadbXw2(GET_EA, SIGN) \ + do { \ + TCGv tmp =3D tcg_temp_new(); \ + TCGv byte =3D tcg_temp_new(); \ + GET_EA; \ + fLOAD(1, 2, u, EA, tmp); \ + tcg_gen_movi_tl(RdV, 0); \ + for (int i =3D 0; i < 2; i++) { \ + gen_set_half(i, RdV, gen_get_byte(byte, i, tmp, (SIGN))); \ + } \ + tcg_temp_free(tmp); \ + tcg_temp_free(byte); \ + } while (0) + +#define fGEN_TCG_L2_loadbzw2_io(SHORTCODE) \ + fGEN_TCG_loadbXw2(fEA_RI(RsV, siV), false) +#define fGEN_TCG_L4_loadbzw2_ur(SHORTCODE) \ + fGEN_TCG_loadbXw2(fEA_IRs(UiV, RtV, uiV), false) +#define fGEN_TCG_L2_loadbsw2_io(SHORTCODE) \ + fGEN_TCG_loadbXw2(fEA_RI(RsV, siV), true) +#define fGEN_TCG_L4_loadbsw2_ur(SHORTCODE) \ + fGEN_TCG_loadbXw2(fEA_IRs(UiV, RtV, uiV), true) +#define fGEN_TCG_L4_loadbzw2_ap(SHORTCODE) \ + fGEN_TCG_loadbXw2(GET_EA_ap, false) +#define fGEN_TCG_L2_loadbzw2_pr(SHORTCODE) \ + fGEN_TCG_loadbXw2(GET_EA_pr, false) +#define fGEN_TCG_L2_loadbzw2_pbr(SHORTCODE) \ + fGEN_TCG_loadbXw2(GET_EA_pbr, false) +#define fGEN_TCG_L2_loadbzw2_pi(SHORTCODE) \ + fGEN_TCG_loadbXw2(GET_EA_pi, false) +#define fGEN_TCG_L4_loadbsw2_ap(SHORTCODE) \ + fGEN_TCG_loadbXw2(GET_EA_ap, true) +#define fGEN_TCG_L2_loadbsw2_pr(SHORTCODE) \ + fGEN_TCG_loadbXw2(GET_EA_pr, true) +#define fGEN_TCG_L2_loadbsw2_pbr(SHORTCODE) \ + fGEN_TCG_loadbXw2(GET_EA_pbr, true) +#define fGEN_TCG_L2_loadbsw2_pi(SHORTCODE) \ + fGEN_TCG_loadbXw2(GET_EA_pi, true) +#define fGEN_TCG_L2_loadbzw2_pci(SHORTCODE) \ + fGEN_TCG_loadbXw2(GET_EA_pci, false) +#define fGEN_TCG_L2_loadbsw2_pci(SHORTCODE) \ + fGEN_TCG_loadbXw2(GET_EA_pci, true) +#define fGEN_TCG_L2_loadbzw2_pcr(SHORTCODE) \ + fGEN_TCG_loadbXw2(GET_EA_pcr(1), false) +#define fGEN_TCG_L2_loadbsw2_pcr(SHORTCODE) \ + fGEN_TCG_loadbXw2(GET_EA_pcr(1), true) + +/* + * These instructions load 4 bytes and places them in + * four halves of the destination register pair. + * The GET_EA macro determines the addressing mode. + * The SIGN argument determines whether to zero-extend or + * sign-extend. + */ +#define fGEN_TCG_loadbXw4(GET_EA, SIGN) \ + do { \ + TCGv tmp =3D tcg_temp_new(); \ + TCGv byte =3D tcg_temp_new(); \ + GET_EA; \ + fLOAD(1, 4, u, EA, tmp); \ + tcg_gen_movi_i64(RddV, 0); \ + for (int i =3D 0; i < 4; i++) { \ + gen_set_half_i64(i, RddV, gen_get_byte(byte, i, tmp, (SIGN)));= \ + } \ + tcg_temp_free(tmp); \ + tcg_temp_free(byte); \ + } while (0) + +#define fGEN_TCG_L2_loadbzw4_io(SHORTCODE) \ + fGEN_TCG_loadbXw4(fEA_RI(RsV, siV), false) +#define fGEN_TCG_L4_loadbzw4_ur(SHORTCODE) \ + fGEN_TCG_loadbXw4(fEA_IRs(UiV, RtV, uiV), false) +#define fGEN_TCG_L2_loadbsw4_io(SHORTCODE) \ + fGEN_TCG_loadbXw4(fEA_RI(RsV, siV), true) +#define fGEN_TCG_L4_loadbsw4_ur(SHORTCODE) \ + fGEN_TCG_loadbXw4(fEA_IRs(UiV, RtV, uiV), true) +#define fGEN_TCG_L2_loadbzw4_pci(SHORTCODE) \ + fGEN_TCG_loadbXw4(GET_EA_pci, false) +#define fGEN_TCG_L2_loadbsw4_pci(SHORTCODE) \ + fGEN_TCG_loadbXw4(GET_EA_pci, true) +#define fGEN_TCG_L2_loadbzw4_pcr(SHORTCODE) \ + fGEN_TCG_loadbXw4(GET_EA_pcr(2), false) +#define fGEN_TCG_L2_loadbsw4_pcr(SHORTCODE) \ + fGEN_TCG_loadbXw4(GET_EA_pcr(2), true) +#define fGEN_TCG_L4_loadbzw4_ap(SHORTCODE) \ + fGEN_TCG_loadbXw4(GET_EA_ap, false) +#define fGEN_TCG_L2_loadbzw4_pr(SHORTCODE) \ + fGEN_TCG_loadbXw4(GET_EA_pr, false) +#define fGEN_TCG_L2_loadbzw4_pbr(SHORTCODE) \ + fGEN_TCG_loadbXw4(GET_EA_pbr, false) +#define fGEN_TCG_L2_loadbzw4_pi(SHORTCODE) \ + fGEN_TCG_loadbXw4(GET_EA_pi, false) +#define fGEN_TCG_L4_loadbsw4_ap(SHORTCODE) \ + fGEN_TCG_loadbXw4(GET_EA_ap, true) +#define fGEN_TCG_L2_loadbsw4_pr(SHORTCODE) \ + fGEN_TCG_loadbXw4(GET_EA_pr, true) +#define fGEN_TCG_L2_loadbsw4_pbr(SHORTCODE) \ + fGEN_TCG_loadbXw4(GET_EA_pbr, true) +#define fGEN_TCG_L2_loadbsw4_pi(SHORTCODE) \ + fGEN_TCG_loadbXw4(GET_EA_pi, true) + /* * Predicated loads * Here is a primer to understand the tag names diff --git a/target/hexagon/macros.h b/target/hexagon/macros.h index 30c8951c16..ec5bf60f5e 100644 --- a/target/hexagon/macros.h +++ b/target/hexagon/macros.h @@ -465,6 +465,21 @@ static inline TCGv gen_read_ireg(TCGv result, TCGv val= , int shift) #define fCAST8S_16S(A) (int128_exts64(A)) #define fCAST16S_8S(A) (int128_getlo(A)) =20 +#ifdef QEMU_GENERATE +#define fEA_RI(REG, IMM) tcg_gen_addi_tl(EA, REG, IMM) +#define fEA_RRs(REG, REG2, SCALE) \ + do { \ + TCGv tmp =3D tcg_temp_new(); \ + tcg_gen_shli_tl(tmp, REG2, SCALE); \ + tcg_gen_add_tl(EA, REG, tmp); \ + tcg_temp_free(tmp); \ + } while (0) +#define fEA_IRs(IMM, REG, SCALE) \ + do { \ + tcg_gen_shli_tl(EA, REG, SCALE); \ + tcg_gen_addi_tl(EA, EA, IMM); \ + } while (0) +#else #define fEA_RI(REG, IMM) \ do { \ EA =3D REG + IMM; \ @@ -477,6 +492,7 @@ static inline TCGv gen_read_ireg(TCGv result, TCGv val,= int shift) do { \ EA =3D IMM + (REG << SCALE); \ } while (0) +#endif =20 #ifdef QEMU_GENERATE #define fEA_IMM(IMM) tcg_gen_movi_tl(EA, IMM) diff --git a/target/hexagon/genptr.c b/target/hexagon/genptr.c index eac3f61921..55c7cd86a4 100644 --- a/target/hexagon/genptr.c +++ b/target/hexagon/genptr.c @@ -306,6 +306,19 @@ static inline TCGv gen_get_half(TCGv result, int N, TC= Gv src, bool sign) return result; } =20 +static inline void gen_set_half(int N, TCGv result, TCGv src) +{ + tcg_gen_deposit_tl(result, result, src, N * 16, 16); +} + +static inline void gen_set_half_i64(int N, TCGv_i64 result, TCGv src) +{ + TCGv_i64 src64 =3D tcg_temp_new_i64(); + tcg_gen_extu_i32_i64(src64, src); + tcg_gen_deposit_i64(result, result, src64, N * 16, 16); + tcg_temp_free_i64(src64); +} + static inline void gen_set_byte(int N, TCGv result, TCGv src) { tcg_gen_deposit_tl(result, result, src, N * 8, 8); diff --git a/tests/tcg/hexagon/load_unpack.c b/tests/tcg/hexagon/load_unpac= k.c new file mode 100644 index 0000000000..3575a37a28 --- /dev/null +++ b/tests/tcg/hexagon/load_unpack.c @@ -0,0 +1,474 @@ +/* + * Copyright(c) 2019-2021 Qualcomm Innovation Center, Inc. All Rights Res= erved. + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +/* + * Test load unpack instructions + * + * Example + * r0 =3D memubh(r1+#0) + * loads a half word from memory and zero-extends the 2 bytes to form a wo= rd + * + * For each addressing mode, there are 4 tests + * bzw2 unsigned 2 elements + * bsw2 signed 2 elements + * bzw4 unsigned 4 elements + * bsw4 signed 4 elements + * There are 8 addressing modes, for a total of 32 instructions to test + */ + +#include +#include + +int err; + +char buf[16] __attribute__((aligned(1 << 16))); + +void init_buf(void) +{ + int i; + for (i =3D 0; i < 16; i++) { + int sign =3D i % 2 =3D=3D 0 ? 0x80 : 0; + buf[i] =3D sign | (i + 1); + } +} + +void __check(int line, long long result, long long expect) +{ + if (result !=3D expect) { + printf("ERROR at line %d: 0x%08llx !=3D 0x%08llx\n", + line, result, expect); + err++; + } +} + +#define check(RES, EXP) __check(__LINE__, RES, EXP) + +void __checkp(int line, void *p, void *expect) +{ + if (p !=3D expect) { + printf("ERROR at line %d: 0x%p !=3D 0x%p\n", line, p, expect); + err++; + } +} + +#define checkp(RES, EXP) __checkp(__LINE__, RES, EXP) + +/* + *************************************************************************= *** + * _io addressing mode (addr + offset) + */ +#define BxW_LOAD_io(SZ, RES, ADDR, OFF) \ + __asm__( \ + "%0 =3D mem" #SZ "(%1+#" #OFF ")\n\t" \ + : "=3Dr"(RES) \ + : "r"(ADDR)) +#define BxW_LOAD_io_Z(RES, ADDR, OFF) \ + BxW_LOAD_io(ubh, RES, ADDR, OFF) +#define BxW_LOAD_io_S(RES, ADDR, OFF) \ + BxW_LOAD_io(bh, RES, ADDR, OFF) + +#define TEST_io(NAME, TYPE, SIGN, SIZE, EXT, EXP1, EXP2, EXP3, EXP4) \ +void test_##NAME(void) \ +{ \ + TYPE result; \ + init_buf(); \ + BxW_LOAD_io_##SIGN(result, buf, 0 * (SIZE)); \ + check(result, (EXP1) | (EXT)); \ + BxW_LOAD_io_##SIGN(result, buf, 1 * (SIZE)); \ + check(result, (EXP2) | (EXT)); \ + BxW_LOAD_io_##SIGN(result, buf, 2 * (SIZE)); \ + check(result, (EXP3) | (EXT)); \ + BxW_LOAD_io_##SIGN(result, buf, 3 * (SIZE)); \ + check(result, (EXP4) | (EXT)); \ +} + + +TEST_io(loadbzw2_io, int, Z, 2, 0x00000000, + 0x00020081, 0x00040083, 0x00060085, 0x00080087) +TEST_io(loadbsw2_io, int, S, 2, 0x0000ff00, + 0x00020081, 0x00040083, 0x00060085, 0x00080087) +TEST_io(loadbzw4_io, long long, Z, 4, 0x0000000000000000LL, + 0x0004008300020081LL, 0x0008008700060085LL, + 0x000c008b000a0089LL, 0x0010008f000e008dLL) +TEST_io(loadbsw4_io, long long, S, 4, 0x0000ff000000ff00LL, + 0x0004008300020081LL, 0x0008008700060085LL, + 0x000c008b000a0089LL, 0x0010008f000e008dLL) + +/* + *************************************************************************= *** + * _ur addressing mode (index << offset + base) + */ +#define BxW_LOAD_ur(SZ, RES, SHIFT, IDX) \ + __asm__( \ + "%0 =3D mem" #SZ "(%1<<#" #SHIFT " + ##buf)\n\t" \ + : "=3Dr"(RES) \ + : "r"(IDX)) +#define BxW_LOAD_ur_Z(RES, SHIFT, IDX) \ + BxW_LOAD_ur(ubh, RES, SHIFT, IDX) +#define BxW_LOAD_ur_S(RES, SHIFT, IDX) \ + BxW_LOAD_ur(bh, RES, SHIFT, IDX) + +#define TEST_ur(NAME, TYPE, SIGN, SHIFT, EXT, RES1, RES2, RES3, RES4) \ +void test_##NAME(void) \ +{ \ + TYPE result; \ + init_buf(); \ + BxW_LOAD_ur_##SIGN(result, (SHIFT), 0); \ + check(result, (RES1) | (EXT)); \ + BxW_LOAD_ur_##SIGN(result, (SHIFT), 1); \ + check(result, (RES2) | (EXT)); \ + BxW_LOAD_ur_##SIGN(result, (SHIFT), 2); \ + check(result, (RES3) | (EXT)); \ + BxW_LOAD_ur_##SIGN(result, (SHIFT), 3); \ + check(result, (RES4) | (EXT)); \ +} \ + +TEST_ur(loadbzw2_ur, int, Z, 1, 0x00000000, + 0x00020081, 0x00040083, 0x00060085, 0x00080087) +TEST_ur(loadbsw2_ur, int, S, 1, 0x0000ff00, + 0x00020081, 0x00040083, 0x00060085, 0x00080087) +TEST_ur(loadbzw4_ur, long long, Z, 2, 0x0000000000000000LL, + 0x0004008300020081LL, 0x0008008700060085LL, + 0x000c008b000a0089LL, 0x0010008f000e008dLL) +TEST_ur(loadbsw4_ur, long long, S, 2, 0x0000ff000000ff00LL, + 0x0004008300020081LL, 0x0008008700060085LL, + 0x000c008b000a0089LL, 0x0010008f000e008dLL) + +/* + *************************************************************************= *** + * _ap addressing mode (addr =3D base) + */ +#define BxW_LOAD_ap(SZ, RES, PTR, ADDR) \ + __asm__( \ + "%0 =3D mem" #SZ "(%1 =3D ##" #ADDR ")\n\t" \ + : "=3Dr"(RES), "=3Dr"(PTR)) +#define BxW_LOAD_ap_Z(RES, PTR, ADDR) \ + BxW_LOAD_ap(ubh, RES, PTR, ADDR) +#define BxW_LOAD_ap_S(RES, PTR, ADDR) \ + BxW_LOAD_ap(bh, RES, PTR, ADDR) + +#define TEST_ap(NAME, TYPE, SIGN, SIZE, EXT, RES1, RES2, RES3, RES4) \ +void test_##NAME(void) \ +{ \ + TYPE result; \ + void *ptr; \ + init_buf(); \ + BxW_LOAD_ap_##SIGN(result, ptr, (buf + 0 * (SIZE))); \ + check(result, (RES1) | (EXT)); \ + checkp(ptr, &buf[0 * (SIZE)]); \ + BxW_LOAD_ap_##SIGN(result, ptr, (buf + 1 * (SIZE))); \ + check(result, (RES2) | (EXT)); \ + checkp(ptr, &buf[1 * (SIZE)]); \ + BxW_LOAD_ap_##SIGN(result, ptr, (buf + 2 * (SIZE))); \ + check(result, (RES3) | (EXT)); \ + checkp(ptr, &buf[2 * (SIZE)]); \ + BxW_LOAD_ap_##SIGN(result, ptr, (buf + 3 * (SIZE))); \ + check(result, (RES4) | (EXT)); \ + checkp(ptr, &buf[3 * (SIZE)]); \ +} + +TEST_ap(loadbzw2_ap, int, Z, 2, 0x00000000, + 0x00020081, 0x00040083, 0x00060085, 0x00080087) +TEST_ap(loadbsw2_ap, int, S, 2, 0x0000ff00, + 0x00020081, 0x00040083, 0x00060085, 0x00080087) +TEST_ap(loadbzw4_ap, long long, Z, 4, 0x0000000000000000LL, + 0x0004008300020081LL, 0x0008008700060085LL, + 0x000c008b000a0089LL, 0x0010008f000e008dLL) +TEST_ap(loadbsw4_ap, long long, S, 4, 0x0000ff000000ff00LL, + 0x0004008300020081LL, 0x0008008700060085LL, + 0x000c008b000a0089LL, 0x0010008f000e008dLL) + +/* + *************************************************************************= *** + * _rp addressing mode (addr ++ modifer-reg) + */ +#define BxW_LOAD_pr(SZ, RES, PTR, INC) \ + __asm__( \ + "m0 =3D %2\n\t" \ + "%0 =3D mem" #SZ "(%1++m0)\n\t" \ + : "=3Dr"(RES), "+r"(PTR) \ + : "r"(INC) \ + : "m0") +#define BxW_LOAD_pr_Z(RES, PTR, INC) \ + BxW_LOAD_pr(ubh, RES, PTR, INC) +#define BxW_LOAD_pr_S(RES, PTR, INC) \ + BxW_LOAD_pr(bh, RES, PTR, INC) + +#define TEST_pr(NAME, TYPE, SIGN, SIZE, EXT, RES1, RES2, RES3, RES4) \ +void test_##NAME(void) \ +{ \ + TYPE result; \ + void *ptr =3D buf; \ + init_buf(); \ + BxW_LOAD_pr_##SIGN(result, ptr, (SIZE)); \ + check(result, (RES1) | (EXT)); \ + checkp(ptr, &buf[1 * (SIZE)]); \ + BxW_LOAD_pr_##SIGN(result, ptr, (SIZE)); \ + check(result, (RES2) | (EXT)); \ + checkp(ptr, &buf[2 * (SIZE)]); \ + BxW_LOAD_pr_##SIGN(result, ptr, (SIZE)); \ + check(result, (RES3) | (EXT)); \ + checkp(ptr, &buf[3 * (SIZE)]); \ + BxW_LOAD_pr_##SIGN(result, ptr, (SIZE)); \ + check(result, (RES4) | (EXT)); \ + checkp(ptr, &buf[4 * (SIZE)]); \ +} + +TEST_pr(loadbzw2_pr, int, Z, 2, 0x00000000, + 0x00020081, 0x0040083, 0x00060085, 0x00080087) +TEST_pr(loadbsw2_pr, int, S, 2, 0x0000ff00, + 0x00020081, 0x0040083, 0x00060085, 0x00080087) +TEST_pr(loadbzw4_pr, long long, Z, 4, 0x0000000000000000LL, + 0x0004008300020081LL, 0x0008008700060085LL, + 0x000c008b000a0089LL, 0x0010008f000e008dLL) +TEST_pr(loadbsw4_pr, long long, S, 4, 0x0000ff000000ff00LL, + 0x0004008300020081LL, 0x0008008700060085LL, + 0x000c008b000a0089LL, 0x0010008f000e008dLL) + +/* + *************************************************************************= *** + * _pbr addressing mode (addr ++ modifer-reg:brev) + */ +#define BxW_LOAD_pbr(SZ, RES, PTR) \ + __asm__( \ + "r4 =3D #(1 << (16 - 3))\n\t" \ + "m0 =3D r4\n\t" \ + "%0 =3D mem" #SZ "(%1++m0:brev)\n\t" \ + : "=3Dr"(RES), "+r"(PTR) \ + : \ + : "r4", "m0") +#define BxW_LOAD_pbr_Z(RES, PTR) \ + BxW_LOAD_pbr(ubh, RES, PTR) +#define BxW_LOAD_pbr_S(RES, PTR) \ + BxW_LOAD_pbr(bh, RES, PTR) + +#define TEST_pbr(NAME, TYPE, SIGN, EXT, RES1, RES2, RES3, RES4) \ +void test_##NAME(void) \ +{ \ + TYPE result; \ + void *ptr =3D buf; \ + init_buf(); \ + BxW_LOAD_pbr_##SIGN(result, ptr); \ + check(result, (RES1) | (EXT)); \ + BxW_LOAD_pbr_##SIGN(result, ptr); \ + check(result, (RES2) | (EXT)); \ + BxW_LOAD_pbr_##SIGN(result, ptr); \ + check(result, (RES3) | (EXT)); \ + BxW_LOAD_pbr_##SIGN(result, ptr); \ + check(result, (RES4) | (EXT)); \ +} + +TEST_pbr(loadbzw2_pbr, int, Z, 0x00000000, + 0x00020081, 0x00060085, 0x00040083, 0x00080087) +TEST_pbr(loadbsw2_pbr, int, S, 0x0000ff00, + 0x00020081, 0x00060085, 0x00040083, 0x00080087) +TEST_pbr(loadbzw4_pbr, long long, Z, 0x0000000000000000LL, + 0x0004008300020081LL, 0x0008008700060085LL, + 0x0006008500040083LL, 0x000a008900080087LL) +TEST_pbr(loadbsw4_pbr, long long, S, 0x0000ff000000ff00LL, + 0x0004008300020081LL, 0x0008008700060085LL, + 0x0006008500040083LL, 0x000a008900080087LL) + +/* + *************************************************************************= *** + * _pi addressing mode (addr ++ inc) + */ +#define BxW_LOAD_pi(SZ, RES, PTR, INC) \ + __asm__( \ + "%0 =3D mem" #SZ "(%1++#" #INC ")\n\t" \ + : "=3Dr"(RES), "+r"(PTR)) +#define BxW_LOAD_pi_Z(RES, PTR, INC) \ + BxW_LOAD_pi(ubh, RES, PTR, INC) +#define BxW_LOAD_pi_S(RES, PTR, INC) \ + BxW_LOAD_pi(bh, RES, PTR, INC) + +#define TEST_pi(NAME, TYPE, SIGN, INC, EXT, RES1, RES2, RES3, RES4) \ +void test_##NAME(void) \ +{ \ + TYPE result; \ + void *ptr =3D buf; \ + init_buf(); \ + BxW_LOAD_pi_##SIGN(result, ptr, (INC)); \ + check(result, (RES1) | (EXT)); \ + checkp(ptr, &buf[1 * (INC)]); \ + BxW_LOAD_pi_##SIGN(result, ptr, (INC)); \ + check(result, (RES2) | (EXT)); \ + checkp(ptr, &buf[2 * (INC)]); \ + BxW_LOAD_pi_##SIGN(result, ptr, (INC)); \ + check(result, (RES3) | (EXT)); \ + checkp(ptr, &buf[3 * (INC)]); \ + BxW_LOAD_pi_##SIGN(result, ptr, (INC)); \ + check(result, (RES4) | (EXT)); \ + checkp(ptr, &buf[4 * (INC)]); \ +} + +TEST_pi(loadbzw2_pi, int, Z, 2, 0x00000000, + 0x00020081, 0x00040083, 0x00060085, 0x00080087) +TEST_pi(loadbsw2_pi, int, S, 2, 0x0000ff00, + 0x00020081, 0x00040083, 0x00060085, 0x00080087) +TEST_pi(loadbzw4_pi, long long, Z, 4, 0x0000000000000000LL, + 0x0004008300020081LL, 0x0008008700060085LL, + 0x000c008b000a0089LL, 0x0010008f000e008dLL) +TEST_pi(loadbsw4_pi, long long, S, 4, 0x0000ff000000ff00LL, + 0x0004008300020081LL, 0x0008008700060085LL, + 0x000c008b000a0089LL, 0x0010008f000e008dLL) + +/* + *************************************************************************= *** + * _pci addressing mode (addr ++ inc:circ) + */ +#define BxW_LOAD_pci(SZ, RES, PTR, START, LEN, INC) \ + __asm__( \ + "r4 =3D %3\n\t" \ + "m0 =3D r4\n\t" \ + "cs0 =3D %2\n\t" \ + "%0 =3D mem" #SZ "(%1++#" #INC ":circ(m0))\n\t" \ + : "=3Dr"(RES), "+r"(PTR) \ + : "r"(START), "r"(LEN) \ + : "r4", "m0", "cs0") +#define BxW_LOAD_pci_Z(RES, PTR, START, LEN, INC) \ + BxW_LOAD_pci(ubh, RES, PTR, START, LEN, INC) +#define BxW_LOAD_pci_S(RES, PTR, START, LEN, INC) \ + BxW_LOAD_pci(bh, RES, PTR, START, LEN, INC) + +#define TEST_pci(NAME, TYPE, SIGN, LEN, INC, EXT, RES1, RES2, RES3, RES4) \ +void test_##NAME(void) \ +{ \ + TYPE result; \ + void *ptr =3D buf; \ + init_buf(); \ + BxW_LOAD_pci_##SIGN(result, ptr, buf, (LEN), (INC)); \ + check(result, (RES1) | (EXT)); \ + checkp(ptr, &buf[(1 * (INC)) % (LEN)]); \ + BxW_LOAD_pci_##SIGN(result, ptr, buf, (LEN), (INC)); \ + check(result, (RES2) | (EXT)); \ + checkp(ptr, &buf[(2 * (INC)) % (LEN)]); \ + BxW_LOAD_pci_##SIGN(result, ptr, buf, (LEN), (INC)); \ + check(result, (RES3) | (EXT)); \ + checkp(ptr, &buf[(3 * (INC)) % (LEN)]); \ + BxW_LOAD_pci_##SIGN(result, ptr, buf, (LEN), (INC)); \ + check(result, (RES4) | (EXT)); \ + checkp(ptr, &buf[(4 * (INC)) % (LEN)]); \ +} + +TEST_pci(loadbzw2_pci, int, Z, 6, 2, 0x00000000, + 0x00020081, 0x00040083, 0x00060085, 0x00020081) +TEST_pci(loadbsw2_pci, int, S, 6, 2, 0x0000ff00, + 0x00020081, 0x00040083, 0x00060085, 0x00020081) +TEST_pci(loadbzw4_pci, long long, Z, 8, 4, 0x0000000000000000LL, + 0x0004008300020081LL, 0x0008008700060085LL, + 0x0004008300020081LL, 0x0008008700060085LL) +TEST_pci(loadbsw4_pci, long long, S, 8, 4, 0x0000ff000000ff00LL, + 0x0004008300020081LL, 0x0008008700060085LL, + 0x0004008300020081LL, 0x0008008700060085LL) + +/* + *************************************************************************= *** + * _pcr addressing mode (addr ++ I:circ(modifier-reg)) + */ +#define BxW_LOAD_pcr(SZ, RES, PTR, START, LEN, INC) \ + __asm__( \ + "r4 =3D %2\n\t" \ + "m1 =3D r4\n\t" \ + "cs1 =3D %3\n\t" \ + "%0 =3D mem" #SZ "(%1++I:circ(m1))\n\t" \ + : "=3Dr"(RES), "+r"(PTR) \ + : "r"((((INC) & 0x7f) << 17) | ((LEN) & 0x1ffff)), \ + "r"(START) \ + : "r4", "m1", "cs1") +#define BxW_LOAD_pcr_Z(RES, PTR, START, LEN, INC) \ + BxW_LOAD_pcr(ubh, RES, PTR, START, LEN, INC) +#define BxW_LOAD_pcr_S(RES, PTR, START, LEN, INC) \ + BxW_LOAD_pcr(bh, RES, PTR, START, LEN, INC) + +#define TEST_pcr(NAME, TYPE, SIGN, SIZE, LEN, INC, \ + EXT, RES1, RES2, RES3, RES4) \ +void test_##NAME(void) \ +{ \ + TYPE result; \ + void *ptr =3D buf; \ + init_buf(); \ + BxW_LOAD_pcr_##SIGN(result, ptr, buf, (LEN), (INC)); \ + check(result, (RES1) | (EXT)); \ + checkp(ptr, &buf[(1 * (INC) * (SIZE)) % (LEN)]); \ + BxW_LOAD_pcr_##SIGN(result, ptr, buf, (LEN), (INC)); \ + check(result, (RES2) | (EXT)); \ + checkp(ptr, &buf[(2 * (INC) * (SIZE)) % (LEN)]); \ + BxW_LOAD_pcr_##SIGN(result, ptr, buf, (LEN), (INC)); \ + check(result, (RES3) | (EXT)); \ + checkp(ptr, &buf[(3 * (INC) * (SIZE)) % (LEN)]); \ + BxW_LOAD_pcr_##SIGN(result, ptr, buf, (LEN), (INC)); \ + check(result, (RES4) | (EXT)); \ + checkp(ptr, &buf[(4 * (INC) * (SIZE)) % (LEN)]); \ +} + +TEST_pcr(loadbzw2_pcr, int, Z, 2, 8, 2, 0x00000000, + 0x00020081, 0x00060085, 0x00020081, 0x00060085) +TEST_pcr(loadbsw2_pcr, int, S, 2, 8, 2, 0x0000ff00, + 0x00020081, 0x00060085, 0x00020081, 0x00060085) +TEST_pcr(loadbzw4_pcr, long long, Z, 4, 8, 1, 0x0000000000000000LL, + 0x0004008300020081LL, 0x0008008700060085LL, + 0x0004008300020081LL, 0x0008008700060085LL) +TEST_pcr(loadbsw4_pcr, long long, S, 4, 8, 1, 0x0000ff000000ff00LL, + 0x0004008300020081LL, 0x0008008700060085LL, + 0x0004008300020081LL, 0x0008008700060085LL) + +int main() +{ + test_loadbzw2_io(); + test_loadbsw2_io(); + test_loadbzw4_io(); + test_loadbsw4_io(); + + test_loadbzw2_ur(); + test_loadbsw2_ur(); + test_loadbzw4_ur(); + test_loadbsw4_ur(); + + test_loadbzw2_ap(); + test_loadbsw2_ap(); + test_loadbzw4_ap(); + test_loadbsw4_ap(); + + test_loadbzw2_pr(); + test_loadbsw2_pr(); + test_loadbzw4_pr(); + test_loadbsw4_pr(); + + test_loadbzw2_pbr(); + test_loadbsw2_pbr(); + test_loadbzw4_pbr(); + test_loadbsw4_pbr(); + + test_loadbzw2_pi(); + test_loadbsw2_pi(); + test_loadbzw4_pi(); + test_loadbsw4_pi(); + + test_loadbzw2_pci(); + test_loadbsw2_pci(); + test_loadbzw4_pci(); + test_loadbsw4_pci(); + + test_loadbzw2_pcr(); + test_loadbsw2_pcr(); + test_loadbzw4_pcr(); + test_loadbsw4_pcr(); + + puts(err ? "FAIL" : "PASS"); + return err ? 1 : 0; +} diff --git a/target/hexagon/imported/encode_pp.def b/target/hexagon/importe= d/encode_pp.def index 4464926634..e3582ebb29 100644 --- a/target/hexagon/imported/encode_pp.def +++ b/target/hexagon/imported/encode_pp.def @@ -342,6 +342,12 @@ DEF_ENC32(L4_pload##TAG##fnew_abs,ICLASS_LD" 1 11 "OPC= " iiiii PP111tti 1--ddd =20 =20 /* 0 000 misc: dealloc,loadw_locked,dcfetch */ +STD_LD_ENC(bzw4,"0 101") +STD_LD_ENC(bzw2,"0 011") + +STD_LD_ENC(bsw4,"0 111") +STD_LD_ENC(bsw2,"0 001") + STD_LD_ENC(rb, "1 000") STD_LD_ENC(rub, "1 001") STD_LD_ENC(rh, "1 010") diff --git a/target/hexagon/imported/ldst.idef b/target/hexagon/imported/ld= st.idef index fe7e018cf1..95c0470757 100644 --- a/target/hexagon/imported/ldst.idef +++ b/target/hexagon/imported/ldst.idef @@ -38,6 +38,49 @@ STD_LD_AMODES(loadrh, "Rd32=3Dmemh", "Load signed Half i= nteger",ATTRIBS(A_LOAD),"1 STD_LD_AMODES(loadri, "Rd32=3Dmemw", "Load Word",ATTRIBS(A_LOAD),"2",fLOAD= (1,4,u,EA,RdV),2) STD_LD_AMODES(loadrd, "Rdd32=3Dmemd","Load Double integer",ATTRIBS(A_LOAD)= ,"3",fLOAD(1,8,u,EA,RddV),3) =20 +/* These instructions do a load an unpack */ +STD_LD_AMODES(loadbzw2, "Rd32=3Dmemubh", "Load Bytes and Vector Zero-Exten= d (unpack)", +ATTRIBS(A_LOAD),"1", +{fHIDE(size2u_t tmpV; int i;) + fLOAD(1,2,u,EA,tmpV); + for (i=3D0;i<2;i++) { + fSETHALF(i,RdV,fGETUBYTE(i,tmpV)); + } +},1) + +STD_LD_AMODES(loadbzw4, "Rdd32=3Dmemubh", "Load Bytes and Vector Zero-Exte= nd (unpack)", +ATTRIBS(A_LOAD),"2", +{fHIDE(size4u_t tmpV; int i;) + fLOAD(1,4,u,EA,tmpV); + for (i=3D0;i<4;i++) { + fSETHALF(i,RddV,fGETUBYTE(i,tmpV)); + } +},2) + + + +/* These instructions do a load an unpack */ +STD_LD_AMODES(loadbsw2, "Rd32=3Dmembh", "Load Bytes and Vector Sign-Extend= (unpack)", +ATTRIBS(A_LOAD),"1", +{fHIDE(size2u_t tmpV; int i;) + fLOAD(1,2,u,EA,tmpV); + for (i=3D0;i<2;i++) { + fSETHALF(i,RdV,fGETBYTE(i,tmpV)); + } +},1) + +STD_LD_AMODES(loadbsw4, "Rdd32=3Dmembh", "Load Bytes and Vector Sign-Exten= d (unpack)", +ATTRIBS(A_LOAD),"2", +{fHIDE(size4u_t tmpV; int i;) + fLOAD(1,4,u,EA,tmpV); + for (i=3D0;i<4;i++) { + fSETHALF(i,RddV,fGETBYTE(i,tmpV)); + } +},2) + + + + /* The set of addressing modes standard to all Store instructions */ #define STD_ST_AMODES(TAG,DEST,OPER,DESCR,ATTRIB,SHFT,SEMANTICS,SCALE)\ Q6INSN(S2_##TAG##_io, OPER"(Rs32+#s11:"SHFT")=3D"DEST, ATTRIB,DESCR,{= fIMMEXT(siV); fEA_RI(RsV,siV); SEMANTICS; })\ diff --git a/tests/tcg/hexagon/Makefile.target b/tests/tcg/hexagon/Makefile= .target index 6e38950d23..183f4e2efe 100644 --- a/tests/tcg/hexagon/Makefile.target +++ b/tests/tcg/hexagon/Makefile.target @@ -44,6 +44,7 @@ HEX_TESTS +=3D multi_result HEX_TESTS +=3D mem_noshuf HEX_TESTS +=3D circ HEX_TESTS +=3D brev +HEX_TESTS +=3D load_unpack HEX_TESTS +=3D atomics HEX_TESTS +=3D fpstuff =20 --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619895533; cv=none; d=zohomail.com; s=zohoarc; b=EWlfvWY/j8kM85gnDOdFzr8y9eGcUNfSYnj6HwvfHvmcB8T6cRYyns+r529Q+tPp78Nq0D8OiY1Dcy+TV+Mf8+vQ5IvZkBbI0okTvgRvXNGKWlz32MQBfrgTEjxF6gYwHvcfQaNHjhz3chr/O7H+QIg+tN08LiExQJNWHR2IZ98= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619895533; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2kUR6kjNrXJCFiJbcl64HX+GrqwPLfmUocnmkgqarp4=; b=C0bRPlUmJUg44X8jZkcuHzyKprIx5n8rDal47j1HtQVXedxsoXsuVAvKBBkpznGhS8GjWV9P/KVm4eLrv1nN3lNuVF4ERbyxJ0PPlhqCocyXaK4tbo4Il8Agtt1J7tnh4U6j9XobyDs8d+mLMfvfsI6ujYUDimjOg0dggcsUXm0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619895533810483.55919920576105; Sat, 1 May 2021 11:58:53 -0700 (PDT) Received: from localhost ([::1]:33452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcupI-0005Q0-HR for importer@patchew.org; Sat, 01 May 2021 14:58:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcub6-0000Da-4l for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:12 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]:46660) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuah-0000Bg-Sw for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:11 -0400 Received: by mail-pg1-x534.google.com with SMTP id q9so822185pgl.13 for ; Sat, 01 May 2021 11:43:45 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2kUR6kjNrXJCFiJbcl64HX+GrqwPLfmUocnmkgqarp4=; b=YZVhZ/d03ysXGreJDYN350yvi8opuQX8/ZFdpDjj7Ec0FJ7sA3H0qgF6k//80DDR8k 3oZ6H6mhzKw5sr+aFhSIOc9KHPvG7MLnPp2McyeCJbpwOBXhxzkMY07eIizu0+9Bf62c dqsymT4CZjezjUae5W33NUNLhHbWwCt8G/Ncnmc5D96Teiejaecw9WyDttOhvMqCjUnP 16KMLhWQTCP2yUrVFkiWxIa8Q97T3ICMmvA8SfxvTGhRNHTg5dzUiD+OA3uh3h9wZosz RIBHCbg7Mak189LJguD9Uu+irdPG/TYE7rJ2Tng9NUY2fwq5hmVpr7/38osbrA1TAQ6G zyTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2kUR6kjNrXJCFiJbcl64HX+GrqwPLfmUocnmkgqarp4=; b=DWw3CytppqxbUuWesO0034eQ+k5uykoetY01dTjoefNbU5pHaQlChm91Q2k+Mv4PC7 g6NJbdrHcPwTatEvXqy045blOQIU3LlFWqsx8TPwlE70CeEpXToqneOzPpyF5YeaBFO4 CxTUaiSDok3QLDtidrsudRdmiwPE3oTxOTRWU4B6cGavgmm9Vxy1KlzYwIDcJ8Z07TFM RBVkbt6sb56gpqhohXEGs8af8keNOVxuOGQJ1uD81BPZJhRLXQM9QjDp7IO70lf4a2hJ LvDvzL9f3K8froNifzZkcKCebn8XDD2ZliWs9sZefQ8t3+3BzC3N7flEoqCteu7D1Dij DbZw== X-Gm-Message-State: AOAM531dHpDp9MtGg59PxErYMT29qAQ87nZs+k3rrIlG/qSetjkfWCsB 6Zmw+t3vnqG3a81nYhsuT0kp6CG8IOgqNA== X-Google-Smtp-Source: ABdhPJyWt0nMnkJ8X1EEMVgCb79Ru/AE/ue+5UgDFzH0s5n7W9yGbX4zHshf/1Im3XGzk4RaY0uYHw== X-Received: by 2002:a63:f311:: with SMTP id l17mr10121317pgh.405.1619894624822; Sat, 01 May 2021 11:43:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 30/31] Hexagon (target/hexagon) load into shifted register instructions Date: Sat, 1 May 2021 11:43:23 -0700 Message-Id: <20210501184324.1338186-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x534.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson The following instructions are added L2_loadalignb_io Ryy32 =3D memb_fifo(Rs32+#s11:1) L2_loadalignh_io Ryy32 =3D memh_fifo(Rs32+#s11:1) L4_loadalignb_ur Ryy32 =3D memb_fifo(Rt32<<#u2+#U6) L4_loadalignh_ur Ryy32 =3D memh_fifo(Rt32<<#u2+#U6) L4_loadalignb_ap Ryy32 =3D memb_fifo(Re32=3D#U6) L4_loadalignh_ap Ryy32 =3D memh_fifo(Re32=3D#U6) L2_loadalignb_pr Ryy32 =3D memb_fifo(Rx32++Mu2) L2_loadalignh_pr Ryy32 =3D memh_fifo(Rx32++Mu2) L2_loadalignb_pbr Ryy32 =3D memb_fifo(Rx32++Mu2:brev) L2_loadalignh_pbr Ryy32 =3D memh_fifo(Rx32++Mu2:brev) L2_loadalignb_pi Ryy32 =3D memb_fifo(Rx32++#s4:1) L2_loadalignh_pi Ryy32 =3D memh_fifo(Rx32++#s4:1) L2_loadalignb_pci Ryy32 =3D memb_fifo(Rx32++#s4:1:circ(Mu2)) L2_loadalignh_pci Ryy32 =3D memh_fifo(Rx32++#s4:1:circ(Mu2)) L2_loadalignb_pcr Ryy32 =3D memb_fifo(Rx32++I:circ(Mu2)) L2_loadalignh_pcr Ryy32 =3D memh_fifo(Rx32++I:circ(Mu2)) Test cases in tests/tcg/hexagon/load_align.c Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-26-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/gen_tcg.h | 66 ++++ tests/tcg/hexagon/load_align.c | 415 ++++++++++++++++++++++++++ target/hexagon/imported/encode_pp.def | 3 + target/hexagon/imported/ldst.idef | 19 ++ tests/tcg/hexagon/Makefile.target | 1 + 5 files changed, 504 insertions(+) create mode 100644 tests/tcg/hexagon/load_align.c diff --git a/target/hexagon/gen_tcg.h b/target/hexagon/gen_tcg.h index 1120aaed4e..18fcdbc7e4 100644 --- a/target/hexagon/gen_tcg.h +++ b/target/hexagon/gen_tcg.h @@ -260,6 +260,72 @@ #define fGEN_TCG_L2_loadbsw4_pi(SHORTCODE) \ fGEN_TCG_loadbXw4(GET_EA_pi, true) =20 +/* + * These instructions load a half word, shift the destination right by 16 = bits + * and place the loaded value in the high half word of the destination pai= r. + * The GET_EA macro determines the addressing mode. + */ +#define fGEN_TCG_loadalignh(GET_EA) \ + do { \ + TCGv tmp =3D tcg_temp_new(); \ + TCGv_i64 tmp_i64 =3D tcg_temp_new_i64(); \ + GET_EA; \ + fLOAD(1, 2, u, EA, tmp); \ + tcg_gen_extu_i32_i64(tmp_i64, tmp); \ + tcg_gen_shri_i64(RyyV, RyyV, 16); \ + tcg_gen_deposit_i64(RyyV, RyyV, tmp_i64, 48, 16); \ + tcg_temp_free(tmp); \ + tcg_temp_free_i64(tmp_i64); \ + } while (0) + +#define fGEN_TCG_L4_loadalignh_ur(SHORTCODE) \ + fGEN_TCG_loadalignh(fEA_IRs(UiV, RtV, uiV)) +#define fGEN_TCG_L2_loadalignh_io(SHORTCODE) \ + fGEN_TCG_loadalignh(fEA_RI(RsV, siV)) +#define fGEN_TCG_L2_loadalignh_pci(SHORTCODE) \ + fGEN_TCG_loadalignh(GET_EA_pci) +#define fGEN_TCG_L2_loadalignh_pcr(SHORTCODE) \ + fGEN_TCG_loadalignh(GET_EA_pcr(1)) +#define fGEN_TCG_L4_loadalignh_ap(SHORTCODE) \ + fGEN_TCG_loadalignh(GET_EA_ap) +#define fGEN_TCG_L2_loadalignh_pr(SHORTCODE) \ + fGEN_TCG_loadalignh(GET_EA_pr) +#define fGEN_TCG_L2_loadalignh_pbr(SHORTCODE) \ + fGEN_TCG_loadalignh(GET_EA_pbr) +#define fGEN_TCG_L2_loadalignh_pi(SHORTCODE) \ + fGEN_TCG_loadalignh(GET_EA_pi) + +/* Same as above, but loads a byte instead of half word */ +#define fGEN_TCG_loadalignb(GET_EA) \ + do { \ + TCGv tmp =3D tcg_temp_new(); \ + TCGv_i64 tmp_i64 =3D tcg_temp_new_i64(); \ + GET_EA; \ + fLOAD(1, 1, u, EA, tmp); \ + tcg_gen_extu_i32_i64(tmp_i64, tmp); \ + tcg_gen_shri_i64(RyyV, RyyV, 8); \ + tcg_gen_deposit_i64(RyyV, RyyV, tmp_i64, 56, 8); \ + tcg_temp_free(tmp); \ + tcg_temp_free_i64(tmp_i64); \ + } while (0) + +#define fGEN_TCG_L2_loadalignb_io(SHORTCODE) \ + fGEN_TCG_loadalignb(fEA_RI(RsV, siV)) +#define fGEN_TCG_L4_loadalignb_ur(SHORTCODE) \ + fGEN_TCG_loadalignb(fEA_IRs(UiV, RtV, uiV)) +#define fGEN_TCG_L2_loadalignb_pci(SHORTCODE) \ + fGEN_TCG_loadalignb(GET_EA_pci) +#define fGEN_TCG_L2_loadalignb_pcr(SHORTCODE) \ + fGEN_TCG_loadalignb(GET_EA_pcr(0)) +#define fGEN_TCG_L4_loadalignb_ap(SHORTCODE) \ + fGEN_TCG_loadalignb(GET_EA_ap) +#define fGEN_TCG_L2_loadalignb_pr(SHORTCODE) \ + fGEN_TCG_loadalignb(GET_EA_pr) +#define fGEN_TCG_L2_loadalignb_pbr(SHORTCODE) \ + fGEN_TCG_loadalignb(GET_EA_pbr) +#define fGEN_TCG_L2_loadalignb_pi(SHORTCODE) \ + fGEN_TCG_loadalignb(GET_EA_pi) + /* * Predicated loads * Here is a primer to understand the tag names diff --git a/tests/tcg/hexagon/load_align.c b/tests/tcg/hexagon/load_align.c new file mode 100644 index 0000000000..12fc9cbd8f --- /dev/null +++ b/tests/tcg/hexagon/load_align.c @@ -0,0 +1,415 @@ +/* + * Copyright(c) 2019-2021 Qualcomm Innovation Center, Inc. All Rights Res= erved. + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +/* + * Test load align instructions + * + * Example + * r1:0 =3D memh_fifo(r1+#0) + * loads a half word from memory, shifts the destination register + * right by one half word and inserts the loaded value into the high + * half word of the destination. + * + * There are 8 addressing modes and byte and half word variants, for a + * total of 16 instructions to test + */ + +#include +#include + +int err; + +char buf[16] __attribute__((aligned(1 << 16))); + +void init_buf(void) +{ + int i; + for (i =3D 0; i < 16; i++) { + buf[i] =3D i + 1; + } +} + +void __check(int line, long long result, long long expect) +{ + if (result !=3D expect) { + printf("ERROR at line %d: 0x%016llx !=3D 0x%016llx\n", + line, result, expect); + err++; + } +} + +#define check(RES, EXP) __check(__LINE__, RES, EXP) + +void __checkp(int line, void *p, void *expect) +{ + if (p !=3D expect) { + printf("ERROR at line %d: 0x%p !=3D 0x%p\n", line, p, expect); + err++; + } +} + +#define checkp(RES, EXP) __checkp(__LINE__, RES, EXP) + +/* + *************************************************************************= *** + * _io addressing mode (addr + offset) + */ +#define LOAD_io(SZ, RES, ADDR, OFF) \ + __asm__( \ + "%0 =3D mem" #SZ "_fifo(%1+#" #OFF ")\n\t" \ + : "+r"(RES) \ + : "r"(ADDR)) +#define LOAD_io_b(RES, ADDR, OFF) \ + LOAD_io(b, RES, ADDR, OFF) +#define LOAD_io_h(RES, ADDR, OFF) \ + LOAD_io(h, RES, ADDR, OFF) + +#define TEST_io(NAME, SZ, SIZE, EXP1, EXP2, EXP3, EXP4) \ +void test_##NAME(void) \ +{ \ + long long result =3D ~0LL; \ + LOAD_io_##SZ(result, buf, 0 * (SIZE)); \ + check(result, (EXP1)); \ + LOAD_io_##SZ(result, buf, 1 * (SIZE)); \ + check(result, (EXP2)); \ + LOAD_io_##SZ(result, buf, 2 * (SIZE)); \ + check(result, (EXP3)); \ + LOAD_io_##SZ(result, buf, 3 * (SIZE)); \ + check(result, (EXP4)); \ +} + +TEST_io(loadalignb_io, b, 1, + 0x01ffffffffffffffLL, 0x0201ffffffffffffLL, + 0x030201ffffffffffLL, 0x04030201ffffffffLL) +TEST_io(loadalignh_io, h, 2, + 0x0201ffffffffffffLL, 0x04030201ffffffffLL, + 0x060504030201ffffLL, 0x0807060504030201LL) + +/* + *************************************************************************= *** + * _ur addressing mode (index << offset + base) + */ +#define LOAD_ur(SZ, RES, SHIFT, IDX) \ + __asm__( \ + "%0 =3D mem" #SZ "_fifo(%1<<#" #SHIFT " + ##buf)\n\t" \ + : "+r"(RES) \ + : "r"(IDX)) +#define LOAD_ur_b(RES, SHIFT, IDX) \ + LOAD_ur(b, RES, SHIFT, IDX) +#define LOAD_ur_h(RES, SHIFT, IDX) \ + LOAD_ur(h, RES, SHIFT, IDX) + +#define TEST_ur(NAME, SZ, SHIFT, RES1, RES2, RES3, RES4) \ +void test_##NAME(void) \ +{ \ + long long result =3D ~0LL; \ + LOAD_ur_##SZ(result, (SHIFT), 0); \ + check(result, (RES1)); \ + LOAD_ur_##SZ(result, (SHIFT), 1); \ + check(result, (RES2)); \ + LOAD_ur_##SZ(result, (SHIFT), 2); \ + check(result, (RES3)); \ + LOAD_ur_##SZ(result, (SHIFT), 3); \ + check(result, (RES4)); \ +} + +TEST_ur(loadalignb_ur, b, 1, + 0x01ffffffffffffffLL, 0x0301ffffffffffffLL, + 0x050301ffffffffffLL, 0x07050301ffffffffLL) +TEST_ur(loadalignh_ur, h, 1, + 0x0201ffffffffffffLL, 0x04030201ffffffffLL, + 0x060504030201ffffLL, 0x0807060504030201LL) + +/* + *************************************************************************= *** + * _ap addressing mode (addr =3D base) + */ +#define LOAD_ap(SZ, RES, PTR, ADDR) \ + __asm__( \ + "%0 =3D mem" #SZ "_fifo(%1 =3D ##" #ADDR ")\n\t" \ + : "+r"(RES), "=3Dr"(PTR)) +#define LOAD_ap_b(RES, PTR, ADDR) \ + LOAD_ap(b, RES, PTR, ADDR) +#define LOAD_ap_h(RES, PTR, ADDR) \ + LOAD_ap(h, RES, PTR, ADDR) + +#define TEST_ap(NAME, SZ, SIZE, RES1, RES2, RES3, RES4) \ +void test_##NAME(void) \ +{ \ + long long result =3D ~0LL; \ + void *ptr; \ + LOAD_ap_##SZ(result, ptr, (buf + 0 * (SIZE))); \ + check(result, (RES1)); \ + checkp(ptr, &buf[0 * (SIZE)]); \ + LOAD_ap_##SZ(result, ptr, (buf + 1 * (SIZE))); \ + check(result, (RES2)); \ + checkp(ptr, &buf[1 * (SIZE)]); \ + LOAD_ap_##SZ(result, ptr, (buf + 2 * (SIZE))); \ + check(result, (RES3)); \ + checkp(ptr, &buf[2 * (SIZE)]); \ + LOAD_ap_##SZ(result, ptr, (buf + 3 * (SIZE))); \ + check(result, (RES4)); \ + checkp(ptr, &buf[3 * (SIZE)]); \ +} + +TEST_ap(loadalignb_ap, b, 1, + 0x01ffffffffffffffLL, 0x0201ffffffffffffLL, + 0x030201ffffffffffLL, 0x04030201ffffffffLL) +TEST_ap(loadalignh_ap, h, 2, + 0x0201ffffffffffffLL, 0x04030201ffffffffLL, + 0x060504030201ffffLL, 0x0807060504030201LL) + +/* + *************************************************************************= *** + * _rp addressing mode (addr ++ modifer-reg) + */ +#define LOAD_pr(SZ, RES, PTR, INC) \ + __asm__( \ + "m0 =3D %2\n\t" \ + "%0 =3D mem" #SZ "_fifo(%1++m0)\n\t" \ + : "+r"(RES), "+r"(PTR) \ + : "r"(INC) \ + : "m0") +#define LOAD_pr_b(RES, PTR, INC) \ + LOAD_pr(b, RES, PTR, INC) +#define LOAD_pr_h(RES, PTR, INC) \ + LOAD_pr(h, RES, PTR, INC) + +#define TEST_pr(NAME, SZ, SIZE, RES1, RES2, RES3, RES4) \ +void test_##NAME(void) \ +{ \ + long long result =3D ~0LL; \ + void *ptr =3D buf; \ + LOAD_pr_##SZ(result, ptr, (SIZE)); \ + check(result, (RES1)); \ + checkp(ptr, &buf[1 * (SIZE)]); \ + LOAD_pr_##SZ(result, ptr, (SIZE)); \ + check(result, (RES2)); \ + checkp(ptr, &buf[2 * (SIZE)]); \ + LOAD_pr_##SZ(result, ptr, (SIZE)); \ + check(result, (RES3)); \ + checkp(ptr, &buf[3 * (SIZE)]); \ + LOAD_pr_##SZ(result, ptr, (SIZE)); \ + check(result, (RES4)); \ + checkp(ptr, &buf[4 * (SIZE)]); \ +} + +TEST_pr(loadalignb_pr, b, 1, + 0x01ffffffffffffffLL, 0x0201ffffffffffffLL, + 0x030201ffffffffffLL, 0x04030201ffffffffLL) +TEST_pr(loadalignh_pr, h, 2, + 0x0201ffffffffffffLL, 0x04030201ffffffffLL, + 0x060504030201ffffLL, 0x0807060504030201LL) + +/* + *************************************************************************= *** + * _pbr addressing mode (addr ++ modifer-reg:brev) + */ +#define LOAD_pbr(SZ, RES, PTR) \ + __asm__( \ + "r4 =3D #(1 << (16 - 3))\n\t" \ + "m0 =3D r4\n\t" \ + "%0 =3D mem" #SZ "_fifo(%1++m0:brev)\n\t" \ + : "+r"(RES), "+r"(PTR) \ + : \ + : "r4", "m0") +#define LOAD_pbr_b(RES, PTR) \ + LOAD_pbr(b, RES, PTR) +#define LOAD_pbr_h(RES, PTR) \ + LOAD_pbr(h, RES, PTR) + +#define TEST_pbr(NAME, SZ, RES1, RES2, RES3, RES4) \ +void test_##NAME(void) \ +{ \ + long long result =3D ~0LL; \ + void *ptr =3D buf; \ + LOAD_pbr_##SZ(result, ptr); \ + check(result, (RES1)); \ + LOAD_pbr_##SZ(result, ptr); \ + check(result, (RES2)); \ + LOAD_pbr_##SZ(result, ptr); \ + check(result, (RES3)); \ + LOAD_pbr_##SZ(result, ptr); \ + check(result, (RES4)); \ +} + +TEST_pbr(loadalignb_pbr, b, + 0x01ffffffffffffffLL, 0x0501ffffffffffffLL, + 0x030501ffffffffffLL, 0x07030501ffffffffLL) +TEST_pbr(loadalignh_pbr, h, + 0x0201ffffffffffffLL, 0x06050201ffffffffLL, + 0x040306050201ffffLL, 0x0807040306050201LL) + +/* + *************************************************************************= *** + * _pi addressing mode (addr ++ inc) + */ +#define LOAD_pi(SZ, RES, PTR, INC) \ + __asm__( \ + "%0 =3D mem" #SZ "_fifo(%1++#" #INC ")\n\t" \ + : "+r"(RES), "+r"(PTR)) +#define LOAD_pi_b(RES, PTR, INC) \ + LOAD_pi(b, RES, PTR, INC) +#define LOAD_pi_h(RES, PTR, INC) \ + LOAD_pi(h, RES, PTR, INC) + +#define TEST_pi(NAME, SZ, INC, RES1, RES2, RES3, RES4) \ +void test_##NAME(void) \ +{ \ + long long result =3D ~0LL; \ + void *ptr =3D buf; \ + LOAD_pi_##SZ(result, ptr, (INC)); \ + check(result, (RES1)); \ + checkp(ptr, &buf[1 * (INC)]); \ + LOAD_pi_##SZ(result, ptr, (INC)); \ + check(result, (RES2)); \ + checkp(ptr, &buf[2 * (INC)]); \ + LOAD_pi_##SZ(result, ptr, (INC)); \ + check(result, (RES3)); \ + checkp(ptr, &buf[3 * (INC)]); \ + LOAD_pi_##SZ(result, ptr, (INC)); \ + check(result, (RES4)); \ + checkp(ptr, &buf[4 * (INC)]); \ +} + +TEST_pi(loadalignb_pi, b, 1, + 0x01ffffffffffffffLL, 0x0201ffffffffffffLL, + 0x030201ffffffffffLL, 0x04030201ffffffffLL) +TEST_pi(loadalignh_pi, h, 2, + 0x0201ffffffffffffLL, 0x04030201ffffffffLL, + 0x060504030201ffffLL, 0x0807060504030201LL) + +/* + *************************************************************************= *** + * _pci addressing mode (addr ++ inc:circ) + */ +#define LOAD_pci(SZ, RES, PTR, START, LEN, INC) \ + __asm__( \ + "r4 =3D %3\n\t" \ + "m0 =3D r4\n\t" \ + "cs0 =3D %2\n\t" \ + "%0 =3D mem" #SZ "_fifo(%1++#" #INC ":circ(m0))\n\t" \ + : "+r"(RES), "+r"(PTR) \ + : "r"(START), "r"(LEN) \ + : "r4", "m0", "cs0") +#define LOAD_pci_b(RES, PTR, START, LEN, INC) \ + LOAD_pci(b, RES, PTR, START, LEN, INC) +#define LOAD_pci_h(RES, PTR, START, LEN, INC) \ + LOAD_pci(h, RES, PTR, START, LEN, INC) + +#define TEST_pci(NAME, SZ, LEN, INC, RES1, RES2, RES3, RES4) \ +void test_##NAME(void) \ +{ \ + long long result =3D ~0LL; \ + void *ptr =3D buf; \ + LOAD_pci_##SZ(result, ptr, buf, (LEN), (INC)); \ + check(result, (RES1)); \ + checkp(ptr, &buf[(1 * (INC)) % (LEN)]); \ + LOAD_pci_##SZ(result, ptr, buf, (LEN), (INC)); \ + check(result, (RES2)); \ + checkp(ptr, &buf[(2 * (INC)) % (LEN)]); \ + LOAD_pci_##SZ(result, ptr, buf, (LEN), (INC)); \ + check(result, (RES3)); \ + checkp(ptr, &buf[(3 * (INC)) % (LEN)]); \ + LOAD_pci_##SZ(result, ptr, buf, (LEN), (INC)); \ + check(result, (RES4)); \ + checkp(ptr, &buf[(4 * (INC)) % (LEN)]); \ +} + +TEST_pci(loadalignb_pci, b, 2, 1, + 0x01ffffffffffffffLL, 0x0201ffffffffffffLL, + 0x010201ffffffffffLL, 0x02010201ffffffffLL) +TEST_pci(loadalignh_pci, h, 4, 2, + 0x0201ffffffffffffLL, 0x04030201ffffffffLL, + 0x020104030201ffffLL, 0x0403020104030201LL) + +/* + *************************************************************************= *** + * _pcr addressing mode (addr ++ I:circ(modifier-reg)) + */ +#define LOAD_pcr(SZ, RES, PTR, START, LEN, INC) \ + __asm__( \ + "r4 =3D %2\n\t" \ + "m1 =3D r4\n\t" \ + "cs1 =3D %3\n\t" \ + "%0 =3D mem" #SZ "_fifo(%1++I:circ(m1))\n\t" \ + : "+r"(RES), "+r"(PTR) \ + : "r"((((INC) & 0x7f) << 17) | ((LEN) & 0x1ffff)), \ + "r"(START) \ + : "r4", "m1", "cs1") +#define LOAD_pcr_b(RES, PTR, START, LEN, INC) \ + LOAD_pcr(b, RES, PTR, START, LEN, INC) +#define LOAD_pcr_h(RES, PTR, START, LEN, INC) \ + LOAD_pcr(h, RES, PTR, START, LEN, INC) + +#define TEST_pcr(NAME, SZ, SIZE, LEN, INC, RES1, RES2, RES3, RES4) \ +void test_##NAME(void) \ +{ \ + long long result =3D ~0LL; \ + void *ptr =3D buf; \ + LOAD_pcr_##SZ(result, ptr, buf, (LEN), (INC)); \ + check(result, (RES1)); \ + checkp(ptr, &buf[(1 * (INC) * (SIZE)) % (LEN)]); \ + LOAD_pcr_##SZ(result, ptr, buf, (LEN), (INC)); \ + check(result, (RES2)); \ + checkp(ptr, &buf[(2 * (INC) * (SIZE)) % (LEN)]); \ + LOAD_pcr_##SZ(result, ptr, buf, (LEN), (INC)); \ + check(result, (RES3)); \ + checkp(ptr, &buf[(3 * (INC) * (SIZE)) % (LEN)]); \ + LOAD_pcr_##SZ(result, ptr, buf, (LEN), (INC)); \ + check(result, (RES4)); \ + checkp(ptr, &buf[(4 * (INC) * (SIZE)) % (LEN)]); \ +} + +TEST_pcr(loadalignb_pcr, b, 1, 2, 1, + 0x01ffffffffffffffLL, 0x0201ffffffffffffLL, + 0x010201ffffffffffLL, 0x02010201ffffffffLL) +TEST_pcr(loadalignh_pcr, h, 2, 4, 1, + 0x0201ffffffffffffLL, 0x04030201ffffffffLL, + 0x020104030201ffffLL, 0x0403020104030201LL) + +int main() +{ + init_buf(); + + test_loadalignb_io(); + test_loadalignh_io(); + + test_loadalignb_ur(); + test_loadalignh_ur(); + + test_loadalignb_ap(); + test_loadalignh_ap(); + + test_loadalignb_pr(); + test_loadalignh_pr(); + + test_loadalignb_pbr(); + test_loadalignh_pbr(); + + test_loadalignb_pi(); + test_loadalignh_pi(); + + test_loadalignb_pci(); + test_loadalignh_pci(); + + test_loadalignb_pcr(); + test_loadalignh_pcr(); + + puts(err ? "FAIL" : "PASS"); + return err ? 1 : 0; +} diff --git a/target/hexagon/imported/encode_pp.def b/target/hexagon/importe= d/encode_pp.def index e3582ebb29..dc4eba4f68 100644 --- a/target/hexagon/imported/encode_pp.def +++ b/target/hexagon/imported/encode_pp.def @@ -348,6 +348,9 @@ STD_LD_ENC(bzw2,"0 011") STD_LD_ENC(bsw4,"0 111") STD_LD_ENC(bsw2,"0 001") =20 +STD_LDX_ENC(alignh,"0 010") +STD_LDX_ENC(alignb,"0 100") + STD_LD_ENC(rb, "1 000") STD_LD_ENC(rub, "1 001") STD_LD_ENC(rh, "1 010") diff --git a/target/hexagon/imported/ldst.idef b/target/hexagon/imported/ld= st.idef index 95c0470757..359d3b744e 100644 --- a/target/hexagon/imported/ldst.idef +++ b/target/hexagon/imported/ldst.idef @@ -80,6 +80,25 @@ ATTRIBS(A_LOAD),"2", =20 =20 =20 +STD_LD_AMODES(loadalignh, "Ryy32=3Dmemh_fifo", "Load Half-word into shifte= d vector", +ATTRIBS(A_LOAD),"1", +{ + fHIDE(size8u_t tmpV;) + fLOAD(1,2,u,EA,tmpV); + RyyV =3D (((size8u_t)RyyV)>>16)|(tmpV<<48); +},1) + + +STD_LD_AMODES(loadalignb, "Ryy32=3Dmemb_fifo", "Load byte into shifted vec= tor", +ATTRIBS(A_LOAD),"0", +{ + fHIDE(size8u_t tmpV;) + fLOAD(1,1,u,EA,tmpV); + RyyV =3D (((size8u_t)RyyV)>>8)|(tmpV<<56); +},0) + + + =20 /* The set of addressing modes standard to all Store instructions */ #define STD_ST_AMODES(TAG,DEST,OPER,DESCR,ATTRIB,SHFT,SEMANTICS,SCALE)\ diff --git a/tests/tcg/hexagon/Makefile.target b/tests/tcg/hexagon/Makefile= .target index 183f4e2efe..0992787d50 100644 --- a/tests/tcg/hexagon/Makefile.target +++ b/tests/tcg/hexagon/Makefile.target @@ -45,6 +45,7 @@ HEX_TESTS +=3D mem_noshuf HEX_TESTS +=3D circ HEX_TESTS +=3D brev HEX_TESTS +=3D load_unpack +HEX_TESTS +=3D load_align HEX_TESTS +=3D atomics HEX_TESTS +=3D fpstuff =20 --=20 2.25.1 From nobody Fri May 17 10:13:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1619896446; cv=none; d=zohomail.com; s=zohoarc; b=O2C0uZ4abub66Speg+olES6wbm4w+q7P6dm2IALViqltwHsXVYlfPg67HQWY2eGE3R0hhd07yTkgeCZ+x73VHsBYpURPIPYdQLXYJWScEdDaaBXpkQUF8v6uvsqkYavJYn6lKyElT2o6qf0PEopW6RjWFYf7gXXOUhI1FN0KPrc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619896446; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=w/02MvMcvcwaLo+V4KLVseMUFm3Gl9HzSInjVPGbUvE=; b=jVqfOm/zpD4NSfMitjEgW0mnW3HGWeumBUJVAuNO0dUufEWK3yXO4v9t0W2JgnR5y1B9qED/DProlhlIEiG4poxkG0vz3iqol2ucjTMF2Vq8eN9dzEkce5jfgIubKVqN8bXD7EXT9Biy8iWQ1TEFkejl6o1jKAziO35SXNr1dOc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; 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 1619896446009775.7962618570398; Sat, 1 May 2021 12:14:06 -0700 (PDT) Received: from localhost ([::1]:41804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcv40-0003bH-UD for importer@patchew.org; Sat, 01 May 2021 15:14:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcub7-0000H1-I7 for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:13 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:40938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuah-0000Bs-TY for qemu-devel@nongnu.org; Sat, 01 May 2021 14:44:13 -0400 Received: by mail-pg1-x536.google.com with SMTP id y30so837573pgl.7 for ; Sat, 01 May 2021 11:43:46 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id i11sm5309088pfa.108.2021.05.01.11.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:43:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=w/02MvMcvcwaLo+V4KLVseMUFm3Gl9HzSInjVPGbUvE=; b=PERtAMuCESOLDrFrNfXu0avkQ/KhrMN/BW3j11HEoa8gnAeRyaFNW/iKd0WuxjhG9h TFeDbYmsEeG7g8L7GfOFtt9456XEGCKo+3pgiS/8PLbI0mTdWRxfH0wjpx7k8pCpvrnc 7IrfS4Hsa6Pff2e4PWxelcOxgO3xDk+dn9zVi891LtmyhaFVxTZB0ELmMGp4myHaBuJ2 n9IPkWHtCp8Go0vl4F/5BU9+mCQuAgCZn8xVPNUAPLAYq2q+U2MsTSsRZoVV6b42QB9d rgiEhdmOoMmCAqFD+kW29cgpc7pY6pB3EcKCdONax3vi6mjR10asFwoufdAQf7wcO6hV WZ9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=w/02MvMcvcwaLo+V4KLVseMUFm3Gl9HzSInjVPGbUvE=; b=K74k9u/Z6/6EuQHPz2B0eNW7mMGvyMBBzl4Loq4sKmV6d7lEn+A+7zjuD8L9qGpQrt PWP6Twf3nv1+J6kYLBIntitqbpz7U+TYJN+f8MDaiL3ssCXQp48WiEvRX6WhphRxJvTw Q57K3FxpfAW55DXGb4oI5IcaAGobL9Z5rLf2mVtgTarJuatR4616fWdIvrEhOsrDyvg0 YPacvHzyHTFMUGijfU32hlIE9mRnyDR9/E6jiZqAVlP5pbVVcbi4P4gpY/DVtrsGoQoY drmFZLgQvGyXZx1D3CVeLqHt2NjKbVsOzHU3miI+hnITK1OLYId13vJOKXwCBTKJcWhY 3mGw== X-Gm-Message-State: AOAM530+wNM+NWl1udrKAqs+Bx9VPQnyMh0bdRibGdTOY6l5X6tlaTT/ klA6uVWkRcTAAjCOgQgbeHKLMkMCpVliqg== X-Google-Smtp-Source: ABdhPJy3bONBj9uRsobBGQF4jNJIAaJ2Xqkr904E3wJGrlg+5wjarLzp2u8BtT3KD0F5NBisJpM8/A== X-Received: by 2002:a63:cf57:: with SMTP id b23mr10292880pgj.328.1619894625458; Sat, 01 May 2021 11:43:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 31/31] Hexagon (target/hexagon) CABAC decode bin Date: Sat, 1 May 2021 11:43:24 -0700 Message-Id: <20210501184324.1338186-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501184324.1338186-1-richard.henderson@linaro.org> References: <20210501184324.1338186-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x536.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Taylor Simpson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Taylor Simpson The following instruction is added S2_cabacdecbin Rdd32=3Ddecbin(Rss32,Rtt32) Test cases added to tests/tcg/hexagon/misc.c Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Message-Id: <1617930474-31979-27-git-send-email-tsimpson@quicinc.com> Signed-off-by: Richard Henderson --- target/hexagon/arch.h | 4 ++ target/hexagon/macros.h | 7 +++ target/hexagon/arch.c | 91 +++++++++++++++++++++++++++ tests/tcg/hexagon/misc.c | 28 +++++++++ target/hexagon/imported/encode_pp.def | 1 + target/hexagon/imported/macros.def | 15 +++++ target/hexagon/imported/shift.idef | 47 ++++++++++++++ 7 files changed, 193 insertions(+) diff --git a/target/hexagon/arch.h b/target/hexagon/arch.h index 3e0c334209..70918065d3 100644 --- a/target/hexagon/arch.h +++ b/target/hexagon/arch.h @@ -20,6 +20,10 @@ =20 #include "qemu/int128.h" =20 +extern const uint8_t rLPS_table_64x4[64][4]; +extern const uint8_t AC_next_state_MPS_64[64]; +extern const uint8_t AC_next_state_LPS_64[64]; + uint64_t interleave(uint32_t odd, uint32_t even); uint64_t deinterleave(uint64_t src); int32_t conv_round(int32_t a, int n); diff --git a/target/hexagon/macros.h b/target/hexagon/macros.h index ec5bf60f5e..b726c3b791 100644 --- a/target/hexagon/macros.h +++ b/target/hexagon/macros.h @@ -222,6 +222,13 @@ static inline void gen_pred_cancel(TCGv pred, int slot= _num) (((HIBIT) - (LOWBIT) + 1) ? \ extract64((INREG), (LOWBIT), ((HIBIT) - (LOWBIT) + 1)) : \ 0LL) +#define fINSERT_RANGE(INREG, HIBIT, LOWBIT, INVAL) \ + do { \ + int width =3D ((HIBIT) - (LOWBIT) + 1); \ + INREG =3D (width >=3D 0 ? \ + deposit64((INREG), (LOWBIT), width, (INVAL)) : \ + INREG); \ + } while (0) =20 #define f8BITSOF(VAL) ((VAL) ? 0xff : 0x00) =20 diff --git a/target/hexagon/arch.c b/target/hexagon/arch.c index dee852e106..68a55b3bd4 100644 --- a/target/hexagon/arch.c +++ b/target/hexagon/arch.c @@ -27,6 +27,97 @@ #define SF_MANTBITS 23 #define float32_nan make_float32(0xffffffff) =20 +/* + * These three tables are used by the cabacdecbin instruction + */ +const uint8_t rLPS_table_64x4[64][4] =3D { + {128, 176, 208, 240}, + {128, 167, 197, 227}, + {128, 158, 187, 216}, + {123, 150, 178, 205}, + {116, 142, 169, 195}, + {111, 135, 160, 185}, + {105, 128, 152, 175}, + {100, 122, 144, 166}, + {95, 116, 137, 158}, + {90, 110, 130, 150}, + {85, 104, 123, 142}, + {81, 99, 117, 135}, + {77, 94, 111, 128}, + {73, 89, 105, 122}, + {69, 85, 100, 116}, + {66, 80, 95, 110}, + {62, 76, 90, 104}, + {59, 72, 86, 99}, + {56, 69, 81, 94}, + {53, 65, 77, 89}, + {51, 62, 73, 85}, + {48, 59, 69, 80}, + {46, 56, 66, 76}, + {43, 53, 63, 72}, + {41, 50, 59, 69}, + {39, 48, 56, 65}, + {37, 45, 54, 62}, + {35, 43, 51, 59}, + {33, 41, 48, 56}, + {32, 39, 46, 53}, + {30, 37, 43, 50}, + {29, 35, 41, 48}, + {27, 33, 39, 45}, + {26, 31, 37, 43}, + {24, 30, 35, 41}, + {23, 28, 33, 39}, + {22, 27, 32, 37}, + {21, 26, 30, 35}, + {20, 24, 29, 33}, + {19, 23, 27, 31}, + {18, 22, 26, 30}, + {17, 21, 25, 28}, + {16, 20, 23, 27}, + {15, 19, 22, 25}, + {14, 18, 21, 24}, + {14, 17, 20, 23}, + {13, 16, 19, 22}, + {12, 15, 18, 21}, + {12, 14, 17, 20}, + {11, 14, 16, 19}, + {11, 13, 15, 18}, + {10, 12, 15, 17}, + {10, 12, 14, 16}, + {9, 11, 13, 15}, + {9, 11, 12, 14}, + {8, 10, 12, 14}, + {8, 9, 11, 13}, + {7, 9, 11, 12}, + {7, 9, 10, 12}, + {7, 8, 10, 11}, + {6, 8, 9, 11}, + {6, 7, 9, 10}, + {6, 7, 8, 9}, + {2, 2, 2, 2} +}; + +const uint8_t AC_next_state_MPS_64[64] =3D { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, + 61, 62, 62, 63 +}; + + +const uint8_t AC_next_state_LPS_64[64] =3D { + 0, 0, 1, 2, 2, 4, 4, 5, 6, 7, + 8, 9, 9, 11, 11, 12, 13, 13, 15, 15, + 16, 16, 18, 18, 19, 19, 21, 21, 22, 22, + 23, 24, 24, 25, 26, 26, 27, 27, 28, 29, + 29, 30, 30, 30, 31, 32, 32, 33, 33, 33, + 34, 34, 35, 35, 35, 36, 36, 36, 37, 37, + 37, 38, 38, 63 +}; + #define BITS_MASK_8 0x5555555555555555ULL #define PAIR_MASK_8 0x3333333333333333ULL #define NYBL_MASK_8 0x0f0f0f0f0f0f0f0fULL diff --git a/tests/tcg/hexagon/misc.c b/tests/tcg/hexagon/misc.c index e5d78b471f..17c39198fc 100644 --- a/tests/tcg/hexagon/misc.c +++ b/tests/tcg/hexagon/misc.c @@ -231,6 +231,14 @@ static void check(int val, int expect) } } =20 +static void check64(long long val, long long expect) +{ + if (val !=3D expect) { + printf("ERROR: 0x%016llx !=3D 0x%016llx\n", val, expect); + err++; + } +} + uint32_t init[10] =3D { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; uint32_t array[10]; =20 @@ -264,6 +272,16 @@ static long long creg_pair(int x, int y) return retval; } =20 +static long long decbin(long long x, long long y, int *pred) +{ + long long retval; + asm ("%0 =3D decbin(%2, %3)\n\t" + "%1 =3D p0\n\t" + : "=3Dr"(retval), "=3Dr"(*pred) + : "r"(x), "r"(y)); + return retval; +} + /* Check that predicates are auto-and'ed in a packet */ static int auto_and(void) { @@ -282,6 +300,8 @@ static int auto_and(void) =20 int main() { + long long res64; + int pred; =20 memcpy(array, init, sizeof(array)); S4_storerhnew_rr(array, 4, 0xffff); @@ -391,6 +411,14 @@ int main() res =3D test_clrtnew(2, 7); check(res, 7); =20 + res64 =3D decbin(0xf0f1f2f3f4f5f6f7LL, 0x7f6f5f4f3f2f1f0fLL, &pred); + check64(res64, 0x357980003700010cLL); + check(pred, 0); + + res64 =3D decbin(0xfLL, 0x1bLL, &pred); + check64(res64, 0x78000100LL); + check(pred, 1); + res =3D auto_and(); check(res, 0); =20 diff --git a/target/hexagon/imported/encode_pp.def b/target/hexagon/importe= d/encode_pp.def index dc4eba4f68..35ae3d2369 100644 --- a/target/hexagon/imported/encode_pp.def +++ b/target/hexagon/imported/encode_pp.def @@ -1767,6 +1767,7 @@ SH_RRR_ENC(S4_vxsubaddh, "0001","01-","-","110= ","ddddd") SH_RRR_ENC(S4_vxaddsubhr, "0001","11-","-","00-","ddddd") SH_RRR_ENC(S4_vxsubaddhr, "0001","11-","-","01-","ddddd") SH_RRR_ENC(S4_extractp_rp, "0001","11-","-","10-","ddddd") +SH_RRR_ENC(S2_cabacdecbin, "0001","11-","-","11-","ddddd") /* implici= t P0 write */ =20 =20 DEF_FIELDROW_DESC32(ICLASS_S3op" 0010 -------- PP------ --------","[#2] Rd= d=3D(Rss,Rtt,Pu)") diff --git a/target/hexagon/imported/macros.def b/target/hexagon/imported/m= acros.def index 56c99b1d64..32ed3bf8fc 100755 --- a/target/hexagon/imported/macros.def +++ b/target/hexagon/imported/macros.def @@ -92,6 +92,21 @@ DEF_MACRO( /* attribs */ ) =20 + +DEF_MACRO( + fINSERT_RANGE, + { + int offset=3DLOWBIT; + int width=3DHIBIT-LOWBIT+1; + /* clear bits where new bits go */ + INREG &=3D ~(((fCONSTLL(1)<>29)&3]; + rLPS =3D rLPS << 23; /* left aligned */ + + /* calculate rMPS */ + rMPS=3D (range&0xff800000) - rLPS; + + /* most probable region */ + if (offset < rMPS) { + RddV =3D AC_next_state_MPS_64[state]; + fINSERT_RANGE(RddV,8,8,valMPS); + fINSERT_RANGE(RddV,31,23,(rMPS>>23)); + fSETWORD(1,RddV,offset); + fWRITE_P0(valMPS); + + + } + /* least probable region */ + else { + RddV =3D AC_next_state_LPS_64[state]; + fINSERT_RANGE(RddV,8,8,((!state)?(1-valMPS):(valMPS))); + fINSERT_RANGE(RddV,31,23,(rLPS>>23)); + fSETWORD(1,RddV,(offset-rMPS)); + fWRITE_P0((valMPS^1)); + } +}) + + Q6INSN(S2_clb,"Rd32=3Dclb(Rs32)",ATTRIBS(), "Count leading bits", {RdV =3D fMAX(fCL1_4(RsV),fCL1_4(~RsV));}) =20 --=20 2.25.1