From patchwork Mon Jun 3 03:09:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Pan2" X-Patchwork-Id: 1942642 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=BmfnftZC; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VszQD1tc0z20PW for ; Mon, 3 Jun 2024 13:16:04 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 889653952514 for ; Mon, 3 Jun 2024 03:16:02 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by sourceware.org (Postfix) with ESMTPS id 7ADA5394882B for ; Mon, 3 Jun 2024 03:10:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7ADA5394882B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7ADA5394882B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=198.175.65.16 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717384212; cv=none; b=Fs7YQ3uIzbTXYoMO8xRup6Tjq6K3BEea2V35qwnJD/JqnAudiJr02ZUUYQc2Dn9dIthrvHjom1HIhqEJoG3OPBYbxhXMYC0h7Y0lYyKKCpquEo4HhUDkLz+BWl7tyUAzldCNsI1SwpKB3m4KwSrFAof/J+9DvwhSo+aSsXiiHMI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717384212; c=relaxed/simple; bh=o69l66sSjylMQVC7Qe+Z9DHuJdYLlKgrGHqghK14mhs=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=u/2S/ZUjWmMogOBdgCG4ZkFOIajWAk/C6RattQajHwOBJf74WdznGChG4p1lnNQk3b4TTDMQ4kTRU3E1oZu1yRvrBtRuCdbTA5FlsMx4rGoCNoMTbbhKM+8ERQtQH2YwyZgbPJ33dH6fqThVA9Lx4NqhHKr9MwSHkBW6JqGpTDQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717384207; x=1748920207; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=o69l66sSjylMQVC7Qe+Z9DHuJdYLlKgrGHqghK14mhs=; b=BmfnftZCCMyl3ibCQcMH2jBipHwm+l4tIWcUCf//WtLG+2VhYlgzDafr VXTaX9+KVh4/mOBylShyp2mwF+VfEZcPf7lHZxtu8zKueeJU15KEHiGqV IDI2yVTQnJ6wnoalUW9OEoJwlpxRD3jbyIbSG317KB5BdWg/ql14pufmT khyeA3ZnDSj295SbgKthzQrPuK6TdBKJGVu/hDB2TnT1/3ZWiijv41GGr X3t8brDWe6BjnKJxMaNaJ0yQoY2mg3PypQ2ceIDT5gdJDhPw/WdF5yBGX 9ujVKOkYVBTkDuz2sRxn0RFj6cG60XGCRa+CTMWeewllYoq9r2dwhI5UZ A==; X-CSE-ConnectionGUID: Hl1X8EPARc+o/fkXs9Xs9Q== X-CSE-MsgGUID: vBKj/gKQRsOiAx89xNJmYg== X-IronPort-AV: E=McAfee;i="6600,9927,11091"; a="13984711" X-IronPort-AV: E=Sophos;i="6.08,210,1712646000"; d="scan'208";a="13984711" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jun 2024 20:10:05 -0700 X-CSE-ConnectionGUID: 8kSNGpLwREiC7E82yNAjYA== X-CSE-MsgGUID: IAKD1SNJSXiozmMCQL2NBg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,210,1712646000"; d="scan'208";a="41184420" Received: from shvmail03.sh.intel.com ([10.239.245.20]) by fmviesa005.fm.intel.com with ESMTP; 02 Jun 2024 20:10:03 -0700 Received: from pli-ubuntu.sh.intel.com (pli-ubuntu.sh.intel.com [10.239.159.47]) by shvmail03.sh.intel.com (Postfix) with ESMTP id E28FC10077E0; Mon, 3 Jun 2024 11:10:01 +0800 (CST) From: pan2.li@intel.com To: gcc-patches@gcc.gnu.org Cc: juzhe.zhong@rivai.ai, kito.cheng@gmail.com, Pan Li Subject: [PATCH v1 4/5] RISC-V: Add testcases for scalar unsigned SAT_ADD form 4 Date: Mon, 3 Jun 2024 11:09:52 +0800 Message-Id: <20240603030953.3333366-4-pan2.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240603030953.3333366-1-pan2.li@intel.com> References: <20240603030953.3333366-1-pan2.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_LOTSOFHASH, KAM_NUMSUBJECT, KAM_SHORT, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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+incoming=patchwork.ozlabs.org@gcc.gnu.org From: Pan Li After the middle-end support the form 4 of unsigned SAT_ADD and the RISC-V backend implement the scalar .SAT_ADD, add more test case to cover the form 4 of unsigned .SAT_ADD. Form 4: #define SAT_ADD_U_4(T) \ T sat_add_u_4_##T (T x, T y) \ { \ T ret; \ return __builtin_add_overflow (x, y, &ret) == 0 ? ret : -1; \ } Passed the rv64gcv fully regression test. gcc/testsuite/ChangeLog: * gcc.target/riscv/sat_arith.h: Add test macro for form 4. * gcc.target/riscv/sat_u_add-17.c: New test. * gcc.target/riscv/sat_u_add-18.c: New test. * gcc.target/riscv/sat_u_add-19.c: New test. * gcc.target/riscv/sat_u_add-20.c: New test. * gcc.target/riscv/sat_u_add-run-17.c: New test. * gcc.target/riscv/sat_u_add-run-18.c: New test. * gcc.target/riscv/sat_u_add-run-19.c: New test. * gcc.target/riscv/sat_u_add-run-20.c: New test. Signed-off-by: Pan Li Signed-off-by: Pan Li --- gcc/testsuite/gcc.target/riscv/sat_arith.h | 8 ++++++ gcc/testsuite/gcc.target/riscv/sat_u_add-17.c | 19 ++++++++++++++ gcc/testsuite/gcc.target/riscv/sat_u_add-18.c | 21 ++++++++++++++++ gcc/testsuite/gcc.target/riscv/sat_u_add-19.c | 18 +++++++++++++ gcc/testsuite/gcc.target/riscv/sat_u_add-20.c | 17 +++++++++++++ .../gcc.target/riscv/sat_u_add-run-17.c | 25 +++++++++++++++++++ .../gcc.target/riscv/sat_u_add-run-18.c | 25 +++++++++++++++++++ .../gcc.target/riscv/sat_u_add-run-19.c | 25 +++++++++++++++++++ .../gcc.target/riscv/sat_u_add-run-20.c | 25 +++++++++++++++++++ 9 files changed, 183 insertions(+) create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_add-17.c create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_add-18.c create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_add-19.c create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_add-20.c create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_add-run-17.c create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_add-run-18.c create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_add-run-19.c create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_add-run-20.c diff --git a/gcc/testsuite/gcc.target/riscv/sat_arith.h b/gcc/testsuite/gcc.target/riscv/sat_arith.h index adb8be5886e..6ca158d57c4 100644 --- a/gcc/testsuite/gcc.target/riscv/sat_arith.h +++ b/gcc/testsuite/gcc.target/riscv/sat_arith.h @@ -34,6 +34,13 @@ sat_u_add_##T##_fmt_4 (T x, T y) \ return __builtin_add_overflow (x, y, &ret) ? -1 : ret; \ } +#define DEF_SAT_U_ADD_FMT_5(T) \ +T __attribute__((noinline)) \ +sat_u_add_##T##_fmt_5 (T x, T y) \ +{ \ + T ret; \ + return __builtin_add_overflow (x, y, &ret) == 0 ? ret : -1; \ +} #define DEF_VEC_SAT_U_ADD_FMT_1(T) \ void __attribute__((noinline)) \ @@ -52,6 +59,7 @@ vec_sat_u_add_##T##_fmt_1 (T *out, T *op_1, T *op_2, unsigned limit) \ #define RUN_SAT_U_ADD_FMT_2(T, x, y) sat_u_add_##T##_fmt_2(x, y) #define RUN_SAT_U_ADD_FMT_3(T, x, y) sat_u_add_##T##_fmt_3(x, y) #define RUN_SAT_U_ADD_FMT_4(T, x, y) sat_u_add_##T##_fmt_4(x, y) +#define RUN_SAT_U_ADD_FMT_5(T, x, y) sat_u_add_##T##_fmt_5(x, y) #define RUN_VEC_SAT_U_ADD_FMT_1(T, out, op_1, op_2, N) \ vec_sat_u_add_##T##_fmt_1(out, op_1, op_2, N) diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_add-17.c b/gcc/testsuite/gcc.target/riscv/sat_u_add-17.c new file mode 100644 index 00000000000..7085ac835f7 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/sat_u_add-17.c @@ -0,0 +1,19 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */ +/* { dg-final { check-function-bodies "**" "" } } */ + +#include "sat_arith.h" + +/* +** sat_u_add_uint8_t_fmt_5: +** add\s+[atx][0-9]+,\s*a0,\s*a1 +** andi\s+[atx][0-9]+,\s*[atx][0-9]+,\s*0xff +** sltu\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+ +** neg\s+[atx][0-9]+,\s*[atx][0-9]+ +** or\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+ +** andi\s+a0,\s*a0,\s*0xff +** ret +*/ +DEF_SAT_U_ADD_FMT_5(uint8_t) + +/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_add-18.c b/gcc/testsuite/gcc.target/riscv/sat_u_add-18.c new file mode 100644 index 00000000000..355ff8ba4ef --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/sat_u_add-18.c @@ -0,0 +1,21 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */ +/* { dg-final { check-function-bodies "**" "" } } */ + +#include "sat_arith.h" + +/* +** sat_u_add_uint16_t_fmt_5: +** add\s+[atx][0-9]+,\s*a0,\s*a1 +** slli\s+[atx][0-9]+,\s*[atx][0-9]+,\s*48 +** srli\s+[atx][0-9]+,\s*[atx][0-9]+,\s*48 +** sltu\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+ +** neg\s+[atx][0-9]+,\s*[atx][0-9]+ +** or\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+ +** slli\s+a0,\s*a0,\s*48 +** srli\s+a0,\s*a0,\s*48 +** ret +*/ +DEF_SAT_U_ADD_FMT_5(uint16_t) + +/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_add-19.c b/gcc/testsuite/gcc.target/riscv/sat_u_add-19.c new file mode 100644 index 00000000000..491909165dc --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/sat_u_add-19.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */ +/* { dg-final { check-function-bodies "**" "" } } */ + +#include "sat_arith.h" + +/* +** sat_u_add_uint32_t_fmt_5: +** addw\s+[atx][0-9]+,\s*a0,\s*a1 +** sltu\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+ +** neg\s+[atx][0-9]+,\s*[atx][0-9]+ +** or\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+ +** sext.w\s+a0,\s*a0 +** ret +*/ +DEF_SAT_U_ADD_FMT_5(uint32_t) + +/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_add-20.c b/gcc/testsuite/gcc.target/riscv/sat_u_add-20.c new file mode 100644 index 00000000000..c5f005cfe2f --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/sat_u_add-20.c @@ -0,0 +1,17 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */ +/* { dg-final { check-function-bodies "**" "" } } */ + +#include "sat_arith.h" + +/* +** sat_u_add_uint64_t_fmt_5: +** add\s+[atx][0-9]+,\s*a0,\s*a1 +** sltu\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+ +** neg\s+[atx][0-9]+,\s*[atx][0-9]+ +** or\s+a0,\s*[atx][0-9]+,\s*[atx][0-9]+ +** ret +*/ +DEF_SAT_U_ADD_FMT_5(uint64_t) + +/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_add-run-17.c b/gcc/testsuite/gcc.target/riscv/sat_u_add-run-17.c new file mode 100644 index 00000000000..936028cbe8b --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/sat_u_add-run-17.c @@ -0,0 +1,25 @@ +/* { dg-do run { target { riscv_v } } } */ +/* { dg-additional-options "-std=c99" } */ + +#include "sat_arith.h" + +#define T uint8_t +#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_5 + +DEF_SAT_U_ADD_FMT_5(T) + +T test_data[][3] = { + /* arg_0, arg_1, expect */ + { 0, 0, 0, }, + { 0, 1, 1, }, + { 1, 1, 2, }, + { 0, 254, 254, }, + { 1, 254, 255, }, + { 2, 254, 255, }, + { 0, 255, 255, }, + { 1, 255, 255, }, + { 2, 255, 255, }, + { 255, 255, 255, }, +}; + +#include "scalar_sat_binary.h" diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_add-run-18.c b/gcc/testsuite/gcc.target/riscv/sat_u_add-run-18.c new file mode 100644 index 00000000000..a1d5d70b4ab --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/sat_u_add-run-18.c @@ -0,0 +1,25 @@ +/* { dg-do run { target { riscv_v } } } */ +/* { dg-additional-options "-std=c99" } */ + +#include "sat_arith.h" + +#define T uint16_t +#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_5 + +DEF_SAT_U_ADD_FMT_5(T) + +T test_data[][3] = { + /* arg_0, arg_1, expect */ + { 0, 0, 0, }, + { 0, 1, 1, }, + { 1, 1, 2, }, + { 0, 65534, 65534, }, + { 1, 65534, 65535, }, + { 2, 65534, 65535, }, + { 0, 65535, 65535, }, + { 1, 65535, 65535, }, + { 2, 65535, 65535, }, + { 65535, 65535, 65535, }, +}; + +#include "scalar_sat_binary.h" diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_add-run-19.c b/gcc/testsuite/gcc.target/riscv/sat_u_add-run-19.c new file mode 100644 index 00000000000..7608e71dd80 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/sat_u_add-run-19.c @@ -0,0 +1,25 @@ +/* { dg-do run { target { riscv_v } } } */ +/* { dg-additional-options "-std=c99" } */ + +#include "sat_arith.h" + +#define T uint32_t +#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_5 + +DEF_SAT_U_ADD_FMT_5(T) + +T test_data[][3] = { + /* arg_0, arg_1, expect */ + { 0, 0, 0, }, + { 0, 1, 1, }, + { 1, 1, 2, }, + { 0, 4294967294, 4294967294, }, + { 1, 4294967294, 4294967295, }, + { 2, 4294967294, 4294967295, }, + { 0, 4294967295, 4294967295, }, + { 1, 4294967295, 4294967295, }, + { 2, 4294967295, 4294967295, }, + { 4294967295, 4294967295, 4294967295, }, +}; + +#include "scalar_sat_binary.h" diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_add-run-20.c b/gcc/testsuite/gcc.target/riscv/sat_u_add-run-20.c new file mode 100644 index 00000000000..496ab58150b --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/sat_u_add-run-20.c @@ -0,0 +1,25 @@ +/* { dg-do run { target { riscv_v } } } */ +/* { dg-additional-options "-std=c99" } */ + +#include "sat_arith.h" + +#define T uint64_t +#define RUN_SAT_BINARY RUN_SAT_U_ADD_FMT_5 + +DEF_SAT_U_ADD_FMT_5(T) + +T test_data[][3] = { + /* arg_0, arg_1, expect */ + { 0, 0, 0, }, + { 0, 1, 1, }, + { 1, 1, 2, }, + { 0, 18446744073709551614u, 18446744073709551614u, }, + { 1, 18446744073709551614u, 18446744073709551615u, }, + { 2, 18446744073709551614u, 18446744073709551615u, }, + { 0, 18446744073709551615u, 18446744073709551615u, }, + { 1, 18446744073709551615u, 18446744073709551615u, }, + { 2, 18446744073709551615u, 18446744073709551615u, }, + { 18446744073709551615u, 18446744073709551615u, 18446744073709551615u, }, +}; + +#include "scalar_sat_binary.h"