From patchwork Fri Jul 7 18:27:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhangjin Wu X-Patchwork-Id: 117245 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3464181vqx; Fri, 7 Jul 2023 11:34:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlG53sIzHZ0JvAMok9OcCFFKBf/nVLBZH9zRPFgHkywfi+70Koww9TAOHD8rPmpgPec8Kst5 X-Received: by 2002:ac2:5f6a:0:b0:4f3:9136:9cd0 with SMTP id c10-20020ac25f6a000000b004f391369cd0mr4568857lfc.44.1688754883172; Fri, 07 Jul 2023 11:34:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688754883; cv=none; d=google.com; s=arc-20160816; b=eRpxlijaqg3nNT70AZeQbgUzGz09uaqGRuZ+ruNHOHz5lFf61A6pdrbNWBFA8uEs6z 2AYK0RewlhdP+LK2WTLtwkPB6uhhmz5Ga6I3TKi/tYQhSlASvVHZdxjo5xZKnSVB4SaB XxxWwhUE52/khXncSXhfTo0OaI3OSzpO3aByXlgwonNGzmzmc9MmZPvgPPVcDxIBO089 D4BhRZLulx49KxICPw5z7ezZVwLzrb8ZZ5nqdgPCDJiKc3jNdYxCeWw67aTIVQxSPNU+ ITtpbs51LxmV7VfSL8HfdF/Urzyn2UAomRiKl2RAYYS1KcGB0xo5GvtaulnyAYKc/Uob 2B7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=pN8UCAnqNDv6aThawDmN5LQS37xNX93jECfXhj4jXek=; fh=+UJGAEU2Zd20Ffzlyw2DOtwfBiThnaWweXJeIpZW2cQ=; b=Laa3xw0w6G1K1gciz5Uiv7v95+4oATA/g5mZlBi7uzq2VtnXvwXXn6lnowYMl10ak2 kb6fOacNmFIEB4lRQIccFJms2fanefr2RY+rebQzfnNGn6lzQINEhNXn7r7+tDR1ewsj D2tS0UJwNA5+pjG7LDgoACUnVpJ3uFG+Cicrk8X6QCkO5hDQQxpFGq7yC1pvzECKEPJR je5GTQiluNWGE4N/CzE/kGg6vbt0ukGLbIScN0GnW5yi0WiutBFxmyhgqI4bXmHZAavZ 0M5M5zn6/dTCvt8e4IW4bQBl/fSizOKdL8ObuzKsmpOMMN1mgTpoCzbLsJMFAjTMOo8F bbqQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c13-20020aa7c74d000000b0051df577866fsi2576632eds.150.2023.07.07.11.34.19; Fri, 07 Jul 2023 11:34:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229890AbjGGS2j (ORCPT + 99 others); Fri, 7 Jul 2023 14:28:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229458AbjGGS2i (ORCPT ); Fri, 7 Jul 2023 14:28:38 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.154.54.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9EB31FEF; Fri, 7 Jul 2023 11:28:36 -0700 (PDT) X-QQ-mid: bizesmtp82t1688754507tdrg1h9k Received: from linux-lab-host.localdomain ( [116.30.131.119]) by bizesmtp.qq.com (ESMTP) with id ; Sat, 08 Jul 2023 02:28:25 +0800 (CST) X-QQ-SSF: 01200000000000D0W000000A0000000 X-QQ-FEAT: WRZea3rwxQma1wpQojp2HUJO9toSuvJ58BA/rW1MdlujMgmE8wzOE1f+ZAxm1 yi/ylEk0muyExC0A3VRaNALKw0dhvoB6nK1Uvs3MifFLYvfb6J6rJ0lVmS3T4dY2Mavdjo4 p7KbkKbvwZMBTvPM5oe/J0DppeEk6wtXg0frKQlHMtFGnMwbVYHdJGWhWi31oGbycVDq+fQ 5mQakxviZLkxKfx1HHtQNqiJVmTM5CTH4hRi5v/AlKQbQsSK1SOx4nDJGw5sbmRqC+SSyFU lx1gUKfdYZ+qD6iBEKWwoWYHGtiW5WJCDEbqviC8tUyIXvJG44r5jMWU0/8aaJ0FSYHd2v3 M149xlrC9bP8pgEQ6KjcVgvoZKPhKVycGTrccOpuZGT+FablhFdjoYv/lLQsTQW40gI6INY X-QQ-GoodBg: 0 X-BIZMAIL-ID: 10073504210191357973 From: Zhangjin Wu To: w@1wt.eu Cc: falcon@tinylab.org, arnd@arndb.de, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, thomas@t-8ch.de, =?utf-8?q?Thomas_Wei?= =?utf-8?q?=C3=9Fschuh?= Subject: [PATCH v4 05/18] selftests/nolibc: fix up int_fast16/32_t test cases for musl Date: Sat, 8 Jul 2023 02:27:40 +0800 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrgz:qybglogicsvrgz5a-1 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770787840483682380?= X-GMAIL-MSGID: =?utf-8?q?1770787840483682380?= musl limits the fast signed int in 32bit, but glibc and nolibc don't, to let such test cases work on musl, let's provide the type based SINT_MAX_OF_TYPE(type) and SINT_MIN_OF_TYPE(type). Suggested-by: Thomas Weißschuh Link: https://lore.kernel.org/lkml/bc635c4f-67fe-4e86-bfdf-bcb4879b928d@t-8ch.de/ Reviewed-by: Thomas Weißschuh Signed-off-by: Zhangjin Wu --- tools/testing/selftests/nolibc/nolibc-test.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c index db743144d8f3..fea1b06131f6 100644 --- a/tools/testing/selftests/nolibc/nolibc-test.c +++ b/tools/testing/selftests/nolibc/nolibc-test.c @@ -41,6 +41,10 @@ #endif #endif +/* for the type of int_fast16_t and int_fast32_t, musl differs from glibc and nolibc */ +#define SINT_MAX_OF_TYPE(type) (((type)1 << (sizeof(type) * 8 - 2)) - (type)1 + ((type)1 << (sizeof(type) * 8 - 2))) +#define SINT_MIN_OF_TYPE(type) (-SINT_MAX_OF_TYPE(type) - 1) + /* will be used by nolibc by getenv() */ char **environ; @@ -827,11 +831,11 @@ int run_stdlib(int min, int max) CASE_TEST(limit_int_fast8_max); EXPECT_EQ(1, INT_FAST8_MAX, (int_fast8_t) 0x7f); break; CASE_TEST(limit_int_fast8_min); EXPECT_EQ(1, INT_FAST8_MIN, (int_fast8_t) 0x80); break; CASE_TEST(limit_uint_fast8_max); EXPECT_EQ(1, UINT_FAST8_MAX, (uint_fast8_t) 0xff); break; - CASE_TEST(limit_int_fast16_min); EXPECT_EQ(1, INT_FAST16_MIN, (int_fast16_t) INTPTR_MIN); break; - CASE_TEST(limit_int_fast16_max); EXPECT_EQ(1, INT_FAST16_MAX, (int_fast16_t) INTPTR_MAX); break; + CASE_TEST(limit_int_fast16_min); EXPECT_EQ(1, INT_FAST16_MIN, (int_fast16_t) SINT_MIN_OF_TYPE(int_fast16_t)); break; + CASE_TEST(limit_int_fast16_max); EXPECT_EQ(1, INT_FAST16_MAX, (int_fast16_t) SINT_MAX_OF_TYPE(int_fast16_t)); break; CASE_TEST(limit_uint_fast16_max); EXPECT_EQ(1, UINT_FAST16_MAX, (uint_fast16_t) UINTPTR_MAX); break; - CASE_TEST(limit_int_fast32_min); EXPECT_EQ(1, INT_FAST32_MIN, (int_fast32_t) INTPTR_MIN); break; - CASE_TEST(limit_int_fast32_max); EXPECT_EQ(1, INT_FAST32_MAX, (int_fast32_t) INTPTR_MAX); break; + CASE_TEST(limit_int_fast32_min); EXPECT_EQ(1, INT_FAST32_MIN, (int_fast32_t) SINT_MIN_OF_TYPE(int_fast32_t)); break; + CASE_TEST(limit_int_fast32_max); EXPECT_EQ(1, INT_FAST32_MAX, (int_fast32_t) SINT_MAX_OF_TYPE(int_fast32_t)); break; CASE_TEST(limit_uint_fast32_max); EXPECT_EQ(1, UINT_FAST32_MAX, (uint_fast32_t) UINTPTR_MAX); break; CASE_TEST(limit_int_fast64_min); EXPECT_EQ(1, INT_FAST64_MIN, (int_fast64_t) INT64_MIN); break; CASE_TEST(limit_int_fast64_max); EXPECT_EQ(1, INT_FAST64_MAX, (int_fast64_t) INT64_MAX); break;