From patchwork Fri Jan 26 19:27:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Segher Boessenkool X-Patchwork-Id: 866550 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-472132-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="n8QmXl29"; 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 3zSppm5PNlz9t2c for ; Sat, 27 Jan 2018 06:28:15 +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:from :to:cc:subject:date:message-id; q=dns; s=default; b=YUySdZgJU2ZH nNaaFC8M10vqGsCuOYMVZ7DQFrBzbzee/I5/iyg9BR7vBSdj9gTRJ6TqGvvkKAU1 eqDa+rKh8PWVlNvJRFjLQQ5gGyCUjaD3R/ShERGqJlA4KEQlU+LLYLer3Me0jJnl pgqaV1XIU7LNaYV6+AUkgj3LqTga4fs= 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:from :to:cc:subject:date:message-id; s=default; bh=4ZaOa/RMvHojt5hVmE FurHfzkcg=; b=n8QmXl29lpfb8g5r8z9gXK8/8OnUdAih99LKUFQYHj3NpjLLcj S1Mj6JknAi/BA9gNxHKLMtWQKhcuvKlZ5QzlsmMXGNN9jd88biPV8q2gS7hzUiYG 8iP/98AK913rr7bgLVrJwBCHFB6PXRWzQ2P7/z6Rz17gRoaoIsXSTl8fY= Received: (qmail 114075 invoked by alias); 26 Jan 2018 19:28:05 -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 114063 invoked by uid 89); 26 Jan 2018 19:28:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=powerpc64-linux, powerpc64linux, UD:safe-indirect-jump-1.c, sk:safe-in X-HELO: gcc1-power7.osuosl.org Received: from gcc1-power7.osuosl.org (HELO gcc1-power7.osuosl.org) (140.211.15.137) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 26 Jan 2018 19:28:01 +0000 Received: by gcc1-power7.osuosl.org (Postfix, from userid 10019) id 0CA051240740; Fri, 26 Jan 2018 19:27:59 +0000 (UTC) From: Segher Boessenkool To: gcc-patches@gcc.gnu.org Cc: dje.gcc@gmail.com, Segher Boessenkool Subject: [PATCH] rs6000: Fix safe-indirect-jump-[18].c Date: Fri, 26 Jan 2018 19:27:58 +0000 Message-Id: <094cb176f757b333c6a3e740bac8c80b7b547a5f.1516855807.git.segher@kernel.crashing.org> X-IsSubscribed: yes Thist patch merges the safe-indirect-jump-1.c and -8.c testcases, since they do the same thing. On the 64-bit and AIX ABIs the indirect call is not a sibcall, since there is code generated after the call (the restore of r2). On the 32-bit non-AIX ABIs it is a sibcall. Tested on powerpc64-linux {-m32,-m64}, and on powerpc-ibm-aix7.1.3.0 . Is this okay for trunk and 7 branch? Segher 2018-01-26 Segher Boessenkool gcc/testsuite/ * gcc.target/powerpc/safe-indirect-jump-1.c: Build on all targets. Make expected output depend on whether we expect sibcalls or not. * gcc.target/powerpc/safe-indirect-jump-8.c: Delete (merged into safe-indirect-jump-1.c). --- gcc/testsuite/gcc.target/powerpc/safe-indirect-jump-1.c | 10 ++++++++-- gcc/testsuite/gcc.target/powerpc/safe-indirect-jump-8.c | 16 ---------------- 2 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 gcc/testsuite/gcc.target/powerpc/safe-indirect-jump-8.c diff --git a/gcc/testsuite/gcc.target/powerpc/safe-indirect-jump-1.c b/gcc/testsuite/gcc.target/powerpc/safe-indirect-jump-1.c index 99cfab2..d1ab83a 100644 --- a/gcc/testsuite/gcc.target/powerpc/safe-indirect-jump-1.c +++ b/gcc/testsuite/gcc.target/powerpc/safe-indirect-jump-1.c @@ -1,4 +1,4 @@ -/* { dg-do compile { target { lp64 } } } */ +/* { dg-do compile } */ /* { dg-additional-options "-mno-speculate-indirect-jumps" } */ /* Test for deliberate misprediction of indirect calls. */ @@ -11,4 +11,10 @@ int bar () } /* { dg-final { scan-assembler "crset 2" } } */ -/* { dg-final { scan-assembler "beqctrl-" } } */ + +/* The AIX and ELFv2 ABIs don't allow a sibcall here. */ +/* { dg-final { scan-assembler "beqctrl-" { target { lp64 || { powerpc*-*-aix* } } } } } */ + +/* The other ABIs do allow a sibcall. */ +/* { dg-final { scan-assembler "beqctr-" { target { ilp32 && !powerpc*-*-aix* } } } } */ +/* { dg-final { scan-assembler {b \$} { target { ilp32 && !powerpc*-*-aix* } } } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/safe-indirect-jump-8.c b/gcc/testsuite/gcc.target/powerpc/safe-indirect-jump-8.c deleted file mode 100644 index 0a6f231..0000000 --- a/gcc/testsuite/gcc.target/powerpc/safe-indirect-jump-8.c +++ /dev/null @@ -1,16 +0,0 @@ -/* { dg-do compile { target { ilp32 } } } */ -/* { dg-skip-if "" { powerpc*-*-aix* } } */ -/* { dg-additional-options "-O2 -mno-speculate-indirect-jumps" } */ - -/* Test for deliberate misprediction of -m32 sibcalls. */ - -extern int (*f)(); - -int bar () -{ - return (*f) (); -} - -/* { dg-final { scan-assembler "crset 2" } } */ -/* { dg-final { scan-assembler "beqctr-" } } */ -/* { dg-final { scan-assembler {b \$} } } */