From patchwork Wed Oct 3 19:39:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 148084 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp65404lji; Wed, 3 Oct 2018 12:50:20 -0700 (PDT) X-Google-Smtp-Source: ACcGV61K/T1mTK+Z27+3GhvTvAqohmmQUVkt7qWqhJXEzLRh34kvDlLK7WgKt8OHE128vktfvNIw X-Received: by 2002:a0c:d788:: with SMTP id z8-v6mr2645160qvi.71.1538596220768; Wed, 03 Oct 2018 12:50:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538596220; cv=none; d=google.com; s=arc-20160816; b=xXunSIRug1BiEfMNTDrH++NPWaCnRw17V9Roit/4YNl5xMUmRbLqidNzhReSad7Thz 0bz79zvpmriQLvHZXiIDCMfwXlTkDiNHFwwOHhW/svY7fZGDubNVZoTYob+kik5Hyke+ T7Wijj9+8O0xe3J131JUMh8NcF2h/grEl1eIv9UbeAZ8iEyOWI+wfNcGROFdNU39XFbX 554a7QRdmXPThDY0fpnzfex5uTZfe3svM5fqbjUbdu8UZhUnAkJewevZoxoHoS5MvUnu eX8PzzoABQweqF2rNHbwRjDKeGWZDaNRh8DBFQpGGhMrfwNtVX5HO5fldQY8dmNtLoC8 M2FQ== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=g7N3N+A91Q9wKX2V+YBrSR0niQNnDAXh8g6joZORqms=; b=X07KiRTQZHWRsh+QmMW9LnG4DBiKMOpCjBOggx0F4XU7bxy/iINxzkjmLMqXeH8ea5 pui0drIZFujb6j7JLm283Mz1wwXQTGKPOSLjUzQXsV+Wg3rrhr1M1mu35qH7U+gbWCmt /Bv6U+y/2nK6UXswo4v+aa6jvy+qJ5rLGU2P5gY/ukxHNtBuQrtDOMEVSWwNrlcxbMNm RxsXPNABIfvJo31zi581H4stYRjSoAb+mo1JYs2i/JEvWs10NeRqIQZ1lvmIh6xHHiI4 sKCS3Z8OXlUS9QI+GXCQWtEmV+6PPwH38iS3ycHF08LsX8WolTnwXRguL6kkcvg6EAmN PrtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RX7khVBz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z4-v6si573876qvg.133.2018.10.03.12.50.20 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 03 Oct 2018 12:50:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RX7khVBz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g7nA4-0001TS-8g for patch@linaro.org; Wed, 03 Oct 2018 15:50:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59533) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g7n08-0001gT-DS for qemu-devel@nongnu.org; Wed, 03 Oct 2018 15:40:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g7n05-00028I-Ha for qemu-devel@nongnu.org; Wed, 03 Oct 2018 15:40:04 -0400 Received: from mail-qt1-x834.google.com ([2607:f8b0:4864:20::834]:45488) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g7n05-000273-3o for qemu-devel@nongnu.org; Wed, 03 Oct 2018 15:40:01 -0400 Received: by mail-qt1-x834.google.com with SMTP id l2-v6so7264780qtr.12 for ; Wed, 03 Oct 2018 12:40:00 -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; bh=g7N3N+A91Q9wKX2V+YBrSR0niQNnDAXh8g6joZORqms=; b=RX7khVBzRJsI+sTkn3vZPwx706CpQ5btzh5UYeiIdWrUM8E+8SW2OZc7lj0oiIYHZl QwJDheE6M5CALk/213B9XAKEvOqNmoGVY7B5CXxYnsDnfOWqbm9k60mNwBnG4Ztt+dY+ 11+lRBmVVaqsJilrKf6OjTOovuuK25B26DmLc= 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; bh=g7N3N+A91Q9wKX2V+YBrSR0niQNnDAXh8g6joZORqms=; b=WPkFj4vEQhf0p/L5BfMfn21gZUgMg2DeII0Nc5bXVaJdgwgZwRrO1dF020BMpE1bXU edcc2hmpda3FwD1fG3iKvV7zjtjZq108IY/RA53mSwgE/ZVGiWXBL2o3E4yDH/mVe+H6 BVG4JFuNoW4H8RGlC2EX17wkjGodKBLdSdSd47vGaa8EsurbjVnXkYg8+bMiHzYK1xIA i3AEOewjoaYIo82LoYLd/5uzcX8dVP+9gZKI4t7EKV+AzVIpKFwV10OPZpBThEhF5eCf HR0v3Wcgz1o7VG4NdUZseegh4VLJXzgcxtZY5hCiBL4LXx/ozFKzitUvgvoDXZ8pxA58 8r4A== X-Gm-Message-State: ABuFfoi5bcWJvvbqt9Y3eTKPNPcgbC/9KrdcfDFR5cb5ia/w7qcSJd/w ZnA/jpvk2nPViSKteCxhyN3GgILY6x9ywg== X-Received: by 2002:ac8:1793:: with SMTP id o19-v6mr2592068qtj.98.1538595599906; Wed, 03 Oct 2018 12:39:59 -0700 (PDT) Received: from cloudburst.twiddle.net ([172.56.13.153]) by smtp.gmail.com with ESMTPSA id t16-v6sm1284946qth.68.2018.10.03.12.39.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Oct 2018 12:39:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 3 Oct 2018 14:39:31 -0500 Message-Id: <20181003193931.18096-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003193931.18096-1-richard.henderson@linaro.org> References: <20181003193931.18096-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::834 Subject: [Qemu-devel] [PATCH v3 9/9] target/s390x: Check HAVE_ATOMIC128 and HAVE_CMPXCHG128 at translate X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Cc: qemu-s390x@nongnu.org Signed-off-by: Richard Henderson --- target/s390x/mem_helper.c | 40 +++++++++++++++++++-------------------- target/s390x/translate.c | 25 +++++++++++++++++------- 2 files changed, 38 insertions(+), 27 deletions(-) -- 2.17.1 Reviewed-by: David Hildenbrand diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index b5858d2fa2..490c43e6e6 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -1420,9 +1420,7 @@ void HELPER(cdsg_parallel)(CPUS390XState *env, uint64_t addr, Int128 oldv; bool fail; - if (!HAVE_CMPXCHG128) { - cpu_loop_exit_atomic(ENV_GET_CPU(env), ra); - } + assert(HAVE_CMPXCHG128); mem_idx = cpu_mmu_index(env, false); oi = make_memop_idx(MO_TEQ | MO_ALIGN_16, mem_idx); @@ -2115,16 +2113,17 @@ uint64_t HELPER(lpq_parallel)(CPUS390XState *env, uint64_t addr) { uintptr_t ra = GETPC(); uint64_t hi, lo; + int mem_idx; + TCGMemOpIdx oi; + Int128 v; - if (HAVE_ATOMIC128) { - int mem_idx = cpu_mmu_index(env, false); - TCGMemOpIdx oi = make_memop_idx(MO_TEQ | MO_ALIGN_16, mem_idx); - Int128 v = helper_atomic_ldo_be_mmu(env, addr, oi, ra); - hi = int128_gethi(v); - lo = int128_getlo(v); - } else { - cpu_loop_exit_atomic(ENV_GET_CPU(env), ra); - } + assert(HAVE_ATOMIC128); + + mem_idx = cpu_mmu_index(env, false); + oi = make_memop_idx(MO_TEQ | MO_ALIGN_16, mem_idx); + v = helper_atomic_ldo_be_mmu(env, addr, oi, ra); + hi = int128_gethi(v); + lo = int128_getlo(v); env->retxl = lo; return hi; @@ -2145,15 +2144,16 @@ void HELPER(stpq_parallel)(CPUS390XState *env, uint64_t addr, uint64_t low, uint64_t high) { uintptr_t ra = GETPC(); + int mem_idx; + TCGMemOpIdx oi; + Int128 v; - if (HAVE_ATOMIC128) { - int mem_idx = cpu_mmu_index(env, false); - TCGMemOpIdx oi = make_memop_idx(MO_TEQ | MO_ALIGN_16, mem_idx); - Int128 v = int128_make128(low, high); - helper_atomic_sto_be_mmu(env, addr, v, oi, ra); - } else { - cpu_loop_exit_atomic(ENV_GET_CPU(env), ra); - } + assert(HAVE_ATOMIC128); + + mem_idx = cpu_mmu_index(env, false); + oi = make_memop_idx(MO_TEQ | MO_ALIGN_16, mem_idx); + v = int128_make128(low, high); + helper_atomic_sto_be_mmu(env, addr, v, oi, ra); } /* Execute instruction. This instruction executes an insn modified with diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 7fad3ad8e9..57fe74e4a0 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -44,6 +44,7 @@ #include "trace-tcg.h" #include "exec/translator.h" #include "exec/log.h" +#include "qemu/atomic128.h" /* Information that (most) every instruction needs to manipulate. */ @@ -2032,6 +2033,7 @@ static DisasJumpType op_cdsg(DisasContext *s, DisasOps *o) int r3 = get_field(s->fields, r3); int d2 = get_field(s->fields, d2); int b2 = get_field(s->fields, b2); + DisasJumpType ret = DISAS_NEXT; TCGv_i64 addr; TCGv_i32 t_r1, t_r3; @@ -2039,17 +2041,20 @@ static DisasJumpType op_cdsg(DisasContext *s, DisasOps *o) addr = get_address(s, 0, b2, d2); t_r1 = tcg_const_i32(r1); t_r3 = tcg_const_i32(r3); - if (tb_cflags(s->base.tb) & CF_PARALLEL) { + if (!(tb_cflags(s->base.tb) & CF_PARALLEL)) { + gen_helper_cdsg(cpu_env, addr, t_r1, t_r3); + } else if (HAVE_CMPXCHG128) { gen_helper_cdsg_parallel(cpu_env, addr, t_r1, t_r3); } else { - gen_helper_cdsg(cpu_env, addr, t_r1, t_r3); + gen_helper_exit_atomic(cpu_env); + ret = DISAS_NORETURN; } tcg_temp_free_i64(addr); tcg_temp_free_i32(t_r1); tcg_temp_free_i32(t_r3); set_cc_static(s); - return DISAS_NEXT; + return ret; } static DisasJumpType op_csst(DisasContext *s, DisasOps *o) @@ -3036,10 +3041,13 @@ static DisasJumpType op_lpd(DisasContext *s, DisasOps *o) static DisasJumpType op_lpq(DisasContext *s, DisasOps *o) { - if (tb_cflags(s->base.tb) & CF_PARALLEL) { + if (!(tb_cflags(s->base.tb) & CF_PARALLEL)) { + gen_helper_lpq(o->out, cpu_env, o->in2); + } else if (HAVE_ATOMIC128) { gen_helper_lpq_parallel(o->out, cpu_env, o->in2); } else { - gen_helper_lpq(o->out, cpu_env, o->in2); + gen_helper_exit_atomic(cpu_env); + return DISAS_NORETURN; } return_low128(o->out2); return DISAS_NEXT; @@ -4462,10 +4470,13 @@ static DisasJumpType op_stmh(DisasContext *s, DisasOps *o) static DisasJumpType op_stpq(DisasContext *s, DisasOps *o) { - if (tb_cflags(s->base.tb) & CF_PARALLEL) { + if (!(tb_cflags(s->base.tb) & CF_PARALLEL)) { + gen_helper_stpq(cpu_env, o->in2, o->out2, o->out); + } else if (HAVE_ATOMIC128) { gen_helper_stpq_parallel(cpu_env, o->in2, o->out2, o->out); } else { - gen_helper_stpq(cpu_env, o->in2, o->out2, o->out); + gen_helper_exit_atomic(cpu_env); + return DISAS_NORETURN; } return DISAS_NEXT; }