From patchwork Fri Mar 26 15:35:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Lyon X-Patchwork-Id: 1458859 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@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.a=rsa-sha256 header.s=default header.b=WRI9KnYV; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F6QzM1xcJz9sRf for ; Sat, 27 Mar 2021 02:35:41 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 46B67386102F; Fri, 26 Mar 2021 15:35:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 46B67386102F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1616772939; bh=FwKaQVcz5t79X6Eu3pWDuAmSE4kuSF7Xv6fhbybikPw=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=WRI9KnYV/BdM2oEtdm3GqdVt8ERGblBop3TRq5pbc434lVgG3SCgAeC0cQeO3KOy6 FumQBQo/OMP7yjRBF7yX7IViWpgvAOGCGt/8cmYOUo7JfyFRtMZIB1cfgozcgzHudN T9MJx1BFhM9Q42wDkPuYgKU7L6gb/iYmgJ3Zrvck= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ot1-x32e.google.com (mail-ot1-x32e.google.com [IPv6:2607:f8b0:4864:20::32e]) by sourceware.org (Postfix) with ESMTPS id 9349C3857C77 for ; Fri, 26 Mar 2021 15:35:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9349C3857C77 Received: by mail-ot1-x32e.google.com with SMTP id g8-20020a9d6c480000b02901b65ca2432cso5579407otq.3 for ; Fri, 26 Mar 2021 08:35:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=FwKaQVcz5t79X6Eu3pWDuAmSE4kuSF7Xv6fhbybikPw=; b=VQT0myqkJEqyxT6DK0Fe7CuI5T09q0LyzExsnVYS2M1QJWOZ7HtPGLSPqxIsaFVCh8 gyPbuxr1m1WRvLmjV/Txdl7YBrJYVJorSJgH8h6/ngLEWDITGGw6slsVGdn6y5g4U+pq RUjRiFqT8b8+cLmzLv1oXkMFCgDivtFNWCFhM9yTjrm5hnEi9szfZezsoUhDMLn3/O0Q oSZkLnOTWVYrpRRDY8hOi7oesNgQ2AMs+2HHJrKFfOm+1LEh1/khTBtKTM/IuQNmKo38 VPT/oSKKkd73OFc3GbV+DX6z1/W7VnCBI7yOiwHlPSprhPcvDSOwHdZzDh1+kDUhD59r NENA== X-Gm-Message-State: AOAM5310nmNxZgvJSIp2RyLs7M6mEaaadVueU6TAIDQX0NFycICGCius SPvP6vh7TyKRGURqS4Xci60AT8LD1O+fgi8B41vSJQdk3wd2fQ== X-Google-Smtp-Source: ABdhPJwEN3LTtsENsnAq+GTaLQMb5aow2K4QrUvyh+zE2aalvB1PR19eLip3BPz7tKf5pwCpkuWrPF48atLJwWQcNIU= X-Received: by 2002:a05:6830:225b:: with SMTP id t27mr11830775otd.73.1616772931633; Fri, 26 Mar 2021 08:35:31 -0700 (PDT) MIME-Version: 1.0 Date: Fri, 26 Mar 2021 16:35:21 +0100 Message-ID: Subject: testsuite/arm: Improve scan-assembler in pr96770.c To: gcc Patches X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Christophe Lyon via Gcc-patches From: Christophe Lyon Reply-To: Christophe Lyon Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi, I'm seeing random scan-assembler-times failures in pr96770.c when LTO is used. I suspect this is because the \\+4 string matches the LTO sections, sometimes. I propose this small patch to avoid the issue, by matching arr\\+4 instead. OK? 2021-03-26 Christophe Lyon gcc/testsuite/ * gcc.target/arm/pure-code/pr96770.c: Improve scan-assembler-times. -/* { dg-final { scan-assembler-times "\\+320" 1 { target { { ! arm_thumb1_movt_ok } && { ! arm_thumb2_ok } } } } } */ +/* { dg-final { scan-assembler-times "arr\\+320" 1 { target { { ! arm_thumb1_movt_ok } && { ! arm_thumb2_ok } } } } } */ /* For cortex-m with movt/movw (thumb-1/v8m.base or thumb-2), we generate a movt/movw pair with upper/lower:arr+320. */ -/* { dg-final { scan-assembler-times "\\+320" 2 { target { arm_thumb1_movt_ok || arm_thumb2_ok } } } } */ +/* { dg-final { scan-assembler-times "arr\\+320" 2 { target { arm_thumb1_movt_ok || arm_thumb2_ok } } } } */ diff --git a/gcc/testsuite/gcc.target/arm/pure-code/pr96770.c b/gcc/testsuite/gcc.target/arm/pure-code/pr96770.c index a43d71f..ae1bd10 100644 --- a/gcc/testsuite/gcc.target/arm/pure-code/pr96770.c +++ b/gcc/testsuite/gcc.target/arm/pure-code/pr96770.c @@ -5,17 +5,17 @@ int arr[1000]; int *f4 (void) { return &arr[1]; } /* For cortex-m0 (thumb-1/v6m), we generate 4 movs with upper/lower:#arr+4. */ -/* { dg-final { scan-assembler-times "\\+4" 4 { target { { ! arm_thumb1_movt_ok } && { ! arm_thumb2_ok } } } } } */ +/* { dg-final { scan-assembler-times "arr\\+4" 4 { target { { ! arm_thumb1_movt_ok } && { ! arm_thumb2_ok } } } } } */ /* For cortex-m with movt/movw (thumb-1/v8m.base or thumb-2), we generate a movt/movw pair with upper/lower:#arr+4. */ -/* { dg-final { scan-assembler-times "\\+4" 2 { target { arm_thumb1_movt_ok || arm_thumb2_ok } } } } */ +/* { dg-final { scan-assembler-times "arr\\+4" 2 { target { arm_thumb1_movt_ok || arm_thumb2_ok } } } } */ int *f5 (void) { return &arr[80]; } /* For cortex-m0 (thumb-1/v6m), we generate 1 ldr from rodata pointer to arr+320. */