From: Nicholas Mc Guire <hofrat@osadl.org>
To: Michal Marek <mmarek@suse.cz>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>,
Sam Ravnborg <sam@ravnborg.org>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Alvin" <hpa@zytor.com>, Joe Perches <joe@perches.com>,
John Stultz <john.stultz@linaro.org>,
Andrew Hunter <ahh@google.com>, Paul Turner <pjt@google.com>,
linux-kernel@vger.kernel.org,
Nicholas Mc Guire <hofrat@osadl.org>
Subject: [PATCH 3/3 V3] time: allow gcc to fold constants when possible
Date: Mon, 18 May 2015 14:19:14 +0200 [thread overview]
Message-ID: <1431951554-5563-3-git-send-email-hofrat@osadl.org> (raw)
In-Reply-To: <1431951554-5563-1-git-send-email-hofrat@osadl.org>
To allow constant folding in msecs_to_jiffies() conditionally calls
the HZ dependent _msecs_to_jiffies() helpers or, when gcc can not
figure out constant folding, __msecs_to_jiffies which is the renamed
original msecs_to_jiffies() function.
Patch was build tested for:
arm - imx_v6_v7_defconfig, vexpress_defconfig
cris - etrax-100lx_v2_defconfig
m68k - multi_defconfig
mips32 - ar7_defconfig,
mips64 - loongson3_defconfig
powerpc - 44x/virtex5_defconfig
powerpc64 - powerpc64_defconfig
sh - se7780_defconfig,
sparc32 - sparc32_defconfig
sparc64 - sparc64_defconfig
x86 64 - x86_64_defconfig,
boot and run testing:
x86 64 - x86_64_defconfig i3
Patch is against 4.1-rc3 (localversion-next is -next-20150518)
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
---
Thanks to Joe Perches <joe@perches.com> for suggesting this approach
and for his review comments on the first attempts.
include/linux/jiffies.h | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
index b41e026e..e96996a 100644
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
@@ -343,12 +343,24 @@ static inline unsigned long _msecs_to_jiffies(const unsigned int m)
* handling any 32-bit overflows.
* for the details see __msecs_to_jiffies()
*
- * the HZ range specific helpers _msecs_to_jiffies() are called from
- * __msecs_to_jiffies().
+ * msecs_to_jiffies() checks for the passed in value being a constant
+ * via __builtin_constant_p() allowing gcc to eliminate most of the
+ * code, __msecs_to_jiffies() is called if the value passed does not
+ * allow constant folding and the actual conversion must be done at
+ * runtime.
+ * the HZ range specific helpers _msecs_to_jiffies() are called both
+ * directly here and from __msecs_to_jiffies() in the case where
+ * constant folding is not possible.
*/
static inline unsigned long msecs_to_jiffies(const unsigned int m)
{
- return __msecs_to_jiffies(m);
+ if (__builtin_constant_p(m)) {
+ if ((int)m < 0)
+ return MAX_JIFFY_OFFSET;
+ return _msecs_to_jiffies(m);
+ } else {
+ return __msecs_to_jiffies(m);
+ }
}
extern unsigned long usecs_to_jiffies(const unsigned int u);
--
1.7.10.4
next prev parent reply other threads:[~2015-05-18 12:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-18 12:19 [PATCH 1/3 V3] time: move timeconst.h into include/generated Nicholas Mc Guire
2015-05-18 12:19 ` [PATCH 2/3 V3] time: refactor msecs_to_jiffies Nicholas Mc Guire
2015-05-19 13:36 ` [tip:timers/core] time: Refactor msecs_to_jiffies tip-bot for Nicholas Mc Guire
2015-05-19 14:03 ` Joe Perches
2015-05-19 14:47 ` Nicholas Mc Guire
2015-05-19 15:18 ` Thomas Gleixner
2015-05-19 19:31 ` Nicholas Mc Guire
2015-05-19 15:12 ` Thomas Gleixner
2015-05-18 12:19 ` Nicholas Mc Guire [this message]
2015-05-19 13:37 ` [tip:timers/core] time: Allow gcc to fold constants when possible tip-bot for Nicholas Mc Guire
2015-05-19 13:36 ` [tip:timers/core] time: Move timeconst.h into include/generated tip-bot for Nicholas Mc Guire
2015-06-29 23:03 ` Stephen Boyd
2015-06-30 6:52 ` Nicholas Mc Guire
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1431951554-5563-3-git-send-email-hofrat@osadl.org \
--to=hofrat@osadl.org \
--cc=ahh@google.com \
--cc=hpa@zytor.com \
--cc=joe@perches.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mmarek@suse.cz \
--cc=pjt@google.com \
--cc=sam@ravnborg.org \
--cc=tglx@linutronix.de \
--cc=yamada.m@jp.panasonic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).