From patchwork Wed Nov 2 19:43:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Landley X-Patchwork-Id: 14468 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp106604wru; Wed, 2 Nov 2022 12:49:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6M7kKbqEA91wXSDRT4clvBs2y54JjClYUSWZQl996rfGhQQOdTZ8ClVNwuCFhW7/Bu+nHx X-Received: by 2002:a50:cd07:0:b0:464:63b:1017 with SMTP id z7-20020a50cd07000000b00464063b1017mr4268377edi.364.1667418588855; Wed, 02 Nov 2022 12:49:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667418588; cv=none; d=google.com; s=arc-20160816; b=VPt03g8mFj+UaEFXHI+E00vJZLpucVVwJf2G0tN9L7c7ZhZl1IA1WRLi96V1WTiPvT 6hysFxDcrkJq+upEgCUOtHFfss3SdCLiNVpaJiCbMHcC589dKPp9aNglXfnViWnrPLRf UMx8YMynzQvf+0pS62lpxkQSh4gu9P+l6Cn31UPFvORZTWeDyP/iZNKk8Nqaub4NFlnq Vakpyej2KY4DD8V0/zsdsKXTfgzxK1i1av3HlBBMirY4ELKfrJHRAY/VBCrssaYiNh4o BnffcFLLx91js9f2kWEGfQBxpkJjMI/ZVC5m/6F20TDjYC4GLerPNOFYr/MAtoXktqJN tV6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language:to :subject:from:user-agent:mime-version:date:message-id:dkim-signature; bh=f2CefYhKNzgp79ypbHnSizLdxwSk630ek8DWtkcvmuU=; b=OzN08XTmxI1o8Ag8cOJ24gpUHoQFKc0Lp9ZwqriBYuF0ISHPV4WtYNS6jtBxmZLH5i jej3mAYIrDSyYoytKBtE+0vsYomzuR61MwuGVoxromrHFAFah8g0z5DJsQ9w9XabeJW1 pq/2pek02qbvQfmU90zQO+ZPTQRuEyg9Ax8StbDpcTllBwrljqaoC/yLSI4FFZ5S98tg BUpHRDF9B6K3JCVgLGMP9GlLVqohm43LZlm0v9oZpd/8bLK1ax92nltnPixqkjah++Dk 6zBC/gXRcDfnMYeDHUuOAoP3IwRXZhfcVIKbAlF7Jn8lauS6U/HeyMEyAAjwkXpWyG4r Swfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@landley-net.20210112.gappssmtp.com header.s=20210112 header.b=SEL+TEmX; 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 g29-20020a056402321d00b00462e597dc46si16178918eda.301.2022.11.02.12.49.06; Wed, 02 Nov 2022 12:49:48 -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; dkim=pass header.i=@landley-net.20210112.gappssmtp.com header.s=20210112 header.b=SEL+TEmX; 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 S230498AbiKBTdi (ORCPT + 99 others); Wed, 2 Nov 2022 15:33:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229487AbiKBTdd (ORCPT ); Wed, 2 Nov 2022 15:33:33 -0400 Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73C1A2ADC for ; Wed, 2 Nov 2022 12:33:32 -0700 (PDT) Received: by mail-qk1-x735.google.com with SMTP id z30so12448905qkz.13 for ; Wed, 02 Nov 2022 12:33:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=landley-net.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=f2CefYhKNzgp79ypbHnSizLdxwSk630ek8DWtkcvmuU=; b=SEL+TEmXPenFH9WZf7nRRsKJhNOSkGKXixAJgiZ+4obv9xC1DRrrTwhtGWPtRwWKQ9 WDXIV+wvyd+rWgwh3XkYxmgNO9xWNO0ZQD4QGxb55vzHyCs72C52sth5fZpcT1QrI/Kz ivIPqdmHZyRSG3a+cqjQK/eBD3PSK0yFt9DDYmHpwViYmuoWb+fmoyFoX8zUIWEz2F6i L4+rRLeiK43XYqhLV0RURZATh9IVkjHe0h6rNUPCltVK75FnXn5SaVaUmNDuzGoaYKzk 8r9iYwtmInlF9HIwlRHREMkHlXQmPjGnZfN8bXnFVSOMtLSGaXul9RsYRKioeeEop6w9 M9UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=f2CefYhKNzgp79ypbHnSizLdxwSk630ek8DWtkcvmuU=; b=Qy9wrBPYby8F3hMhM4uZxfSGmnK5WphdoyCdZwL6j88Th6d1VaRVNFQZToKsOOJWcm AJNxl9mpPm05oMjU7ZULnVdolbC67U7I3iiGoFXh4zNgflOz9suDBAy441DeFlTxpmT9 KV3mmkKK2JVGYDxT+dK4vZtQbob2+XkqALTHUV6nuIpMnSBVfsbmeLHxVwKMGpHKQX1e I9Sx13/hNICgrJdFf7e8bDSYubl7njdZ+8ScONqWdjca5dCNVw4E+fMDIVV+yK0hHbcY J7+OdPaGIM42pMQJxD0VVh26leM3+BjTZWC/aIf13V7kKEYw1QRjGdavarLXpglY0QY7 i4IQ== X-Gm-Message-State: ACrzQf0bTawmXe0Jt5nw8FbBsrJcfKW8Tv0HxTlvFW9A39aigM/WPB+n TvkILdrbW/MTUmPJYyY9ImyQDcjIkvCdGrBK X-Received: by 2002:a05:620a:1511:b0:6fa:2605:4582 with SMTP id i17-20020a05620a151100b006fa26054582mr14563373qkk.697.1667417610934; Wed, 02 Nov 2022 12:33:30 -0700 (PDT) Received: from ?IPV6:2607:fb90:9a29:563d:6ca3:50ff:fe5f:eabe? ([2607:fb90:9a29:563d:6ca3:50ff:fe5f:eabe]) by smtp.gmail.com with ESMTPSA id gb11-20020a05622a598b00b003999d25e772sm7079420qtb.71.2022.11.02.12.33.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Nov 2022 12:33:29 -0700 (PDT) Message-ID: <8398de34-5363-30c4-299b-b5717fc89635@landley.net> Date: Wed, 2 Nov 2022 14:43:11 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.0 From: Rob Landley Subject: [PATCH] Replace timeconst.bc with mktimeconst.c To: "linux-kernel@vger.kernel.org" , toybox Content-Language: en-US X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE 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?1748415114555393997?= X-GMAIL-MSGID: =?utf-8?q?1748415114555393997?= Signed-off-by: Rob Landley --- Kbuild | 7 +- kernel/time/mktimeconst.c | 110 +++++++++++++++++++++++++++++++++ kernel/time/timeconst.bc | 117 ------------------------------------ 3 files changed, 115 insertions(+), 119 deletions(-) Update for 6.0 of my old patch replacing timeconst.pl with mktimeconst.c, removing the only user of "bc" from the build. Last posted to this list... sometime around 2013 I think? I started from the 2015 version at https://github.com/landley/aboriginal/blob/master/sources/patches/linux-noperl-timeconst.patch and not much had changed. One extra iteration of the loop for nanoseconds and different makefile plumbing. In theory you could use this version to calculate the values at startup in a small _init function and eliminate the header, perhaps even allowing HZ to change at runtime. But... $ egrep -rl 'HZ_TO_|SEC_TO_HZ_' * | wc -l 29 Bit more intrusive than I'm up for at the moment. diff --git a/Kbuild b/Kbuild index fa441b98c9f6..32c89a28e4dc 100644 --- a/Kbuild +++ b/Kbuild @@ -18,9 +18,12 @@ $(bounds-file): kernel/bounds.s FORCE timeconst-file := include/generated/timeconst.h -filechk_gentimeconst = echo $(CONFIG_HZ) | bc -q $< +hostprogs += mktimeconst +mktimeconst-objs = kernel/time/mktimeconst.o -$(timeconst-file): kernel/time/timeconst.bc FORCE +filechk_gentimeconst = $(obj)/mktimeconst $(CONFIG_HZ) - + +$(timeconst-file): $(obj)/mktimeconst FORCE $(call filechk,gentimeconst) ##### --- /dev/null 2022-09-01 11:12:08.823776915 -0500 +++ linux/kernel/time/mktimeconst.c 2022-11-02 11:57:05.279404681 -0500 @@ -0,0 +1,110 @@ +/* Copyright 2010-2022 Rob Landley */ + +#include +#include +#include +#include + +int main(int argc, char *argv[]) +{ + uint64_t hz, periods[] = {1000, 1000000, 1000000000}; + char *names[] = {"MSEC", "USEC", "NSEC"}; + FILE *file = !strcmp(argv[2], "-") ? stdout : fopen(argv[2], "w"); + int i, j; + + if (argc != 3 || (hz = atol(argv[1])) < 1 || !file) + { + fprintf(stderr, "Usage: mktimeconst HZ FILENAME\n\n"); + fprintf(stderr, "Generate a header file with constants to convert between\n"); + fprintf(stderr, "decimal HZ timer ticks and milisecond or microsecond delays,\n"); + fprintf(stderr, "using reciprocal multiplication to avoid 64 bit division.\n"); + exit(1); + } + + fprintf(file, + "/* Conversion constants for HZ == %"PRIu64" */\n\n" + "/* Automatically generated by kernel/time/mktimeconst.c */\n" + "/* This could be generated in __init code but isn't */\n" + + "#ifndef __KERNEL_TIMECONST_H\n" + "#define __KERNEL_TIMECONST_H\n\n" + "#include \n" + "#include \n\n" + "#if HZ != %"PRIu64"\n" + "#error \"include/generated/timeconst.h has the wrong HZ value!\"\n" + "#endif\n\n", hz, hz); + + /* Repeat for MSEC, USEC, and NSEC */ + + for (i = 0; i < 3; i++) { + uint64_t gcd, period; + + /* Find greatest common denominator using Euclid's algorithm. */ + + gcd = hz; + period = periods[i]; + while (period) { + uint64_t temp = gcd % period; + gcd = period; + period = temp; + } + + /* Output both directions (HZ_TO_PERIOD and PERIOD_TO_HZ) */ + + for (j = 0; j < 2; j++) { + char name[16]; + uint64_t from = j ? periods[i] : hz; + uint64_t to = j ? hz : periods[i]; + uint64_t mul32 = 0, adj32 = 0, shift = 0; + + sprintf(name, j ? "%s_TO_HZ" : "HZ_TO_%s", names[i]); + + /* Figure out what shift value gives 32 significant + bits of MUL32 data. (Worst case to=1 from=1000000 + uses 52 bits, to<= (1UL<<31)) + break; + shift++; + } + + /* ADJ32 is is just (((FROM/GCD)-1)< 32) { + uint64_t upper, lower; + + upper = (adj32 - 1) << (shift - 32); + lower = (upper % adj32) << 32; + adj32 = ((upper/adj32) << 32) + (lower/adj32); + } else + adj32 = ((adj32 - 1) << shift) / adj32; + + /* Emit the constants into the header file. */ + + fprintf(file, "#define %s_MUL32\tU64_C(0x%"PRIx64")\n", + name, mul32); + fprintf(file, "#define %s_ADJ32\tU64_C(0x%"PRIx64")\n", + name, adj32); + fprintf(file, "#define %s_SHR32\t%"PRIu64"\n", + name, shift); + fprintf(file, "#define %s_NUM\t\tU64_C(%"PRIu64")\n", + name, to/gcd); + fprintf(file, "#define %s_DEN\t\tU64_C(%"PRIu64")\n\n", + name, from/gcd); + } + } + fprintf(file, "#endif /* __KERNEL_TIMECONST_H */\n"); + + /* Notice if the disk fills up. */ + + fflush(file); +} --- linux/kernel/time/timeconst.bc 2022-11-02 11:16:37.711491455 -0500 +++ /dev/null 2022-09-01 11:12:08.823776915 -0500 @@ -1,117 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ - -scale=0 - -define gcd(a,b) { - auto t; - while (b) { - t = b; - b = a % b; - a = t; - } - return a; -} - -/* Division by reciprocal multiplication. */ -define fmul(b,n,d) { - return (2^b*n+d-1)/d; -} - -/* Adjustment factor when a ceiling value is used. Use as: - (imul * n) + (fmulxx * n + fadjxx) >> xx) */ -define fadj(b,n,d) { - auto v; - d = d/gcd(n,d); - v = 2^b*(d-1)/d; - return v; -} - -/* Compute the appropriate mul/adj values as well as a shift count, - which brings the mul value into the range 2^b-1 <= x < 2^b. Such - a shift value will be correct in the signed integer range and off - by at most one in the upper half of the unsigned range. */ -define fmuls(b,n,d) { - auto s, m; - for (s = 0; 1; s++) { - m = fmul(s,n,d); - if (m >= 2^(b-1)) - return s; - } - return 0; -} - -define timeconst(hz) { - print "/* Automatically generated by kernel/time/timeconst.bc */\n" - print "/* Time conversion constants for HZ == ", hz, " */\n" - print "\n" - - print "#ifndef KERNEL_TIMECONST_H\n" - print "#define KERNEL_TIMECONST_H\n\n" - - print "#include \n" - print "#include \n\n" - - print "#if HZ != ", hz, "\n" - print "#error \qinclude/generated/timeconst.h has the wrong HZ value!\q\n" - print "#endif\n\n" - - if (hz < 2) { - print "#error Totally bogus HZ value!\n" - } else { - s=fmuls(32,1000,hz) - obase=16 - print "#define HZ_TO_MSEC_MUL32\tU64_C(0x", fmul(s,1000,hz), ")\n" - print "#define HZ_TO_MSEC_ADJ32\tU64_C(0x", fadj(s,1000,hz), ")\n" - obase=10 - print "#define HZ_TO_MSEC_SHR32\t", s, "\n" - - s=fmuls(32,hz,1000) - obase=16 - print "#define MSEC_TO_HZ_MUL32\tU64_C(0x", fmul(s,hz,1000), ")\n" - print "#define MSEC_TO_HZ_ADJ32\tU64_C(0x", fadj(s,hz,1000), ")\n" - obase=10 - print "#define MSEC_TO_HZ_SHR32\t", s, "\n" - - obase=10 - cd=gcd(hz,1000) - print "#define HZ_TO_MSEC_NUM\t\t", 1000/cd, "\n" - print "#define HZ_TO_MSEC_DEN\t\t", hz/cd, "\n" - print "#define MSEC_TO_HZ_NUM\t\t", hz/cd, "\n" - print "#define MSEC_TO_HZ_DEN\t\t", 1000/cd, "\n" - print "\n" - - s=fmuls(32,1000000,hz) - obase=16 - print "#define HZ_TO_USEC_MUL32\tU64_C(0x", fmul(s,1000000,hz), ")\n" - print "#define HZ_TO_USEC_ADJ32\tU64_C(0x", fadj(s,1000000,hz), ")\n" - obase=10 - print "#define HZ_TO_USEC_SHR32\t", s, "\n" - - s=fmuls(32,hz,1000000) - obase=16 - print "#define USEC_TO_HZ_MUL32\tU64_C(0x", fmul(s,hz,1000000), ")\n" - print "#define USEC_TO_HZ_ADJ32\tU64_C(0x", fadj(s,hz,1000000), ")\n" - obase=10 - print "#define USEC_TO_HZ_SHR32\t", s, "\n" - - obase=10 - cd=gcd(hz,1000000) - print "#define HZ_TO_USEC_NUM\t\t", 1000000/cd, "\n" - print "#define HZ_TO_USEC_DEN\t\t", hz/cd, "\n" - print "#define USEC_TO_HZ_NUM\t\t", hz/cd, "\n" - print "#define USEC_TO_HZ_DEN\t\t", 1000000/cd, "\n" - - cd=gcd(hz,1000000000) - print "#define HZ_TO_NSEC_NUM\t\t", 1000000000/cd, "\n" - print "#define HZ_TO_NSEC_DEN\t\t", hz/cd, "\n" - print "#define NSEC_TO_HZ_NUM\t\t", hz/cd, "\n" - print "#define NSEC_TO_HZ_DEN\t\t", 1000000000/cd, "\n" - print "\n" - - print "#endif /* KERNEL_TIMECONST_H */\n" - } - halt -} - -hz = read(); -timeconst(hz)