From patchwork Tue Oct 3 22:27:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick O'Neill X-Patchwork-Id: 1842911 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=fkESOPyh; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S0XWk53RLz1yqD for ; Wed, 4 Oct 2023 09:27:46 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8E21A3857BB2 for ; Tue, 3 Oct 2023 22:27:44 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by sourceware.org (Postfix) with ESMTPS id C46CA38582A9 for ; Tue, 3 Oct 2023 22:27:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C46CA38582A9 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-27752a1e184so1091542a91.3 for ; Tue, 03 Oct 2023 15:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1696372050; x=1696976850; darn=gcc.gnu.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=Zvhtjz2PEBGCSdS6gZ6qwrc9Ph+UE/YLNRJHXttIrY4=; b=fkESOPyh4hzPScZi5odlWSoQfMM2t/uZYreL7bxmhYgkTF1eULQQHeJJsZGLEgXycj WEyjn713zHxo6Sa/MfLeDCghIayMi53oWt6JWizzC5x5H8JbVrI+1Hfmh32Q9gjVriM9 uVHya8OcFch59hqSpAfV8lVBepRFROq393RI88DrJ1kGiJuIMs+CmtcoT+K00WvCOwY1 fgPiWgHoNTjyUQU96PSgyFHbvhVXlukvVf+QWF4Lb3GwfsbuSis0DiQeeh80Nhab+JGS BdoM1oGt47Ojl+5WZ7zI2m6A8jG142fd+Tkdu1KYkjxQJ9P87EMp7eb4IWDICwpgVzKq +8Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696372050; x=1696976850; 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=Zvhtjz2PEBGCSdS6gZ6qwrc9Ph+UE/YLNRJHXttIrY4=; b=iFdZJlCyLaE8pavuOuy7cOdQp4No9v+y5wPtAAbs2sH3kkaT8VHr0UrV1y3XfurEp6 C7NFlPQs3tAHHU9M9rHDPsHnr1UlgccJa0OVgatugNQ/ClEpgG3h1cfI9GymwB/s7zWR 7+IfJag7XM0TCqp+G+/iY2/1WX9xcDXjc6OOlf7bh4iRB9b0ly7cGLziL3THAsqgtap1 uAa1T9uHUEUz5DQrmJIyPTQASOFClV8yGD3w2/C5p9f/FXrSKMwbH4m2Q7USUQ+LFEnD iUHtyhduY7jMDmKlGOi6Iv84Jm00zMhHuhn79Tel8Wr3HPS91+PYO0VFxlqIOHrxROj0 +4/g== X-Gm-Message-State: AOJu0YySe8qtCF2QcMWLDSvGKIy+2Eu/TOcY86jVvp3arMBnsot5tMJT 5zFt8Gqu5gKpUfAg8AV3wi8SBn2+bzRV2uMV3Oc= X-Google-Smtp-Source: AGHT+IFFMFd+xjxJMPoSS9zg6KoKcxTJB6TqUPuamFcIS4ibR1qpFFJn0mNLBh5yjJPVOqFch5NcNg== X-Received: by 2002:a17:90a:f40e:b0:274:67f4:30f1 with SMTP id ch14-20020a17090af40e00b0027467f430f1mr586957pjb.14.1696372050572; Tue, 03 Oct 2023 15:27:30 -0700 (PDT) Received: from patrick-ThinkPad-X1-Carbon-Gen-8.ba.rivosinc.com ([2601:647:5700:6860:c65d:964:6f26:42e5]) by smtp.gmail.com with ESMTPSA id 20-20020a17090a199400b00278f1512dd9sm103956pji.32.2023.10.03.15.27.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 15:27:30 -0700 (PDT) From: Patrick O'Neill To: gcc-patches@gcc.gnu.org Cc: jeffreyalaw@gmail.com, palmer@rivosinc.com, kito.cheng@gmail.com, gnu-toolchain@rivosinc.com, Jeff Law , Patrick O'Neill Subject: [RFC gcc13 backport 3/3] [RISCV][committed] Remove spurious newline in ztso sequence Date: Tue, 3 Oct 2023 15:27:00 -0700 Message-Id: <20231003222700.909771-4-patrick@rivosinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231003222700.909771-1-patrick@rivosinc.com> References: <20231003222700.909771-1-patrick@rivosinc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org From: Jeff Law amo-table-ztso-load-3 the coordination branch after merging up the Ztso changes due to a spurious newline in the output causing scan-function-body to fail. There's probably an over-zealous .* or similar regexp in the framework. I didn't see it in a quick scan, but could have easily missed it. Regardless, fixing the extraneous newline is easy :-) gcc/ * config/riscv/sync-ztso.md (atomic_load_ztso): Avoid extraenous newline. Signed-off-by: Patrick O'Neill --- gcc/config/riscv/sync-ztso.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/config/riscv/sync-ztso.md b/gcc/config/riscv/sync-ztso.md index 91c2a48c069..ed94471b96b 100644 --- a/gcc/config/riscv/sync-ztso.md +++ b/gcc/config/riscv/sync-ztso.md @@ -52,7 +52,7 @@ if (model == MEMMODEL_SEQ_CST) return "fence\trw,rw\;" - "l\t%0,%1\;"; + "l\t%0,%1"; else return "l\t%0,%1"; } @@ -77,4 +77,4 @@ return "s\t%z1,%0"; } [(set_attr "type" "atomic") - (set (attr "length") (const_int 8))]) \ No newline at end of file + (set (attr "length") (const_int 8))])