Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp70863imm; Wed, 29 Aug 2018 14:13:58 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaeLqChbO6ILjOpOzNkNpOEO9fsoYbMSeU1MqqmQXBrYs52bXFMD54obbGD8+Jsp7fvj0xU X-Received: by 2002:aa7:84c2:: with SMTP id x2-v6mr7561853pfn.220.1535577238537; Wed, 29 Aug 2018 14:13:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535577238; cv=none; d=google.com; s=arc-20160816; b=ZfALFEPyKZKtt4q93SYg8vYECR9N7WGItzI9KeQZDJ+XBvv/PHYzafjVBugFUdEMGl jFyf+9y5TzKFOTKJkx32+7XhpPVxxihC9wVVFT8FuAasoEPMOVbc1IO6JhXY4M8RFCwq ZUDMeBQecTUuZlykRAvFgULAUHURCUQAiZaciXWILq6HZm3/8z2OyS4CZQNHIt/JL8fK 4uqrpRMA5Jra+UrFugRBvednPErXHruMRtvKyBmRRYvfB0gaxS0xvd6LvrSULUXNux3w BDCDQXlv1ZpZH+cHHE/pOzq3iWxCDo4LFyrRT2NsP/2WnHuBkL+aVf6rvcKbYhpf1zBs iPYg== 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=8qEwhbGXSUqu008LmJwl2rWZS4h5XvqmhrCuEplNOJk=; b=nt9nknWAAkh+axWrkZYE4XKjWLy6hZMZ82RBAIxnNrW5CEkyiN9/hI/XEUWb0AXbse ij2Ya6MW3w867pae+3GWf1aeirHR1DiurTydeVq6OMC6qZsAnAA6+SK8uKCggcJoaoUa nO5J6E7bULm1jSJnE+tBr76YKcPggbxGyduFHUEtCdFWwzvhoP8/GKp37D3/lGErkK0H SDxmgcsCw390Q3IL0INpceRedUhzoOTizbqUY/X5Dk9SwW43oPcHxtY6BmFQbG2bR/JX n586o1eJlwmJHplVhSASF2FyofoJ8O7E4IWA831TznZttqKMUfZJbho0t21Sg0iugL/w QMEA== 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 c19-v6si5006239pfc.18.2018.08.29.14.13.43; Wed, 29 Aug 2018 14:13:58 -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 S1729063AbeH3BJo (ORCPT + 99 others); Wed, 29 Aug 2018 21:09:44 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:41806 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728586AbeH3BJo (ORCPT ); Wed, 29 Aug 2018 21:09:44 -0400 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w7TL95ui108310 for ; Wed, 29 Aug 2018 17:11:02 -0400 Received: from e16.ny.us.ibm.com (e16.ny.us.ibm.com [129.33.205.206]) by mx0a-001b2d01.pphosted.com with ESMTP id 2m60fgph6b-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 29 Aug 2018 17:11:02 -0400 Received: from localhost by e16.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 29 Aug 2018 17:11:01 -0400 Received: from b01cxnp22035.gho.pok.ibm.com (9.57.198.25) by e16.ny.us.ibm.com (146.89.104.203) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 29 Aug 2018 17:10:57 -0400 Received: from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com [9.57.199.108]) by b01cxnp22035.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w7TLAuni38535312 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 29 Aug 2018 21:10:56 GMT Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 74BA8B2066; Wed, 29 Aug 2018 17:09:52 -0400 (EDT) Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5605FB2068; Wed, 29 Aug 2018 17:09:52 -0400 (EDT) Received: from paulmck-ThinkPad-W541 (unknown [9.70.82.159]) by b01ledav003.gho.pok.ibm.com (Postfix) with ESMTP; Wed, 29 Aug 2018 17:09:52 -0400 (EDT) Received: by paulmck-ThinkPad-W541 (Postfix, from userid 1000) id 6390616C91CB; Wed, 29 Aug 2018 14:10:56 -0700 (PDT) From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, mingo@kernel.org Cc: 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 LKMM 7/7] EXP tools/memory-model: Add .cfg and .cat files for s390 Date: Wed, 29 Aug 2018 14:10:53 -0700 X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180829211018.GA19646@linux.vnet.ibm.com> References: <20180829211018.GA19646@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18082921-0072-0000-0000-0000039960A5 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00009636; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000266; SDB=6.01080715; UDB=6.00557479; IPR=6.00860700; MB=3.00023001; MTD=3.00000008; XFM=3.00000015; UTC=2018-08-29 21:11:00 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18082921-0073-0000-0000-0000493E89F8 Message-Id: <20180829211053.20531-7-paulmck@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-08-29_04:,, 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 mlxscore=0 impostorscore=0 mlxlogscore=808 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1808290206 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.17.1