From patchwork Fri May 4 18:30:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 135023 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp383438lji; Fri, 4 May 2018 11:36:40 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrVFpLKQBYMUBR36vbiI5QjfuqYY6mMa6abpxA7y/xMriL+NEYKtazN14IS9BfiZbaI/X/r X-Received: by 2002:a0c:bdac:: with SMTP id n44-v6mr23936801qvg.165.1525458999953; Fri, 04 May 2018 11:36:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525458999; cv=none; d=google.com; s=arc-20160816; b=ars6062SzLQISbC6HQvZwsbIUl1b19h4gdsR22Igz6k/5Iw0So/kdEVcjqOMJVetdw FQ+ABuvuwR414kfW5Rarzth2Y2DdWpoWYq74JLWh+qHBOOc2s5FZFWsgZEaXUREz/mvF X+AedqPtvoQz8varDMQRIlCVV4rNY68O53bGJx3Ye4YFM8wp/iDBpFYWTuJ5hbBqGuZQ Cb/Ll+WTH0eRxeDitEhrwi4xoGjBy1iyb2N+/tQ6meMHOTIgSSzuXWWT8EnLkHHRpU4h qnb7//4S0NtCn6aB/PT4wLLVZKr434zudWmqIM9jRFaedNmpJyn4p5koRiymmt7t8+0S NH8Q== 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:arc-authentication-results; bh=pX83ru2E3i1FHrQMTmbujCaU3VeAorJ2wf0oyrpNImg=; b=zFfECNr2rjThXdv5u9gA+gTuBzvNSrB76fo/e+ozRzx0FA0YrXzS7iRSuVMVFLyfHS 7kjh6f+Ww6zAssyFQSSB6rljbBKmAYils3IqmKJb1WXKsHmgukFPhopep67dhwhWM0qn jS2uUwcz4oPEy64bmwLKJ+cthrc4cg/EKhBK3eMYJp2Y7Z2/3gVBIp8uloRR1mW6nXRF T169rzKgAAdSZd1QvHM+JCfrmQJoSzCZUcqkQTajGNqqmnHdPp/XLQzZApUe7C7tpebg YgHsSuDzysYmmdiw76Ub+mYPUL9VZ8jgT7F9o7b7VAfGMjSvIi7SBBONu39BOcqgzRHK 0vkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CvleDs3g; 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 x127si4270754qke.143.2018.05.04.11.36.39 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 04 May 2018 11:36:39 -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=CvleDs3g; 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]:36008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEfZP-0004Ew-CS for patch@linaro.org; Fri, 04 May 2018 14:36:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEfTV-0007Vr-0M for qemu-devel@nongnu.org; Fri, 04 May 2018 14:30:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEfTU-00018M-7t for qemu-devel@nongnu.org; Fri, 04 May 2018 14:30:33 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:37409) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fEfTU-00017o-2G for qemu-devel@nongnu.org; Fri, 04 May 2018 14:30:32 -0400 Received: by mail-pf0-x243.google.com with SMTP id e9so14078306pfi.4 for ; Fri, 04 May 2018 11:30:31 -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=pX83ru2E3i1FHrQMTmbujCaU3VeAorJ2wf0oyrpNImg=; b=CvleDs3g8JmKMkxfP3OtTB94Ww3Rb//Oj1uizsTVgfVz3l0TASH5EAsw22/6gcoci4 9O+e4G1ftvzA4FeHmW8CoifbclTWsDKZGajIaeVt/ZT4Uvbv1oFZp+v/mMi+A1pqCOft MkaO4aJxfKT+n5GZfvQDKIFDPMSxxV3tPdmdY= 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=pX83ru2E3i1FHrQMTmbujCaU3VeAorJ2wf0oyrpNImg=; b=HyUoIXNIex+IvK19AhDhwj6/Yz9iLzDGyRMV62+JzjbaMuytLYs+4pYTNbP3mVYZAe B1Kulbq3NNhL/gq4HZzbjy7qhHNkIgtM44O+t1ZGe3s95dret4MceG7RUDZml4lj5NDI DXPkKJCvs78gcM4BXnCljFq0opaEIyM7EqPX8sjpBlLp35Pc7qXvoF8bEGjGR9UbmUio 5PV7KMRYrLyyMkj5tZQWJi6jGezhrYFPGpzNI5FY8LkvRvuWIJ7nOHpK9Z6WPoELcQJ/ IFJsHYEma8KzvGh4HtToUmUmewqlyY2WzPVvyAEaG3j781/kJbQBW6mraulDQ5cuTf0X lg4Q== X-Gm-Message-State: ALQs6tDjOIxi9Uy8KHJB/WaWobsdUfxePZudbylPqHamp0iZ1H0tPT5/ fAStoXQe6e+vkXh2E+5rl9QaSl1iFbk= X-Received: by 2002:a17:902:9a9:: with SMTP id 38-v6mr29290044pln.114.1525458630724; Fri, 04 May 2018 11:30:30 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-2-170.tukw.qwest.net. [97.113.2.170]) by smtp.gmail.com with ESMTPSA id r8-v6sm16987413pgn.2.2018.05.04.11.30.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 May 2018 11:30:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 4 May 2018 11:30:16 -0700 Message-Id: <20180504183021.19318-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180504183021.19318-1-richard.henderson@linaro.org> References: <20180504183021.19318-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PATCH v2 05/10] tcg: Use GEN_ATOMIC_HELPER_FN for opposite endian atomic add 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: peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Suggested-by: Peter Maydell Signed-off-by: Richard Henderson --- accel/tcg/atomic_template.h | 49 +++++++-------------------------------------- 1 file changed, 7 insertions(+), 42 deletions(-) -- 2.14.3 diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h index 2489dd3ec1..3f41ef2782 100644 --- a/accel/tcg/atomic_template.h +++ b/accel/tcg/atomic_template.h @@ -229,48 +229,6 @@ GEN_ATOMIC_HELPER(xor_fetch) #undef GEN_ATOMIC_HELPER -/* Note that for addition, we need to use a separate cmpxchg loop instead - of bswaps for the reverse-host-endian helpers. */ -ABI_TYPE ATOMIC_NAME(fetch_add)(CPUArchState *env, target_ulong addr, - ABI_TYPE val EXTRA_ARGS) -{ - ATOMIC_MMU_DECLS; - DATA_TYPE *haddr = ATOMIC_MMU_LOOKUP; - DATA_TYPE ldo, ldn, ret, sto; - - ldo = atomic_read__nocheck(haddr); - while (1) { - ret = BSWAP(ldo); - sto = BSWAP(ret + val); - ldn = atomic_cmpxchg__nocheck(haddr, ldo, sto); - if (ldn == ldo) { - ATOMIC_MMU_CLEANUP; - return ret; - } - ldo = ldn; - } -} - -ABI_TYPE ATOMIC_NAME(add_fetch)(CPUArchState *env, target_ulong addr, - ABI_TYPE val EXTRA_ARGS) -{ - ATOMIC_MMU_DECLS; - DATA_TYPE *haddr = ATOMIC_MMU_LOOKUP; - DATA_TYPE ldo, ldn, ret, sto; - - ldo = atomic_read__nocheck(haddr); - while (1) { - ret = BSWAP(ldo) + val; - sto = BSWAP(ret); - ldn = atomic_cmpxchg__nocheck(haddr, ldo, sto); - if (ldn == ldo) { - ATOMIC_MMU_CLEANUP; - return ret; - } - ldo = ldn; - } -} - /* These helpers are, as a whole, full barriers. Within the helper, * the leading barrier is explicit and the trailing barrier is within * cmpxchg primitive. @@ -302,6 +260,13 @@ GEN_ATOMIC_HELPER_FN(umin_fetch, MIN, DATA_TYPE, new) GEN_ATOMIC_HELPER_FN(smax_fetch, MAX, SDATA_TYPE, new) GEN_ATOMIC_HELPER_FN(umax_fetch, MAX, DATA_TYPE, new) +/* Note that for addition, we need to use a separate cmpxchg loop instead + of bswaps for the reverse-host-endian helpers. */ +#define ADD(X, Y) (X + Y) +GEN_ATOMIC_HELPER_FN(fetch_add, ADD, DATA_TYPE, old) +GEN_ATOMIC_HELPER_FN(add_fetch, ADD, DATA_TYPE, new) +#undef ADD + #undef GEN_ATOMIC_HELPER_FN #endif /* DATA_SIZE >= 16 */