/hg/icedtea6: Zero/Shark: PR690: Shark fails to JIT using hs20, ...
xranby at icedtea.classpath.org
xranby at icedtea.classpath.org
Fri Aug 12 08:02:25 PDT 2011
changeset f418ea6127b6 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f418ea6127b6
author: Xerxes Ranby <xerxes at zafena.se>
date: Fri Aug 12 17:02:19 2011 +0200
Zero/Shark: PR690: Shark fails to JIT using hs20, PR696: Zero fails
to handle fast_aldc and fast_aldc_w in hs20.
2011-08-12 Xerxes Ranby <xerxes at zafena.se>
Zero/Shark
- PR690: Shark fails to JIT using hs20.
- PR696: Zero fails to handle fast_aldc and fast_aldc_w in hs20.
* patches/pr690-shark-jit-hs20.patch: New patch backported from
OpenJDK 7 bug 7032458.
* patches/pr696-zero-fast_aldc-hs20.patch: New patch backported from
OpenJDK 7 bug 7032458 and 7030207.
* Makefile.am: Added new patches.
* NEWS: Updated.
diffstat:
ChangeLog | 12 ++++++
Makefile.am | 4 +-
NEWS | 3 +
patches/pr690-shark-jit-hs20.patch | 58 +++++++++++++++++++++++++++++++++
patches/pr696-zero-fast_aldc-hs20.patch | 42 +++++++++++++++++++++++
5 files changed, 118 insertions(+), 1 deletions(-)
diffs (159 lines):
diff -r 4c641e5e379d -r f418ea6127b6 ChangeLog
--- a/ChangeLog Thu Aug 11 16:48:40 2011 +0200
+++ b/ChangeLog Fri Aug 12 17:02:19 2011 +0200
@@ -1,3 +1,15 @@
+2011-08-12 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ Zero/Shark
+ - PR690: Shark fails to JIT using hs20.
+ - PR696: Zero fails to handle fast_aldc and fast_aldc_w in hs20.
+ * patches/pr690-shark-jit-hs20.patch: New patch backported from
+ OpenJDK 7 bug 7032458.
+ * patches/pr696-zero-fast_aldc-hs20.patch: New patch backported from
+ OpenJDK 7 bug 7032458 and 7030207.
+ * Makefile.am: Added new patches.
+ * NEWS: Updated.
+
2011-08-11 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am: added new patch
diff -r 4c641e5e379d -r f418ea6127b6 Makefile.am
--- a/Makefile.am Thu Aug 11 16:48:40 2011 +0200
+++ b/Makefile.am Fri Aug 12 17:02:19 2011 +0200
@@ -372,7 +372,9 @@
patches/openjdk/5047314-Collator_compare_runs_indefinitely.patch \
patches/openjdk/6669869-Beans_isDesignTime_should_be_per-AppContext.patch \
patches/openjdk/6934356-Vector_writeObject_serialization_DL.patch \
- patches/openjdk/7036582-Improve_test_coverage_of_BigDecimal.patch
+ patches/openjdk/7036582-Improve_test_coverage_of_BigDecimal.patch \
+ patches/pr690-shark-jit-hs20.patch \
+ patches/pr696-zero-fast_aldc-hs20.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 4c641e5e379d -r f418ea6127b6 NEWS
--- a/NEWS Thu Aug 11 16:48:40 2011 +0200
+++ b/NEWS Fri Aug 12 17:02:19 2011 +0200
@@ -401,6 +401,9 @@
- Add extra includes to get rid off compiler warning.
- Rework OpenJDK storage of native thread structure.
- Implement remaining OpenJDK Array reflection interface.
+* Zero/Shark
+ - PR690: Shark fails to JIT using hs20.
+ - PR696: Zero fails to handle fast_aldc and fast_aldc_w in hs20.
New in release 1.10.2 (2011-06-07):
diff -r 4c641e5e379d -r f418ea6127b6 patches/pr690-shark-jit-hs20.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr690-shark-jit-hs20.patch Fri Aug 12 17:02:19 2011 +0200
@@ -0,0 +1,61 @@
+Index: openjdk/hotspot/src/share/vm/shark/sharkCompiler.hpp
+===================================================================
+--- openjdk.orig/hotspot/src/share/vm/shark/sharkCompiler.hpp 2011-04-15 14:48:22.175181000 +0200
++++ openjdk/hotspot/src/share/vm/shark/sharkCompiler.hpp 2011-04-15 16:19:28.915181000 +0200
+@@ -113,7 +113,7 @@
+ // Global access
+ public:
+ static SharkCompiler* compiler() {
+- AbstractCompiler *compiler = CompileBroker::compiler(CompLevel_simple);
++ AbstractCompiler *compiler = CompileBroker::compiler(CompLevel_full_optimization);
+ assert(compiler->is_shark() && compiler->is_initialized(), "should be");
+ return (SharkCompiler *) compiler;
+ }
+Index: openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+===================================================================
+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp 2011-04-15 14:54:00.447181000 +0200
++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp 2011-04-15 15:02:25.851181000 +0200
+@@ -740,9 +740,9 @@
+ CompLevel_simple = 1, // C1
+ CompLevel_limited_profile = 2, // C1, invocation & backedge counters
+ CompLevel_full_profile = 3, // C1, invocation & backedge counters + mdo
+- CompLevel_full_optimization = 4, // C2
++ CompLevel_full_optimization = 4, // C2 or Shark
+
+-#if defined(COMPILER2)
++#if defined(COMPILER2) || defined(SHARK)
+ CompLevel_highest_tier = CompLevel_full_optimization, // pure C2 and tiered
+ #elif defined(COMPILER1)
+ CompLevel_highest_tier = CompLevel_simple, // pure C1
+@@ -754,7 +754,7 @@
+ CompLevel_initial_compile = CompLevel_full_profile // tiered
+ #elif defined(COMPILER1)
+ CompLevel_initial_compile = CompLevel_simple // pure C1
+-#elif defined(COMPILER2)
++#elif defined(COMPILER2) || defined(SHARK)
+ CompLevel_initial_compile = CompLevel_full_optimization // pure C2
+ #else
+ CompLevel_initial_compile = CompLevel_none
+Index: openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp
+===================================================================
+--- openjdk.orig/hotspot/src/share/vm/compiler/compileBroker.cpp 2011-04-15 16:05:50.051181001 +0200
++++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp 2011-04-15 16:08:46.127181000 +0200
+@@ -768,7 +768,9 @@
+ // Initialize the compilation queue
+ void CompileBroker::init_compiler_threads(int c1_compiler_count, int c2_compiler_count) {
+ EXCEPTION_MARK;
++#if !defined(ZERO) && !defined(SHARK)
+ assert(c2_compiler_count > 0 || c1_compiler_count > 0, "No compilers?");
++#endif // !ZERO && !SHARK
+ if (c2_compiler_count > 0) {
+ _c2_method_queue = new CompileQueue("C2MethodQueue", MethodCompileQueue_lock);
+ }
+@@ -1029,7 +1031,7 @@
+
+ assert(!HAS_PENDING_EXCEPTION, "No exception should be present");
+ // some prerequisites that are compiler specific
+- if (compiler(comp_level)->is_c2()) {
++ if (compiler(comp_level)->is_c2() || compiler(comp_level)->is_shark()) {
+ method->constants()->resolve_string_constants(CHECK_0);
+ // Resolve all classes seen in the signature of the method
+ // we are compiling.
diff -r 4c641e5e379d -r f418ea6127b6 patches/pr696-zero-fast_aldc-hs20.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr696-zero-fast_aldc-hs20.patch Fri Aug 12 17:02:19 2011 +0200
@@ -0,0 +1,44 @@
+Index: openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
+===================================================================
+--- openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Sun Apr 03 12:00:54 2011 +0200
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Mon Apr 04 03:02:00 2011 -0700
+@@ -568,7 +568,7 @@ BytecodeInterpreter::run(interpreterStat
+ /* 0xDC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
+
+ /* 0xE0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
+-/* 0xE4 */ &&opc_default, &&opc_return_register_finalizer, &&opc_default, &&opc_default,
++/* 0xE4 */ &&opc_default, &&opc_default, &&opc_default, &&opc_return_register_finalizer,
+ /* 0xE8 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
+ /* 0xEC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
+
+# HG changeset patch
+# User twisti
+# Date 1300957910 25200
+# Node ID 151da0c145a8e4de263740273ec10c0eb46b30d0
+# Parent 9dc311b8473e0259a5de3f9358ca94de3990d692
+7030207: Zero tweak to remove accidentally incorporated code
+Summary: IcedTea contains a now-unmaintained ARM-specific interpreter and part of that interpreter was accidentally incorporated in one of the webrevs when Zero was initially imported.
+Reviewed-by: twisti
+Contributed-by: Gary Benson <gbenson at redhat.com>
+
+--- openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Mon Mar 21 11:28:14 2011 -0700
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Thu Mar 24 02:11:50 2011 -0700
+@@ -2383,17 +2383,6 @@ run:
+ }
+
+ DEFAULT:
+-#ifdef ZERO
+- // Some zero configurations use the C++ interpreter as a
+- // fallback interpreter and have support for platform
+- // specific fast bytecodes which aren't supported here, so
+- // redispatch to the equivalent non-fast bytecode when they
+- // are encountered.
+- if (Bytecodes::is_defined((Bytecodes::Code)opcode)) {
+- opcode = (jubyte)Bytecodes::java_code((Bytecodes::Code)opcode);
+- goto opcode_switch;
+- }
+-#endif
+ fatal(err_msg("Unimplemented opcode %d = %s", opcode,
+ Bytecodes::name((Bytecodes::Code)opcode)));
+ goto finish;
+
More information about the distro-pkg-dev
mailing list