From patchwork Thu Dec 29 03:51:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 37293 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2214748wrt; Wed, 28 Dec 2022 19:52:10 -0800 (PST) X-Google-Smtp-Source: AMrXdXsGcV/I4Z/MHeyHVyndrbP2inOFl+naMs7XsMe1iJqQG31+ekGLlYboaMGdAzHz44Hw5IqI X-Received: by 2002:a17:907:7f04:b0:7c1:36:9002 with SMTP id qf4-20020a1709077f0400b007c100369002mr28125546ejc.67.1672285930467; Wed, 28 Dec 2022 19:52:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672285930; cv=none; d=google.com; s=arc-20160816; b=uA1NN7YWXLxnSq4rfE8gMooT+qzz/H0nEbyNTncIylabz/+ZUkburejnPfnfFxm3uN jvbn+V+zfqAWAabILseUUKsE3RhVXWUNR0Yk0V4dfq5JywtivMEv/sqNg+/jneg5Wpcc PfS9xRl9+oZTfk+cIhzt7P0dslVAxB43GqTaGOwc86cQ7F3vUtT4YwV7DsjChXfEo4u4 RGx7EVwSlX7RPKNq3tyepMwofzB5TH0PdievEpN5R7f14Q65iWxMacIE7tw061g9hZTM 6r/v1m/8PaXupHeBuU9+pl48U0uBXboO8ekirNHrhDPfsFCLa55IVvovGPBCx8hHcI7H zdTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=VtbjLXGtgxZTTEC7mIcf7BrE7Amq3nz5vkVAbSZ3HJk=; b=RDNolHV8cVnuf098FOOJsmN13Jt6S0CZQeMmVZnqw1y4b1T0v3BpygEmGYWFcHs0t9 uDQZMvS/I3p8213RrFlB2djUO7ajbOYh0Z0dx5q87kLMxFu4u2VeuuzoKwxyHhsl6HRD 02TNBB2N9wud1ZFaLoHL9joAIxxV746u9dwjLfa4M/tcYvF7hKEDImUBSlUmnqVfBVd6 OHyO3fAyAy+XI6opixz/Ghm68SeD8Ns6TFNxO8SAyLCPNMtvcibtYzUsbZnAYHIZn3+r 2nePtr5yF3t/Wj48K6t8JCWpBnNLov+EDoH8E86eDcQnvW9M4nbilGOwSpM2Eqp+ev7p 6BZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=WY74h8aU; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id ne38-20020a1709077ba600b007ae09db5f4esi16107251ejc.657.2022.12.28.19.52.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Dec 2022 19:52:10 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.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=@sourceware.org header.s=default header.b=WY74h8aU; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 45DC43858C2F for ; Thu, 29 Dec 2022 03:52:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 45DC43858C2F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1672285929; bh=VtbjLXGtgxZTTEC7mIcf7BrE7Amq3nz5vkVAbSZ3HJk=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=WY74h8aU0XqJPWeMgR9Z0u4UukwrsHAVV82B2FW6ptg5Zx366REDTzsvhE5t/dt+W 8UxEM6nVl/3y53IRWJk7GMZhvXmDWIpsWxMoVz4RDgVUks9tgYyJSjufI1CGsZrQnb MmH+/4A1YK5bR0M8CRtXfwJYX48HXmp89gVpACRA= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-sender-0.a4lg.com (mail-sender.a4lg.com [153.120.152.154]) by sourceware.org (Postfix) with ESMTPS id C958F3858D20 for ; Thu, 29 Dec 2022 03:51:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C958F3858D20 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 65845300089; Thu, 29 Dec 2022 03:51:56 +0000 (UTC) To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt Cc: binutils@sourceware.org Subject: [PATCH] RISC-V: Make T-Head testing pattern more generic Date: Thu, 29 Dec 2022 03:51:44 +0000 Message-Id: Mime-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, KAM_LOTSOFHASH, SPF_HELO_NONE, SPF_PASS, 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: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tsukasa OI via Binutils From: Tsukasa OI Reply-To: Tsukasa OI Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753518891752471494?= X-GMAIL-MSGID: =?utf-8?q?1753518891752471494?= From: Tsukasa OI On some T-Head vendor extensions, we test against the constant 18446744073709551615 (2**64-1) to detect invalid immediate errors on -1. However, it heavily depends on the fact that the value used to print immediate value is a 64-bit unsigned type and this constant is not (and should not be) important (we just want to know that -1 is not valid). This commit replaces all such occurrences of 18446744073709551615 with a more generic regular expression. gas/ChangeLog: * testsuite/gas/riscv/x-thead-ba-fail.l: Replace 18446744073709551615 with generic regular expression. * testsuite/gas/riscv/x-thead-bb-fail.l: Likewise. * testsuite/gas/riscv/x-thead-bs-fail.l: Likewise. * testsuite/gas/riscv/x-thead-fmemidx-fail.l: Likewise. * testsuite/gas/riscv/x-thead-memidx-fail.l: Likewise. * testsuite/gas/riscv/x-thead-mempair-fail.l: Likewise. --- gas/testsuite/gas/riscv/x-thead-ba-fail.l | 2 +- gas/testsuite/gas/riscv/x-thead-bb-fail.l | 4 ++-- gas/testsuite/gas/riscv/x-thead-bs-fail.l | 2 +- gas/testsuite/gas/riscv/x-thead-fmemidx-fail.l | 16 ++++++++-------- gas/testsuite/gas/riscv/x-thead-memidx-fail.l | 6 +++--- gas/testsuite/gas/riscv/x-thead-mempair-fail.l | 10 +++++----- 6 files changed, 20 insertions(+), 20 deletions(-) base-commit: dc20b8f00abb74e2c26846c615ec5ba3a62f8677 diff --git a/gas/testsuite/gas/riscv/x-thead-ba-fail.l b/gas/testsuite/gas/riscv/x-thead-ba-fail.l index 4bb12e7f6423..bfafe4590e5f 100644 --- a/gas/testsuite/gas/riscv/x-thead-ba-fail.l +++ b/gas/testsuite/gas/riscv/x-thead-ba-fail.l @@ -1,3 +1,3 @@ .*: Assembler messages: -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(4\) diff --git a/gas/testsuite/gas/riscv/x-thead-bb-fail.l b/gas/testsuite/gas/riscv/x-thead-bb-fail.l index dd4a0df664eb..cde1c22ad253 100644 --- a/gas/testsuite/gas/riscv/x-thead-bb-fail.l +++ b/gas/testsuite/gas/riscv/x-thead-bb-fail.l @@ -1,7 +1,7 @@ .*: Assembler messages: -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(64\) -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(32\) .*: Error: illegal operands `th.ext a0,64,62' .*: Error: illegal operands `th.extu a0,-1,0' diff --git a/gas/testsuite/gas/riscv/x-thead-bs-fail.l b/gas/testsuite/gas/riscv/x-thead-bs-fail.l index c8a7ff4e7f14..200218480c84 100644 --- a/gas/testsuite/gas/riscv/x-thead-bs-fail.l +++ b/gas/testsuite/gas/riscv/x-thead-bs-fail.l @@ -1,3 +1,3 @@ .*: Assembler messages: -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(64\) diff --git a/gas/testsuite/gas/riscv/x-thead-fmemidx-fail.l b/gas/testsuite/gas/riscv/x-thead-fmemidx-fail.l index 33cddac856e5..4d40f66f3998 100644 --- a/gas/testsuite/gas/riscv/x-thead-fmemidx-fail.l +++ b/gas/testsuite/gas/riscv/x-thead-fmemidx-fail.l @@ -1,19 +1,19 @@ .*: Assembler messages: .*: Error: illegal operands `th.flrd a0,a1,a2,0' -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(4\) -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(4\) -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(4\) -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(4\) -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(4\) -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(4\) -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(4\) -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(4\) diff --git a/gas/testsuite/gas/riscv/x-thead-memidx-fail.l b/gas/testsuite/gas/riscv/x-thead-memidx-fail.l index c6bd25c0268c..44ca58bbf2cd 100644 --- a/gas/testsuite/gas/riscv/x-thead-memidx-fail.l +++ b/gas/testsuite/gas/riscv/x-thead-memidx-fail.l @@ -1,14 +1,14 @@ .*: Assembler messages: .*: Error: improper immediate value \(-17\) -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(16\) .*: Error: improper immediate value \(4\) .*: Error: illegal operands `th.ldia a0,\(a0\),0,0' .*: Error: illegal operands `th.ldib a0,\(a0\),0,0' -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(4\) -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(4\) diff --git a/gas/testsuite/gas/riscv/x-thead-mempair-fail.l b/gas/testsuite/gas/riscv/x-thead-mempair-fail.l index 32d98f475017..be3965559047 100644 --- a/gas/testsuite/gas/riscv/x-thead-mempair-fail.l +++ b/gas/testsuite/gas/riscv/x-thead-mempair-fail.l @@ -5,23 +5,23 @@ .*: Error: illegal operands `th.sdd a0,a1,\(a2\),3' .*: Error: illegal operands `th.swd a0,a1,\(a2\),0' -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(4\) .*: Error: unexpected literal \(3\) -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(4\) .*: Error: unexpected literal \(4\) -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(4\) .*: Error: unexpected literal \(4\) -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(4\) .*: Error: unexpected literal \(3\) -.*: Error: improper immediate value \(18446744073709551615\) +.*: Error: improper immediate value \(-?\d+\) .*: Error: improper immediate value \(4\) .*: Error: unexpected literal \(4\)