Received: by 10.192.165.156 with SMTP id m28csp835698imm; Mon, 16 Apr 2018 09:26:47 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+Th54xUs4OlPP72lREYlw0aORehPMDioLF1gDfxePdmz9ab9L78+IwwkGbzFos3G6opUH5 X-Received: by 10.99.132.198 with SMTP id k189mr13140431pgd.298.1523896007407; Mon, 16 Apr 2018 09:26:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523896007; cv=none; d=google.com; s=arc-20160816; b=V93chZDnTYN8ZqiTPc4Yf9pHCNO4uqkokiK0qhVkojDwYzdVMUCa56v9CjCX6lK3E9 mEfZaX4KcSroQ3tg6okLxCb08yKgd5YyP5A1SWnNYC3GavlVvJb+zzaWTA2lXX9/Xu/d XO9w4jhAzGehLgwZgWcATVni4TCkufhS7GntItSs7nPMcgThXnVT/whuDgqe5Gy510uj WbaWKSuCOWonX13UX97VsjOlVXie4N/pl9msl4wIdV/+RKU/7gyRXQfPG9swOWvtOkTN NwY3yLuWveA6GFbPHqD68dxfZ9okRyYZS5o7xpQJzjpaVb13s8kSY22HI5kT4n/RKT1g gWrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:references:in-reply-to:date :subject:cc:to:from:arc-authentication-results; bh=kOqcXiq3b7Pqegsw+Aliz0/7jn+HQDx8i1jPvOFRJvU=; b=wceicpjf0Dd266BcmloDo0BtAFQZi7+8qoaUfEr27kCjmQT8mglpz33qi1ybQUD3Xj mS19iLGXu1dwe+++UHo82QQzDrk/Ew7BjLN2cvYxYBt/A0qjLRW2ZxPXwqalUL6LwbsL IwGqRnr8NGHT3cYDPQTpnwD32mNFN4bGnfWZGXH2CLZoReAWj6UvYVxjYT/FxQ/R+X3Q yDojnwqGbnaHWhRNSSOpEm0/ZoKhHpcbGSOySI7hq+uxJgrMKEdq6OE79ZT4+S066dNj AFPYzTEs7mc8NNQpAxN4XX930CbNRBaaV8BQMeV43tzbB6zyFtFJOohpg7ndUKOvISsN TaYw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g8si9517981pgq.544.2018.04.16.09.26.33; Mon, 16 Apr 2018 09:26:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753251AbeDPQWY (ORCPT + 99 others); Mon, 16 Apr 2018 12:22:24 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:35144 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751194AbeDPQVx (ORCPT ); Mon, 16 Apr 2018 12:21:53 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w3GGKd7O011085 for ; Mon, 16 Apr 2018 12:21:52 -0400 Received: from e14.ny.us.ibm.com (e14.ny.us.ibm.com [129.33.205.204]) by mx0a-001b2d01.pphosted.com with ESMTP id 2hcy58gdd9-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Mon, 16 Apr 2018 12:21:51 -0400 Received: from localhost by e14.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 16 Apr 2018 12:21:50 -0400 Received: from b01cxnp23034.gho.pok.ibm.com (9.57.198.29) by e14.ny.us.ibm.com (146.89.104.201) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 16 Apr 2018 12:21:46 -0400 Received: from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com [9.57.199.108]) by b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w3GGLjLK52363474; Mon, 16 Apr 2018 16:21:45 GMT Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EDF31B2058; Mon, 16 Apr 2018 13:23:49 -0400 (EDT) Received: from paulmck-ThinkPad-W541 (unknown [9.70.82.108]) by b01ledav003.gho.pok.ibm.com (Postfix) with ESMTP id B6650B204E; Mon, 16 Apr 2018 13:23:49 -0400 (EDT) Received: by paulmck-ThinkPad-W541 (Postfix, from userid 1000) id 77DEC16C207F; Mon, 16 Apr 2018 09:22:53 -0700 (PDT) From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Cc: mingo@kernel.org, stern@rowland.harvard.edu, parri.andrea@gmail.com, will.deacon@arm.com, 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 RFC tools/memory-model 3/5] EXP tools/memory-model: Add .cfg and .cat files for s390 Date: Mon, 16 Apr 2018 09:22:49 -0700 X-Mailer: git-send-email 2.5.2 In-Reply-To: <20180416162228.GA18167@linux.vnet.ibm.com> References: <20180416162228.GA18167@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18041616-0052-0000-0000-000002DBDB6E X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008863; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000257; SDB=6.01018805; UDB=6.00519705; IPR=6.00798046; MB=3.00020599; MTD=3.00000008; XFM=3.00000015; UTC=2018-04-16 16:21:49 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18041616-0053-0000-0000-00005C59E09C Message-Id: <1523895771-19224-3-git-send-email-paulmck@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-04-16_09:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1804160148 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This commit adds s390.cat and s390.cfg files to allow users to check litmus tests for s390-specific code. Note that this change only enables herd7 checking of C-language litmus tests. Larger changes are required to enable the litmus7 and klitmus7 tools to check litmus tests on real hardare. Suggested-by: Martin Schwidefsky Suggested-by: Christian Borntraeger Signed-off-by: Paul E. McKenney [ paulmck: Add fixes suggested by Alan Stern. ] --- tools/memory-model/s390.cat | 18 ++++++++++++++++++ tools/memory-model/s390.cfg | 21 +++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 tools/memory-model/s390.cat create mode 100644 tools/memory-model/s390.cfg diff --git a/tools/memory-model/s390.cat b/tools/memory-model/s390.cat new file mode 100644 index 000000000000..216bf33d3ffe --- /dev/null +++ b/tools/memory-model/s390.cat @@ -0,0 +1,18 @@ +s390 + +include "fences.cat" +include "cos.cat" + +(* Fundamental coherence ordering *) +let com = rf | co | fr +acyclic po-loc | com as coherence + +(* Atomic *) +empty rmw & (fre;coe) as atom + +(* Fences *) +let mb = [M] ; fencerel(Mb) ; [M] + +(* TSO with multicopy atomicity (tso-mca) *) +let po-ghb = ([R] ; po ; [M]) | ([M] ; po ; [W]) +acyclic mb | po-ghb | fr | rf | co as tso-mca diff --git a/tools/memory-model/s390.cfg b/tools/memory-model/s390.cfg new file mode 100644 index 000000000000..d77e05d2395c --- /dev/null +++ b/tools/memory-model/s390.cfg @@ -0,0 +1,21 @@ +macros linux-kernel.def +bell linux-kernel.bell +model s390.cat +graph columns +squished true +showevents noregs +movelabel true +fontsize 8 +xscale 2.0 +yscale 1.5 +arrowsize 0.8 +showinitrf false +showfinalrf false +showinitwrites false +splines spline +pad 0.1 +edgeattr hb,color,indigo +edgeattr co,color,blue +edgeattr mb,color,darkgreen +edgeattr wmb,color,darkgreen +edgeattr rmb,color,darkgreen -- 2.5.2