From patchwork Mon Apr 20 07:47:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Lyon X-Patchwork-Id: 1273168 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=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org 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=WB1i0g+r; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 495JhT6Tcnz9sSg for ; Mon, 20 Apr 2020 17:47:50 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7D0D3384B439; Mon, 20 Apr 2020 07:47:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7D0D3384B439 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1587368864; bh=KheAP9mBTUAAOeVyRn0pSXkzOeAydXjWb4GRT9aTjoo=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=WB1i0g+r1m+qMmQUlTzmL1x5PRFxDaa/5UUAZEgFubhPiegivvzUijbrIR03ws/Wp 4i6ZmmdreDrL76JHf0bbT76QfCojX8kmFAGfHINWH5IlFKSjhz/np/6tPbmypnkf1B rvQrMCnynZahx1uQbR7YWpQtCVZKgEhzYW79hjZA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by sourceware.org (Postfix) with ESMTPS id BA9053858D31 for ; Mon, 20 Apr 2020 07:47:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BA9053858D31 Received: by mail-wr1-x431.google.com with SMTP id t14so10800286wrw.12 for ; Mon, 20 Apr 2020 00:47:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=KheAP9mBTUAAOeVyRn0pSXkzOeAydXjWb4GRT9aTjoo=; b=fhJt0e4zILqjOjwLEiaa1roiD7uinTx27KwuqNM2lUBO9+r/2ao6WYjtZqb0f3Ly9y QPb+2svVmE1ZnWZylmJ8iY6orAQxhvGp0ypeuu3nRsWgeh+d9HVKS1ZyYU/aH0TQBSPd ZJlQ38gh/1L6DQUn6+ZNuUIZTyTxL8nanqSC6180Nv+tCPf12c+aQX9mBUiF1vi0zH6t 7OS5XocAB727HBqtj2K+u1Wq9sZmviNetRQGar7FKI2ilPFBbkSOUHAZkXJvZwh1jGl1 +B+KC90dfBrXzSZchYtJvKamTo1U0QWnwtoxlEMIke+rO4bSbcaO1ErP9KichOrWZXoo fgAQ== X-Gm-Message-State: AGi0PuZ1jROiV0Fp8g8xRz8nuHUrlDYQvzj7g30R1aOIJSmd6CgRUQ3j 6kQILfdJN1BaqWV0NjubPu8wvmj5/jhdHcDK X-Google-Smtp-Source: APiQypJY4LoWWegDbz9AmnKVV0D5kmeINsPAXNjghAMscQGr5V1F59dnKj/hvRMBfkyY7iqGNuWW1Q== X-Received: by 2002:adf:ee05:: with SMTP id y5mr16677586wrn.176.1587368860234; Mon, 20 Apr 2020 00:47:40 -0700 (PDT) Received: from localhost.localdomain (static.42.136.251.148.clients.your-server.de. [148.251.136.42]) by smtp.gmail.com with ESMTPSA id w12sm58509wrk.56.2020.04.20.00.47.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Apr 2020 00:47:39 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH 1/2] testsuite: [arm/cde] Include arm_cde.h and arm_mve.h in arm_v8*m_main_cde* Date: Mon, 20 Apr 2020 07:47:38 +0000 Message-Id: <1587368859-5619-1-git-send-email-christophe.lyon@linaro.org> X-Mailer: git-send-email 2.7.4 X-Spam-Status: No, score=-24.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, 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" Since arm_cde.h includes stdint.h, its use requires the presence of the right gnu/stub-*.h, so make sure to include it when checking the arm_v8*m_main_cde* effective targets, otherwise we can decide CDE is supported while it's not really (all tests that use arm_v8m_main_cde* also include arm_cde.h aynway). Similarly for the effective targets that also require MVE. This makes several tests unsupported rather than fail. --- gcc/testsuite/lib/target-supports.exp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index d16498d..23a5abf 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -5140,21 +5140,25 @@ proc add_options_for_arm_v8_2a_bf16_neon { flags } { # /* { dg-add-options arm_v8m_main_cde } */ # The tests are valid for Arm. -foreach { armfunc armflag armdef } { +foreach { armfunc armflag armdef arminc } { arm_v8m_main_cde "-march=armv8-m.main+cdecp0+cdecp6 -mthumb" "defined (__ARM_FEATURE_CDE)" + "" arm_v8m_main_cde_fp "-march=armv8-m.main+fp+cdecp0+cdecp6 -mthumb -mfpu=auto" "defined (__ARM_FEATURE_CDE) && defined (__ARM_FP)" + "" arm_v8_1m_main_cde_mve "-march=armv8.1-m.main+mve+cdecp0+cdecp6 -mthumb -mfpu=auto" "defined (__ARM_FEATURE_CDE) && defined (__ARM_FEATURE_MVE)" + "#include " arm_v8_1m_main_cde_mve_fp "-march=armv8.1-m.main+mve.fp+cdecp0+cdecp6 -mthumb -mfpu=auto" "defined (__ARM_FEATURE_CDE) || __ARM_FEATURE_MVE == 3" + "#include " } { - eval [string map [list FUNC $armfunc FLAG $armflag DEF $armdef ] { + eval [string map [list FUNC $armfunc FLAG $armflag DEF $armdef INC $arminc ] { proc check_effective_target_FUNC_ok_nocache { } { global et_FUNC_flags set et_FUNC_flags "" @@ -5167,6 +5171,8 @@ foreach { armfunc armflag armdef } { #if !(DEF) #error "DEF failed" #endif + #include + INC } "FLAG"] } { set et_FUNC_flags "FLAG" return 1