From patchwork Sat Nov 12 07:56:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 624225 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1248235pvb; Fri, 11 Nov 2022 23:57:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf75yJk9J4SVt/Z1xoQbXtTYxOXdEsfnZFgkpWAIOiUgGCX6Ze3S2k7hlHSqNv7XdJkrpoJJ X-Received: by 2002:a05:622a:1a05:b0:3a5:285c:d9fb with SMTP id f5-20020a05622a1a0500b003a5285cd9fbmr4652121qtb.408.1668239875260; Fri, 11 Nov 2022 23:57:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668239875; cv=none; d=google.com; s=arc-20160816; b=RBDb0wLwdp5OzDylNjKZrUViGYyUTCdqa75WPhXE1h7uljO4ATAvZxxJdvaI9VMO7Y nWFqkQA5TW8SrQJRvfUqJJaYAfUO+FKmcrR7csq+uO5b6shFoeWh66IjaCugAe67ogO9 ETHcWdfqHw7hI4Ptq3262O7HRnU/YYHVynw8cb3XV/ficRw/KXNQccccfhxoARjYc8wY x+DlvFVo9wR2Hq6nCR/cBu0WIidS2ECVdjG3DUyAZYqZ8WqPCAZSWzZtT3UsALfN5284 E42oX9rM+q2ZCMPat/klmZgLwOb34E+rfSUVUlZwzET0qz1i2XtLJM5Ph4XUW9POi0XH fGcA== 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:cc:to :from:dkim-signature; bh=uZPaYOgpXH2xCLOdQ104Ejv9oIO+hb8rMy2pf7ORzjY=; b=EWfTLmFKGVkfLip29wSP/EKVynksrQhsMMtGCy+AzOt2uq0DiSeqZhCrj/GBgZ+/Vh MY6p7AZnzNuKLeIp6EbrNIsvQ8s+Mz1h1BIzJrkdKDOA6l489VjAfXBeUgufbTwWjkap 1cuTmIz7fLM82GysO1VZ6C88VkH5rgXDQ0dXF6dDIakKplj0S6I1y9h7phB5+rtplMr3 TrqdEYpYWDtvPc9ktp2eDnU2F8834TtBEl1mlDnR5hgsx8Nwk0MLaxYQ/mRjsRdjNzVb ln0Sco3uenjYx2IHWk8/AM8alnL4t8hmtPiVf1R/5mZ54I4KjG+bCBFvlUpTTRX6eSbh +1rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=px694ABq; 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 fv19-20020a05622a4a1300b003a53c633793si2359033qtb.595.2022.11.11.23.57.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Nov 2022 23:57:55 -0800 (PST) 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=px694ABq; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1otlNx-0006BW-8G; Sat, 12 Nov 2022 02:57:05 -0500 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 1otlNv-0006Av-A0 for qemu-devel@nongnu.org; Sat, 12 Nov 2022 02:57:03 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1otlNt-0008CX-Ii for qemu-devel@nongnu.org; Sat, 12 Nov 2022 02:57:03 -0500 Received: by mail-pl1-x62e.google.com with SMTP id g24so6002077plq.3 for ; Fri, 11 Nov 2022 23:57:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=uZPaYOgpXH2xCLOdQ104Ejv9oIO+hb8rMy2pf7ORzjY=; b=px694ABq8q/a6Z+wJaBZ0m7j/QEqDLn2u5UbdiP0DM9+LLKeSoaWeqr9cskhsSyg21 QQk3ZVt3peM+uTkH2gosbrKFJc+uyulLGAGj/8szS0IyUOrc15oxspACei+2y1FdTKPt Nf4u8QNQ1hJ+BKYh/TqvN8FdqJCaJDEADbQECFoKXqHhOGxunu+Fw20DxUnk/wMLOCK9 XHp3uzn2fvIIdzB41qrD+jpggQjx59/SzEL0w7uazNqNQaZHC/VWVWGTEl+69/0+DWsH z3bug2t5LEQ6pOTlIBk243GO5MDQ2N4eWpzlIHil4j4TzvwtX3H4nCLToAqOoVpSVAdl 4zqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=uZPaYOgpXH2xCLOdQ104Ejv9oIO+hb8rMy2pf7ORzjY=; b=WqlhU0NqnOSPLVSw/bq1Ho+EzV9MM5/i3u9lqUmHDOCMpHg4Sq/oFF08r/hOVpJsYh Cg1podJKwCdxbaKqHnBpVjsXZ7z5li+0WoKe7X8jgiNgksgIdeL91oxxzp1i++yyUZhw MzlaHGxe1SeI3imQyIUWoahFLqPCdAImxROzgbg6Eq4tPACnjB3luf3tz7iCUYa6tnND V75flUpmNAYQWBSAm5CWfcf/IDnn1WVXNWG8aCR/8XvUP8I201MVmSFu4+9iTlHt7tAg 1vZi8ax4DAZxMMi1itX6obOJdAFfOvO7gxzhVo8sQN3QiRgpC4oTX/0aLcjynLO1sqOO XDyQ== X-Gm-Message-State: ANoB5pl4/INyqUtPiMgv0QE9Ytbk/8vqF5TwkiOGiSM0gEWbufl7mFmN UKF64wgYnbvAxskHLdovUEPw+KsbrCXUr/nE X-Received: by 2002:a17:902:7296:b0:186:e222:9f05 with SMTP id d22-20020a170902729600b00186e2229f05mr5909063pll.61.1668239820087; Fri, 11 Nov 2022 23:57:00 -0800 (PST) Received: from stoup.lan (2001-44b8-2176-c800-8228-b676-fb42-ee07.static.ipv6.internode.on.net. [2001:44b8:2176:c800:8228:b676:fb42:ee07]) by smtp.gmail.com with ESMTPSA id m8-20020a17090a71c800b00213d08fa459sm2743062pjs.17.2022.11.11.23.56.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 23:56:59 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, eduardo@habkost.net Subject: [PATCH for-8.0 3/3] target/i386: Inline cmpxchg16b Date: Sat, 12 Nov 2022 17:56:45 +1000 Message-Id: <20221112075645.2850679-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221112075645.2850679-1-richard.henderson@linaro.org> References: <20221112075645.2850679-1-richard.henderson@linaro.org> MIME-Version: 1.0 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.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-bounces+patch=linaro.org@nongnu.org Use tcg_gen_atomic_cmpxchg_i128 for the atomic case, and tcg_gen_qemu_ld/st_i128 otherwise. Signed-off-by: Richard Henderson --- target/i386/helper.h | 4 --- target/i386/tcg/mem_helper.c | 69 ------------------------------------ target/i386/tcg/translate.c | 44 ++++++++++++++++++++--- 3 files changed, 39 insertions(+), 78 deletions(-) diff --git a/target/i386/helper.h b/target/i386/helper.h index 2df8049f91..e627a93107 100644 --- a/target/i386/helper.h +++ b/target/i386/helper.h @@ -66,10 +66,6 @@ DEF_HELPER_1(rsm, void, env) #endif /* !CONFIG_USER_ONLY */ DEF_HELPER_2(into, void, env, int) -#ifdef TARGET_X86_64 -DEF_HELPER_2(cmpxchg16b_unlocked, void, env, tl) -DEF_HELPER_2(cmpxchg16b, void, env, tl) -#endif DEF_HELPER_FLAGS_1(single_step, TCG_CALL_NO_WG, noreturn, env) DEF_HELPER_1(rechecking_single_step, void, env) DEF_HELPER_1(cpuid, void, env) diff --git a/target/i386/tcg/mem_helper.c b/target/i386/tcg/mem_helper.c index 814786bb87..3ef84e90d9 100644 --- a/target/i386/tcg/mem_helper.c +++ b/target/i386/tcg/mem_helper.c @@ -27,75 +27,6 @@ #include "tcg/tcg.h" #include "helper-tcg.h" -#ifdef TARGET_X86_64 -void helper_cmpxchg16b_unlocked(CPUX86State *env, target_ulong a0) -{ - uintptr_t ra = GETPC(); - Int128 oldv, cmpv, newv; - uint64_t o0, o1; - int eflags; - bool success; - - if ((a0 & 0xf) != 0) { - raise_exception_ra(env, EXCP0D_GPF, GETPC()); - } - eflags = cpu_cc_compute_all(env, CC_OP); - - cmpv = int128_make128(env->regs[R_EAX], env->regs[R_EDX]); - newv = int128_make128(env->regs[R_EBX], env->regs[R_ECX]); - - o0 = cpu_ldq_data_ra(env, a0 + 0, ra); - o1 = cpu_ldq_data_ra(env, a0 + 8, ra); - - oldv = int128_make128(o0, o1); - success = int128_eq(oldv, cmpv); - if (!success) { - newv = oldv; - } - - cpu_stq_data_ra(env, a0 + 0, int128_getlo(newv), ra); - cpu_stq_data_ra(env, a0 + 8, int128_gethi(newv), ra); - - if (success) { - eflags |= CC_Z; - } else { - env->regs[R_EAX] = int128_getlo(oldv); - env->regs[R_EDX] = int128_gethi(oldv); - eflags &= ~CC_Z; - } - CC_SRC = eflags; -} - -void helper_cmpxchg16b(CPUX86State *env, target_ulong a0) -{ - uintptr_t ra = GETPC(); - - if ((a0 & 0xf) != 0) { - raise_exception_ra(env, EXCP0D_GPF, ra); - } else if (HAVE_CMPXCHG128) { - int eflags = cpu_cc_compute_all(env, CC_OP); - - Int128 cmpv = int128_make128(env->regs[R_EAX], env->regs[R_EDX]); - Int128 newv = int128_make128(env->regs[R_EBX], env->regs[R_ECX]); - - int mem_idx = cpu_mmu_index(env, false); - MemOpIdx oi = make_memop_idx(MO_TE | MO_128 | MO_ALIGN, mem_idx); - Int128 oldv = cpu_atomic_cmpxchgo_le_mmu(env, a0, cmpv, newv, oi, ra); - - if (int128_eq(oldv, cmpv)) { - eflags |= CC_Z; - } else { - env->regs[R_EAX] = int128_getlo(oldv); - env->regs[R_EDX] = int128_gethi(oldv); - eflags &= ~CC_Z; - } - CC_SRC = eflags; - } else { - cpu_loop_exit_atomic(env_cpu(env), ra); - } -} -#endif - void helper_boundw(CPUX86State *env, target_ulong a0, int v) { int low, high; diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index a134d63946..6dfcfaf31a 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -3034,15 +3034,49 @@ static void gen_cmpxchg8b(DisasContext *s, CPUX86State *env, int modrm) #ifdef TARGET_X86_64 static void gen_cmpxchg16b(DisasContext *s, CPUX86State *env, int modrm) { + MemOp mop = MO_TE | MO_128 | MO_ALIGN; + TCGv_i64 t0, t1; + TCGv_i128 cmp, val; + gen_lea_modrm(env, s, modrm); - if ((s->prefix & PREFIX_LOCK) && - (tb_cflags(s->base.tb) & CF_PARALLEL)) { - gen_helper_cmpxchg16b(cpu_env, s->A0); + cmp = tcg_temp_new_i128(); + val = tcg_temp_new_i128(); + tcg_gen_concat_i64_i128(cmp, cpu_regs[R_EAX], cpu_regs[R_EDX]); + tcg_gen_concat_i64_i128(val, cpu_regs[R_EBX], cpu_regs[R_ECX]); + + /* Only require atomic with LOCK; non-parallel handled in generator. */ + if (s->prefix & PREFIX_LOCK) { + tcg_gen_atomic_cmpxchg_i128(val, s->A0, cmp, val, s->mem_index, mop); } else { - gen_helper_cmpxchg16b_unlocked(cpu_env, s->A0); + tcg_gen_nonatomic_cmpxchg_i128(val, s->A0, cmp, val, s->mem_index, mop); } - set_cc_op(s, CC_OP_EFLAGS); + + tcg_gen_extr_i128_i64(s->T0, s->T1, val); + tcg_temp_free_i128(cmp); + tcg_temp_free_i128(val); + + /* Determine success after the fact. */ + t0 = tcg_temp_new_i64(); + t1 = tcg_temp_new_i64(); + tcg_gen_xor_i64(t0, s->T0, cpu_regs[R_EAX]); + tcg_gen_xor_i64(t1, s->T1, cpu_regs[R_EDX]); + tcg_gen_or_i64(t0, t0, t1); + tcg_temp_free_i64(t1); + + /* Update Z. */ + gen_compute_eflags(s); + tcg_gen_setcondi_i64(TCG_COND_EQ, t0, t0, 0); + tcg_gen_deposit_tl(cpu_cc_src, cpu_cc_src, t0, ctz32(CC_Z), 1); + tcg_temp_free_i64(t0); + + /* + * Extract the result values for the register pair. We may do this + * unconditionally, because on success (Z=1), the old value matches + * the previous value in RDX:RAX. + */ + tcg_gen_mov_i64(cpu_regs[R_EAX], s->T0); + tcg_gen_mov_i64(cpu_regs[R_EDX], s->T1); } #endif