From patchwork Thu Mar 12 19:42:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 184536 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp966115ile; Thu, 12 Mar 2020 13:00:02 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuRgF1jzh58rxaBu1mRWB5inGWf1rdgxySFCSc8qiI/xlMDiiecaZU1prLp53IojKAnwEai X-Received: by 2002:ac8:130d:: with SMTP id e13mr9295415qtj.363.1584043202489; Thu, 12 Mar 2020 13:00:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584043202; cv=none; d=google.com; s=arc-20160816; b=NxCINJgaS66WLo02m2uFcQ2MVRUQBCMczFvA1rdpyfkO3qT4s7iwpJ3Nvaiedj+PmX LszPcj2G8SRwwi/cg3mrOp/uH53nfJNOqLcxMYq4Nr7sWByle0M2hXp1+yrjfLefr26o Rgzjmpx7u6sGaUrc7WdXXNS4aXw4qIO3k88OuoU9MjXFiWCL7GgYo7zPUp2QnRQlBnhH Th9YZ7ob29HcFd89TnXHaq9Ygl0ttr254bTOZj+HQ2V41jtH3eWENrBv1Ot0EaQR/Kmn KPFdQmsD8aR2oUi9h0QUDkDuFEiDQNDsq9gPoBQ4CTXGKkNT64Do2297ZlDuE0BOs4ao gaXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=tHPURWIXRjblQZ58gS3vbMqtD53IcLCIb5jBh5LhEBk=; b=Y9jOBriOJqBlgOHQpz7+X9TBmQd3YutHU4W3VdWpPGSiVR1xnauwihrCpUuWLXy00C OkM4Uld55/CbphBFa3hWkV4dHjFVXT5iS7LA/7hsTJhxhuz/anQocPEam8HuuU0g5yI2 UgyPfd8oVV3DnRscPhZQd1B01HDuJwZY5lKB+WPTtzJuq4T2R1GJaPBGtyDPem4ymvIf ID+Pyg+BHHyTcQjdTO2AKKYU4Vzmxb49kvmS0YRAlD8ZzzwLUQROUnpaOeFPNG1vpkHo SYrutjOpJqp1UCuE8E09QbF+lAPULg9Pu02M9IbOmoZuKiJ8IVRY5W+bzIspMZbcfBLr 1FPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MlOZmQFo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t1si3692358qkb.29.2020.03.12.13.00.02 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Mar 2020 13:00:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MlOZmQFo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCTzt-0001bX-Mj for patch@linaro.org; Thu, 12 Mar 2020 16:00:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45804) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCTjU-0006G7-6J for qemu-devel@nongnu.org; Thu, 12 Mar 2020 15:43:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCTjT-0002Ig-33 for qemu-devel@nongnu.org; Thu, 12 Mar 2020 15:43:04 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:42183) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jCTjS-0002II-Tz for qemu-devel@nongnu.org; Thu, 12 Mar 2020 15:43:03 -0400 Received: by mail-pg1-x541.google.com with SMTP id h8so3564110pgs.9 for ; Thu, 12 Mar 2020 12:43:02 -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=tHPURWIXRjblQZ58gS3vbMqtD53IcLCIb5jBh5LhEBk=; b=MlOZmQFoWQ4BcERTNAds4uxhqMuCO/enNBCMxm2iuR8i7FsWL3S/cxT5f036TcYZ4U HlSa2YxwlY+FlemkiBU8CJAN04Na0ofH+05kOPESp9gLLSqKCd0wweaTX6B2nvXrUbpS csnTHbWzOkQG56KC4/uNjqPbzo3hDbQFIvid7/bjK0hEXABkJgd2fDqLLKufrjdC51Z7 3zPyoGEjzj/b3wUap8rs1ENOrdztnzAzTgTSRSb3Ssk0oODPn/BHF26a+lDUVawMUj68 QNZ8xzLe95x6rqTL3QFN5xiEh+/qQvV0nARGhMxSPpTvle81ANNwUJgIqpS41svM8Gzm vHXQ== 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=tHPURWIXRjblQZ58gS3vbMqtD53IcLCIb5jBh5LhEBk=; b=SKglMUmMRly3fB31+uyOIx4sUmqpX1CRhjr2GBMNLXWI9BUmf8enVVFs0nwtvLx8gc vMT/9Ccrytb7z9bi18RoVj8vOInALFpXyGLnGV120LNqFbNaSgJm315lJa2IePihQnfp s4bmXi8U6+PcOorHENC55y4pAv596/rqgM/OvHzzC4e7YciIf6u0+2WO0cQBh+dzQR5M ux+jpUm15c9oBjuO53JVnaCDU6zjPWwuWvwpHIDA0+wMHCIJTcqKkrrfhUrcpVgqAQXP H7idk70LRBnagcaZUu7fuHrtC3Vy0RiaoNjXi7db80pKGH/nYupmhgkg8SeOjHJgTNYU cChA== X-Gm-Message-State: ANhLgQ3joiLx0P8zCOijQ8yRG7PkZH99jHZOcCUbSsc08A21/+6S7MzP VtwcMKMIMiBzab7pw5KIn7rNb8f1JRE= X-Received: by 2002:a63:330f:: with SMTP id z15mr9534986pgz.104.1584042181608; Thu, 12 Mar 2020 12:43:01 -0700 (PDT) Received: from localhost.localdomain (97-126-123-70.tukw.qwest.net. [97.126.123.70]) by smtp.gmail.com with ESMTPSA id g69sm6824842pje.34.2020.03.12.12.43.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2020 12:43:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v6 30/42] target/arm: Use mte_check1 for sve LD1R Date: Thu, 12 Mar 2020 12:42:07 -0700 Message-Id: <20200312194219.24406-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200312194219.24406-1-richard.henderson@linaro.org> References: <20200312194219.24406-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 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, qemu-arm@nongnu.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/arm/translate-sve.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) -- 2.20.1 diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 49d2e68564..e5d12edd55 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -4850,16 +4850,16 @@ static bool trans_LD1RQ_zpri(DisasContext *s, arg_rpri_load *a) /* Load and broadcast element. */ static bool trans_LD1R_zpri(DisasContext *s, arg_rpri_load *a) { - if (!sve_access_check(s)) { - return true; - } - unsigned vsz = vec_full_reg_size(s); unsigned psz = pred_full_reg_size(s); unsigned esz = dtype_esz[a->dtype]; unsigned msz = dtype_msz(a->dtype); TCGLabel *over = gen_new_label(); - TCGv_i64 temp; + TCGv_i64 temp, clean_addr; + + if (!sve_access_check(s)) { + return true; + } /* If the guarding predicate has no bits set, no load occurs. */ if (psz <= 8) { @@ -4880,9 +4880,11 @@ static bool trans_LD1R_zpri(DisasContext *s, arg_rpri_load *a) } /* Load the data. */ - temp = tcg_temp_new_i64(); - tcg_gen_addi_i64(temp, cpu_reg_sp(s, a->rn), a->imm << msz); - tcg_gen_qemu_ld_i64(temp, temp, get_mem_index(s), + temp = read_cpu_reg_sp(s, a->rn, true); + tcg_gen_addi_i64(temp, temp, a->imm << msz); + clean_addr = gen_mte_check1(s, temp, false, true, msz); + + tcg_gen_qemu_ld_i64(temp, clean_addr, get_mem_index(s), s->be_data | dtype_mop[a->dtype]); /* Broadcast to *all* elements. */