RFC: PR690: Shark fails to JIT using hs20
Dr Andrew John Hughes
ahughes at redhat.com
Wed Apr 20 15:31:12 PDT 2011
On 12:28 Wed 20 Apr , Xerxes Rånby wrote:
> Hi the attached patches updates icedtea6-1.10 and icedtea6 trunk to make the Shark JIT work when using HotSpot 20 and later:
>
> Before:
> #Shark built against hs20 fails to JIT.
> icedtea6-shark/openjdk.build/j2sdk-image/bin/java -version
> java version "1.6.0_22"
> OpenJDK Runtime Environment (IcedTea6 1.11pre+r0239a181c7a0+) (Ubuntu build
> 1.6.0_22-b22)
> OpenJDK Shark VM (build 20.0-b11, mixed mode)
> xerxes at xerxes-J464X:~/cm30$
> ../icedtea6-shark/openjdk.build/j2sdk-image/bin/java CaffeineMarkEmbeddedApp
> Sieve score = 2648 (98)
> Loop score = 1746 (2017)
> Logic score = 2459 (0)
> String score = 4048 (708)
> Float score = 1836 (185)
> Method score = 1490 (166650)
> Overall score = 2238
>
> After:
> xerxes at xerxes-J464X:~/cm30$ ../icedtea6-shark-hs/openjdk.build/j2sdk-image/binava -showversion CaffeineMarkEmbeddedApp
> java version "1.6.0_22"
> OpenJDK Runtime Environment (IcedTea6 1.11pre+r307d19e0cca0+) (Ubuntu build 1.6.0_22-b22)
> OpenJDK Shark VM (build 20.0-b11, mixed mode)
>
> Sieve score = 39462 (98)
> Loop score = 54003 (2017)
> Logic score = 71066 (0)
> String score = 26256 (708)
> Float score = 33218 (185)
> Method score = 21011 (166650)
> Overall score = 37487
>
>
> I have tested these patches using the following three configurations:
>
> ../icedtea6-1.10/configure --enable-shark --disable-bootstrap --disable-docs --with-hotspot-build
>
> ../icedtea6/configure --enable-shark --disable-docs --disable-bootstrap
> ../icedtea6/configure --enable-shark --disable-bootstrap --disable-docs --with-hotspot-build
>
>
> Ok to push to IcedTea6-1.10 release branch?
>
> Ok to push to IcedTea6 trunk?
>
> Cheers
> Xerxes
What part of 7032458 is being used here? I'm concerned that neither the NEWS item
nor the patch file mention 7032458. Are there parts of 7032458 that don't apply?
The patch claims to be for hs20 but you seem to be applying it unconditionally
(and thus for hs19 too).
> Index: icedtea6/Makefile.am
> ===================================================================
> --- icedtea6.orig/Makefile.am 2011-04-20 11:39:13.640753000 +0200
> +++ icedtea6/Makefile.am 2011-04-20 11:39:55.248753002 +0200
> @@ -336,7 +336,8 @@
> patches/revert-6885123.patch \
> patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \
> patches/openjdk/7031385-gcc-register-allocation-fix.patch \
> - patches/shark-llvm-2.9.patch
> + patches/shark-llvm-2.9.patch \
> + patches/pr690-shark-jit-hs20.patch
>
> if WITH_ALT_HSBUILD
> ICEDTEA_PATCHES += \
> Index: icedtea6/patches/pr690-shark-jit-hs20.patch
> ===================================================================
> --- /dev/null 1970-01-01 00:00:00.000000000 +0000
> +++ icedtea6/patches/pr690-shark-jit-hs20.patch 2011-04-20 11:39:01.520753016 +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.
> Index: icedtea6/ChangeLog
> ===================================================================
> --- icedtea6.orig/ChangeLog 2011-04-20 11:56:57.852753002 +0200
> +++ icedtea6/ChangeLog 2011-04-20 11:57:34.420753002 +0200
> @@ -1,3 +1,11 @@
> +2011-04-20 Xerxes R??nby <xerxes at zafena.se>
> +
> + PR690: Shark fails to JIT using hs20
> + * Makefile.am: Add patch
> + * patches/pr690-shark-jit-hs20.patch:
> + Backported Shark fixes from OpenJDK bug 7032458.
> + * NEWS: Updated.
> +
> 2011-04-12 Xerxes R??nby <xerxes at zafena.se>
>
> PR689: Shark fails to find LLVM 2.9 System headers during build
> Index: icedtea6/NEWS
> ===================================================================
> --- icedtea6.orig/NEWS 2011-04-20 11:54:46.900753002 +0200
> +++ icedtea6/NEWS 2011-04-20 11:56:10.648753002 +0200
> @@ -48,6 +48,7 @@
> - Trivial implementation of stubs for MIPS.
> * Shark
> - PR689: Shark fails to find LLVM 2.9 System headers during build.
> + - PR690: Shark fails to JIT using hs20.
>
> New in release 1.10 (2011-XX-XX):
>
> Index: icedtea6-1.10/Makefile.am
> ===================================================================
> --- icedtea6-1.10.orig/Makefile.am 2011-04-20 11:42:37.816753001 +0200
> +++ icedtea6-1.10/Makefile.am 2011-04-20 11:44:13.344753002 +0200
> @@ -335,6 +335,7 @@
> if WITH_ALT_HSBUILD
> ICEDTEA_PATCHES += \
> patches/pr639-broken_shark_build.patch \
> + patches/pr690-shark-jit-hs20.patch \
> patches/hotspot/$(HSBUILD)/powerpc-stacksize.patch
> else
> ICEDTEA_PATCHES += \
> Index: icedtea6-1.10/patches/pr690-shark-jit-hs20.patch
> ===================================================================
> --- /dev/null 1970-01-01 00:00:00.000000000 +0000
> +++ icedtea6-1.10/patches/pr690-shark-jit-hs20.patch 2011-04-20 11:43:11.420753001 +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.
> Index: icedtea6-1.10/ChangeLog
> ===================================================================
> --- icedtea6-1.10.orig/ChangeLog 2011-04-20 11:47:44.612753002 +0200
> +++ icedtea6-1.10/ChangeLog 2011-04-20 11:53:20.040753002 +0200
> @@ -1,3 +1,11 @@
> +2011-04-20 Xerxes R??nby <xerxes at zafena.se>
> +
> + PR690: Shark fails to JIT using hs20
> + * Makefile.am: Add WITH_ALT_HSBUILD patch
> + * patches/pr690-shark-jit-hs20.patch:
> + Backported Shark fixes from OpenJDK bug 7032458.
> + * NEWS: Updated.
> +
> 2011-04-12 Xerxes R??nby <xerxes at zafena.se>
>
> PR689: Shark fails to find LLVM 2.9 System headers during build
> Index: icedtea6-1.10/NEWS
> ===================================================================
> --- icedtea6-1.10.orig/NEWS 2011-04-20 11:53:31.536753002 +0200
> +++ icedtea6-1.10/NEWS 2011-04-20 11:54:08.648753002 +0200
> @@ -13,6 +13,7 @@
>
> * Shark
> - PR689: Shark fails to find LLVM 2.9 System headers during build.
> + - PR690: Shark fails to JIT using hs20.
>
> New in release 1.10.1 (2011-04-04):
>
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37
More information about the distro-pkg-dev
mailing list