[1.7 & 1.8 BRANCH APPROVAL]: Backport 6539464: Math functions produce inconsistent results
Dr Andrew John Hughes
ahughes at redhat.com
Mon Sep 6 07:13:40 PDT 2010
On 10:16 Mon 06 Sep , Pavel Tisnovsky wrote:
> Dr Andrew John Hughes wrote:
> > On 00:25 Sat 04 Sep , Dr Andrew John Hughes wrote:
> >> Applies to hs14 only. hs16 (1.7 & 1.8 --with-hotspot-build=hs16) and hs17 (1.9, HEAD) have this fix.
> >>
> >> changeset: 1981:0b63ff75d44a
> >> tag: tip
> >> user: Andrew John Hughes <ahughes at redhat.com>
> >> date: Sat Sep 04 00:21:46 2010 +0100
> >> files: ChangeLog Makefile.am NEWS patches/hotspot/original/6539464-consistent-math.patch
> >> description:
> >> S6539464, RH500077: Ensure Math functions return consistent results.
> >>
> >> 2010-09-03 Andrew John Hughes <ahughes at redhat.com>
> >>
> >> * Makefile.am: Add new patch.
> >> * patches/hotspot/original/6539464-consistent-math.patch:
> >> Backport fix for S6539464 which ensures Math functions
> >> return consistent results.
> >> * NEWS: Updated.
> >>
> >> Ok for 1.7 & 1.8?
>
> Hi Andrew,
>
> should I run our usual tests before you push this changes to 1.7 and
> 1.8? (just to be sure :-)
>
I take it you mean testing them with this patch applied locally? Yes,
that sounds like a good idea. I've attached the patches for each version.
> Pavel
>
>
> >> --
> >> Andrew :)
> >>
> >> Free Java Software Engineer
> >> Red Hat, Inc. (http://www.redhat.com)
> >>
> >> Support Free Java!
> >> Contribute to GNU Classpath and the OpenJDK
> >> http://www.gnu.org/software/classpath
> >> http://openjdk.java.net
> >> PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
> >> Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
> >
> > The patch is simply http://hg.openjdk.java.net/jdk7/hotspot-comp/hotspot/rev/819880572f09. No changes.
>
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
-------------- next part --------------
# HG changeset patch
# User Andrew John Hughes <ahughes at redhat.com>
# Date 1283556106 -3600
# Node ID 0b63ff75d44a751a20b0b085079820f0fcc3253b
# Parent e508d944ca9dbc16812f2c64e16e1d0c7b26a891
S6539464, RH500077: Ensure Math functions return consistent results.
2010-09-03 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add new patch.
* patches/hotspot/original/6539464-consistent-math.patch:
Backport fix for S6539464 which ensures Math functions
return consistent results.
* NEWS: Updated.
diff -r e508d944ca9d -r 0b63ff75d44a ChangeLog
--- a/ChangeLog Fri Aug 27 14:46:25 2010 -0400
+++ b/ChangeLog Sat Sep 04 00:21:46 2010 +0100
@@ -1,3 +1,11 @@
+2010-09-03 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add new patch.
+ * patches/hotspot/original/6539464-consistent-math.patch:
+ Backport fix for S6539464 which ensures Math functions
+ return consistent results.
+ * NEWS: Updated.
+
2010-08-27 Deepak Bhole <dbhole at redhat.com>
Fixes rhbz#560193
diff -r e508d944ca9d -r 0b63ff75d44a Makefile.am
--- a/Makefile.am Fri Aug 27 14:46:25 2010 -0400
+++ b/Makefile.am Sat Sep 04 00:21:46 2010 +0100
@@ -402,7 +402,8 @@
patches/hotspot/original/icedtea-6778657-f2i-overflow.patch \
patches/hotspot/original/icedtea-6791168.patch \
patches/hotspot/original/icedtea-6793825-includedb.patch \
- patches/openjdk/6822370-reentrantreadwritelock.patch
+ patches/openjdk/6822370-reentrantreadwritelock.patch \
+ patches/hotspot/original/6539464-consistent-math.patch
endif
if HAS_PAX
diff -r e508d944ca9d -r 0b63ff75d44a NEWS
--- a/NEWS Fri Aug 27 14:46:25 2010 -0400
+++ b/NEWS Sat Sep 04 00:21:46 2010 +0100
@@ -4,6 +4,7 @@
- G244901: Skip test_gamma on hardened (PaX-enabled) kernels
- G266295: Provide font configuration for Gentoo.
- Provide font configuration for RHEL 6.
+ - S6539464, RH500077: Ensure java.lang.Math functions provide consistent results.
* NetX
- Fix browser command in BasicService.showDocument(URL)
- Run programs that inherit main(String[]) in their main-class
diff -r e508d944ca9d -r 0b63ff75d44a patches/hotspot/original/6539464-consistent-math.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/original/6539464-consistent-math.patch Sat Sep 04 00:21:46 2010 +0100
@@ -0,0 +1,79 @@
+# HG changeset patch
+# User never
+# Date 1239043997 25200
+# Node ID 819880572f0972750d759c1fa6f8705c33b42172
+# Parent 1f2abec697143b7575318be7db855e5e9f893e69
+6539464: Math.log() produces inconsistent results between successive runs.
+Reviewed-by: kvn
+
+diff -r 1f2abec69714 -r 819880572f09 src/cpu/x86/vm/templateInterpreter_x86_64.cpp
+--- openjdk.orig/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Fri Apr 03 18:51:31 2009 -0700
++++ openjdk/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Mon Apr 06 11:53:17 2009 -0700
+@@ -1393,12 +1393,13 @@
+ case Interpreter::empty : entry_point = ((InterpreterGenerator*) this)->generate_empty_entry(); break;
+ case Interpreter::accessor : entry_point = ((InterpreterGenerator*) this)->generate_accessor_entry(); break;
+ case Interpreter::abstract : entry_point = ((InterpreterGenerator*) this)->generate_abstract_entry(); break;
+- case Interpreter::java_lang_math_sin : break;
+- case Interpreter::java_lang_math_cos : break;
+- case Interpreter::java_lang_math_tan : break;
+- case Interpreter::java_lang_math_abs : break;
+- case Interpreter::java_lang_math_log : break;
+- case Interpreter::java_lang_math_log10 : break;
++
++ case Interpreter::java_lang_math_sin : // fall thru
++ case Interpreter::java_lang_math_cos : // fall thru
++ case Interpreter::java_lang_math_tan : // fall thru
++ case Interpreter::java_lang_math_abs : // fall thru
++ case Interpreter::java_lang_math_log : // fall thru
++ case Interpreter::java_lang_math_log10 : // fall thru
+ case Interpreter::java_lang_math_sqrt : entry_point = ((InterpreterGenerator*) this)->generate_math_entry(kind); break;
+ default : ShouldNotReachHere(); break;
+ }
+diff -r 1f2abec69714 -r 819880572f09 test/compiler/6539464/Test.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/hotspot/test/compiler/6539464/Test.java Mon Apr 06 11:53:17 2009 -0700
+@@ -0,0 +1,44 @@
++/*
++ * Copyright 2009 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/**
++ * @test
++ * @bug 6539464
++ * @summary Math.log() produces inconsistent results between successive runs.
++ *
++ * @run main/othervm -Xcomp -XX:CompileOnly=Test.main Test
++ */
++
++public class Test {
++ static double log_value = 17197;
++ static double log_result = Math.log(log_value);
++
++ public static void main(String[] args) throws Exception {
++ for (int i = 0; i < 1000000; i++) {
++ double log_result2 = Math.log(log_value);
++ if (log_result2 != log_result) {
++ throw new InternalError("Math.log produces inconsistent results: " + log_result2 + " != " + log_result);
++ }
++ }
++ }
++}
-------------- next part --------------
# HG changeset patch
# User Andrew John Hughes <ahughes at redhat.com>
# Date 1283780918 -3600
# Node ID 4e8e7394fd77e69579a24da117bf36668ceb0878
# Parent 59c86078a67605e66f4b5e4bed080ac6686209c6
S6539464, RH500077: Ensure Math functions return consistent results.
2010-09-03 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add new patch.
* patches/hotspot/original/6539464-consistent-math.patch:
Backport fix for S6539464 which ensures Math functions
return consistent results.
* NEWS: Updated.
diff -r 59c86078a676 -r 4e8e7394fd77 ChangeLog
--- a/ChangeLog Sun Aug 29 12:54:00 2010 +0200
+++ b/ChangeLog Mon Sep 06 14:48:38 2010 +0100
@@ -1,3 +1,11 @@
+2010-09-03 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add new patch.
+ * patches/hotspot/original/6539464-consistent-math.patch:
+ Backport fix for S6539464 which ensures Math functions
+ return consistent results.
+ * NEWS: Updated.
+
2010-08-27 Andrew John Hughes <ahughes at redhat.com>
Matthias Klose <doko at ubuntu.com>
diff -r 59c86078a676 -r 4e8e7394fd77 Makefile.am
--- a/Makefile.am Sun Aug 29 12:54:00 2010 +0200
+++ b/Makefile.am Mon Sep 06 14:48:38 2010 +0100
@@ -400,7 +400,8 @@
patches/hotspot/original/icedtea-6778657-f2i-overflow.patch \
patches/hotspot/original/icedtea-6791168.patch \
patches/hotspot/original/icedtea-6793825-includedb.patch \
- patches/openjdk/6822370-reentrantreadwritelock.patch
+ patches/openjdk/6822370-reentrantreadwritelock.patch \
+ patches/hotspot/original/6539464-consistent-math.patch
endif
if HAS_PAX
diff -r 59c86078a676 -r 4e8e7394fd77 NEWS
--- a/NEWS Sun Aug 29 12:54:00 2010 +0200
+++ b/NEWS Mon Sep 06 14:48:38 2010 +0100
@@ -5,6 +5,7 @@
- G266295: Provide font configuration for Gentoo.
- Provide font configuration for RHEL 6.
- S6951319: enable solaris builds using Sun Studio 12 update 1 (fixes PR398)
+ - S6539464, RH500077: Ensure java.lang.Math functions provide consistent results.
- NetX:
- Fix browser command in BasicService.showDocument(URL)
- Run programs that inherit main(String[]) in their main-class
diff -r 59c86078a676 -r 4e8e7394fd77 patches/hotspot/original/6539464-consistent-math.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/original/6539464-consistent-math.patch Mon Sep 06 14:48:38 2010 +0100
@@ -0,0 +1,79 @@
+# HG changeset patch
+# User never
+# Date 1239043997 25200
+# Node ID 819880572f0972750d759c1fa6f8705c33b42172
+# Parent 1f2abec697143b7575318be7db855e5e9f893e69
+6539464: Math.log() produces inconsistent results between successive runs.
+Reviewed-by: kvn
+
+diff -r 1f2abec69714 -r 819880572f09 src/cpu/x86/vm/templateInterpreter_x86_64.cpp
+--- openjdk.orig/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Fri Apr 03 18:51:31 2009 -0700
++++ openjdk/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Mon Apr 06 11:53:17 2009 -0700
+@@ -1393,12 +1393,13 @@
+ case Interpreter::empty : entry_point = ((InterpreterGenerator*) this)->generate_empty_entry(); break;
+ case Interpreter::accessor : entry_point = ((InterpreterGenerator*) this)->generate_accessor_entry(); break;
+ case Interpreter::abstract : entry_point = ((InterpreterGenerator*) this)->generate_abstract_entry(); break;
+- case Interpreter::java_lang_math_sin : break;
+- case Interpreter::java_lang_math_cos : break;
+- case Interpreter::java_lang_math_tan : break;
+- case Interpreter::java_lang_math_abs : break;
+- case Interpreter::java_lang_math_log : break;
+- case Interpreter::java_lang_math_log10 : break;
++
++ case Interpreter::java_lang_math_sin : // fall thru
++ case Interpreter::java_lang_math_cos : // fall thru
++ case Interpreter::java_lang_math_tan : // fall thru
++ case Interpreter::java_lang_math_abs : // fall thru
++ case Interpreter::java_lang_math_log : // fall thru
++ case Interpreter::java_lang_math_log10 : // fall thru
+ case Interpreter::java_lang_math_sqrt : entry_point = ((InterpreterGenerator*) this)->generate_math_entry(kind); break;
+ default : ShouldNotReachHere(); break;
+ }
+diff -r 1f2abec69714 -r 819880572f09 test/compiler/6539464/Test.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/hotspot/test/compiler/6539464/Test.java Mon Apr 06 11:53:17 2009 -0700
+@@ -0,0 +1,44 @@
++/*
++ * Copyright 2009 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/**
++ * @test
++ * @bug 6539464
++ * @summary Math.log() produces inconsistent results between successive runs.
++ *
++ * @run main/othervm -Xcomp -XX:CompileOnly=Test.main Test
++ */
++
++public class Test {
++ static double log_value = 17197;
++ static double log_result = Math.log(log_value);
++
++ public static void main(String[] args) throws Exception {
++ for (int i = 0; i < 1000000; i++) {
++ double log_result2 = Math.log(log_value);
++ if (log_result2 != log_result) {
++ throw new InternalError("Math.log produces inconsistent results: " + log_result2 + " != " + log_result);
++ }
++ }
++ }
++}
More information about the distro-pkg-dev
mailing list