From patchwork Sun Mar 4 19:52:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Schmidt X-Patchwork-Id: 881225 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-474264-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.vnet.ibm.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="FJexgnRp"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zvYbp61FXz9sYD for ; Mon, 5 Mar 2018 06:52:36 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:date:mime-version:content-type :content-transfer-encoding:message-id; q=dns; s=default; b=uhRsz v170i0f8VRo0rwmWRvfAYE3POc4wH8G8S1PNqdrUfIKFrDtmsNkw6uQBNRzCGaKJ 3KQYCgz9cLDvk/dG1LFWn/FonnmhkpJ42HIwNtmqRFKKNjxGtvgpwynW/jpByTU0 iNf+pxjbl+o+yIRv+AP1ZkgagNjhsZ1aqjNgRk= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:date:mime-version:content-type :content-transfer-encoding:message-id; s=default; bh=5DZkdbkW/p4 7xSOW0/SjAwu5t9E=; b=FJexgnRpFbAKIpUcMexo+qXuMpidSbZqmAOjKLxDp5X nfUmMdURsTmMsVwqUZAFd6QJD0ggsq+Kfw4onaWKpvt/DXtpztyGF/9QFsAbSL4T F3CZ2RQeJHUs3yrrqubCChDL1KxmAhVWIbLE9lkIUre7wnA9F0zwO/+AQFVMXIP0 = Received: (qmail 69904 invoked by alias); 4 Mar 2018 19:52:28 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 69891 invoked by uid 89); 4 Mar 2018 19:52:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy= X-HELO: mx0a-001b2d01.pphosted.com Received: from mx0b-001b2d01.pphosted.com (HELO mx0a-001b2d01.pphosted.com) (148.163.158.5) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 04 Mar 2018 19:52:26 +0000 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w24JnGiE098174 for ; Sun, 4 Mar 2018 14:52:24 -0500 Received: from e35.co.us.ibm.com (e35.co.us.ibm.com [32.97.110.153]) by mx0a-001b2d01.pphosted.com with ESMTP id 2gg9vf3at5-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Sun, 04 Mar 2018 14:52:23 -0500 Received: from localhost by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 4 Mar 2018 12:52:23 -0700 Received: from b03cxnp08026.gho.boulder.ibm.com (9.17.130.18) by e35.co.us.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sun, 4 Mar 2018 12:52:21 -0700 Received: from b03ledav001.gho.boulder.ibm.com (b03ledav001.gho.boulder.ibm.com [9.17.130.232]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w24JqLta10158450; Sun, 4 Mar 2018 12:52:21 -0700 Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0C16C6E03A; Sun, 4 Mar 2018 12:52:21 -0700 (MST) Received: from bigmac.rchland.ibm.com (unknown [9.10.86.203]) by b03ledav001.gho.boulder.ibm.com (Postfix) with ESMTP id D5CC36E035; Sun, 4 Mar 2018 12:52:20 -0700 (MST) To: GCC Patches Cc: Segher Boessenkool From: Bill Schmidt Subject: Rename __builtin_rs6000_speculation_barrier Date: Sun, 4 Mar 2018 13:52:20 -0600 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 18030419-0012-0000-0000-000015D85AFE X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008621; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000254; SDB=6.00998367; UDB=6.00507713; IPR=6.00777684; MB=3.00019852; MTD=3.00000008; XFM=3.00000015; UTC=2018-03-04 19:52:22 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18030419-0013-0000-0000-000051BCE21B Message-Id: <83796b73-cc62-5112-0838-8c4d541dbe75@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-03-04_10:, , 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=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1803040257 X-IsSubscribed: yes Hi, We realized recently that the use of "rs6000" in a builtin name doesn't agree with our normal naming conventions. Thus this patch changes such a builtin to __builtin_powerpc_speculation_barrier instead. Bootstrapped and tested on powerpc64le-linux-gnu with no regressions. Is this okay for trunk? Thanks, Bill [gcc] 2018-03-04 Bill Schmidt * config/rs6000/rs6000-builtin.def (rs6000_speculation_barrier): Rename to powerpc_speculation_barrier. * config/rs6000/rs6000.c (rs6000_expand_builtin): Rename called function to gen_powerpc_speculation_barrier. (rs6000_init_builtins): Rename builtin to __builtin_powerpc_speculation_barrier. * config/rs6000/rs6000.md (rs6000_speculation_barrier): Rename define_insn to powerpc_speculation_barrier. [gcc/testsuite] 2018-03-04 Bill Schmidt * gcc.target/powerpc/spec-barr-1.c: Change called function name to __builtin_powerpc_speculation_barrier. Index: gcc/config/rs6000/rs6000-builtin.def =================================================================== --- gcc/config/rs6000/rs6000-builtin.def (revision 258157) +++ gcc/config/rs6000/rs6000-builtin.def (working copy) @@ -2348,7 +2348,7 @@ BU_DFP_MISC_2 (DSCRIQ, "dscriq", CONST, dfp_dscri /* 0 argument void function that we pretend was added in ISA 2.06. It's a special nop recognized by 2018+ firmware for P7 and up, with speculation barrier semantics. */ -BU_P7_MISC_X (SPEC_BARRIER, "rs6000_speculation_barrier", MISC) +BU_P7_MISC_X (SPEC_BARRIER, "powerpc_speculation_barrier", MISC) /* 1 argument BCD functions added in ISA 2.06. */ BU_P7_MISC_1 (CDTBCD, "cdtbcd", CONST, cdtbcd) Index: gcc/config/rs6000/rs6000.c =================================================================== --- gcc/config/rs6000/rs6000.c (revision 258157) +++ gcc/config/rs6000/rs6000.c (working copy) @@ -16874,7 +16874,7 @@ rs6000_expand_builtin (tree exp, rtx target, rtx s case MISC_BUILTIN_SPEC_BARRIER: { - emit_insn (gen_rs6000_speculation_barrier ()); + emit_insn (gen_powerpc_speculation_barrier ()); return NULL_RTX; } @@ -17250,7 +17250,7 @@ rs6000_init_builtins (void) ftype = build_function_type_list (void_type_node, NULL_TREE); def_builtin ("__builtin_cpu_init", ftype, RS6000_BUILTIN_CPU_INIT); - def_builtin ("__builtin_rs6000_speculation_barrier", ftype, + def_builtin ("__builtin_powerpc_speculation_barrier", ftype, MISC_BUILTIN_SPEC_BARRIER); ftype = build_function_type_list (bool_int_type_node, const_ptr_type_node, Index: gcc/config/rs6000/rs6000.md =================================================================== --- gcc/config/rs6000/rs6000.md (revision 258157) +++ gcc/config/rs6000/rs6000.md (working copy) @@ -12574,7 +12574,7 @@ return "ori 2,2,0"; }) -(define_insn "rs6000_speculation_barrier" +(define_insn "powerpc_speculation_barrier" [(unspec_volatile:BLK [(const_int 0)] UNSPECV_SPEC_BARRIER)] "" "ori 31,31,0") Index: gcc/testsuite/gcc.target/powerpc/spec-barr-1.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/spec-barr-1.c (revision 258157) +++ gcc/testsuite/gcc.target/powerpc/spec-barr-1.c (working copy) @@ -4,7 +4,7 @@ void foo () { - __builtin_rs6000_speculation_barrier (); + __builtin_powerpc_speculation_barrier (); } /* { dg-final { scan-assembler "ori 31,31,0" } } */