From patchwork Tue Mar 21 01:05:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 72601 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1529555wrt; Mon, 20 Mar 2023 18:24:56 -0700 (PDT) X-Google-Smtp-Source: AK7set+ZSu5UuzF2m0EYpRMo1w4cixPHieMVcOsr8rQvTkvxRXshCH18VnoEiHT/OcsBj9IAtfOP X-Received: by 2002:a17:90a:734a:b0:234:a88e:d67e with SMTP id j10-20020a17090a734a00b00234a88ed67emr665451pjs.34.1679361896149; Mon, 20 Mar 2023 18:24:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679361896; cv=none; d=google.com; s=arc-20160816; b=mCVOnckj//HdOBtTjMR8pqDy2R/4qrtb7/WKBXCrv3Ybq3wVMMEdA2npP5lIitZ42J 1cKEVwyxyhkaNcclOtoB7Odue5NxSGDiMu88rJ8BTA06puutGUO/YDZh2wt07OlZUG22 xsLBFPY5dtOWWRnAmU4O2PsOU4uo9vvh7cS7zO6cUbG10e9T1knmac4Essm0agYw6jq5 sNB4z3mWA5/rSiFZcdOdPcDCw0e12m/UI2oZ37Bi0MzUngKtPvzdXNg/Rke+iOOT+YeQ S1BDJLTI0l6RPk0SR9XAHHC4Coyop+cRXxSUbTnlgvJakqWNpZ80+T1MMjzKhmKManCK STdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nzhRabapQDM6i6jOalqvXi3cg+89fZqCrqb5YtRRy+4=; b=MNg9tVdxIj/usiltXRpjM7jpKDZ+zFj9RLGEcZ9OPi62Hen4VSe/nP2UC9rhRGUmE9 boP2Dlq2C5OgC4dgHfzA3UbkVl8OAZGJSdJdbHwY6Tf2w9+KG9vYM5/wDlzIAnPQywvk rbkSLwrFVFNR17dbn15yo4zAnNDSnpbwprKP5y2YoloLv20OX6uR2opP3pUukpGBa8Ug xQURqnUeAfiZMPdjIf4D8AAIWsAzQjgI8pzdhFFdenEEM+IUi/cJcPnG5yKczEfNaEWB enLqH7yZkt+cHTtGWjCosr4PVhU3QWw0uRY5RsJbbASO57eUoO0gNlQEnJ4oCZ4WEc43 I+mQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="YY/DmIoY"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e14-20020a17090a4a0e00b0021918bc9a47si10965146pjh.174.2023.03.20.18.24.43; Mon, 20 Mar 2023 18:24:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="YY/DmIoY"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230252AbjCUBH7 (ORCPT + 99 others); Mon, 20 Mar 2023 21:07:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230053AbjCUBHQ (ORCPT ); Mon, 20 Mar 2023 21:07:16 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A92235243; Mon, 20 Mar 2023 18:06:37 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 472B261912; Tue, 21 Mar 2023 01:05:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D1DDC433B0; Tue, 21 Mar 2023 01:05:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679360751; bh=VGCA+C0ef8eZmvBaYJ92neS/iUXCg6LsBghMzQBbpPw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YY/DmIoYUbhumK+97XG71aS+6NywVzT49eNz5WQ46VIuWTq3pdQ8yaQztDxjKanXF ovIDbvi/JS+BOuMgPgxFk6rMyNu3ZDYEsWXeTffamw5q7ETxB1BowdmvKzvDvPcjMi ARyaFTWZU0L4qa0uPYSJ8NtPQNyX+DMkQQVUHFu/Z93YCtn2LmEx1DRxTdEJj0FddJ gfcTr9zPp0iWjhOAM43/97HLW3MSeVrXecigO7zAzuNuD0uUabImJpmBUghdjhavXB c1lVBRMsCMKoa6Je2KJL8AzNYyc0LgwMeyIyoC6PvEITPpqdDH6h/KWs/3SJqwB13/ S84bCLaN7K75g== Received: by paulmck-ThinkPad-P72.home (Postfix, from userid 1000) id 9A00815403B5; Mon, 20 Mar 2023 18:05:50 -0700 (PDT) From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, kernel-team@meta.com, mingo@kernel.org Cc: stern@rowland.harvard.edu, parri.andrea@gmail.com, will@kernel.org, peterz@infradead.org, boqun.feng@gmail.com, npiggin@gmail.com, dhowells@redhat.com, j.alglave@ucl.ac.uk, luc.maranget@inria.fr, akiyks@gmail.com, "Paul E. McKenney" Subject: [PATCH memory-model scripts 15/31] tools/memory-model: Move from .AArch64.litmus.out to .litmus.AArch.out Date: Mon, 20 Mar 2023 18:05:33 -0700 Message-Id: <20230321010549.51296-15-paulmck@kernel.org> X-Mailer: git-send-email 2.40.0.rc2 In-Reply-To: <4e5839bb-e980-4931-a550-3548d025a32a@paulmck-laptop> References: <4e5839bb-e980-4931-a550-3548d025a32a@paulmck-laptop> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760938579468932643?= X-GMAIL-MSGID: =?utf-8?q?1760938579468932643?= When the github scripts see ".litmus.out", they assume that there must be a corresponding C-language ".litmus" file. Won't they be disappointed when they instead see nothing, or, worse yet, the corresponding assembly-language litmus test? This commit therefore swaps the hardware tag with the "litmus" to avoid this sort of disappointment. This commit also adjusts the .gitignore file so as to avoid adding these new ".out" files to git. [ paulmck: Apply Akira Yokosawa feedback. ] Signed-off-by: Paul E. McKenney --- tools/memory-model/litmus-tests/.gitignore | 2 +- tools/memory-model/scripts/judgelitmus.sh | 4 ++-- tools/memory-model/scripts/runlitmus.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/memory-model/litmus-tests/.gitignore b/tools/memory-model/litmus-tests/.gitignore index c492a1ddad91..d65462d64816 100644 --- a/tools/memory-model/litmus-tests/.gitignore +++ b/tools/memory-model/litmus-tests/.gitignore @@ -1,2 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only -*.litmus.out +*.out diff --git a/tools/memory-model/scripts/judgelitmus.sh b/tools/memory-model/scripts/judgelitmus.sh index fe9131f8eb96..9abda72fe013 100755 --- a/tools/memory-model/scripts/judgelitmus.sh +++ b/tools/memory-model/scripts/judgelitmus.sh @@ -6,7 +6,7 @@ # test ran correctly. If the --hw argument is omitted, check against the # LKMM output, which is assumed to be in file.litmus.out. If this argument # is provided, this is assumed to be a hardware test, and the output is -# assumed to be in file.HW.litmus.out, where "HW" is the --hw argument. +# assumed to be in file.litmus.HW.out, where "HW" is the --hw argument. # In addition, non-Sometimes verification results will be noted, but # forgiven. Furthermore, if there is no "Result:" comment but there is # an LKMM .litmus.out file, the observation in that file will be used @@ -37,7 +37,7 @@ then lkmmout= else litmusout="`echo $litmus | - sed -e 's/\.litmus$/.'${LKMM_HW_MAP_FILE}'.litmus/'`.out" + sed -e 's/\.litmus$/.litmus.'${LKMM_HW_MAP_FILE}'/'`.out" lkmmout=$litmus.out fi if test -f "$LKMM_DESTDIR/$litmusout" -a -r "$LKMM_DESTDIR/$litmusout" diff --git a/tools/memory-model/scripts/runlitmus.sh b/tools/memory-model/scripts/runlitmus.sh index 2865a9661b07..c84124b32bee 100755 --- a/tools/memory-model/scripts/runlitmus.sh +++ b/tools/memory-model/scripts/runlitmus.sh @@ -57,7 +57,7 @@ catfile="`echo $LKMM_HW_MAP_FILE | tr '[A-Z]' '[a-z]'`.cat" mapfile="Linux2${LKMM_HW_MAP_FILE}.map" themefile="$T/${LKMM_HW_MAP_FILE}.theme" herdoptions="-model $LKMM_HW_CAT_FILE" -hwlitmus=`echo $litmus | sed -e 's/\.litmus$/.'${LKMM_HW_MAP_FILE}'.litmus/'` +hwlitmus=`echo $litmus | sed -e 's/\.litmus$/.litmus.'${LKMM_HW_MAP_FILE}'/'` hwlitmusfile=`echo $hwlitmus | sed -e 's,^.*/,,'` # Don't run on litmus tests with complex synchronization