-
Notifications
You must be signed in to change notification settings - Fork 6.2k
8319423: Improve Year.isLeap by checking divisibility by 16 #16491
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
a9ee331
Leap year optimization inspired by Neri & Schneider
cl4es e8f46e0
Merge branch 'master' into leapyear
cl4es ce137d7
Delegate IsoChronology.isLeapYear to Year.isLeap (both specified to b…
cl4es e461201
Add comment
cl4es 6ad562c
Apply similar optimization to GregorianCalendar, sun.util.calendar
cl4es File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -40,8 +40,12 @@ private CalendarUtils() {} | |||||||||
| * @see CalendarDate#isLeapYear | ||||||||||
| */ | ||||||||||
| public static boolean isGregorianLeapYear(int gregorianYear) { | ||||||||||
| return (((gregorianYear % 4) == 0) && (((gregorianYear % 100) != 0) | ||||||||||
| || ((gregorianYear % 400) == 0))); | ||||||||||
| // A year that is a multiple of 100, 200 and 300 is not divisible by 16, but 400 is. | ||||||||||
| // So for a year that's divisible by 4, checking that it's also divisible by 16 | ||||||||||
| // is sufficient to determine it must be a leap year. | ||||||||||
| return (gregorianYear & 15) == 0 | ||||||||||
| ? (gregorianYear & 3) == 0 | ||||||||||
| : (gregorianYear & 3) == 0 && gregorianYear % 100 != 0; | ||||||||||
|
Comment on lines
+46
to
+48
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Similarly,
Suggested change
|
||||||||||
| } | ||||||||||
|
|
||||||||||
| /** | ||||||||||
|
|
||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
108 changes: 108 additions & 0 deletions
108
test/micro/org/openjdk/bench/java/time/LeapYearBench.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| /* | ||
| * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
|
|
||
| package org.openjdk.bench.java.time; | ||
|
|
||
| import org.openjdk.jmh.annotations.Benchmark; | ||
| import org.openjdk.jmh.annotations.BenchmarkMode; | ||
| import org.openjdk.jmh.annotations.Fork; | ||
| import org.openjdk.jmh.annotations.Measurement; | ||
| import org.openjdk.jmh.annotations.Mode; | ||
| import org.openjdk.jmh.annotations.OutputTimeUnit; | ||
| import org.openjdk.jmh.annotations.Scope; | ||
| import org.openjdk.jmh.annotations.Setup; | ||
| import org.openjdk.jmh.annotations.State; | ||
| import org.openjdk.jmh.annotations.Warmup; | ||
| import org.openjdk.jmh.infra.Blackhole; | ||
|
|
||
| import java.time.Duration; | ||
| import java.time.Instant; | ||
| import java.time.Year; | ||
| import java.time.ZonedDateTime; | ||
| import java.time.chrono.IsoChronology; | ||
| import java.time.temporal.ChronoUnit; | ||
| import java.util.GregorianCalendar; | ||
| import java.util.Random; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.stream.IntStream; | ||
|
|
||
| /** | ||
| * Examine Year.leapYear-related operations | ||
| */ | ||
| @BenchmarkMode(Mode.Throughput) | ||
| @OutputTimeUnit(TimeUnit.MICROSECONDS) | ||
| @Warmup(iterations = 5, time = 1) | ||
| @Measurement(iterations = 5, time = 1) | ||
| @Fork(3) | ||
| @State(Scope.Thread) | ||
| public class LeapYearBench { | ||
|
|
||
| private long[] years; | ||
|
|
||
| private GregorianCalendar calendar; | ||
|
|
||
| @Setup | ||
| public void createInstants() { | ||
| // Large enough number of years to guarantee that the distribution of | ||
| // leap years is reasonably realistic | ||
| years = new long[2048]; | ||
| final Random random = new Random(0); | ||
| for (int i = 0; i < years.length; i++) { | ||
| years[i] = random.nextLong(2000) + 2000; | ||
| } | ||
| calendar = GregorianCalendar.from(ZonedDateTime.now()); | ||
| } | ||
|
|
||
| @Benchmark | ||
| public void isLeapYear(Blackhole bh) { | ||
| for (long year : years) { | ||
| bh.consume(Year.isLeap(year)); | ||
| } | ||
| } | ||
|
|
||
| @Benchmark | ||
| public void isLeapYearChrono(Blackhole bh) { | ||
| for (long year : years) { | ||
| bh.consume(IsoChronology.INSTANCE.isLeapYear(year)); | ||
| } | ||
| } | ||
|
|
||
| @Benchmark | ||
| public void isLeapYearGregorian(Blackhole bh) { | ||
| for (long year : years) { | ||
| bh.consume(calendar.isLeapYear((int)year)); | ||
| } | ||
| } | ||
|
|
||
| public static boolean isLeapNeriSchneider(long year) { | ||
| int d = year % 100 != 0 ? 4 : 16; | ||
| return (year & (d - 1)) == 0; | ||
| } | ||
|
|
||
| @Benchmark | ||
| public void isLeapYearNS(Blackhole bh) { | ||
| for (long year : years) { | ||
| bh.consume(isLeapNeriSchneider(year)); | ||
| } | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think
(year & 3) == 0 && ((year & 15) == 0) || (year % 25) != 0would be better simply because the common path will be a little bit shorter.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So equal to or even slightly worse than baseline. I tested a few variants before submitting the PR - some that looked simpler or better - but the ternary variant in this PR always came out on top.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On top of my general comments made earlier, let me give my two cents on this line:
If
(year & 15) == 0, then the last four bits ofyearare zeros. In particular, the last two bits ofyearare zeros, that is,(year & 3) == 0. The same conclusion can be obtained in terms of divisibility: ifyear % 16 == 0, i.e.,yearis a multiple of 16, thenyear % 4 == 0, i.e.,yearis multiple of 4. What I'm trying to say is that the line above can be simplified to:But now it becomes clear that the above is also equivalent to:
Which is the simplest form of all the above. It's possible, but I'm not sure, that the Java compiler makes this simplification for you. (FWIW: the GCC C compiler does. Indeed, as seen here the three expressions above generate exactly the same assembly instructions.)
As I explained in my earlier post, for this particular expression a further simplification, that makes the compiler (at least the C compiler above) to save one instruction (
ror edi 2) is replacing 100 by 25: