From patchwork Tue May 3 10:33:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1625466 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=afBKUlyg; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KsxLK3W6Tz9sBB for ; Tue, 3 May 2022 20:40:09 +1000 (AEST) Received: from localhost ([::1]:38354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlpws-00021y-3y for incoming@patchwork.ozlabs.org; Tue, 03 May 2022 06:40:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlpqo-0003yd-C7; Tue, 03 May 2022 06:33:56 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:36702) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlpqm-0003ev-Ow; Tue, 03 May 2022 06:33:50 -0400 Received: by mail-pf1-x42a.google.com with SMTP id z16so14375338pfh.3; Tue, 03 May 2022 03:33:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=u/kA7T2GMCtCLNudknximE6UqDzwULMgjCP/toncnkA=; b=afBKUlygdwo1jruzAbBSY4njWqPlBhY9m5XANkgEwteZtSWV70HU+I1nP/eLgUZ+Ms UUfKJxaUvxp+PsNJpXEJj/81ZDYaEh5yz2/ho5fKHY7s6nZwaVhNyjq62wtxvopZfYkT Nyutc2+VVp7sbC/5eAL7FzRCXPcn13lFWVkuhl5HiDMfh4jPtjtI6TPnEnnUDF4Nzjns 9s8ANxdoSFqBT6a5ip2S48itTl3NeSQbOCgTb3w4PYeaM3U05kkwdzODdaYuc8HxkGeG c5B6fHqmAP/Xj9bV/DggIjsI0F+o2NFhGlSlenIHCWkDjx/HrJUVmF5ivv7zfYpJljUf cxlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=u/kA7T2GMCtCLNudknximE6UqDzwULMgjCP/toncnkA=; b=Slv+Ig/Xkp5iAdbQqf52REua+wzQO215R+7dUfwGVObLVXQcYuywrGwJ/OIw7pS1r6 OCU4y3mPcOw61OnrVgstGtyuQY5o4/P0vKuWxyozvctm6YCiswl67zKRXwDB4mj7D9pf k1n2qTPCdw7rh/d11A+egUsDNhxO9L/air/YTdc3Vb2f7K0QvNlafl85w5j4HlTATe2J 7MOlCv9KRXPykFvR+jjZKg1Ej+hVZMnPko/iPpVOAQp9Wdw2wiSuisZ0yV/kNW8izVAG ZGFg3zbjG4/M7o84bTbqRRlOQJ7jSCyXRBhfeiyAnzwstdWFx+2l4a+XClM5yNbQap5F DoUQ== X-Gm-Message-State: AOAM5330T/67hV/cduCb55s2ebz2QN8fqqh3Twb7D7XjKP2YNK42exu0 p1XR8YlAHhuGtJ6MndIRfRI8LIfJSTUElA== X-Google-Smtp-Source: ABdhPJyBkUkVcYqVnsmDhywkZYvhvdChiC2g/lYO49D8N4VZoa2lVbO2CS+IoRwI3AKUqikZBN83BA== X-Received: by 2002:a63:82c1:0:b0:3c2:83b9:e975 with SMTP id w184-20020a6382c1000000b003c283b9e975mr1233177pgd.297.1651574026229; Tue, 03 May 2022 03:33:46 -0700 (PDT) Received: from bobo.ozlabs.ibm.com (193-116-108-62.tpgi.com.au. [193.116.108.62]) by smtp.gmail.com with ESMTPSA id x48-20020a056a000bf000b0050dc76281dcsm6056301pfu.182.2022.05.03.03.33.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 May 2022 03:33:45 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org Subject: [RFC PATCH 1/4] target/ppc: Fix eieio memory ordering semantics Date: Tue, 3 May 2022 20:33:31 +1000 Message-Id: <20220503103334.2046414-1-npiggin@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=npiggin@gmail.com; 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The generated eieio memory ordering semantics do not match the instruction definition in the architecture. Add a big comment to explain this strange instruction and correct the memory ordering behaviour. Signed-off: Nicholas Piggin --- target/ppc/translate.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/target/ppc/translate.c b/target/ppc/translate.c index fa34f81c30..abb8807180 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -3513,7 +3513,31 @@ static void gen_stswx(DisasContext *ctx) /* eieio */ static void gen_eieio(DisasContext *ctx) { - TCGBar bar = TCG_MO_LD_ST; + TCGBar bar = TCG_MO_ALL; + + /* + * eieio has complex semanitcs. It provides memory ordering between + * operations in the set: + * - loads from CI memory. + * - stores to CI memory. + * - stores to WT memory. + * + * It separately also orders memory for operations in the set: + * - stores to cacheble memory. + * + * It also serializes instructions: + * - dcbt and dcbst. + * + * It separately serializes: + * - tlbie and tlbsync. + * + * And separately serializes: + * - slbieg, slbiag, and slbsync. + * + * The end result is that CI memory ordering requires TCG_MO_ALL + * and it is not possible to special-case more relaxed ordering for + * cacheable accesses. TCG_BAR_SC is required to provide the serialization. + */ /* * POWER9 has a eieio instruction variant using bit 6 as a hint to From patchwork Tue May 3 10:33:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1625468 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=cVDH97Bg; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KsxNL6LfHz9sBB for ; Tue, 3 May 2022 20:41:53 +1000 (AEST) Received: from localhost ([::1]:40980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlpyY-000493-9K for incoming@patchwork.ozlabs.org; Tue, 03 May 2022 06:41:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlpqq-0003yi-6q; Tue, 03 May 2022 06:33:56 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]:39579) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlpqo-0003f7-Ar; Tue, 03 May 2022 06:33:51 -0400 Received: by mail-pj1-x1029.google.com with SMTP id a15-20020a17090ad80f00b001dc2e23ad84so1820748pjv.4; Tue, 03 May 2022 03:33:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2uq6KnBqo+6CSEhbKzngQA2FxHJ1XZB++97y0vZbTJE=; b=cVDH97BgMnxeNk5bjazUZ0lKjGbEqvBmZDx2ww33H7FRMk4Ye8aqBKY+2Y+XDXwy5Y kE0YR0tnNqB96SzGxc6xHzwo54BcWdLwQxcoZeIzGZ0m+q0jG0igOp3fCruby9yDaPZt H+kLuFCJmQWkf8oHV86R/1UJ34u0Qkpjqm8pFpChyde3/YP06DT+m97kocI9CYK+Asiq Jm4DDIBr3z3hEq6DYtjcoBRynytwKrGWVjNBw/pvQqnQgUb7mWXG2NvGWTsAdEEPHcH7 W1Cmto7kun0josBc8QIq6EejubAczdzZ7t5mkMLBfbnMzeOJ5mDobhleagqr/jmc1anZ lmqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2uq6KnBqo+6CSEhbKzngQA2FxHJ1XZB++97y0vZbTJE=; b=0DyANN205h5kUQ2f5Jnjw8fuChKPtKGvxFsCMAzI1ap9Lvx1Apj3MvzuSj//cQsLI+ xKT0nzuO8QenP+8JZfCMFyrFpPKKSw504Slc9ntryK8xmbGM4NLAKRllovarkoueVQKZ 3HKGb+6mQbJSHipeptdR8B2zCD+KNi4w4WXHmDd0vAK07xj2U0Fl8AvXuudUxhZUT5oR //mzsNpn32CtSbKwLfjtH+38fU8mWazAJi/gX4wR6Ot7rZlQFvsV4S+E1/wDFtAY46xB RGqwxSkwEzqGJaxr2B4H5ivYltNbxDkX2Rg6uyMMRYtAWP/tsOX8wip1OhgbXyrFzn33 zZIA== X-Gm-Message-State: AOAM531wpvEC5LBc/3/dKJUmbbOLEhfsaP0RMPPP7Iwz0+c1vdcebsYz FA0NCqWb0aJQRHBwYYPexMxQRRZT1ZYYfQ== X-Google-Smtp-Source: ABdhPJz/NpmKkgwiexUeF0a4WGl+NsYpxR6LXUrETQ6sRYXCTezIIuV9SMLXUmpmkiX0d5oIajJSLA== X-Received: by 2002:a17:902:e84d:b0:15e:b0af:477b with SMTP id t13-20020a170902e84d00b0015eb0af477bmr5514045plg.49.1651574028691; Tue, 03 May 2022 03:33:48 -0700 (PDT) Received: from bobo.ozlabs.ibm.com (193-116-108-62.tpgi.com.au. [193.116.108.62]) by smtp.gmail.com with ESMTPSA id x48-20020a056a000bf000b0050dc76281dcsm6056301pfu.182.2022.05.03.03.33.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 May 2022 03:33:48 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org Subject: [RFC PATCH 2/4] tcg/ppc: ST_ST memory ordering is not provided with eieio Date: Tue, 3 May 2022 20:33:32 +1000 Message-Id: <20220503103334.2046414-2-npiggin@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220503103334.2046414-1-npiggin@gmail.com> References: <20220503103334.2046414-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=npiggin@gmail.com; helo=mail-pj1-x1029.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" eieio does not provide ordering between stores to CI memory and stores to cacheable memory so it can't be used as a general ST_ST barrier. Signed-of-by: Nicholas Piggin Reviewed-by: Richard Henderson --- tcg/ppc/tcg-target.c.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index cfcd121f9c..3ff845d063 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -1836,8 +1836,6 @@ static void tcg_out_mb(TCGContext *s, TCGArg a0) a0 &= TCG_MO_ALL; if (a0 == TCG_MO_LD_LD) { insn = LWSYNC; - } else if (a0 == TCG_MO_ST_ST) { - insn = EIEIO; } tcg_out32(s, insn); } From patchwork Tue May 3 10:33:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1625463 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=mpwln3uB; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KsxF528NHz9sBB for ; Tue, 3 May 2022 20:35:37 +1000 (AEST) Received: from localhost ([::1]:58278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlpsV-00044i-4X for incoming@patchwork.ozlabs.org; Tue, 03 May 2022 06:35:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58936) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlpqt-0003yn-H8; Tue, 03 May 2022 06:33:56 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]:50705) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlpqr-0003fM-0s; Tue, 03 May 2022 06:33:54 -0400 Received: by mail-pj1-x102c.google.com with SMTP id iq10so14978563pjb.0; Tue, 03 May 2022 03:33:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2cK9QMjyJBK9LE5fBjUDlyQq92UtB2If4iM6Ue3ErBI=; b=mpwln3uBHIzZMVpluWOVkdNAjP23naHlk/LpmmKk6jPbQ0XQSOMyZRlaMfReNpOPgj corDQV77nS+dmUiDrxcPqBQLl2xfOqOlf6wJHvmisA/9237RYQD7vh9Zv9Y2wDh7nQuf hrS5jNA+HSpw1BKbr42qM7CQrqEQDuvzPh3/JAGSEfl+DBQFiXijqI4c9lSnUYu5SIDx 1DVhv0DHW2+4AWrn+TOVv5V1K1htq45aogC4jSuJ/0EjwoIUvQRQj/nldtTfUY9BWRkE kWkxpdX/ZgUoDJmzh3P+noyrj9JLY+3DE18ArN5clx4ySihzMz6Ijiq67b7nV2KER+bO +IwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2cK9QMjyJBK9LE5fBjUDlyQq92UtB2If4iM6Ue3ErBI=; b=X3VXl56bwqZ1uCroBEn8nmF2zybsWEqFdpIQ96ItcJyEl4SdkIodMe7EV7dJ2OFKrA 2BqRNTPncXn2aBBS0RgQL1w7VpLKDzFY+GBuRgMGxUJ3tmpEm0QN6GOc7swI6ASoqIyu QLMqU/mtblsMCfYhScKgqJsitqDDIbaN9mqNs2ZKZVHdnG5lRUNO2hfe+j6vIiVIHtqH ES247MOwobsXVDFFnw6+a/0JsGQBuwlIHeFm0CVTDi+LjEBVzzBuhXnqTNGV+pJ4Jbth G338HN50Dug0/jnAaacupimH1HKhdqeWEVI64xPBCwvDu53LRMgIZ+DYoOh131hNlJ/A hO0A== X-Gm-Message-State: AOAM531BvPihdMtqHc9mlT7BtcRgTEqiVijUiOVBOkau8udePHiND3G5 Y9XIO3Fh4H0G2WDuF5r6YE1G8TUFZxcksA== X-Google-Smtp-Source: ABdhPJypfe+sTDxD5QFS7mhbwzJh/J0bFM0n2XjzyjgCqTUuEiEUiuIxPzfjcxKjlCx1+fLywZ3OZA== X-Received: by 2002:a17:90b:3503:b0:1d1:c700:e484 with SMTP id ls3-20020a17090b350300b001d1c700e484mr3927997pjb.245.1651574031037; Tue, 03 May 2022 03:33:51 -0700 (PDT) Received: from bobo.ozlabs.ibm.com (193-116-108-62.tpgi.com.au. [193.116.108.62]) by smtp.gmail.com with ESMTPSA id x48-20020a056a000bf000b0050dc76281dcsm6056301pfu.182.2022.05.03.03.33.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 May 2022 03:33:50 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org Subject: [RFC PATCH 3/4] tcg/ppc: Optimize memory ordering generation with lwsync Date: Tue, 3 May 2022 20:33:33 +1000 Message-Id: <20220503103334.2046414-3-npiggin@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220503103334.2046414-1-npiggin@gmail.com> References: <20220503103334.2046414-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=npiggin@gmail.com; helo=mail-pj1-x102c.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" lwsync orders more than just LD_LD, importantly it matches x86 and s390 default memory ordering. Signed-off-by: Nicholas Piggin --- target/ppc/cpu.h | 2 ++ tcg/ppc/tcg-target.c.inc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index c2b6c987c0..0b0e9761cd 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -28,6 +28,8 @@ #define TCG_GUEST_DEFAULT_MO 0 +#define PPC_LWSYNC_MO (TCG_MO_LD_LD | TCG_MO_LD_ST | TCG_MO_ST_ST) + #define TARGET_PAGE_BITS_64K 16 #define TARGET_PAGE_BITS_16M 24 diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index 3ff845d063..b87fc2383e 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -1834,7 +1834,7 @@ static void tcg_out_mb(TCGContext *s, TCGArg a0) { uint32_t insn = HWSYNC; a0 &= TCG_MO_ALL; - if (a0 == TCG_MO_LD_LD) { + if ((a0 & PPC_LWSYNC_MO) == a0) { insn = LWSYNC; } tcg_out32(s, insn); From patchwork Tue May 3 10:33:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1625470 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=l/HpBbxL; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Ksxc839FZz9sBB for ; Tue, 3 May 2022 20:52:08 +1000 (AEST) Received: from localhost ([::1]:48856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlq8T-000252-2p for incoming@patchwork.ozlabs.org; Tue, 03 May 2022 06:52:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlpqv-00040j-3T; Tue, 03 May 2022 06:33:58 -0400 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]:38454) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlpqt-0003fY-F0; Tue, 03 May 2022 06:33:56 -0400 Received: by mail-pg1-x52d.google.com with SMTP id e5so2617674pgc.5; Tue, 03 May 2022 03:33:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+z+BIR5Fz4MEzbcLcrzqBKYgAkLBehsDf+0ISlNokLo=; b=l/HpBbxLG5TpvIaZzXfgYRCLLjmv8xhNJpSKK3xFAxoAPNMuD5ef5cHxkTEXXFqYyR WopDWhgcfev1qsT5R3SPlUrsWEz+YhpELNknBFGhKBeR04aR6PC86YGeKncIg4kko2Kc V5feH9Zm2H9SPiahH759r0Cp11SfBj+m1kEOMb1X8OEzgZvn5/QMkH6gj81ZP405hYXo QlqjTnfBgl7+ON9enXVRN2QeCZqGlHRg6tkoz2ESy4dKhwdM4gE+6vjgayqCTus9CO6A K/MjjjKqIEWU0UVbe1mQFiAqtFCeCFeE1yLMuLP8mPDUSK1qeGBz3h28Rxr1HAeo1n5V 7rFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+z+BIR5Fz4MEzbcLcrzqBKYgAkLBehsDf+0ISlNokLo=; b=VHP+zJCZCgNnDgR0XaRPoZYWBpg+u33b2p7yljTm5fCaPf3gSJTyz+rgJRdgg1CCfh sUM0N2R6csvKwKV+1zpqE+CgAsf/SZzzGZOwbZflZMesLv1CYjgQmOlWCjK6gXEuG2n8 FxXLCyYK3Zaqk+a7BCVi14nDwVyoA50mb252gIRt/Dmmmlbf55GeHdbfB0CRrTflVvXt zujbLHZjclLHS6NTnWGD0lUX3wza+x/oXYAeBXB01JNi63PYvzwJyCq3UDAaK92PfJCE DBlypnqqxddwD0g6lYoWUXWEa230QV6S+iyNi17VTP5CgIa8sqjDvPxD4cgu4nXM1Lmy 6pbQ== X-Gm-Message-State: AOAM532whCScLSvuXn3ltVC+nQ2ykRyPzz7GL7VtcaZDrgTNE3v9o4Ye PWu6E3SWwvZNmCQ174b75zygaJUXURs2FA== X-Google-Smtp-Source: ABdhPJyS0eBzOQG9UoP/qvf7ew/IMvnPV/20kWAars2eF4rYCyAzCGurRQxjgo1LhA7OA7ezblko+Q== X-Received: by 2002:a63:2215:0:b0:3c1:fd25:b6a1 with SMTP id i21-20020a632215000000b003c1fd25b6a1mr9383925pgi.406.1651574033321; Tue, 03 May 2022 03:33:53 -0700 (PDT) Received: from bobo.ozlabs.ibm.com (193-116-108-62.tpgi.com.au. [193.116.108.62]) by smtp.gmail.com with ESMTPSA id x48-20020a056a000bf000b0050dc76281dcsm6056301pfu.182.2022.05.03.03.33.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 May 2022 03:33:53 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org Subject: [RFC PATCH 4/4] target/ppc: Implement lwsync with weaker memory ordering Date: Tue, 3 May 2022 20:33:34 +1000 Message-Id: <20220503103334.2046414-4-npiggin@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220503103334.2046414-1-npiggin@gmail.com> References: <20220503103334.2046414-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52d; envelope-from=npiggin@gmail.com; helo=mail-pg1-x52d.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This allows an x86 host to no-op lwsyncs, and ppc host can use lwsync rather than sync. Signed-off-by: Nicholas Piggin --- target/ppc/cpu.h | 4 +++- target/ppc/cpu_init.c | 13 +++++++------ target/ppc/machine.c | 3 ++- target/ppc/translate.c | 8 +++++++- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 0b0e9761cd..bf5f226567 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -2287,6 +2287,8 @@ enum { PPC2_ISA300 = 0x0000000000080000ULL, /* POWER ISA 3.1 */ PPC2_ISA310 = 0x0000000000100000ULL, + /* lwsync instruction */ + PPC2_MEM_LWSYNC = 0x0000000000200000ULL, #define PPC_TCG_INSNS2 (PPC2_BOOKE206 | PPC2_VSX | PPC2_PRCNTL | PPC2_DBRX | \ PPC2_ISA205 | PPC2_VSX207 | PPC2_PERM_ISA206 | \ @@ -2295,7 +2297,7 @@ enum { PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | \ PPC2_ALTIVEC_207 | PPC2_ISA207S | PPC2_DFP | \ PPC2_FP_CVT_S64 | PPC2_TM | PPC2_PM_ISA206 | \ - PPC2_ISA300 | PPC2_ISA310) + PPC2_ISA300 | PPC2_ISA310 | PPC2_MEM_LWSYNC) }; /*****************************************************************************/ diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index d42e2ba8e0..26d9277ffb 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -5769,7 +5769,7 @@ POWERPC_FAMILY(970)(ObjectClass *oc, void *data) PPC_MEM_TLBIE | PPC_MEM_TLBSYNC | PPC_64B | PPC_ALTIVEC | PPC_SEGMENT_64B | PPC_SLBI; - pcc->insns_flags2 = PPC2_FP_CVT_S64; + pcc->insns_flags2 = PPC2_FP_CVT_S64 | PPC2_MEM_LWSYNC; pcc->msr_mask = (1ull << MSR_SF) | (1ull << MSR_VR) | (1ull << MSR_POW) | @@ -5846,7 +5846,7 @@ POWERPC_FAMILY(POWER5P)(ObjectClass *oc, void *data) PPC_64B | PPC_POPCNTB | PPC_SEGMENT_64B | PPC_SLBI; - pcc->insns_flags2 = PPC2_FP_CVT_S64; + pcc->insns_flags2 = PPC2_FP_CVT_S64 | PPC2_MEM_LWSYNC; pcc->msr_mask = (1ull << MSR_SF) | (1ull << MSR_VR) | (1ull << MSR_POW) | @@ -5984,7 +5984,7 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | PPC2_FP_CVT_S64 | - PPC2_PM_ISA206; + PPC2_PM_ISA206 | PPC2_MEM_LWSYNC; pcc->msr_mask = (1ull << MSR_SF) | (1ull << MSR_VR) | (1ull << MSR_VSX) | @@ -6157,7 +6157,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64 | - PPC2_TM | PPC2_PM_ISA206; + PPC2_TM | PPC2_PM_ISA206 | PPC2_MEM_LWSYNC; pcc->msr_mask = (1ull << MSR_SF) | (1ull << MSR_HV) | (1ull << MSR_TM) | @@ -6375,7 +6375,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64 | - PPC2_TM | PPC2_ISA300 | PPC2_PRCNTL; + PPC2_TM | PPC2_ISA300 | PPC2_PRCNTL | PPC2_MEM_LWSYNC; pcc->msr_mask = (1ull << MSR_SF) | (1ull << MSR_HV) | (1ull << MSR_TM) | @@ -6590,7 +6590,8 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64 | - PPC2_TM | PPC2_ISA300 | PPC2_PRCNTL | PPC2_ISA310; + PPC2_TM | PPC2_ISA300 | PPC2_PRCNTL | PPC2_ISA310 | + PPC2_MEM_LWSYNC; pcc->msr_mask = (1ull << MSR_SF) | (1ull << MSR_HV) | (1ull << MSR_TM) | diff --git a/target/ppc/machine.c b/target/ppc/machine.c index e673944597..33b3d6cf30 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -157,7 +157,8 @@ static int cpu_pre_save(void *opaque) | PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 - | PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64 | PPC2_TM; + | PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64 | PPC2_TM + | PPC2_MEM_LWSYNC; env->spr[SPR_LR] = env->lr; env->spr[SPR_CTR] = env->ctr; diff --git a/target/ppc/translate.c b/target/ppc/translate.c index abb8807180..76691cf082 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -4040,8 +4040,13 @@ static void gen_stqcx_(DisasContext *ctx) /* sync */ static void gen_sync(DisasContext *ctx) { + TCGBar bar = TCG_MO_ALL; uint32_t l = (ctx->opcode >> 21) & 3; + if ((l == 1) && (ctx->insns_flags2 & PPC2_MEM_LWSYNC)) { + bar = PPC_LWSYNC_MO; + } + /* * We may need to check for a pending TLB flush. * @@ -4053,7 +4058,8 @@ static void gen_sync(DisasContext *ctx) if (((l == 2) || !(ctx->insns_flags & PPC_64B)) && !ctx->pr) { gen_check_tlb_flush(ctx, true); } - tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); + + tcg_gen_mb(bar | TCG_BAR_SC); } /* wait */