From nobody Mon Oct 27 14:06:09 2025 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1761263478; cv=none; d=zohomail.com; s=zohoarc; b=khZJmuz1aKZVvXlLFbWz2mJSIjd1PEDbkCqXTQCOu3QQT/ED47hqusnQsgNJ9IKKzReQBxpJmc8JJ+GkdmoqT/yMeJs7JDyJK2Df34USp3208J5KXt9d8snnwZXkPO24wV5m5BZeNBTidCBXeIpU1vadtMiGiQslJFB8gAv7zgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761263478; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=d5FE2heCAcRJvSP8v6hzQsEmDuz5OULa6o5imBMV2Lo=; b=TTdEB6/CoDXVme+Z67u7pO3QKMEnNbsdPpHP6F2zUVquxYgpyYJql0fYQqO2MeLm5HbFl502I6n4ksYXJwH2ZjQQZf4Hg7fp0cX1wdKZd+FhInGniA/3aEkzg0u5P7yg0nOMIfYHg2J+F6ztOJ63hhiaWh84lX+SIUdWzd3ehU4= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761263478419847.5853957730279; Thu, 23 Oct 2025 16:51:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vC54T-000490-5D; Thu, 23 Oct 2025 19:50:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vC54R-000436-1J for qemu-devel@nongnu.org; Thu, 23 Oct 2025 19:50:15 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vC54N-0007MR-Cx for qemu-devel@nongnu.org; Thu, 23 Oct 2025 19:50:13 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-290ab379d48so13783995ad.2 for ; Thu, 23 Oct 2025 16:50:10 -0700 (PDT) Received: from toolbx.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2946de02cb7sm36088525ad.40.2025.10.23.16.50.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Oct 2025 16:50:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761263409; x=1761868209; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d5FE2heCAcRJvSP8v6hzQsEmDuz5OULa6o5imBMV2Lo=; b=NwjIc18gZxdBIBG1dL75s0aVQ6ByPVeVFAb+9iubfXbHo+CVsB9DQ+bqFGInfT35gp Qxuhknm7K8zZNOceuiOY+6Jd4dNiSoElf2M+1c4erFpfNmmG65HP9Vbobd1nr1Inf4dP nWQHZi80o1x6Mpnb+GZvlKVnAs3gfrAUjwSb370OkAEpwVMweQOAiL1Xjha6Ux9KWYAF j4vCoMEBKvup8dM4DPAcBNSv9gU2EUGVGj8Mv7OC1Pog1J1OJCUdCjSJeKmxrFa0bI8j KXjkRQPFtjMuY9VGcCzEw97D1hbup6tjcs+8r9FAJZqxebKsZNToK3xBFFp7D10kmvrp H8eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761263409; x=1761868209; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d5FE2heCAcRJvSP8v6hzQsEmDuz5OULa6o5imBMV2Lo=; b=HD5vcE6gulEWzX4o1QI79831EyfUuTq44hnkqfdu8miwMGWliMsSNyshIMyWP1XtpZ KdQ/4SpER0UR9AYjvFfbXZbfWGVFCkS40VcZhOW9vcF3B5CxC1tjQJci9fzD0m7fISB/ xQFqwaCHbl19IRLALZf8JoHsaO1u3/3nCLdF2wWoyb7hMteNMVjvGFW4u8P85OUpg3bQ 4Wg2nbAavylfSIkyGeJF57txIDcnnDwl9RfcHKFWIHnKh+aBAUKLwECY/7InZC+iHssM FyP2Z18aC1woV687JGpVYmELl/FNtuqxITI6hCyy6N2q+pWpkUGwQMOCslF3G8o7ad6Y gsaw== X-Gm-Message-State: AOJu0YxO3zEuFaY3wdUTXjn+WNPiiSF4nP7POxi1QoBVxbuTq8CZPQxe dEkXHB9HcwfUqFL1/ZrdbQIw/qBR6ieUBtTWTiMskd6OAR+DccDt8yljIB1klQ== X-Gm-Gg: ASbGncvbNi9XscMKpjaPLBLsj+PzPhosKiFev6xI12lhwaUkh3QkzrAHQDd90rgIr3K 43ZQ4wFMx0T49woA68bMtrEq12Un8Jx2EJsZMBde1DP5a9fJRh0k8cSUaSOrh7j90MPusjqqeux 9Tqt9PInCVMam8KW85c7KM8A7LrZE+yFqcHR4qnNuj3/EKH+cmQ4XpUSXmhjhr5HwpgmIiRishY TlFwZoVuV3qvfq++lMZKYJByEXYsBGYwTo2JRX6KFunnAGl5mAwMpYgqh4otSVt1+LeTwW7oMPY Lc3Rqj1rs+b7WnsHur8zeKV2xNr22A/CE0uhvvCxtbPqSTrnL2/5IviZWlrNVA7opIqYOxnq/3m eck4nOVqzyE9bEtCSPyMxf4MnFIPbQVz7D6uJQc38ZyS8hTgRx9mjMptVmsJ0+Sr6hpY0xwe12N cq3+O24I9E/InPgsPp1zOikm0coF6LS/5Ut8G7UfblNE0CwPYMA4ge59PC0oBqUhHxFeNbr3LKA pEbEaEFs1jW9zKH1+k= X-Google-Smtp-Source: AGHT+IE1H4Xrgu14c29Ihaikih9omAnDA8Qmptu/dG4xHFzg+5dvShJZnh2hTfz+aNECJidEG9ECUw== X-Received: by 2002:a17:903:2b06:b0:272:f9c3:31fb with SMTP id d9443c01a7336-290cba4dbb5mr335398585ad.58.1761263408737; Thu, 23 Oct 2025 16:50:08 -0700 (PDT) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: qemu-devel@nongnu.org Cc: alistair23@gmail.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Alistair Francis Subject: [PULL v2 09/25] target/riscv: Conceal MO_TE within gen_cmpxchg*() Date: Fri, 24 Oct 2025 09:49:11 +1000 Message-ID: <20251023234927.1864284-10-alistair.francis@wdc.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251023234927.1864284-1-alistair.francis@wdc.com> References: <20251023234927.1864284-1-alistair.francis@wdc.com> 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::62b; envelope-from=alistair23@gmail.com; helo=mail-pl1-x62b.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1761263481528154100 From: Philippe Mathieu-Daud=C3=A9 All callers of gen_cmpxchg() / gen_cmpxchg64() set the MO_TE flag. Set it once in the callees. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Alistair Francis Message-ID: <20251010155045.78220-10-philmd@linaro.org> Signed-off-by: Alistair Francis --- target/riscv/translate.c | 1 + target/riscv/insn_trans/trans_rvzabha.c.inc | 2 +- target/riscv/insn_trans/trans_rvzacas.c.inc | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 94af9853cf..2e6f39aa02 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -1156,6 +1156,7 @@ static bool gen_cmpxchg(DisasContext *ctx, arg_atomic= *a, MemOp mop) TCGv src1 =3D get_address(ctx, a->rs1, 0); TCGv src2 =3D get_gpr(ctx, a->rs2, EXT_NONE); =20 + mop |=3D MO_TE; decode_save_opc(ctx, RISCV_UW2_ALWAYS_STORE_AMO); tcg_gen_atomic_cmpxchg_tl(dest, src1, dest, src2, ctx->mem_idx, mop); =20 diff --git a/target/riscv/insn_trans/trans_rvzabha.c.inc b/target/riscv/ins= n_trans/trans_rvzabha.c.inc index c1f99b65f0..302c63f2a3 100644 --- a/target/riscv/insn_trans/trans_rvzabha.c.inc +++ b/target/riscv/insn_trans/trans_rvzabha.c.inc @@ -141,5 +141,5 @@ static bool trans_amocas_h(DisasContext *ctx, arg_amoca= s_h *a) { REQUIRE_ZACAS(ctx); REQUIRE_ZABHA(ctx); - return gen_cmpxchg(ctx, a, MO_ALIGN | MO_TE | MO_SW); + return gen_cmpxchg(ctx, a, MO_ALIGN | MO_SW); } diff --git a/target/riscv/insn_trans/trans_rvzacas.c.inc b/target/riscv/ins= n_trans/trans_rvzacas.c.inc index 5e7c7c92b7..d850b14264 100644 --- a/target/riscv/insn_trans/trans_rvzacas.c.inc +++ b/target/riscv/insn_trans/trans_rvzacas.c.inc @@ -25,7 +25,7 @@ static bool trans_amocas_w(DisasContext *ctx, arg_amocas_w *a) { REQUIRE_ZACAS(ctx); - return gen_cmpxchg(ctx, a, MO_ALIGN | MO_TE | MO_SL); + return gen_cmpxchg(ctx, a, MO_ALIGN | MO_SL); } =20 static TCGv_i64 get_gpr_pair(DisasContext *ctx, int reg_num) @@ -76,6 +76,7 @@ static bool gen_cmpxchg64(DisasContext *ctx, arg_atomic *= a, MemOp mop) TCGv src1 =3D get_address(ctx, a->rs1, 0); TCGv_i64 src2 =3D get_gpr_pair(ctx, a->rs2); =20 + mop |=3D MO_TE; decode_save_opc(ctx, RISCV_UW2_ALWAYS_STORE_AMO); tcg_gen_atomic_cmpxchg_i64(dest, src1, dest, src2, ctx->mem_idx, mop); =20 @@ -88,10 +89,10 @@ static bool trans_amocas_d(DisasContext *ctx, arg_amoca= s_d *a) REQUIRE_ZACAS(ctx); switch (get_ol(ctx)) { case MXL_RV32: - return gen_cmpxchg64(ctx, a, MO_ALIGN | MO_TE | MO_UQ); + return gen_cmpxchg64(ctx, a, MO_ALIGN | MO_UQ); case MXL_RV64: case MXL_RV128: - return gen_cmpxchg(ctx, a, MO_ALIGN | MO_TE | MO_UQ); + return gen_cmpxchg(ctx, a, MO_ALIGN | MO_UQ); default: g_assert_not_reached(); } --=20 2.51.0