From patchwork Wed Jan 17 10:37:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Botcazou X-Patchwork-Id: 862163 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-471456-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="JW0FnkCV"; 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 3zM3Sx6k75z9sNV for ; Wed, 17 Jan 2018 21:37:53 +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:subject:date:message-id:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=j1CEZnue6wPLujNu db3QkoFnYOsSHUKL1qRu4udIKCDuWrGGoZMvLXDDsGNjhj2PVmfogqqmpmY/NRXb zVPYcOxx6aKWKQDU1/VepLpqRHjtq3y4SK+NkLfx/dC3drR1L0NHSbvTn5VkwgvB x0dp867+467rZFPmyEEgYsyK/lo= 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:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=default; bh=fNfo9uk7NKxIhYqfQSZCkZ OKTU8=; b=JW0FnkCVSOs2Rpe8yd/o5W5Q1hRE8nckATjytTcTKhoFbjkIkMIIce cHA/BqBuPW7RiRBT5KHgU1GImK5V/kyr4zuQKkQf13WE+1GThjkNFow7/gorAm2Z CSo2HO1OUPJth74e3UjxYI96VoIfryX4ojoPLBldY4WpdY2FSdG14= Received: (qmail 30683 invoked by alias); 17 Jan 2018 10:37:46 -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 30666 invoked by uid 89); 17 Jan 2018 10:37:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-9.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: smtp.eu.adacore.com Received: from mel.act-europe.fr (HELO smtp.eu.adacore.com) (194.98.77.210) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 17 Jan 2018 10:37:44 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 6E3348139F for ; Wed, 17 Jan 2018 11:37:42 +0100 (CET) Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oLFCs8tNyzqo for ; Wed, 17 Jan 2018 11:37:42 +0100 (CET) Received: from polaris.localnet (bon31-6-88-161-99-133.fbx.proxad.net [88.161.99.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.eu.adacore.com (Postfix) with ESMTPSA id 4AE698138F for ; Wed, 17 Jan 2018 11:37:42 +0100 (CET) From: Eric Botcazou To: gcc-patches@gcc.gnu.org Subject: [patch] Fix PR tree-optimization/81184 Date: Wed, 17 Jan 2018 11:37:41 +0100 Message-ID: <2276127.A0PPYHmpHS@polaris> MIME-Version: 1.0 Hi, as suggested by Jakub in the audit trail, this simply adjusts the dg-final line according to whether it's for a logical_op_short_circuit target or not. Tested on visium-elf and x86_64-suse-linux, OK for the mainline? 2018-01-17 Eric Botcazou PR tree-optimization/81184 * gcc.dg/pr21643.c: Adjust dg-final line for logical_op_short_circuit targets. * gcc.dg/tree-ssa/phi-opt-11.c: Likewise. Index: gcc.dg/pr21643.c =================================================================== --- gcc.dg/pr21643.c (revision 256776) +++ gcc.dg/pr21643.c (working copy) @@ -87,4 +87,5 @@ f9 (unsigned char c) return 1; } -/* { dg-final { scan-tree-dump-times "Optimizing range tests c_\[0-9\]*.D. -.0, 31. and -.32, 32.\[\n\r\]* into" 6 "reassoc1" } } */ +/* { dg-final { scan-tree-dump-times "Optimizing range tests c_\[0-9\]*.D. -.0, 31. and -.32, 32.\[\n\r\]* into" 6 "reassoc1" { target { ! logical_op_short_circuit } } } } */ +/* { dg-final { scan-tree-dump-times "Optimizing range tests c_\[0-9\]*.D. -.0, 31. and -.32, 32.\[\n\r\]* into" 5 "reassoc1" { target logical_op_short_circuit } } } */ Index: gcc.dg/tree-ssa/phi-opt-11.c =================================================================== --- gcc.dg/tree-ssa/phi-opt-11.c (revision 256776) +++ gcc.dg/tree-ssa/phi-opt-11.c (working copy) @@ -22,4 +22,6 @@ int h(int a, int b, int c, int d) return d; return a; } -/* { dg-final { scan-tree-dump-times "if" 0 "optimized"} } */ + +/* { dg-final { scan-tree-dump-times "if" 0 "optimized" { target { ! logical_op_short_circuit } } } } */ +/* { dg-final { scan-tree-dump-times "if" 2 "optimized" { target logical_op_short_circuit } } } */