From patchwork Mon Oct 30 16:28:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Frager X-Patchwork-Id: 739264 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1211987wrt; Mon, 30 Oct 2023 09:28:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH8G4uwFTeUQkXDBIqVYraFiq22rUXus7EL6Wo8mv7SoutOjjmO1G8960v71XmPpyQ0WbL5 X-Received: by 2002:a05:6214:5289:b0:66d:2090:d22 with SMTP id kj9-20020a056214528900b0066d20900d22mr12870732qvb.35.1698683316322; Mon, 30 Oct 2023 09:28:36 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1698683316; cv=pass; d=google.com; s=arc-20160816; b=XWHuaPVu85doCJ6ieGsOMgk5XjhfchVxnm8FM4XMZhjnid4Zu9shsTH2swsuJyRS7U cSG2V547Xv7zCdoEm5eaz3B35SjSqELGD7ICyiV6UjTp7cF73FCT6PKY1NUTybE5F0Tj DbBCYeGF4nTewifHpJfOYrVTz1OKbg3IQCDaKfVAkirP6KriN5nL6MgBLGimJCGDuVwq MhNZD7/zKbFXFB3LyS5sPFMdBzF3uQeNIxUQKegLL0fPfF9BXRQwyq9H0ySlke1PO6KL I140GdHMeApSvR7GlVktJJgsYy+y63DhDrV8keklMk0jiWwE0l0bNhNbzmpw6uPVOwAp m4dA== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=yk+/3FzmG96RM5l325bY9W1nPOSUGQlPanwmvXxQ9A8=; fh=yRADZcmw/G6ekBwW/4lHPdEw06SO4uLMmcVaZMeeVeM=; b=hX8PM0ND88YTbehELoq3A7za8y7N6u1o6RoYQXkSKSgzst8+GxaEAMnIaFeWxZFsHq 8ZhnACG/gKBMy/a6nobI3buWdkgzpVmIhthexnbZ/K3RYne33GLdMZTrfHEnBgLprCaB tUQqIHoFKAHUT58llvFCgLIaTq1jv8tuelQeM45YSHLLGCzpvFpwY0yC4TBrlrDMRIIU o07V05VQOwb191VLh/KeoSbruHbTKeb4tdAzKqeZS+czwr2zPFfaNJCX/o/tHPYuYQ8f 9Je0GWCXnUwWQD1QX2RM4uNNMIFBqqSiUq6szTpZpXvudFen05A+WyfuYeSFr90QnjDF lxgg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=UqnPR+xA; arc=pass (i=2); spf=pass (google.com: domain of gcc-patches-bounces+patch=linaro.org@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+patch=linaro.org@gcc.gnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Return-Path: Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id w5-20020a0cf705000000b0066d17e5f449si5899157qvn.17.2023.10.30.09.28.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 09:28:36 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+patch=linaro.org@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=UqnPR+xA; arc=pass (i=2); spf=pass (google.com: domain of gcc-patches-bounces+patch=linaro.org@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+patch=linaro.org@gcc.gnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9B5483857C40 for ; Mon, 30 Oct 2023 16:28:35 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2042.outbound.protection.outlook.com [40.107.237.42]) by sourceware.org (Postfix) with ESMTPS id 836DF3858281 for ; Mon, 30 Oct 2023 16:28:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 836DF3858281 Authentication-Results: sourceware.org; dmarc=fail (p=quarantine dis=none) header.from=amd.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=amd.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 836DF3858281 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.237.42 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1698683308; cv=pass; b=YsI1fy90C4QxPM9Xa7C8eYcGYegbx0hVidrW+47OFZoVeRZwt4XFPzruQvI/pAnDQE8LV2al6JvTt0P9o2mp/EcoYTgAL3w1TLQpp/AO2tC+U+n8Y1UE6OL9hpu3K3X9lc8vS8R3KaqwxnRpmtjNY+t83pLGh5xVVEKHugFqXCc= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1698683308; c=relaxed/simple; bh=DPgvYVp4yM7IoaWezefg65nvFWSsFra8XqknwdV1HQw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=pQmuh0Sk1Rh5lUnvBLVefRrYK04+YcmmaK4dU139BvwT3k4g2DtFWKKWgnt8pw1NZUQVoZ3hfnSXK/5/eHVjeodO+lKHDhpLpWafTXAbL0ue5IhVBaNJKAyOfcLHfMFveMNme7peny+RWFqSQFP+n84WOtn5jp4Jruo91FLZSG8= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ITNQyCCqAiSi8k1iPXoLngK2LVjzSqICctAZ+JoZ4X0faw1wWPTT2gefYtRo4qGmSO06Zc3SeVYvcnM0NZBZRFILWfmmgOgMhV9jvLh24TrHv5tH+bnRHig+VtD1qCCckMb1rSuWYbmj6l3ByUj79iIdHAKV1+DeMYYzOUOe6p7b2/vNqLk1H0myF7BFEJjW5FGYYbTcNO5lRjf4jB71ozVa5XnZKp20MYvANJf03Ohvv4hsU8kqEMFbhvnkVaC1KXi/7vvUz5aY2WPIvREyhw/0dXAVlGinf/+jGuk1uoRyaNmFrjnBBoVxRNgBOnXJffP6hwNBv8pKjTz4Ro0QcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=yk+/3FzmG96RM5l325bY9W1nPOSUGQlPanwmvXxQ9A8=; b=XZ4fji4ia11/MQNHuOm5goG7jLirrhf5EJLCCe8XzCQn7BoQO+FEVjxmACSTO9iRbflWg/mnYGw9q7aiVo+O7agtc5TUveCVzDsNVhbqircOfDzDeDTYnrnjYM/b5PSlWZINsyFtBv9yCHaJd9KjjMLEzJJX3uUjt3mSH88gkfE+rLvvlOD0jFw3Ew7T1+Q1VYXR3HbQW2i/LEXTcRyTUXld4K8y2ZC2Y62bI/TPi6yejbwssfRD4TeLxxI7NseLO/HpAz5lkKZ5AdDkc0yRM4k7J89ktx5AZ7xSHjaVxjaFphtGtz7RG3XrJqeIwRcxCnz+Z0dgBHMQsBsOmKXpgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gcc.gnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yk+/3FzmG96RM5l325bY9W1nPOSUGQlPanwmvXxQ9A8=; b=UqnPR+xAJQMSLJwvpU/laT/9VE1fOZaZEfqNs837d0L/vP4pB6riQycBfjS8BW+1QsRi1EHPExoZYuhvVf5LsiUmrV4wtiNiNhLxGWwdEWxlUXPX3h9dLSM/lSHkSG1wBfYG7LgDtvuvFhGkztJ84/M3b42iZtbyb7Ixq7NVNOE= Received: from BYAPR03CA0023.namprd03.prod.outlook.com (2603:10b6:a02:a8::36) by PH0PR12MB8050.namprd12.prod.outlook.com (2603:10b6:510:26e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.26; Mon, 30 Oct 2023 16:28:23 +0000 Received: from MWH0EPF000971E4.namprd02.prod.outlook.com (2603:10b6:a02:a8:cafe::cf) by BYAPR03CA0023.outlook.office365.com (2603:10b6:a02:a8::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.26 via Frontend Transport; Mon, 30 Oct 2023 16:28:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by MWH0EPF000971E4.mail.protection.outlook.com (10.167.243.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6933.15 via Frontend Transport; Mon, 30 Oct 2023 16:28:23 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Mon, 30 Oct 2023 11:28:22 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Mon, 30 Oct 2023 09:28:21 -0700 Received: from xirengwts09.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.32 via Frontend Transport; Mon, 30 Oct 2023 11:28:20 -0500 From: Neal Frager To: , , CC: , , , , , , , Neal Frager Subject: [PATCH v6 1/1] gcc: config: microblaze: fix cpu version check Date: Mon, 30 Oct 2023 16:28:18 +0000 Message-ID: <20231030162818.288359-1-neal.frager@amd.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000971E4:EE_|PH0PR12MB8050:EE_ X-MS-Office365-Filtering-Correlation-Id: f2fcc7e2-3544-45d9-e9a3-08dbd9653c82 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: K5MqAJEEFw0lAK9yZ+/yXTWu09lJ5gjaPPN3NZnzAyIFp7G85iw60SCOJ7J4kmzaa5hLHfUtrz74ErS0veHYESB9avjYSlj84EccnvMnkwqirqPQFCniLlYizxilwBQFzzBK/FCAb5w0Mp4wY1tlemn9RLn4xd2gVvYn6Glqd2XXbUreix3Vfw5NxDqnXtGhz4xl5ASYFmvaJIXmE5/7bcw44WPZtyyRAbBceoTus2pap3BT7AhVqgE+8Z4fPwXT9GpHCIhqKxiCGBDY9AYv9A9Rf4iLnRI95EykM5t0+K6ob+r1BH0S6E09BUKK7R7AX26IqWxf9VmvV195oOUJ8ytO5yHj73CSUf0HWV36Q+Za3AQUvixYmFeUuIkEtecC+M+v13xfNz7RJ971Fe+P8T33pmZbQOMz19J1q1ZC7KKVGMkxlsnf7IGe8LxkAmiQWK80fzQF1aIlzOgrPgrNPL00pfzOFX6WL55SxCOMuPwir6zuAO97+Nh+NbP6AMz4JjD9q8NtU3Mlh4paRNdGQKVNZqcS2LGDRwLQwimR1+g9ASSJFs8pqTx0++IWznQ5FSEAjynRUD4BWyPAqKWS+TCUrQGPzCNzqOpfRV+yBDoThIKne/RA+wLsFLe5NN+EeI1aEkBNuzXdHDxd+3rYDrS+ljoRXFcIPe+nAXwX9EIY7sgHdq0cSTwgEMZsiQmGT8ChSjZJDGa7jCiI77RxHFBR6b05iOmdu5E2UENaIjQXFfZr0I6gqZ17KlOr35gfv/2Xf+fubNtqe36i/WL6K69hQ8cA0rxWgA6N2MvjOTY= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(39860400002)(396003)(376002)(346002)(136003)(230922051799003)(186009)(82310400011)(64100799003)(1800799009)(451199024)(40470700004)(46966006)(36840700001)(30864003)(316002)(54906003)(4001150100001)(36860700001)(70206006)(70586007)(2906002)(110136005)(478600001)(86362001)(40460700003)(40480700001)(36756003)(4326008)(82740400003)(41300700001)(44832011)(8676002)(8936002)(5660300002)(84970400001)(47076005)(2616005)(83380400001)(1076003)(336012)(426003)(26005)(356005)(81166007)(36900700001)(2101003); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2023 16:28:23.1631 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f2fcc7e2-3544-45d9-e9a3-08dbd9653c82 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000971E4.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB8050 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FORGED_SPF_HELO, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patch=linaro.org@gcc.gnu.org The MICROBLAZE_VERSION_COMPARE was incorrectly using strcasecmp instead of strverscmp to check the mcpu version against feature options. By simply changing the define to use strverscmp, the new version 10.0 is treated correctly as a higher version than previous versions. Signed-off-by: Neal Frager --- V1->V2: - No need to create a new microblaze specific version check routine as strverscmp is the correct solution. V2->V3: - Changed mcpu define for microblaze isa testsuite examples. V3->V4: - Added ChangeLog V4->V5: - Added testsuite ChangeLog V5->V6: - Updated testsuite ChangeLog to include all files --- gcc/ChangeLog | 4 ++++ gcc/config/microblaze/microblaze.cc | 2 +- gcc/testsuite/ChangeLog | 22 +++++++++++++++++++ .../gcc.target/microblaze/isa/bshift.c | 2 +- gcc/testsuite/gcc.target/microblaze/isa/div.c | 2 +- .../gcc.target/microblaze/isa/fcmp1.c | 2 +- .../gcc.target/microblaze/isa/fcmp2.c | 2 +- .../gcc.target/microblaze/isa/fcmp3.c | 2 +- .../gcc.target/microblaze/isa/fcmp4.c | 2 +- .../gcc.target/microblaze/isa/fcvt.c | 2 +- .../gcc.target/microblaze/isa/float.c | 2 +- .../gcc.target/microblaze/isa/fsqrt.c | 2 +- .../microblaze/isa/mul-bshift-pcmp.c | 2 +- .../gcc.target/microblaze/isa/mul-bshift.c | 2 +- gcc/testsuite/gcc.target/microblaze/isa/mul.c | 2 +- .../microblaze/isa/mulh-bshift-pcmp.c | 2 +- .../gcc.target/microblaze/isa/mulh.c | 2 +- .../gcc.target/microblaze/isa/nofcmp.c | 2 +- .../gcc.target/microblaze/isa/nofloat.c | 2 +- .../gcc.target/microblaze/isa/pcmp.c | 2 +- .../gcc.target/microblaze/isa/vanilla.c | 2 +- .../gcc.target/microblaze/microblaze.exp | 2 +- 22 files changed, 46 insertions(+), 20 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4964796c6a6..7f63f39d4cd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2023-10-30 Neal Frager + + * config/microblaze/microblaze.cc: Fix mcpu version check. + 2023-10-29 Martin Uecker PR tree-optimization/109334 diff --git a/gcc/config/microblaze/microblaze.cc b/gcc/config/microblaze/microblaze.cc index c9f6c4198cf..60ad55120d2 100644 --- a/gcc/config/microblaze/microblaze.cc +++ b/gcc/config/microblaze/microblaze.cc @@ -56,7 +56,7 @@ /* This file should be included last. */ #include "target-def.h" -#define MICROBLAZE_VERSION_COMPARE(VA,VB) strcasecmp (VA, VB) +#define MICROBLAZE_VERSION_COMPARE(VA,VB) strverscmp (VA, VB) /* Classifies an address. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5c18129b4ac..9be4942b61d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,25 @@ +2023-10-30 Neal Frager + + * gcc.target/microblaze/isa/bshift.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/isa/div.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/isa/fcmp1.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/isa/fcmp2.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/isa/fcmp3.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/isa/fcmp4.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/isa/fcvt.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/isa/float.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/isa/fsqrt.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/isa/mul-bshift-pcmp.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/isa/mul-bshift.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/isa/mul.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/isa/mulh-bshift-pcmp.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/isa/mulh.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/isa/nofcmp.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/isa/nofloat.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/isa/pcmp.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/isa/vanilla.c: Bump to mcpu=v10.0. + * gcc.target/microblaze/microblaze.exp: Bump to mcpu=v10.0. + 2023-10-29 Iain Buclaw PR d/110712 diff --git a/gcc/testsuite/gcc.target/microblaze/isa/bshift.c b/gcc/testsuite/gcc.target/microblaze/isa/bshift.c index 64cf1e2e59e..664586bff9f 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/bshift.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/bshift.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a -mxl-barrel-shift" } */ +/* { dg-options "-O3 -mcpu=v10.0 -mxl-barrel-shift" } */ volatile int m1, m2, m3; volatile unsigned int u1, u2, u3; diff --git a/gcc/testsuite/gcc.target/microblaze/isa/div.c b/gcc/testsuite/gcc.target/microblaze/isa/div.c index 25ee42ce5c8..783e7c0f684 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/div.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/div.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a -mno-xl-soft-div" } */ +/* { dg-options "-O3 -mcpu=v10.0 -mno-xl-soft-div" } */ volatile int m1, m2, m3; volatile long l1, l2; diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fcmp1.c b/gcc/testsuite/gcc.target/microblaze/isa/fcmp1.c index 4041a241391..b6202e168d6 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/fcmp1.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/fcmp1.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float" } */ +/* { dg-options "-O3 -mcpu=v10.0 -mhard-float" } */ volatile float f1, f2, f3; diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fcmp2.c b/gcc/testsuite/gcc.target/microblaze/isa/fcmp2.c index 3902b839db9..4386c6e6cc3 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/fcmp2.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/fcmp2.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float" } */ +/* { dg-options "-O3 -mcpu=v10.0 -mhard-float" } */ volatile float f1, f2, f3; diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fcmp3.c b/gcc/testsuite/gcc.target/microblaze/isa/fcmp3.c index 8555974dda5..b414e48fe1b 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/fcmp3.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/fcmp3.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float" } */ +/* { dg-options "-O3 -mcpu=v10.0 -mhard-float" } */ volatile float f1, f2, f3; diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fcmp4.c b/gcc/testsuite/gcc.target/microblaze/isa/fcmp4.c index 79cc5f9dd8e..ff137012df4 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/fcmp4.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/fcmp4.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float" } */ +/* { dg-options "-O3 -mcpu=v10.0 -mhard-float" } */ void float_func(float f1, float f2, float f3) { diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fcvt.c b/gcc/testsuite/gcc.target/microblaze/isa/fcvt.c index ee057c1b6ac..90fd45bd3b3 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/fcvt.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/fcvt.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float -mxl-float-convert" } */ +/* { dg-options "-O3 -mcpu=v10.0 -mhard-float -mxl-float-convert" } */ int float_func (float f) { diff --git a/gcc/testsuite/gcc.target/microblaze/isa/float.c b/gcc/testsuite/gcc.target/microblaze/isa/float.c index f5ef3186cdd..212435d6435 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/float.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/float.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float" } */ +/* { dg-options "-O3 -mcpu=v10.0 -mhard-float" } */ volatile float f1, f2, f3; diff --git a/gcc/testsuite/gcc.target/microblaze/isa/fsqrt.c b/gcc/testsuite/gcc.target/microblaze/isa/fsqrt.c index 4c2466e4a55..834767d7a40 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/fsqrt.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/fsqrt.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a -mhard-float -mxl-float-sqrt" } */ +/* { dg-options "-O3 -mcpu=v10.0 -mhard-float -mxl-float-sqrt" } */ #include float sqrt_func (float f) diff --git a/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift-pcmp.c b/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift-pcmp.c index ce186314e6a..2720ad38f57 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift-pcmp.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift-pcmp.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a -mxl-barrel-shift -mno-xl-soft-mul -mxl-pattern-compare" } */ +/* { dg-options "-O3 -mcpu=v10.0 -mxl-barrel-shift -mno-xl-soft-mul -mxl-pattern-compare" } */ volatile int m1, m2, m3; volatile unsigned int u1, u2, u3; diff --git a/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift.c b/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift.c index 76d174ec7c3..59a17c79bbe 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/mul-bshift.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a -mxl-barrel-shift -mno-xl-soft-mul" } */ +/* { dg-options "-O3 -mcpu=v10.0 -mxl-barrel-shift -mno-xl-soft-mul" } */ volatile int m1, m2, m3; volatile unsigned int u1, u2, u3; diff --git a/gcc/testsuite/gcc.target/microblaze/isa/mul.c b/gcc/testsuite/gcc.target/microblaze/isa/mul.c index d2a6bec61e2..e4e330a0d0c 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/mul.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/mul.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a -mno-xl-soft-mul" } */ +/* { dg-options "-O3 -mcpu=v10.0 -mno-xl-soft-mul" } */ volatile int m1, m2, m3; volatile long l1, l2; diff --git a/gcc/testsuite/gcc.target/microblaze/isa/mulh-bshift-pcmp.c b/gcc/testsuite/gcc.target/microblaze/isa/mulh-bshift-pcmp.c index a15983af117..0f962030fdd 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/mulh-bshift-pcmp.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/mulh-bshift-pcmp.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a -mxl-barrel-shift -mno-xl-soft-mul -mxl-pattern-compare -mxl-multiply-high" } */ +/* { dg-options "-O3 -mcpu=v10.0 -mxl-barrel-shift -mno-xl-soft-mul -mxl-pattern-compare -mxl-multiply-high" } */ volatile int m1, m2, m3; volatile unsigned int u1, u2, u3; diff --git a/gcc/testsuite/gcc.target/microblaze/isa/mulh.c b/gcc/testsuite/gcc.target/microblaze/isa/mulh.c index 6e0cc3ac470..da28e8c4d1e 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/mulh.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/mulh.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a -mno-xl-soft-mul -mxl-multiply-high" } */ +/* { dg-options "-O3 -mcpu=v10.0 -mno-xl-soft-mul -mxl-multiply-high" } */ volatile int m1, m2, m3; volatile unsigned int u1, u2, u3; diff --git a/gcc/testsuite/gcc.target/microblaze/isa/nofcmp.c b/gcc/testsuite/gcc.target/microblaze/isa/nofcmp.c index ebfb170ecee..86910fc347a 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/nofcmp.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/nofcmp.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a " } */ +/* { dg-options "-O3 -mcpu=v10.0" } */ volatile float f1, f2, f3; diff --git a/gcc/testsuite/gcc.target/microblaze/isa/nofloat.c b/gcc/testsuite/gcc.target/microblaze/isa/nofloat.c index 647da3cfe24..b1f0268715d 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/nofloat.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/nofloat.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a -msoft-float" } */ +/* { dg-options "-O3 -mcpu=v10.0 -msoft-float" } */ volatile float f1, f2, f3; diff --git a/gcc/testsuite/gcc.target/microblaze/isa/pcmp.c b/gcc/testsuite/gcc.target/microblaze/isa/pcmp.c index aea79572103..d9e5793f6f5 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/pcmp.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/pcmp.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a -mxl-pattern-compare" } */ +/* { dg-options "-O3 -mcpu=v10.0 -mxl-pattern-compare" } */ volatile int m1, m2, m3; volatile long l1, l2; diff --git a/gcc/testsuite/gcc.target/microblaze/isa/vanilla.c b/gcc/testsuite/gcc.target/microblaze/isa/vanilla.c index 1d6ba807b12..35824b6d077 100644 --- a/gcc/testsuite/gcc.target/microblaze/isa/vanilla.c +++ b/gcc/testsuite/gcc.target/microblaze/isa/vanilla.c @@ -1,4 +1,4 @@ -/* { dg-options "-O3 -mcpu=v6.00.a -mcpu=v6.00.a" } */ +/* { dg-options "-O3 -mcpu=v10.0" } */ volatile int m1, m2, m3; volatile long l1, l2; diff --git a/gcc/testsuite/gcc.target/microblaze/microblaze.exp b/gcc/testsuite/gcc.target/microblaze/microblaze.exp index 1c7b0e23353..33979ae5e42 100644 --- a/gcc/testsuite/gcc.target/microblaze/microblaze.exp +++ b/gcc/testsuite/gcc.target/microblaze/microblaze.exp @@ -49,7 +49,7 @@ dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/isa/*.\[cSi\]]] \ ${default_c_flags} "" gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/others/*.\[cSi\]]] \ - "" "-mcpu=v6.00.a" + "" "-mcpu=v10.0" # All done.