From patchwork Wed Sep 24 13:20:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Johnson X-Patchwork-Id: 392946 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 D83C51400B2 for ; Wed, 24 Sep 2014 23:20:30 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:content-type; q= dns; s=default; b=INs36WvbxQ01wKSot2mnp/Y0vDyBca7isV3uD/WOn/JR9M fiajKNC89XKryNq668CW+I4PkZ0m1gnGQeRyyLI+G1btC6756YSOqDMHJc+aoHV5 sCayt4frnS8aNPElE0U25GIsnqZJQt6UxcySUtkVowMKtUmDS2igZKEv2Odik= 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 :mime-version:date:message-id:subject:from:to:content-type; s= default; bh=O8sSahHFDSMiaC8kOJshc+ECMXM=; b=e1EjKr+7AWSInystlaxT pEaKiaikRYuVCxEcIm/iWtA90m0C658hRyB3lpLGtKR0JrSAH3V5oCcXMtmZous9 kZgZQfgqUaa3jiKIniGQaf4jGfWG4U8EUsW5j/+gibBuMkSNz77SvmbSwNMYpi2k XQezO4CU3J+HcrZ9baJ9NTY= Received: (qmail 29552 invoked by alias); 24 Sep 2014 13:20:24 -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 29534 invoked by uid 89); 24 Sep 2014 13:20:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-qc0-f176.google.com Received: from mail-qc0-f176.google.com (HELO mail-qc0-f176.google.com) (209.85.216.176) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Wed, 24 Sep 2014 13:20:22 +0000 Received: by mail-qc0-f176.google.com with SMTP id o8so3387172qcw.35 for ; Wed, 24 Sep 2014 06:20:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to :content-type; bh=v++wBf2sGg5kNLWZVkIMcNUVrF35gpU1Pef0hY692sQ=; b=IeE4R2fvElUBdG/EfbT2aJu5np9tBUdqZe3RNhQ5aKfbiXClqTa4MawKHwxcrrxK56 Jhih1PIlxGX2NRrpd6TejOht8qVPUMrgeBU9StcrU/I3hHq4/jjnt10N15kYOLsoObVW +nSTHBY9RYIE1vcu5AhgOZf4pGGVCVsNyMSW2+jRob9HaAOCpJ2NkXug377B3iUuD4ZH wwev4YDQag0EZhapGh/06K2rcayXEjJWeq56Hl+vYK0SC1Mqu0zD/Sy68UPaN7CxMzCX lb642X+/a3tBeIGXTclnM4wxQQeY/tVFDjGzV4uDGOhCT4Eyo1aJzf0YDd1ZhPVRrbRu FGPQ== X-Gm-Message-State: ALoCoQkJz86GcIX4i3uFrt/EeOV/0vuh3Ftu3bsuuaeT8yHB1a+IhLURHBFUG38HHDfAxqmYcQlW MIME-Version: 1.0 X-Received: by 10.229.73.70 with SMTP id p6mr8738193qcj.13.1411564820284; Wed, 24 Sep 2014 06:20:20 -0700 (PDT) Received: by 10.229.148.1 with HTTP; Wed, 24 Sep 2014 06:20:20 -0700 (PDT) Date: Wed, 24 Sep 2014 06:20:20 -0700 Message-ID: Subject: [GOOGLE] Fix new tests From: Teresa Johnson To: "gcc-patches@gcc.gnu.org" , David Li X-IsSubscribed: yes The new tests added for -mpatch-functions-for-instrumentation did not correctly restrict themselves to x86_64 since tree-prof.exp doesn't support dg-do. Work around this by using target selectors on the dg-options. I apply the -mpatch and related options only if it is x86_64, otherwise it simply does splitting. Ok for google branches? Teresa 2014-09-24 Teresa Johnson * testsuite/gcc.dg/tree-prof/cold_partition_patch.c: * testsuite/g++.dg/tree-prof/partition_patch.C: Index: testsuite/gcc.dg/tree-prof/cold_partition_patch.c =================================================================== --- testsuite/gcc.dg/tree-prof/cold_partition_patch.c (revision 215525) +++ testsuite/gcc.dg/tree-prof/cold_partition_patch.c (working copy) @@ -1,8 +1,7 @@ /* Check if patching works with function splitting. */ -/* { dg-do compile { target x86_64-*-* } } */ /* { dg-require-effective-target freorder } */ -/* { dg-options "-O2 -freorder-blocks-and-partition -save-temps -mpatch-functions-for-instrumentation -fno-optimize-sibling-calls " } */ - +/* { dg-options "-O2 -freorder-blocks-and-partition -save-temps " { target { ! x86_64-*-* } } } +/* { dg-options "-O2 -freorder-blocks-and-partition -save-temps -mpatch-functions-for-instrumentation -fno-optimize-sibling-calls " { target x86_64-*-* } } */ #define SIZE 10000 const char *sarr[SIZE]; Index: testsuite/g++.dg/tree-prof/partition_patch.C =================================================================== --- testsuite/g++.dg/tree-prof/partition_patch.C (revision 215525) +++ testsuite/g++.dg/tree-prof/partition_patch.C (working copy) @@ -1,7 +1,7 @@ // Check if patching works with function splitting. -// { dg-do compile { target x86_64-*-* } } // { dg-require-effective-target freorder } -// { dg-options "-O2 -fnon-call-exceptions -freorder-blocks-and-partition -mpatch-functions-for-instrumentation -fno-optimize-sibling-calls " } +// { dg-options "-O2 -fnon-call-exceptions -freorder-blocks-and-partition " { target { ! x86_64-*-* } } } +// { dg-options "-O2 -fnon-call-exceptions -freorder-blocks-and-partition -mpatch-functions-for-instrumentation -fno-optimize-sibling-calls " { target x86_64-*-* } } int k;