From patchwork Thu Apr 24 00:49:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883846 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3204160wrs; Wed, 23 Apr 2025 18:11:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVogxthDHr9I3N1zl7blKQD5EBhmOIwwRklzAVP77zIK+hJzTZfUpU/dpwXT+EkfihHWe/qTA==@linaro.org X-Google-Smtp-Source: AGHT+IG0puSgtLqY6j2pFS7878JRAJzRWfempx94jJ223WAahRvLiqxFSrH+sPOOZhSpvqie5LKP X-Received: by 2002:ad4:5dc5:0:b0:6e8:f464:c9a9 with SMTP id 6a1803df08f44-6f4bfbb4c7cmr15335256d6.2.1745457066342; Wed, 23 Apr 2025 18:11:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745457066; cv=none; d=google.com; s=arc-20240605; b=HnGJE/lXBsUJYB9rUaE8MiVTcp6CS/f25NCafKMpVXsca0x2GvfwcjRluTKrtKMZFA qdq2H1bR9tFfja5q6XHqmd9fMoWU8NKzH790SYRwGDOwSO9VqAaJJCmCcCdOTksX5QWW caLxSJgLeaInR6qrJDa44i04JknSxBI6umFd4w7DCUEYyKeaVgiFP7P0RFaPXOHWyHTb M/L23WoQ4jYY125owfljsXOpJ2gj1NYMvimkLM72qcqFMhRHw0OmalvykAao+Xw7GtI5 jg9mxsILcpT/Z3769Rel44IkMHNTtiOXSU5yTiQ1bHI8u65kY0bd9d47wkapfGPGk80D lA6A== 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=ZPgRWviqzPcDKLx8IaFHXh0X/9ydQ1zqKG6igkxlxfQHRsOpsl8MdbXSRhZ6/NPQWw Nxkb7bdmWPL/o8j66Sj4zF9VFlEWghilfTixCy+i2K34GfrnOTsfKDRkxaAh9YfdlSqC KC3IRZAXFTHUw9i2a2JJlXBLutmbNKZw0SAHf1vaC5V1aaJ3O/XAVXBCbn2OBorgllP7 5M8j7trHUCRZGWr1Nw07bEUcazkjeNRG0R9KDo5hQFFMpRafElUp1Zpppb3rnOHS6Ouz +hF0ORPf6sRDk23qSfLE7/1yQ0rRlSk0wBkeMQI5QQ4pIDxQ+Wqs1uMWFh7ybKfUgIpj H+og==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=L5EFUqb+; 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-6f4c08d6646si3818396d6.1.2025.04.23.18.11.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Apr 2025 18:11:06 -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=L5EFUqb+; 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 1u7kwz-0005Sz-6K; Wed, 23 Apr 2025 21:00:25 -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 1u7kws-00057X-JG for qemu-devel@nongnu.org; Wed, 23 Apr 2025 21:00:18 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7kwp-0005Ue-Q2 for qemu-devel@nongnu.org; Wed, 23 Apr 2025 21:00:18 -0400 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-736a7e126c7so341524b3a.3 for ; Wed, 23 Apr 2025 18:00:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745456413; x=1746061213; 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=L5EFUqb+4WfThfiQHU2A+sGqSLph1enJySFlWRDsrMgJ8VJTszkxQB9uReuwaLSDcX fXcQe9Z4kmVBPfhwrLjb3PawvcbY48/MGLXDdzTyiZMGaXublvId6K0NxLt76IiRWBY2 PS8MfRzQqzmFiidnIAaqtNgSAN0m7v3KhHeWeSHIgUtQ+VCgP4gdKd43oxfX3e2qMnoK FLXBGqZmPM8SDRKMtldM568iQQ/5XMqr/qY8gixmRZPrqBc/c255VxfhJFoh/oP/PJPi a9UTEMAO1fcxJDHi97wPgyjiW5z1MaqSrwllExrjbo4CJlrg61vcGdZsd8Y7fpUPjxwV diig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745456413; x=1746061213; 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=gT/XsmMUUJg596tSNSBmoaFYA+1a/TKw21pMMW4ba2UZshEbPAb4UvaiBxZPfTQW5M C6i8oML990vxkkq6/n4RwWmsNkgm+kkFq3+tLfRY6I07VauH5A4eB3o/NSGzN8O3PXCh S/V0H8BMcpWo/d2jyZHQJDeHJsMDLa4QwwPi5Ey5W1bzteOM/HhEOLf2uRC/PTx8V+hr zDPvPlOBDb9V7X61rxKpTOAc2LsvmOIcOTMTnzVfuI3vSWib0g2zS2kp2WGHUsjPl326 ubSBSB72XhrJVOuVcNXhS7BNE6buXzPDX3GaI7JDs9sY5JBntLhv9hFW+5lK+llt8Ccb Nbcw== X-Gm-Message-State: AOJu0YytN2YBpGBAehXpJvzF/Pu2Sk6zv/0KE3hUIgozem5Ojr25U0/b 2/gfoUfQgkXRmRVDHsglBJr37J8p0OTxnoA+fhU9ImG9yLE43ULJvAhnn7u+IhQ/Y47LDeh3yO1 s X-Gm-Gg: ASbGnctUWEK+Gcj1NgawI+l0vhYRbwPobx5yWcADXRJSqlSnfpyGXBbrPKA0b5bJIJg bbUdhg2jb+z5nl0gnbtQeexol3D2hKXALSPnvl11SnZvLkwqZo8A+5fmDmP8LPb7i4LnqhsgSY2 JYhfSQI2v/gnymiCoaJgA6xVwBYnYxjLCY5LheokMGC7ktHh+NrPHWhFjK7ilPz1DgY0BEWpOPc 02NXVIFQtcFduKZFJtjFiJfrJzX55RY2XYFtWkJZY9OrBfGsR3/H1x2Sjo7GGZBdI35mLnIZT+Y l4ikbdzO31rKAHYOGNHBMZtZTi0fMZEgPxNGPmmQcaY3TrCeh7eBL4laBJHW2zNyefTt2ihIqPs FucQ709YSmg== X-Received: by 2002:a05:6a21:3294:b0:1f5:769a:a4be with SMTP id adf61e73a8af0-20444f9e8bemr964027637.36.1745456413343; Wed, 23 Apr 2025 18:00:13 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b15f76f45c7sm129259a12.16.2025.04.23.18.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 18:00:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anton Johansson , Pierrick Bouvier Subject: [PULL 134/148] tcg: Simplify tcg_req_mo() macro Date: Wed, 23 Apr 2025 17:49:19 -0700 Message-ID: <20250424004934.598783-135-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250424004934.598783-1-richard.henderson@linaro.org> References: <20250424004934.598783-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42a.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;