From patchwork Tue Mar 21 01:05:46 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: 72602 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1529584wrt; Mon, 20 Mar 2023 18:24:59 -0700 (PDT) X-Google-Smtp-Source: AK7set8nykUh4fIPco9mqE7Voh+3zmA0DDlS6PvZ6K3TNKBpDCvDUm/nAB6abVSbKOwveeh4jYh8 X-Received: by 2002:a05:6a20:3b29:b0:d9:7868:60c5 with SMTP id c41-20020a056a203b2900b000d9786860c5mr486456pzh.54.1679361899397; Mon, 20 Mar 2023 18:24:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679361899; cv=none; d=google.com; s=arc-20160816; b=ioyLyGPenAbftHWLVkT8qkTFezDBfXyWWsguR1bZKcnqqXwv9N5SVZ865wA61paRGY LaWYt+z4xURW2Lc0wHhRcjDTEdUA/XcsHUUfs06FdafF/B9surM8gbEAXHJC0PQ2Ni0+ akOw1nKdwNZYIwUKzkb4ilJ8BzNEbjE3JiHWA9/D7Dc+K3BunhqEgFwvKYaHIXYHK6W7 EEJDitwXhZNpdxnyRCrHUQrUCTYyR/0AGjm4B4qaYl3B5FUa6mftztG3HsbrZv+ktiBO DzTsc8axoB+CCzICzCxmSiRFynfXaxYr6TWCmeAowO2LOUTV0D3fLRonCnGG5fFAAYzu q54w== 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=kNX+khWysBkMlELNKeV1ZcEMBQQCL3vLvVpO4hAZ4ic=; b=r/kcuBnjxu9sm5WQh61UtBDrm6QR8xVVWjc5MNtDEZSs/QFKtauxa2kurXGdQ8Vycb ZpkgYQOVFzr3GOA+45AaaXcZN3gRIiRLd6m2dmXI6L6FBJ/nH4bNgXqL+GhGISXLnEQV IhoCx4+2C0VfLCKRvtCbDfRyVrrZi6yk9oiiPgxRKho3PNKc0R/2n8VxuDsQTEf1wwjd 9o08yTV+wCz6ROAW6Htw1q/g0ShKSPqxlaKaIyrhcme5gk8i19jcvACZqf+a/nAEwake orjquY1Pt692Xf59gCx6T9iKKf2fqplzOkF1NHBQBiTWq6MaYYsfSq9AhA5m+nmKYkI3 ycwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Brt0kjtX; 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 s3-20020a056a00194300b00608ab285f1csi10552799pfk.199.2023.03.20.18.24.46; Mon, 20 Mar 2023 18:24:59 -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=Brt0kjtX; 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 S230364AbjCUBJ1 (ORCPT + 99 others); Mon, 20 Mar 2023 21:09:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230175AbjCUBIk (ORCPT ); Mon, 20 Mar 2023 21:08:40 -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 31BE63864E; Mon, 20 Mar 2023 18:07:33 -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 7DAAB61923; Tue, 21 Mar 2023 01:05:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B552BC43323; 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=zCihDnP1nhMRD7A4aKMBexBXbcNXxLpiIowJmzZbfCY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Brt0kjtXDiG28K+fPikI/fC2jGfYPLyjf9idP56YaGbo2y0gfFPHTxF8IvLDqIPic KEqeeMCAWVD5hyiqQ5Alt1g0h9xRiFtYNkwNOGeqB9XT/djoTpXU2pvoncvbATzdJu wcwZkRQmNwDQML75ZWnRtDJ098Wz3SogPyJFNx6eoiB4aVt4r3IFaLIWVmHqaiPAlY eTac3CxYlchsF6DO6wS6BaYTkHHZxr/KR5Sm137oGJ0zrYAH4B+pLKvnszeMGjiur2 VUp0mzynqSxc6HpJ6h5BG2pHNAoZE+tRZCosOcHfFSXoZcPYrutA2Je5TwNXprwzoH 1Sw+dRTM0uaGQ== Received: by paulmck-ThinkPad-P72.home (Postfix, from userid 1000) id DB56715403CD; 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 28/31] tools/memory-model: Make judgelitmus.sh handle scripted Result: tag Date: Mon, 20 Mar 2023 18:05:46 -0700 Message-Id: <20230321010549.51296-28-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?1760938582945382536?= X-GMAIL-MSGID: =?utf-8?q?1760938582945382536?= The scripts that generate the litmus tests in the "auto" directory of the https://github.com/paulmckrcu/litmus archive place the "Result:" tag into a single-line ocaml comment, which judgelitmus.sh currently does not recognize. This commit therefore makes judgelitmus.sh recognize both the multiline comment format that it currently does and the automatically generated single-line format. Signed-off-by: Paul E. McKenney --- tools/memory-model/scripts/judgelitmus.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/memory-model/scripts/judgelitmus.sh b/tools/memory-model/scripts/judgelitmus.sh index 2700481d20f0..1ec5d89fcfbb 100755 --- a/tools/memory-model/scripts/judgelitmus.sh +++ b/tools/memory-model/scripts/judgelitmus.sh @@ -57,10 +57,10 @@ if grep -q '^Flag data-race$' "$LKMM_DESTDIR/$litmusout" then datarace_modeled=1 fi -if grep -q '^ \* Result: ' $litmus +if grep -q '^[( ]\* Result: ' $litmus then - outcome=`grep -m 1 '^ \* Result: ' $litmus | awk '{ print $3 }'` - if grep -m1 '^ \* Result: .* DATARACE' $litmus + outcome=`grep -m 1 '^[( ]\* Result: ' $litmus | awk '{ print $3 }'` + if grep -m1 '^[( ]\* Result: .* DATARACE' $litmus then datarace_predicted=1 fi