From patchwork Tue Apr 22 19:28:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883052 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp2589348wrs; Tue, 22 Apr 2025 12:41:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVpvy9fTPIdr7DG0GJJwK6ZnX1aqodZ36bkZQpnSHo/I3Z77jocOhqRBQPU09YlXiecS/pCEA==@linaro.org X-Google-Smtp-Source: AGHT+IE3ebbCIY6RMyOlq+S3l1h/jnhcieHryuRWdjYSu97XRZgYUlhMQstQCTUz0YM8lVgOwmqT X-Received: by 2002:a05:6214:1c47:b0:6e4:4484:f35b with SMTP id 6a1803df08f44-6f2c465a117mr211755486d6.30.1745350917736; Tue, 22 Apr 2025 12:41:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745350917; cv=none; d=google.com; s=arc-20240605; b=AG/WuwTIDB/U+ozM7fWDBoTv+iRKe8i/i/o091KPJtGL/K50TCLNvs1uVsZkfHjACo V0p9odLnojiYI6WxtYTrU3ewEcoPBSEGJmU/LIjPHY6keD0z/8QVcVEQFQtoEn8rwqX0 ltzK0dnv6KRTdM2radiK/kl2hs/IwvN7We8AVkqnp7SRGPCWVhlVHO8xqnlgezaRcoBj XAncKRMVAqCytXZPv2MA/43ip2xIfA+TEYAlajB0j7ZzqdEi+RHiVTzsY6W5XAMNtICi CpMcHKQao4w0QWtBja3YbyBVYia3WfyzAEgCqqz+k1w0GlXWuQHvjEx+jFExKVtE+JGA ZIYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=sQncdcCBTAzD3tdjUYfUMSnmVN4uvUMzzqpT196vY4c=; fh=GenBbR+/7gYaTcd1KqVHGA9TQPQZSS4lyPm/ns+6Qjo=; b=d3XLuFeUnuzXsEarjiCRcfSfSFx8mBk5sQHQja+diTFw/yG2KoKKUuMboX6bu9poQe EaD+UzbMpS5/7lp/Jx0Fq4RjreuRD4N7KKgSibdELA6iF4cNZaLj5jgFsnCHTjiqoOhn jk5VPkeZOFQLq98mIt4LhqXr3pvGqCz4rETDZydP50f+Xsof4T18KPxkCYbi++w0slZv BJR0B73TDNSm3grg6k1uxfwSPmNqRWbCCbWGh2u7CweXSYAKvMGVf8CrburqmwoWFRyC Dvl13ah9WxC8b2CGWH+j9wthUA8nMwZI2vsq/PpHiVX6RjKm3IvC5zDPrERCzUQp8VVD cxsQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dRCmGBwl; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f2c2b01a0dsi115632106d6.19.2025.04.22.12.41.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Apr 2025 12:41:57 -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=dRCmGBwl; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7JSq-0005N9-C3; Tue, 22 Apr 2025 15:39:29 -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 1u7JSG-00048N-Gw for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:38:52 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7JSE-0007M6-BF for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:38:52 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-2243803b776so87144335ad.0 for ; Tue, 22 Apr 2025 12:38:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745350728; x=1745955528; 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=sQncdcCBTAzD3tdjUYfUMSnmVN4uvUMzzqpT196vY4c=; b=dRCmGBwll1XObaBKqySKvhYxm/iKdqmRXz8pI7ra612AkbVbTY896TmN5XlEvrNiqO zd1wuGZhkYHe47Qb7IlUS8+1SxLB5vzxVcVkkEVYwhl+VWlktUim0GX+fUK1ZngAes6X KC07WMhr+O6EY3+nHm1GJIafH3N5W19WXPrBDi8+PYgp20d0eedviRsVvHohhhvHBudI Q61FRCtBAX3ewsJ1RmUf9VaDaZ4tJ5l9d646rznhd16v8M+0bogyGW46PgzaNsrrEbzI BMl3o89BT2FA3afTci6AlfOgYnhIEs0ENdk2W4Tk6Z03roSNXx2NYVXKvIbyTWS7qeTe F/bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745350728; x=1745955528; 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=sQncdcCBTAzD3tdjUYfUMSnmVN4uvUMzzqpT196vY4c=; b=MEZlmg8pjrTvbyM2Om7P5MWVS8Xst66GVz5WiXwn4kOroTV4Go4f6OOaPYLiUF2M9w Z9fhuRVPBOP86QJd/M/eaitmzQRVT7Cj6H6xczYzxtIIbicHoJc7qXllQadnilpSzukc b9VMEUdPVJPAumdpkJXJ3ZBogXrDzsRYRjzwIaVATjmrtF37B1XHiyF3A2SQCES1t07G mH11R0D8ARiuKIpezXoBuCBse7An1MyrIsC+e675GA90jz8BBlO4TZ5jc9uP6inSgj89 bbHE07xqCBhylhTa+P5S1an8pUAwCk/ZXfAFKqxUU7MmqMRCHnCIb3pubswqjSu54xOo +bBg== X-Gm-Message-State: AOJu0Yx9TCp84vOsJWcYPtqFRx12w+ZmxXxaxjK2+B6FxhqGwGLRaEbp 8qJlTafx7VqlLEVhtwKrfQzs2ovpTn8vD2gQggtJmT0RlICmS1UipqD3ChLOsJlOAOCytPWeksP p X-Gm-Gg: ASbGncvTEmllVhPoWSsYaAowIW7lokMyh1HFbmE5phZWs/S6OS8KQqrGwenlRwZNCZL aeWbbNp59ChUArzUOdCGS3k0WUjQAsDoMQD0ojErrJpq0rXJb1adPf1UBz6B4xzIJSz3+2MHdmc v1emVT2w2bysQA15q7OuRhCOYSWP4K0ZqswtUjx7qu3Hzw/lcEE/XyTzwWSPdCy8t0DvsfNknMg orWqR5NDPrva1CiOuyWvdg9f+sQzBgA5SfF/M6g+nFug+DCCy+dx54EiYkpGujdau/XWRSAYoXN PbUr6Zt+hMnFZiw1usHISTCBpAurc2xXLK+Hp6yt24oye6hOxZB+F9havrMHWHGYG5sJJjEqfps = X-Received: by 2002:a17:903:2306:b0:223:517a:d2a3 with SMTP id d9443c01a7336-22c535a5567mr258099045ad.17.1745350728582; Tue, 22 Apr 2025 12:38:48 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50eb484dsm88951765ad.148.2025.04.22.12.38.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 12:38:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anton Johansson , Pierrick Bouvier Subject: [PATCH 133/147] tcg: Simplify tcg_req_mo() macro Date: Tue, 22 Apr 2025 12:28:02 -0700 Message-ID: <20250422192819.302784-134-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250422192819.302784-1-richard.henderson@linaro.org> References: <20250422192819.302784-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62c.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 From: Philippe Mathieu-Daudé Now that TCG_GUEST_DEFAULT_MO is always defined, simplify the tcg_req_mo() macro. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Anton Johansson Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- accel/tcg/internal-target.h | 9 +-------- accel/tcg/tcg-all.c | 3 --- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/accel/tcg/internal-target.h b/accel/tcg/internal-target.h index 05abaeb8e0..1a46a7c87d 100644 --- a/accel/tcg/internal-target.h +++ b/accel/tcg/internal-target.h @@ -52,17 +52,10 @@ G_NORETURN void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr); * memory ordering vs the host memory ordering. A non-zero * result indicates that some barrier is required. * - * If TCG_GUEST_DEFAULT_MO is not defined, assume that the - * guest requires strict ordering. - * * This is a macro so that it's constant even without optimization. */ -#ifdef TCG_GUEST_DEFAULT_MO -# define tcg_req_mo(type) \ +#define tcg_req_mo(type) \ ((type) & TCG_GUEST_DEFAULT_MO & ~TCG_TARGET_DEFAULT_MO) -#else -# define tcg_req_mo(type) ((type) & ~TCG_TARGET_DEFAULT_MO) -#endif /** * cpu_req_mo: diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index 7a5b810b88..a5a1fd6a11 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -77,9 +77,6 @@ static bool default_mttcg_enabled(void) return false; } #ifdef TARGET_SUPPORTS_MTTCG -# ifndef TCG_GUEST_DEFAULT_MO -# error "TARGET_SUPPORTS_MTTCG without TCG_GUEST_DEFAULT_MO" -# endif return true; #else return false;