From patchwork Mon May 30 16:06:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 577281 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:330b:0:0:0:0 with SMTP id f11csp444135mag; Mon, 30 May 2022 10:38:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0/qNMS4RZyd3ReY0hAfMx/l9E0EW3yLlVz4mZDFW2p8BnCuJv/Lv5KFmiMtM4nz6A54PC X-Received: by 2002:a05:6214:5097:b0:45a:cadc:af88 with SMTP id kk23-20020a056214509700b0045acadcaf88mr46606465qvb.129.1653932334094; Mon, 30 May 2022 10:38:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653932334; cv=none; d=google.com; s=arc-20160816; b=S3qBwtognkScCYvgkCwhwYdYmnkviP4xA7pxc+an4u62F4KrksDWIV0HLx0/NbBwVQ WfsSqLaN1fm3xSZZA4emyP40pAmiaJCboxjtcZaCSh81goRDITYi/PeY54Lfczhf5A6L lwnx21kDPElJYwuTRJFOlDfDdoFPYdCtvhaoQfTm2O3bb9B1AJn0ZD9RkP2MBNVxcwGp 0t/XOPpXwQNRhFbRNsijreDS7FLtLlJ/tSEL6ekZDlrefuoBsnRvA3v/8+DGYEpUtQtU c63tx4345jiNFWzrYQB4Y7yhR/WWWxMlbJ09UsHi9i1qS9rB2V1oXDJcULrtKTqnM2nW dRaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=HtWHT2QceLlo70uOLMS5xYP71haF5rXQwIihn1cEbPM=; b=Utu5jFrNGbHP9nYy0DFV0s7j+9fuUUQXSvDa+qR97BBWV0e6UUzT4Mdj/0AnOe6AbM tbiDO1Jn0TeDy2Gy6MJfFCUA52VnayvH49ITHUsWMgC2cYRAMAmdoTZ45cTFr8nXZIRM I39/b1wWDjz4bXIion9poGTwW1QQE10p6ixf83TD5jAaGvp+GVbW1nkZl/4rnfc1Ho3U 7f9wgBRbHS+D9IXHXqZtJHvwi6Gmp8ZoRdwQPg8znW/SjXA+RzxnlZ5+/m/WKngZj/vk nfwAeNX88FlwrfazgYGGREsKHGhnLE4o0ewzTtbraaPeKBhAO5HUJZu26wYYAIm6RuQQ owRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VNmKFleT; 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 fv5-20020a056214240500b0046431c34f0bsi2344427qvb.592.2022.05.30.10.38.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 May 2022 10:38:54 -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=VNmKFleT; 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]:51388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvjLx-0005Pf-Mo for patch@linaro.org; Mon, 30 May 2022 13:38:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvhvx-0003fZ-HH for qemu-devel@nongnu.org; Mon, 30 May 2022 12:07:58 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:45703) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nvhvs-0007Be-8x for qemu-devel@nongnu.org; Mon, 30 May 2022 12:07:57 -0400 Received: by mail-wr1-x430.google.com with SMTP id p10so15257378wrg.12 for ; Mon, 30 May 2022 09:07:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=HtWHT2QceLlo70uOLMS5xYP71haF5rXQwIihn1cEbPM=; b=VNmKFleTB4XdSxku2YP4UjymrcIUjGbgJtj3xN3ry9SGTyuYymXq4QgQgqH0AuyOmZ Gl/LuJPYgG+U3mbu1YP0ziral88cYUFxRZ3wgZwlvekFwwF8AailMp2jmKg/Fv9kZ/// VGtAue6ir0RD1KxZ16kndnijSEPI/B95QVYD75t0jpw7YPitvz/zj0NDDd1F9sl31e9W enlc1e4RsLZPS7BQhW/uBqtslP6sUeRvZ16G8jrZ5Uv9dY1QQ1QK+Vl/W9pFnR9zCSRO pt8B/L/GIM3tU44Cs4t43ztAvGF4QQmRfpFK7tkbMvo63zaWIVFI0yqHRozzPtfUIwqc Utxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HtWHT2QceLlo70uOLMS5xYP71haF5rXQwIihn1cEbPM=; b=6cnnr9Vyn4jRieGunzfBx70dk2ttBvxV1nYn8Afkm9gBvyQ1Vr12x7iOL8hkEwA+ic 3g2ZAis+3CKe7sZQUubMVW1EgNGhNWDc2aw+2b+29Hz4iKwjY1xs8wDOIaBs/2FBHeux T76PgJuWBSugQR5+oHrUPWNWxgzej/jMGT34iegtbID6sv2bYPYuV+XDaF12L7TLNAlF MDlTMOjNn2cjvA3S+C7ElfV+N/qaWOwXe/BY5fmm4fATPiPI2l/QLme6Cxzyuj3TCUbE 6c/rT9xC8pMbYb/uIIA1fEbUrJ+ARGaEFNdC/5GeWzMXQ/u8RbP/E3eWz4ntKc4+m5Vz lwOQ== X-Gm-Message-State: AOAM531jmWBigVS4HP/z8H75LuINewncDfniCbpTEEbyjlv20Mweykla WYxTUtkHvftVCHLhBQj6xD9W9hcqeg/+hw== X-Received: by 2002:adf:ed49:0:b0:210:2b98:a539 with SMTP id u9-20020adfed49000000b002102b98a539mr8536292wro.118.1653926870791; Mon, 30 May 2022 09:07:50 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id bi12-20020a05600c3d8c00b003974b95d897sm10232152wmb.37.2022.05.30.09.07.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 09:07:50 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 051/117] target/arm: Move sve check into do_index Date: Mon, 30 May 2022 17:06:02 +0100 Message-Id: <20220530160708.726466-52-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220530160708.726466-1-peter.maydell@linaro.org> References: <20220530160708.726466-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Signed-off-by: Richard Henderson Message-id: 20220527181907.189259-49-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/translate-sve.c | 53 ++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 52bbd1a4faa..44c23429232 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -1087,12 +1087,20 @@ TRANS_FEAT(MLS, aa64_sve, do_zpzzz_ool, a, mls_fns[a->esz]) *** SVE Index Generation Group */ -static void do_index(DisasContext *s, int esz, int rd, +static bool do_index(DisasContext *s, int esz, int rd, TCGv_i64 start, TCGv_i64 incr) { - unsigned vsz = vec_full_reg_size(s); - TCGv_i32 desc = tcg_constant_i32(simd_desc(vsz, vsz, 0)); - TCGv_ptr t_zd = tcg_temp_new_ptr(); + unsigned vsz; + TCGv_i32 desc; + TCGv_ptr t_zd; + + if (!sve_access_check(s)) { + return true; + } + + vsz = vec_full_reg_size(s); + desc = tcg_constant_i32(simd_desc(vsz, vsz, 0)); + t_zd = tcg_temp_new_ptr(); tcg_gen_addi_ptr(t_zd, cpu_env, vec_full_reg_offset(s, rd)); if (esz == 3) { @@ -1115,46 +1123,35 @@ static void do_index(DisasContext *s, int esz, int rd, tcg_temp_free_i32(i32); } tcg_temp_free_ptr(t_zd); + return true; } static bool trans_INDEX_ii(DisasContext *s, arg_INDEX_ii *a) { - if (sve_access_check(s)) { - TCGv_i64 start = tcg_constant_i64(a->imm1); - TCGv_i64 incr = tcg_constant_i64(a->imm2); - do_index(s, a->esz, a->rd, start, incr); - } - return true; + TCGv_i64 start = tcg_constant_i64(a->imm1); + TCGv_i64 incr = tcg_constant_i64(a->imm2); + return do_index(s, a->esz, a->rd, start, incr); } static bool trans_INDEX_ir(DisasContext *s, arg_INDEX_ir *a) { - if (sve_access_check(s)) { - TCGv_i64 start = tcg_constant_i64(a->imm); - TCGv_i64 incr = cpu_reg(s, a->rm); - do_index(s, a->esz, a->rd, start, incr); - } - return true; + TCGv_i64 start = tcg_constant_i64(a->imm); + TCGv_i64 incr = cpu_reg(s, a->rm); + return do_index(s, a->esz, a->rd, start, incr); } static bool trans_INDEX_ri(DisasContext *s, arg_INDEX_ri *a) { - if (sve_access_check(s)) { - TCGv_i64 start = cpu_reg(s, a->rn); - TCGv_i64 incr = tcg_constant_i64(a->imm); - do_index(s, a->esz, a->rd, start, incr); - } - return true; + TCGv_i64 start = cpu_reg(s, a->rn); + TCGv_i64 incr = tcg_constant_i64(a->imm); + return do_index(s, a->esz, a->rd, start, incr); } static bool trans_INDEX_rr(DisasContext *s, arg_INDEX_rr *a) { - if (sve_access_check(s)) { - TCGv_i64 start = cpu_reg(s, a->rn); - TCGv_i64 incr = cpu_reg(s, a->rm); - do_index(s, a->esz, a->rd, start, incr); - } - return true; + TCGv_i64 start = cpu_reg(s, a->rn); + TCGv_i64 incr = cpu_reg(s, a->rm); + return do_index(s, a->esz, a->rd, start, incr); } /*