From patchwork Mon Aug 21 17:25:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Law X-Patchwork-Id: 1823721 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=Pu2eD6J7; 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 4RTzsf6LlSz1yNm for ; Tue, 22 Aug 2023 03:26:14 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E32B13870C26 for ; Mon, 21 Aug 2023 17:26:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E32B13870C26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1692638772; bh=DGrQj9XbdW7G6MOHYr2ARRrXWQieEzsuGUaEtKepLs4=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Pu2eD6J7yqkdW9ItA6MhkVg2cu+7AwBlwM4P/KynBl8mEEwPL4qKKnXZ8sOM0wjT/ Nfkgz9TIIrqGgAbOSkMASgh3SPnaplwyZzJEMC64iJxS15wPCWfzLcIoLM1yCXQDSg F4RQ4ZAc/1yjPMzpm4hpQUfiVLTtPrcnntr/M9rM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by sourceware.org (Postfix) with ESMTPS id 2EAED3858CD1 for ; Mon, 21 Aug 2023 17:25:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2EAED3858CD1 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1bf48546ccfso15877475ad.2 for ; Mon, 21 Aug 2023 10:25:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692638750; x=1693243550; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DGrQj9XbdW7G6MOHYr2ARRrXWQieEzsuGUaEtKepLs4=; b=HtNqq8UBngH4PCu7hBWvHY58ZfzOHKNOfUCNyptJBVmi7Rh3yTRO0Z6cJRK+0uQAiM o+SI0s+IgPdm/Ehn1nXZxfM4g4FvQmn+5LW+IBpzMDuoH5ZSRaxRD3Tw6EaGDvtOneWB aZ+ctC400efevlT1dsEspfMcNcbP2FYhi4UIQoGw/HUvI69v8lq25eEfOUr3XAUQQH0h Go+UP6mlf5aGhcTAqhzgGNhZrWiyxzOAu97bwM257BJa8mMfkxDJtMhWYV7Bx1LgL74Y 4UZLI4QNOkW6Ch0k5nZGarGmb3z+gPve33khS2tLO+qhjb1Pugk2x3wD6cfJqCLM4GV1 vCgQ== X-Gm-Message-State: AOJu0Yzq9l4PWupZNI7zhgm5rTAmBXGb6opbOaw8Gn8676i3rTjDQ8RI ka8S4gxs34IB/ck2rwzZTmXhQOpMRkk= X-Google-Smtp-Source: AGHT+IFbxQX+0TzVGJaSW1tZoga3YIRY9t1j56LGxBUnsNgYEybvv8DsV1rlwbdBNHL/gcrtN8wZSw== X-Received: by 2002:a17:903:25d4:b0:1bf:120a:a29e with SMTP id jc20-20020a17090325d400b001bf120aa29emr4583805plb.10.1692638750120; Mon, 21 Aug 2023 10:25:50 -0700 (PDT) Received: from [172.31.0.109] ([136.36.130.248]) by smtp.gmail.com with ESMTPSA id a6-20020a170902ecc600b0019ee045a2b3sm7274868plh.308.2023.08.21.10.25.48 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Aug 2023 10:25:49 -0700 (PDT) Message-ID: <0fe0fbca-d8cc-2ac7-bae7-328bdab9bd47@gmail.com> Date: Mon, 21 Aug 2023 11:25:48 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Content-Language: en-US To: "gcc-patches@gcc.gnu.org" Subject: [RISCV][committed] Remove spurious newline in ztso sequence X-Spam-Status: No, score=-8.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jeff Law via Gcc-patches From: Jeff Law Reply-To: Jeff Law Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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 :-) Committed to the trunk, Jeff commit 39491441a3aca7725d5a6dfeea4b01229d30c899 Author: Jeff Law Date: Mon Aug 21 11:20:28 2023 -0600 [RISCV][committed] Remove spurious newline in ztso sequence 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. 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 @@ (define_insn "atomic_load_ztso" 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 @@ (define_insn "atomic_store_ztso" 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))])